diff options
364 files changed, 9197 insertions, 9197 deletions
diff --git a/epan/dissectors/packet-2dparityfec.c b/epan/dissectors/packet-2dparityfec.c index 68d5e22bab..f74490a7fb 100644 --- a/epan/dissectors/packet-2dparityfec.c +++ b/epan/dissectors/packet-2dparityfec.c @@ -142,19 +142,19 @@ static void dissect_2dparityfec(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t ti = proto_tree_add_item(tree, proto_2dparityfec, tvb, 0, -1, FALSE); tree_2dparityfec = proto_item_add_subtree(ti, ett_2dparityfec); - proto_tree_add_item(tree_2dparityfec, hf_2dparityfec_snbase_low, tvb, offset, 2, FALSE); offset += 2; - proto_tree_add_item(tree_2dparityfec, hf_2dparityfec_length_recovery, tvb, offset, 2, FALSE); offset += 2; + proto_tree_add_item(tree_2dparityfec, hf_2dparityfec_snbase_low, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; + proto_tree_add_item(tree_2dparityfec, hf_2dparityfec_length_recovery, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(tree_2dparityfec, hf_2dparityfec_rfc2733_ext, tvb, offset, 1, FALSE); - proto_tree_add_item(tree_2dparityfec, hf_2dparityfec_pt_recovery, tvb, offset, 1, FALSE); offset += 1; + proto_tree_add_item(tree_2dparityfec, hf_2dparityfec_pt_recovery, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; proto_tree_add_item(tree_2dparityfec, hf_2dparityfec_mask, tvb, offset, 3, FALSE); offset += 3; - proto_tree_add_item(tree_2dparityfec, hf_2dparityfec_ts_recovery, tvb, offset, 4, FALSE); offset += 4; + proto_tree_add_item(tree_2dparityfec, hf_2dparityfec_ts_recovery, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; proto_tree_add_item(tree_2dparityfec, hf_2dparityfec_ts_pro_mpeg_ext, tvb, offset, 1, FALSE); proto_tree_add_item(tree_2dparityfec, hf_2dparityfec_row_flag, tvb, offset, 1, FALSE); - proto_tree_add_item(tree_2dparityfec, hf_2dparityfec_type, tvb, offset, 1, FALSE); - proto_tree_add_item(tree_2dparityfec, hf_2dparityfec_index, tvb, offset, 1, FALSE); offset += 1; - proto_tree_add_item(tree_2dparityfec, hf_2dparityfec_offset, tvb, offset, 1, FALSE); offset += 1; - proto_tree_add_item(tree_2dparityfec, hf_2dparityfec_na, tvb, offset, 1, FALSE); offset += 1; - proto_tree_add_item(tree_2dparityfec, hf_2dparityfec_snbase_ext, tvb, offset, 1, FALSE); offset += 1; + proto_tree_add_item(tree_2dparityfec, hf_2dparityfec_type, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree_2dparityfec, hf_2dparityfec_index, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; + proto_tree_add_item(tree_2dparityfec, hf_2dparityfec_offset, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; + proto_tree_add_item(tree_2dparityfec, hf_2dparityfec_na, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; + proto_tree_add_item(tree_2dparityfec, hf_2dparityfec_snbase_ext, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; proto_tree_add_item(tree_2dparityfec, hf_2dparityfec_payload, tvb, offset, -1, ENC_NA); } } diff --git a/epan/dissectors/packet-aim-buddylist.c b/epan/dissectors/packet-aim-buddylist.c index 86f97cb1c9..3a135e9796 100644 --- a/epan/dissectors/packet-aim-buddylist.c +++ b/epan/dissectors/packet-aim-buddylist.c @@ -92,7 +92,7 @@ static int dissect_aim_buddylist_oncoming(tvbuff_t *tvb, packet_info *pinfo, pro /* Warning level */ proto_tree_add_item(buddy_tree, hf_aim_userinfo_warninglevel, tvb, offset, - 2, FALSE); + 2, ENC_BIG_ENDIAN); offset += 2; offset = dissect_aim_tlv_list(tvb, pinfo, offset, buddy_tree, aim_onlinebuddy_tlvs); @@ -115,7 +115,7 @@ static int dissect_aim_buddylist_offgoing(tvbuff_t *tvb, packet_info *pinfo, pro /* Warning level */ proto_tree_add_item(buddy_tree, hf_aim_userinfo_warninglevel, tvb, offset, - 2, FALSE); + 2, ENC_BIG_ENDIAN); offset += 2; return dissect_aim_tlv_list(tvb, pinfo, offset, buddy_tree, aim_onlinebuddy_tlvs); diff --git a/epan/dissectors/packet-aim-generic.c b/epan/dissectors/packet-aim-generic.c index b00d28009d..0ffe7c58d6 100644 --- a/epan/dissectors/packet-aim-generic.c +++ b/epan/dissectors/packet-aim-generic.c @@ -376,7 +376,7 @@ static int dissect_aim_generic_setprivflags(tvbuff_t *tvb, packet_info *pinfo _U static int dissect_aim_generic_selfinfo_repl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *gen_tree) { int offset = dissect_aim_buddyname(tvb, pinfo, 0, gen_tree); - proto_tree_add_item(gen_tree, hf_generic_selfinfo_warninglevel, tvb, offset, 2, FALSE); + proto_tree_add_item(gen_tree, hf_generic_selfinfo_warninglevel, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; return dissect_aim_tlv_list(tvb, pinfo, offset, gen_tree, aim_onlinebuddy_tlvs); } @@ -384,7 +384,7 @@ static int dissect_aim_generic_selfinfo_repl(tvbuff_t *tvb, packet_info *pinfo, static int dissect_aim_generic_evil(tvbuff_t *tvb, packet_info *pinfo, proto_tree *gen_tree) { int offset = 0; - proto_tree_add_item(gen_tree, hf_generic_evil_new_warn_level, tvb, offset, 2, FALSE); + proto_tree_add_item(gen_tree, hf_generic_evil_new_warn_level, tvb, offset, 2, ENC_BIG_ENDIAN); while(tvb_length_remaining(tvb, offset)) { offset = dissect_aim_userinfo(tvb, pinfo, offset, gen_tree); } @@ -393,7 +393,7 @@ static int dissect_aim_generic_evil(tvbuff_t *tvb, packet_info *pinfo, proto_tre static int dissect_aim_generic_setidle(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *gen_tree) { - proto_tree_add_item(gen_tree, hf_generic_idle_time, tvb, 0, 2, FALSE); + proto_tree_add_item(gen_tree, hf_generic_idle_time, tvb, 0, 2, ENC_BIG_ENDIAN); return 2; } @@ -405,9 +405,9 @@ static int dissect_aim_generic_ext_status_req(tvbuff_t *tvb, packet_info *pinfo, static int dissect_aim_generic_clientver_req(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *gen_tree) { int offset = 0; - proto_tree_add_item(gen_tree, hf_generic_client_ver_req_offset, tvb, offset, 4, FALSE); + proto_tree_add_item(gen_tree, hf_generic_client_ver_req_offset, tvb, offset, 4, ENC_BIG_ENDIAN); offset+=4; - proto_tree_add_item(gen_tree, hf_generic_client_ver_req_length, tvb, offset, 4, FALSE); + proto_tree_add_item(gen_tree, hf_generic_client_ver_req_length, tvb, offset, 4, ENC_BIG_ENDIAN); return offset+4; } @@ -421,9 +421,9 @@ static int dissect_aim_generic_ext_status_repl(tvbuff_t *tvb, packet_info *pinfo { guint8 length; int offset = 0; - proto_tree_add_item(gen_tree, hf_generic_ext_status_type, tvb, offset, 2, FALSE); offset += 2; - proto_tree_add_item(gen_tree, hf_generic_ext_status_flags, tvb, offset, 1, FALSE); offset += 1; - proto_tree_add_item(gen_tree, hf_generic_ext_status_length, tvb, offset, 1, FALSE); length = tvb_get_guint8(tvb, offset); offset += 1; + proto_tree_add_item(gen_tree, hf_generic_ext_status_type, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; + proto_tree_add_item(gen_tree, hf_generic_ext_status_flags, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; + proto_tree_add_item(gen_tree, hf_generic_ext_status_length, tvb, offset, 1, ENC_BIG_ENDIAN); length = tvb_get_guint8(tvb, offset); offset += 1; proto_tree_add_item(gen_tree, hf_generic_ext_status_data, tvb, offset, length, ENC_NA); offset += 1; return offset; } diff --git a/epan/dissectors/packet-aim-icq.c b/epan/dissectors/packet-aim-icq.c index 5d6df9a076..9e42fa2b91 100644 --- a/epan/dissectors/packet-aim-icq.c +++ b/epan/dissectors/packet-aim-icq.c @@ -151,17 +151,17 @@ static int dissect_aim_tlv_value_icq(proto_item *ti _U_, guint16 subtype _U_, tv guint16 req_type, req_subtype; proto_tree *t = proto_item_add_subtree(ti, ett_aim_icq_tlv); - proto_tree_add_item(t, hf_icq_tlv_data_chunk_size, tvb, offset, 2, TRUE); + proto_tree_add_item(t, hf_icq_tlv_data_chunk_size, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; - proto_tree_add_item(t, hf_icq_tlv_request_owner_uid, tvb, offset, 4, TRUE); + proto_tree_add_item(t, hf_icq_tlv_request_owner_uid, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; - proto_tree_add_item(t, hf_icq_tlv_request_type, tvb, offset, 2, TRUE); + proto_tree_add_item(t, hf_icq_tlv_request_type, tvb, offset, 2, ENC_LITTLE_ENDIAN); req_type = tvb_get_letohs(tvb, offset); offset += 2; - proto_tree_add_item(t, hf_icq_tlv_request_seq_num, tvb, offset, 2, TRUE); + proto_tree_add_item(t, hf_icq_tlv_request_seq_num, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; switch(req_type) { @@ -171,12 +171,12 @@ static int dissect_aim_tlv_value_icq(proto_item *ti _U_, guint16 subtype _U_, tv /* FIXME */ break; case ICQ_SRV_END_OF_OFFLINE_MSGS: - proto_tree_add_item(t, hf_icq_dropped_msg_flag, tvb, offset, 1, TRUE); + proto_tree_add_item(t, hf_icq_dropped_msg_flag, tvb, offset, 1, ENC_LITTLE_ENDIAN); return offset+1; case ICQ_CLI_META_INFO_REQ: case ICQ_SRV_META_INFO_REPL: req_subtype = tvb_get_letohs(tvb, offset); - subtype_item = proto_tree_add_item(t, hf_icq_meta_subtype, tvb, offset, 2, TRUE); offset+=2; + subtype_item = proto_tree_add_item(t, hf_icq_meta_subtype, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset+=2; for(i = 0; icq_calls[i].name; i++) { if(icq_calls[i].subtype == req_subtype) break; diff --git a/epan/dissectors/packet-aim-sst.c b/epan/dissectors/packet-aim-sst.c index d54f7cf18d..65cc9c26f0 100644 --- a/epan/dissectors/packet-aim-sst.c +++ b/epan/dissectors/packet-aim-sst.c @@ -60,7 +60,7 @@ static int dissect_aim_sst_buddy_down_req (tvbuff_t *tvb, packet_info *pinfo _U_ proto_tree_add_item(tree, hf_aim_sst_unknown, tvb, offset, 4, ENC_NA); offset+=4; - proto_tree_add_item(tree, hf_aim_sst_md5_hash_size, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_aim_sst_md5_hash_size, tvb, offset, 1, ENC_BIG_ENDIAN); md5_size = tvb_get_guint8(tvb, offset); offset++; @@ -79,7 +79,7 @@ static int dissect_aim_sst_buddy_down_repl (tvbuff_t *tvb, packet_info *pinfo _U proto_tree_add_item(tree, hf_aim_sst_unknown, tvb, offset, 3, ENC_NA); offset+=3; - proto_tree_add_item(tree, hf_aim_sst_md5_hash_size, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_aim_sst_md5_hash_size, tvb, offset, 1, ENC_BIG_ENDIAN); md5_size = tvb_get_guint8(tvb, offset); offset++; @@ -87,7 +87,7 @@ static int dissect_aim_sst_buddy_down_repl (tvbuff_t *tvb, packet_info *pinfo _U offset+=md5_size; - proto_tree_add_item(tree, hf_aim_sst_icon_size, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_aim_sst_icon_size, tvb, offset, 2, ENC_BIG_ENDIAN); icon_size = tvb_get_ntohs(tvb, offset); offset+=2; @@ -109,7 +109,7 @@ static int dissect_aim_sst_buddy_up_repl (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree_add_item(tree, hf_aim_sst_unknown, tvb, offset, 4, ENC_NA); offset+=4; - proto_tree_add_item(tree, hf_aim_sst_md5_hash_size, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_aim_sst_md5_hash_size, tvb, offset, 1, ENC_BIG_ENDIAN); md5_size = tvb_get_guint8(tvb, offset); offset++; @@ -124,10 +124,10 @@ static int dissect_aim_sst_buddy_up_req (tvbuff_t *tvb, packet_info *pinfo _U_, int offset = 0; guint16 icon_size; - proto_tree_add_item(tree, hf_aim_sst_ref_num, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_aim_sst_ref_num, tvb, offset, 2, ENC_BIG_ENDIAN); offset+=2; - proto_tree_add_item(tree, hf_aim_sst_icon_size, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_aim_sst_icon_size, tvb, offset, 2, ENC_BIG_ENDIAN); icon_size = tvb_get_ntohs(tvb, offset); offset+=2; diff --git a/epan/dissectors/packet-ancp.c b/epan/dissectors/packet-ancp.c index 4b7d248d6a..c92dba87fe 100644 --- a/epan/dissectors/packet-ancp.c +++ b/epan/dissectors/packet-ancp.c @@ -299,22 +299,22 @@ dissect_ancp_port_up_dn_mgmt(tvbuff_t *tvb, proto_tree *ancp_tree, gint offset) gint val; proto_tree_add_item(ancp_tree, hf_ancp_port, tvb, offset, 4, - FALSE); + ENC_BIG_ENDIAN); offset += 4; proto_tree_add_item(ancp_tree, hf_ancp_port_sess_num, tvb, offset, 4, - FALSE); + ENC_BIG_ENDIAN); offset += 4; proto_tree_add_item(ancp_tree, hf_ancp_evt_seq_num, tvb, offset, 4, - FALSE); + ENC_BIG_ENDIAN); offset += 4; proto_tree_add_item(ancp_tree, hf_ancp_label, tvb, offset, 8, FALSE); offset += 8; /* Start of the Extension Block */ - proto_tree_add_item(ancp_tree, hf_ancp_reserved, tvb, offset, 1, FALSE); + proto_tree_add_item(ancp_tree, hf_ancp_reserved, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; /* * We have already displayed the message type in the common header dissect @@ -322,21 +322,21 @@ dissect_ancp_port_up_dn_mgmt(tvbuff_t *tvb, proto_tree *ancp_tree, gint offset) */ offset += 1; /* Message type in Ext Blk */ - proto_tree_add_item(ancp_tree, hf_ancp_tech_type, tvb, offset, 1, FALSE); + proto_tree_add_item(ancp_tree, hf_ancp_tech_type, tvb, offset, 1, ENC_BIG_ENDIAN); tech_type = tvb_get_guint8(tvb, offset); offset += 1; - proto_tree_add_item(ancp_tree, hf_ancp_blk_len, tvb, offset, 1, FALSE); + proto_tree_add_item(ancp_tree, hf_ancp_blk_len, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; if (tech_type == TECH_TYPE_DSL) { proto_tree_add_item(ancp_tree, hf_ancp_num_ext_tlvs, tvb, - offset, 2, FALSE); + offset, 2, ENC_BIG_ENDIAN); num_tlvs = tvb_get_ntohs(tvb, offset); offset += 2; sti = proto_tree_add_item(ancp_tree, hf_ancp_len, tvb, - offset, 2, FALSE); + offset, 2, ENC_BIG_ENDIAN); proto_item_append_text(sti, " (Extension Block)"); offset += 2; @@ -345,12 +345,12 @@ dissect_ancp_port_up_dn_mgmt(tvbuff_t *tvb, proto_tree *ancp_tree, gint offset) for( ;num_tlvs; num_tlvs--) { proto_tree_add_item(tlv_tree, hf_ancp_ext_tlv_type, tvb, - offset, 2, FALSE); + offset, 2, ENC_BIG_ENDIAN); ttype = tvb_get_ntohs(tvb, offset); offset += 2; sti = proto_tree_add_item(tlv_tree, hf_ancp_len, tvb, - offset, 2, FALSE); + offset, 2, ENC_BIG_ENDIAN); tlen = tvb_get_ntohs(tvb, offset); offset += 2; @@ -368,7 +368,7 @@ dissect_ancp_port_up_dn_mgmt(tvbuff_t *tvb, proto_tree *ancp_tree, gint offset) for ( ;num_stlvs; num_stlvs--) { proto_tree_add_item(dsl_tree, hf_ancp_dsl_line_stlv_type, tvb, offset, - 2, FALSE); + 2, ENC_BIG_ENDIAN); stlvtype = tvb_get_ntohs(tvb, offset); offset += 2; /* Skip sub-tlv-len display for now */ @@ -377,7 +377,7 @@ dissect_ancp_port_up_dn_mgmt(tvbuff_t *tvb, proto_tree *ancp_tree, gint offset) sti = proto_tree_add_item(dsl_tree, hf_ancp_dsl_line_stlv_value, tvb, offset, - stlvlen, FALSE); + stlvlen, ENC_BIG_ENDIAN); val = tvb_get_ntohl(tvb, offset); offset += stlvlen; /* Except loop-encap, rest are 4B */ @@ -416,10 +416,10 @@ dissect_ancp_port_up_dn_mgmt(tvbuff_t *tvb, proto_tree *ancp_tree, gint offset) case TLV_PING_PARAMS: /* Count (1B) Timeout (1B), 2B empty */ proto_tree_add_item(tlv_tree, - hf_ancp_oam_loopb_cnt, tvb, offset, 1, FALSE); + hf_ancp_oam_loopb_cnt, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; proto_tree_add_item(tlv_tree, - hf_ancp_oam_timeout, tvb, offset, 1, FALSE); + hf_ancp_oam_timeout, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; /* Lets not bother about 2B until IETF WG figures out */ offset += 2; @@ -447,7 +447,7 @@ dissect_ancp_adj_msg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ancp_tree, guint16 tlv_len; sti = proto_tree_add_item(ancp_tree, hf_ancp_timer, tvb, offset, 1, - FALSE); + ENC_BIG_ENDIAN); offset += 1; proto_item_append_text(sti, " msec"); @@ -469,36 +469,36 @@ dissect_ancp_adj_msg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ancp_tree, proto_tree_add_item(ancp_tree, hf_ancp_receiver_name, tvb,offset, 6, FALSE); offset += 6; - proto_tree_add_item(ancp_tree, hf_ancp_sender_port, tvb, offset, 4, FALSE); + proto_tree_add_item(ancp_tree, hf_ancp_sender_port, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(ancp_tree, hf_ancp_receiver_port, tvb,offset, 4, FALSE); + proto_tree_add_item(ancp_tree, hf_ancp_receiver_port, tvb,offset, 4, ENC_BIG_ENDIAN); offset += 4; sti = proto_tree_add_item(ancp_tree, hf_ancp_p_info, tvb, - offset, 1, FALSE); + offset, 1, ENC_BIG_ENDIAN); byte = tvb_get_guint8(tvb, offset); offset += 1; proto_item_append_text(sti, " (Type = %d, Flag = %d)", byte >> 4, byte & 0x0F); proto_tree_add_item(ancp_tree, hf_ancp_sender_instance, tvb, offset, 3, - FALSE); + ENC_BIG_ENDIAN); offset += 3; - proto_tree_add_item(ancp_tree, hf_ancp_p_id, tvb, offset, 1, FALSE); + proto_tree_add_item(ancp_tree, hf_ancp_p_id, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; proto_tree_add_item(ancp_tree, hf_ancp_receiver_instance, tvb, offset, 3, - FALSE); + ENC_BIG_ENDIAN); offset += 3; proto_tree_add_item(ancp_tree, hf_ancp_tech_type, tvb, - offset, 1, FALSE); + offset, 1, ENC_BIG_ENDIAN); offset += 1; sti = proto_tree_add_item(ancp_tree, hf_ancp_num_tlvs, tvb, offset, 1, - FALSE); + ENC_BIG_ENDIAN); numcaps = tvb_get_guint8(tvb, offset); offset += 1; @@ -511,7 +511,7 @@ dissect_ancp_adj_msg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ancp_tree, for ( ;numcaps; numcaps--) { sti = proto_tree_add_item(ancp_cap_tree, hf_ancp_cap, tvb, - offset, 2, FALSE); + offset, 2, ENC_BIG_ENDIAN); offset += 2; tlv_len = tvb_get_ntohs(tvb, offset); @@ -580,17 +580,17 @@ dissect_ancp_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = 2; /* skip ether type */ proto_tree_add_item(ancp_tree, hf_ancp_len, tvb, offset, 2, - FALSE); + ENC_BIG_ENDIAN); offset += 2; sti = proto_tree_add_item(ancp_tree, hf_ancp_ver, tvb, offset, 1, - FALSE); + ENC_BIG_ENDIAN); byte = tvb_get_guint8(tvb, offset); offset += 1; proto_item_append_text(sti, " (%d.%d)", byte >> 4, byte & 0x0F); sti = proto_tree_add_item(ancp_tree, hf_ancp_mtype, tvb, offset, 1, - FALSE); + ENC_BIG_ENDIAN); mtype = tvb_get_guint8(tvb, offset); /* ANCP message type */ ancp_info->ancp_mtype = mtype; /* stats */ offset += 1; @@ -601,25 +601,25 @@ dissect_ancp_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (mtype != ANCP_MTYPE_ADJ) { /* Dissect common header */ proto_tree_add_item(ancp_tree, hf_ancp_result, tvb, offset, 1, - FALSE); /* treat as 1B, but dont change offset */ + ENC_BIG_ENDIAN); /* treat as 1B, but dont change offset */ proto_tree_add_item(ancp_tree, hf_ancp_code, tvb, offset, 2, - FALSE); + ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(ancp_tree, hf_ancp_p_id, tvb, offset, - 1, FALSE); + 1, ENC_BIG_ENDIAN); offset += 1; proto_tree_add_item(ancp_tree, hf_ancp_trans_id, tvb, - offset, 3, FALSE); + offset, 3, ENC_BIG_ENDIAN); offset += 3; proto_tree_add_item(ancp_tree, hf_ancp_i_flag, tvb, offset, 1, FALSE); /* treat as 1B, but dont change offset */ sti = proto_tree_add_item(ancp_tree, hf_ancp_submsg_num, tvb, - offset, 2, FALSE); + offset, 2, ENC_BIG_ENDIAN); offset += 2; /* diff --git a/epan/dissectors/packet-ansi_637.c b/epan/dissectors/packet-ansi_637.c index a51fee7663..1e40510004 100644 --- a/epan/dissectors/packet-ansi_637.c +++ b/epan/dissectors/packet-ansi_637.c @@ -457,7 +457,7 @@ tele_param_msg_status(tvbuff_t *tvb, proto_tree *tree, guint len, guint32 offset /* error class filter */ - proto_tree_add_item(tree, hf_ansi_637_tele_msg_status,tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_ansi_637_tele_msg_status,tvb, offset, 1, ENC_BIG_ENDIAN); /*error class filter end */ diff --git a/epan/dissectors/packet-ansi_a.c b/epan/dissectors/packet-ansi_a.c index fac0717ad6..e645393605 100644 --- a/epan/dissectors/packet-ansi_a.c +++ b/epan/dissectors/packet-ansi_a.c @@ -8034,7 +8034,7 @@ elem_a2p_bearer_session(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint l } proto_tree_add_item(tree, hf_ansi_a_a2p_bearer_udp_port, - tvb, curr_offset, 2, FALSE); + tvb, curr_offset, 2, ENC_BIG_ENDIAN); rtp_port = tvb_get_ntohs(tvb, curr_offset); @@ -8270,7 +8270,7 @@ elem_a2p_bearer_format(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint le } proto_tree_add_item(subtree, hf_ansi_a_a2p_bearer_udp_port, - tvb, curr_offset, 2, FALSE); + tvb, curr_offset, 2, ENC_BIG_ENDIAN); if (format_assigned) { diff --git a/epan/dissectors/packet-applemidi.c b/epan/dissectors/packet-applemidi.c index 23fdf303a1..99e2aad606 100644 --- a/epan/dissectors/packet-applemidi.c +++ b/epan/dissectors/packet-applemidi.c @@ -123,10 +123,10 @@ dissect_applemidi_common( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, g ti = proto_tree_add_item( tree, proto_applemidi, tvb, 0, -1, FALSE ); applemidi_tree = proto_item_add_subtree( ti, ett_applemidi ); - proto_tree_add_item( applemidi_tree, hf_applemidi_signature, tvb, offset, 2, FALSE ); + proto_tree_add_item( applemidi_tree, hf_applemidi_signature, tvb, offset, 2, ENC_BIG_ENDIAN ); offset += 2; - proto_tree_add_item( applemidi_tree, hf_applemidi_command, tvb, offset, 2, FALSE ); + proto_tree_add_item( applemidi_tree, hf_applemidi_command, tvb, offset, 2, ENC_BIG_ENDIAN ); offset += 2; /* the format of packets for "IN", "NO", "OK" and "BY" is identical and contains @@ -136,13 +136,13 @@ dissect_applemidi_common( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, g if ( ( APPLEMIDI_COMMAND_INVITATION == command ) || ( APPLEMIDI_COMMAND_INVITATION_REJECTED == command ) || ( APLLEMIDI_COMMAND_INVITATION_ACCEPTED == command ) || ( APPLEMIDI_COMMAND_ENDSESSION == command ) ) { int len; - proto_tree_add_item( applemidi_tree, hf_applemidi_protocol_version, tvb, offset, 4, FALSE ); + proto_tree_add_item( applemidi_tree, hf_applemidi_protocol_version, tvb, offset, 4, ENC_BIG_ENDIAN ); offset += 4; - proto_tree_add_item( applemidi_tree, hf_applemidi_token, tvb, offset, 4, FALSE ); + proto_tree_add_item( applemidi_tree, hf_applemidi_token, tvb, offset, 4, ENC_BIG_ENDIAN ); offset += 4; - proto_tree_add_item( applemidi_tree, hf_applemidi_ssrc, tvb, offset, 4, FALSE ); + proto_tree_add_item( applemidi_tree, hf_applemidi_ssrc, tvb, offset, 4, ENC_BIG_ENDIAN ); offset += 4; len = tvb_reported_length(tvb) - offset; @@ -157,33 +157,33 @@ dissect_applemidi_common( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, g /* the synchronization packet contains three 64bit timestamps, and a value to define how * many of the timestamps transmitted are valid */ } else if ( APPLEMIDI_COMMAND_SYNCHRONIZATION == command ) { - proto_tree_add_item( applemidi_tree, hf_applemidi_ssrc, tvb, offset, 4, FALSE ); + proto_tree_add_item( applemidi_tree, hf_applemidi_ssrc, tvb, offset, 4, ENC_BIG_ENDIAN ); offset += 4; count = tvb_get_guint8( tvb, offset ); - proto_tree_add_item( applemidi_tree, hf_applemidi_count, tvb, offset, 1, FALSE ); + proto_tree_add_item( applemidi_tree, hf_applemidi_count, tvb, offset, 1, ENC_BIG_ENDIAN ); col_append_fstr( pinfo->cinfo, COL_INFO, ": count = %u", count ); offset += 1; - proto_tree_add_item( applemidi_tree, hf_applemidi_padding, tvb, offset, 3, FALSE ); + proto_tree_add_item( applemidi_tree, hf_applemidi_padding, tvb, offset, 3, ENC_BIG_ENDIAN ); offset += 3; - proto_tree_add_item(applemidi_tree, hf_applemidi_timestamp1, tvb, offset, 8, FALSE ); + proto_tree_add_item(applemidi_tree, hf_applemidi_timestamp1, tvb, offset, 8, ENC_BIG_ENDIAN ); offset += 8; - proto_tree_add_item( applemidi_tree, hf_applemidi_timestamp2, tvb, offset, 8, FALSE ); + proto_tree_add_item( applemidi_tree, hf_applemidi_timestamp2, tvb, offset, 8, ENC_BIG_ENDIAN ); offset += 8; - proto_tree_add_item( applemidi_tree, hf_applemidi_timestamp3, tvb, offset, 8, FALSE ); + proto_tree_add_item( applemidi_tree, hf_applemidi_timestamp3, tvb, offset, 8, ENC_BIG_ENDIAN ); offset += 8; /* With the receiver feedback packet, the recipient can tell the sender up to what sequence * number in the RTP-stream the packets have been received; this can be used to shorten the * recovery-journal-section in the RTP-session */ } else if ( APPLEMIDI_COMMAND_RECEIVER_FEEDBACK == command ) { - proto_tree_add_item( applemidi_tree, hf_applemidi_ssrc, tvb, offset, 4, FALSE ); + proto_tree_add_item( applemidi_tree, hf_applemidi_ssrc, tvb, offset, 4, ENC_BIG_ENDIAN ); offset += 4; - ti = proto_tree_add_item( applemidi_tree, hf_applemidi_sequence_num, tvb, offset, 4, FALSE ); + ti = proto_tree_add_item( applemidi_tree, hf_applemidi_sequence_num, tvb, offset, 4, ENC_BIG_ENDIAN ); /* Apple includes a 32bit sequence-number, but the RTP-packet only specifies 16bit. * this subtree and subitem are added to be able to associate the sequence-number * here easier with the one specified in the corresponding RTP-packet */ diff --git a/epan/dissectors/packet-artnet.c b/epan/dissectors/packet-artnet.c index ca34e7494d..7d9d6c5adf 100644 --- a/epan/dissectors/packet-artnet.c +++ b/epan/dissectors/packet-artnet.c @@ -522,7 +522,7 @@ dissect_artnet_poll_reply(tvbuff_t *tvb, guint offset, proto_tree *tree) offset += 4; proto_tree_add_item(tree, hf_artnet_poll_reply_port_nr, tvb, - offset, 2, TRUE); + offset, 2, ENC_LITTLE_ENDIAN); offset += 2; proto_tree_add_item(tree, hf_artnet_poll_reply_versinfo, tvb, @@ -546,7 +546,7 @@ dissect_artnet_poll_reply(tvbuff_t *tvb, guint offset, proto_tree *tree) offset += 1; proto_tree_add_item(tree, hf_artnet_poll_reply_esta_man, tvb, - offset, 2, TRUE); + offset, 2, ENC_LITTLE_ENDIAN); offset += 2; proto_tree_add_item(tree, hf_artnet_poll_reply_short_name, @@ -776,7 +776,7 @@ dissect_artnet_output(tvbuff_t *tvb, guint offset, proto_tree *tree) offset += 1; proto_tree_add_item(tree, hf_artnet_output_universe, tvb, - offset, 2, TRUE); + offset, 2, ENC_LITTLE_ENDIAN); offset += 2; length = tvb_get_ntohs(tvb, offset); diff --git a/epan/dissectors/packet-aruba-erm.c b/epan/dissectors/packet-aruba-erm.c index fa92de56cf..5f3996d0f0 100644 --- a/epan/dissectors/packet-aruba-erm.c +++ b/epan/dissectors/packet-aruba-erm.c @@ -81,8 +81,8 @@ dissect_aruba_erm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ts.secs = tvb_get_ntohl(tvb, 0); ts.nsecs = tvb_get_ntohl(tvb,4)*1000; proto_tree_add_time(aruba_erm_tree, hf_aruba_erm_time, tvb, 0, 8,&ts); - proto_tree_add_item(aruba_erm_tree, hf_aruba_erm_incl_len, tvb, 8, 4, FALSE); - proto_tree_add_item(aruba_erm_tree, hf_aruba_erm_orig_len, tvb, 12, 4, FALSE); + proto_tree_add_item(aruba_erm_tree, hf_aruba_erm_incl_len, tvb, 8, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(aruba_erm_tree, hf_aruba_erm_orig_len, tvb, 12, 4, ENC_BIG_ENDIAN); } eth_tvb = tvb_new_subset_remaining(tvb, 16); diff --git a/epan/dissectors/packet-aruba-papi.c b/epan/dissectors/packet-aruba-papi.c index a806ad1382..96229eeab2 100644 --- a/epan/dissectors/packet-aruba-papi.c +++ b/epan/dissectors/packet-aruba-papi.c @@ -92,23 +92,23 @@ dissect_papi_debug(tvbuff_t *tvb, guint offset, proto_tree *tree) case 0x00: ti = proto_tree_add_item(debug_tree, hf_papi_debug_text, tvb, offset+3, tvb_get_ntohs(tvb,offset+1), FALSE); debug_sub_tree = proto_item_add_subtree(ti, ett_papi); - proto_tree_add_item(debug_sub_tree, hf_papi_debug_text_length, tvb, offset+1, 2, FALSE); + proto_tree_add_item(debug_sub_tree, hf_papi_debug_text_length, tvb, offset+1, 2, ENC_BIG_ENDIAN); offset += tvb_get_ntohs(tvb, offset+1) + 3; break; case 0x01: - proto_tree_add_item(debug_tree, hf_papi_debug_48bits, tvb, offset+1, 6, FALSE); + proto_tree_add_item(debug_tree, hf_papi_debug_48bits, tvb, offset+1, 6, ENC_BIG_ENDIAN); offset += 7; break; case 0x02: - proto_tree_add_item(debug_tree, hf_papi_debug_8bits, tvb, offset+1, 1, FALSE); + proto_tree_add_item(debug_tree, hf_papi_debug_8bits, tvb, offset+1, 1, ENC_BIG_ENDIAN); offset += 2; break; case 0x03: - proto_tree_add_item(debug_tree, hf_papi_debug_16bits, tvb, offset+1, 2, FALSE); + proto_tree_add_item(debug_tree, hf_papi_debug_16bits, tvb, offset+1, 2, ENC_BIG_ENDIAN); offset += 3; break; case 0x04: - proto_tree_add_item(debug_tree, hf_papi_debug_32bits, tvb, offset+1, 4, FALSE); + proto_tree_add_item(debug_tree, hf_papi_debug_32bits, tvb, offset+1, 4, ENC_BIG_ENDIAN); offset += 5; break; case 0x05: @@ -116,17 +116,17 @@ dissect_papi_debug(tvbuff_t *tvb, guint offset, proto_tree *tree) offset += 5; break; case 0x07: - proto_tree_add_item(debug_tree, hf_papi_debug_16bits, tvb, offset+1, 2, FALSE); + proto_tree_add_item(debug_tree, hf_papi_debug_16bits, tvb, offset+1, 2, ENC_BIG_ENDIAN); offset += 3; break; case 0x08: ti = proto_tree_add_item(debug_tree, hf_papi_debug_bytes, tvb, offset+3, tvb_get_ntohs(tvb,offset+1), ENC_NA); debug_sub_tree = proto_item_add_subtree(ti, ett_papi); - proto_tree_add_item(debug_sub_tree, hf_papi_debug_bytes_length, tvb, offset+1, 2, FALSE); + proto_tree_add_item(debug_sub_tree, hf_papi_debug_bytes_length, tvb, offset+1, 2, ENC_BIG_ENDIAN); offset += tvb_get_ntohs(tvb,offset+1) + 3; break; case 0x09: - proto_tree_add_item(debug_tree, hf_papi_debug_64bits, tvb, offset+1, 8, FALSE); + proto_tree_add_item(debug_tree, hf_papi_debug_64bits, tvb, offset+1, 8, ENC_BIG_ENDIAN); offset += 9; break; default: @@ -160,10 +160,10 @@ dissect_papi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) papi_tree = proto_item_add_subtree(ti, ett_papi); - proto_tree_add_item(papi_tree, hf_papi_hdr_id, tvb, offset, 2, FALSE); + proto_tree_add_item(papi_tree, hf_papi_hdr_id, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(papi_tree, hf_papi_hdr_version, tvb, offset, 2, FALSE); + proto_tree_add_item(papi_tree, hf_papi_hdr_version, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(papi_tree, hf_papi_hdr_ip_destination, tvb, offset, 4, FALSE); @@ -172,28 +172,28 @@ dissect_papi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(papi_tree, hf_papi_hdr_ip_source, tvb, offset, 4, FALSE); offset += 4; - proto_tree_add_item(papi_tree, hf_papi_hdr_unknown, tvb, offset, 2, FALSE); + proto_tree_add_item(papi_tree, hf_papi_hdr_unknown, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(papi_tree, hf_papi_hdr_unknown, tvb, offset, 2, FALSE); + proto_tree_add_item(papi_tree, hf_papi_hdr_unknown, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(papi_tree, hf_papi_hdr_port_source, tvb, offset, 2, FALSE); + proto_tree_add_item(papi_tree, hf_papi_hdr_port_source, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(papi_tree, hf_papi_hdr_port_destination, tvb, offset, 2, FALSE); + proto_tree_add_item(papi_tree, hf_papi_hdr_port_destination, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(papi_tree, hf_papi_hdr_unknown, tvb, offset, 2, FALSE); + proto_tree_add_item(papi_tree, hf_papi_hdr_unknown, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(papi_tree, hf_papi_hdr_unknown, tvb, offset, 2, FALSE); + proto_tree_add_item(papi_tree, hf_papi_hdr_unknown, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(papi_tree, hf_papi_hdr_sequence, tvb, offset, 2, FALSE); + proto_tree_add_item(papi_tree, hf_papi_hdr_sequence, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(papi_tree, hf_papi_hdr_unknown, tvb, offset, 2, FALSE); + proto_tree_add_item(papi_tree, hf_papi_hdr_unknown, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(papi_tree, hf_papi_hdr_checksum, tvb, offset, 16, ENC_NA); diff --git a/epan/dissectors/packet-assa_r3.c b/epan/dissectors/packet-assa_r3.c index 6892986fa2..2072344a0e 100644 --- a/epan/dissectors/packet-assa_r3.c +++ b/epan/dissectors/packet-assa_r3.c @@ -3323,8 +3323,8 @@ static void dissect_r3_upstreamfields (tvbuff_t *tvb, guint32 start_offset _U_, upstreamfield_item = proto_tree_add_none_format (tree, hf_r3_upstreamfield, tvb, offset + 0, fieldLength, "Upstream Field: %s (%u)", usfn, fieldType); upstreamfield_tree = proto_item_add_subtree (upstreamfield_item, ett_r3upstreamfield); - proto_tree_add_item (upstreamfield_tree, hf_r3_upstreamfieldlength, tvb, offset + 0, 1, TRUE); - proto_tree_add_item (upstreamfield_tree, hf_r3_upstreamfieldtype, tvb, offset + 1, 1, TRUE); + proto_tree_add_item (upstreamfield_tree, hf_r3_upstreamfieldlength, tvb, offset + 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (upstreamfield_tree, hf_r3_upstreamfieldtype, tvb, offset + 1, 1, ENC_LITTLE_ENDIAN); offset += 2; @@ -3382,14 +3382,14 @@ static void dissect_r3_upstreamfields (tvbuff_t *tvb, guint32 start_offset _U_, eventlog_item = proto_tree_add_text (upstreamfield_tree, tvb, offset, 9, "Event Log Record"); eventlog_tree = proto_item_add_subtree (eventlog_item, ett_r3eventlogrecord); - proto_tree_add_item (eventlog_tree, hf_r3_eventlog_year, tvb, offset + 0, 1, TRUE); - proto_tree_add_item (eventlog_tree, hf_r3_eventlog_month, tvb, offset + 1, 1, TRUE); - proto_tree_add_item (eventlog_tree, hf_r3_eventlog_day, tvb, offset + 2, 1, TRUE); - proto_tree_add_item (eventlog_tree, hf_r3_eventlog_hour, tvb, offset + 3, 1, TRUE); - proto_tree_add_item (eventlog_tree, hf_r3_eventlog_minute, tvb, offset + 4, 1, TRUE); - proto_tree_add_item (eventlog_tree, hf_r3_eventlog_second, tvb, offset + 5, 1, TRUE); - proto_tree_add_item (eventlog_tree, hf_r3_eventlog_usernumber, tvb, offset + 6, 2, TRUE); - proto_tree_add_item (eventlog_tree, hf_r3_eventlog_event, tvb, offset + 8, 1, TRUE); + proto_tree_add_item (eventlog_tree, hf_r3_eventlog_year, tvb, offset + 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (eventlog_tree, hf_r3_eventlog_month, tvb, offset + 1, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (eventlog_tree, hf_r3_eventlog_day, tvb, offset + 2, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (eventlog_tree, hf_r3_eventlog_hour, tvb, offset + 3, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (eventlog_tree, hf_r3_eventlog_minute, tvb, offset + 4, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (eventlog_tree, hf_r3_eventlog_second, tvb, offset + 5, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (eventlog_tree, hf_r3_eventlog_usernumber, tvb, offset + 6, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item (eventlog_tree, hf_r3_eventlog_event, tvb, offset + 8, 1, ENC_LITTLE_ENDIAN); } } break; @@ -3408,13 +3408,13 @@ static void dissect_r3_upstreamfields (tvbuff_t *tvb, guint32 start_offset _U_, tvb_get_guint8 (tvb, offset + 4), tvb_get_guint8 (tvb, offset + 5), tvb_get_guint8 (tvb, offset + 6), tvb_get_guint8 (tvb, offset + 7)); datetime_tree = proto_item_add_subtree (datetime_item, ett_r3datetime); - proto_tree_add_item (datetime_tree, hf_r3_datetime_year, tvb, offset + 0, 1, TRUE); - proto_tree_add_item (datetime_tree, hf_r3_datetime_month, tvb, offset + 1, 1, TRUE); - proto_tree_add_item (datetime_tree, hf_r3_datetime_day, tvb, offset + 2, 1, TRUE); - proto_tree_add_item (datetime_tree, hf_r3_datetime_dow, tvb, offset + 3, 1, TRUE); - proto_tree_add_item (datetime_tree, hf_r3_datetime_hours, tvb, offset + 4, 1, TRUE); - proto_tree_add_item (datetime_tree, hf_r3_datetime_minutes, tvb, offset + 5, 1, TRUE); - proto_tree_add_item (datetime_tree, hf_r3_datetime_seconds, tvb, offset + 6, 1, TRUE); + proto_tree_add_item (datetime_tree, hf_r3_datetime_year, tvb, offset + 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (datetime_tree, hf_r3_datetime_month, tvb, offset + 1, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (datetime_tree, hf_r3_datetime_day, tvb, offset + 2, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (datetime_tree, hf_r3_datetime_dow, tvb, offset + 3, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (datetime_tree, hf_r3_datetime_hours, tvb, offset + 4, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (datetime_tree, hf_r3_datetime_minutes, tvb, offset + 5, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (datetime_tree, hf_r3_datetime_seconds, tvb, offset + 6, 1, ENC_LITTLE_ENDIAN); proto_tree_add_item (datetime_tree, hf_r3_datetime_dst, tvb, offset + 7, 1, TRUE); } } @@ -3434,13 +3434,13 @@ static void dissect_r3_upstreamfields (tvbuff_t *tvb, guint32 start_offset _U_, declinedlog_item = proto_tree_add_text (upstreamfield_tree, tvb, offset, 49, "Declined Log Record"); declinedlog_tree = proto_item_add_subtree (declinedlog_item, ett_r3declinedlogrecord); - proto_tree_add_item (declinedlog_tree, hf_r3_declinedlog_year, tvb, offset + 0, 1, TRUE); - proto_tree_add_item (declinedlog_tree, hf_r3_declinedlog_month, tvb, offset + 1, 1, TRUE); - proto_tree_add_item (declinedlog_tree, hf_r3_declinedlog_day, tvb, offset + 2, 1, TRUE); - proto_tree_add_item (declinedlog_tree, hf_r3_declinedlog_hour, tvb, offset + 3, 1, TRUE); - proto_tree_add_item (declinedlog_tree, hf_r3_declinedlog_minute, tvb, offset + 4, 1, TRUE); - proto_tree_add_item (declinedlog_tree, hf_r3_declinedlog_second, tvb, offset + 5, 1, TRUE); - proto_tree_add_item (declinedlog_tree, hf_r3_declinedlog_usernumber, tvb, offset + 6, 2, TRUE); + proto_tree_add_item (declinedlog_tree, hf_r3_declinedlog_year, tvb, offset + 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (declinedlog_tree, hf_r3_declinedlog_month, tvb, offset + 1, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (declinedlog_tree, hf_r3_declinedlog_day, tvb, offset + 2, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (declinedlog_tree, hf_r3_declinedlog_hour, tvb, offset + 3, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (declinedlog_tree, hf_r3_declinedlog_minute, tvb, offset + 4, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (declinedlog_tree, hf_r3_declinedlog_second, tvb, offset + 5, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (declinedlog_tree, hf_r3_declinedlog_usernumber, tvb, offset + 6, 2, ENC_LITTLE_ENDIAN); cred1type = tvb_get_guint8 (tvb, offset + 8) & 0x07; cred2type = (tvb_get_guint8 (tvb, offset + 8) & 0x38) >> 3; @@ -3466,9 +3466,9 @@ static void dissect_r3_upstreamfields (tvbuff_t *tvb, guint32 start_offset _U_, tvb_get_guint8 (tvb, offset + 2), tvb_get_guint8 (tvb, offset + 0), tvb_get_guint8 (tvb, offset + 1)); expireon_tree = proto_item_add_subtree (expireon_item, ett_r3expireon); - proto_tree_add_item (expireon_tree, hf_r3_expireon_month, tvb, offset + 0, 1, TRUE); - proto_tree_add_item (expireon_tree, hf_r3_expireon_day, tvb, offset + 1, 1, TRUE); - proto_tree_add_item (expireon_tree, hf_r3_expireon_year, tvb, offset + 2, 1, TRUE); + proto_tree_add_item (expireon_tree, hf_r3_expireon_month, tvb, offset + 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (expireon_tree, hf_r3_expireon_day, tvb, offset + 1, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (expireon_tree, hf_r3_expireon_year, tvb, offset + 2, 1, ENC_LITTLE_ENDIAN); } } break; @@ -3506,14 +3506,14 @@ static void dissect_r3_upstreamfields (tvbuff_t *tvb, guint32 start_offset _U_, expert_add_info_format (pinfo, tree, PI_UNDECODED, PI_WARN, "Malformed alarm log field -- expected 9 octets"); else { - proto_tree_add_item (alarmlog_tree, hf_r3_alarmlog_year, tvb, offset + 0, 1, TRUE); - proto_tree_add_item (alarmlog_tree, hf_r3_alarmlog_month, tvb, offset + 1, 1, TRUE); - proto_tree_add_item (alarmlog_tree, hf_r3_alarmlog_day, tvb, offset + 2, 1, TRUE); - proto_tree_add_item (alarmlog_tree, hf_r3_alarmlog_hour, tvb, offset + 3, 1, TRUE); - proto_tree_add_item (alarmlog_tree, hf_r3_alarmlog_minute, tvb, offset + 4, 1, TRUE); - proto_tree_add_item (alarmlog_tree, hf_r3_alarmlog_second, tvb, offset + 5, 1, TRUE); - proto_tree_add_item (alarmlog_tree, hf_r3_alarmlog_id, tvb, offset + 6, 1, TRUE); - proto_tree_add_item (alarmlog_tree, hf_r3_alarmlog_usernumber, tvb, offset + 7, 2, TRUE); + proto_tree_add_item (alarmlog_tree, hf_r3_alarmlog_year, tvb, offset + 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (alarmlog_tree, hf_r3_alarmlog_month, tvb, offset + 1, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (alarmlog_tree, hf_r3_alarmlog_day, tvb, offset + 2, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (alarmlog_tree, hf_r3_alarmlog_hour, tvb, offset + 3, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (alarmlog_tree, hf_r3_alarmlog_minute, tvb, offset + 4, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (alarmlog_tree, hf_r3_alarmlog_second, tvb, offset + 5, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (alarmlog_tree, hf_r3_alarmlog_id, tvb, offset + 6, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (alarmlog_tree, hf_r3_alarmlog_usernumber, tvb, offset + 7, 2, ENC_LITTLE_ENDIAN); } } break; @@ -3580,15 +3580,15 @@ static void dissect_r3_upstreamcommand_dumpeventlog (tvbuff_t *tvb, guint32 star eventlog_item = proto_tree_add_text (tree, tvb, start_offset, 10, "Event Log Record %u (%s)", tvb_get_letohs (tvb, start_offset + 0), en); eventlog_tree = proto_item_add_subtree (eventlog_item, ett_r3eventlogrecord); - proto_tree_add_item (eventlog_tree, hf_r3_eventlog_recordnumber, tvb, start_offset + 0, 2, TRUE); - proto_tree_add_item (eventlog_tree, hf_r3_eventlog_year, tvb, start_offset + 2, 1, TRUE); - proto_tree_add_item (eventlog_tree, hf_r3_eventlog_month, tvb, start_offset + 3, 1, TRUE); - proto_tree_add_item (eventlog_tree, hf_r3_eventlog_day, tvb, start_offset + 4, 1, TRUE); - proto_tree_add_item (eventlog_tree, hf_r3_eventlog_hour, tvb, start_offset + 5, 1, TRUE); - proto_tree_add_item (eventlog_tree, hf_r3_eventlog_minute, tvb, start_offset + 6, 1, TRUE); - proto_tree_add_item (eventlog_tree, hf_r3_eventlog_second, tvb, start_offset + 7, 1, TRUE); - proto_tree_add_item (eventlog_tree, hf_r3_eventlog_usernumber, tvb, start_offset + 8, 2, TRUE); - proto_tree_add_item (eventlog_tree, hf_r3_eventlog_event, tvb, start_offset + 10, 1, TRUE); + proto_tree_add_item (eventlog_tree, hf_r3_eventlog_recordnumber, tvb, start_offset + 0, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item (eventlog_tree, hf_r3_eventlog_year, tvb, start_offset + 2, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (eventlog_tree, hf_r3_eventlog_month, tvb, start_offset + 3, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (eventlog_tree, hf_r3_eventlog_day, tvb, start_offset + 4, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (eventlog_tree, hf_r3_eventlog_hour, tvb, start_offset + 5, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (eventlog_tree, hf_r3_eventlog_minute, tvb, start_offset + 6, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (eventlog_tree, hf_r3_eventlog_second, tvb, start_offset + 7, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (eventlog_tree, hf_r3_eventlog_usernumber, tvb, start_offset + 8, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item (eventlog_tree, hf_r3_eventlog_event, tvb, start_offset + 10, 1, ENC_LITTLE_ENDIAN); } } @@ -3596,8 +3596,8 @@ static void dissect_r3_upstreamcommand_dumpnvram (tvbuff_t *tvb, guint32 start_o { tvb_ensure_bytes_exist (tvb, start_offset, 3); - proto_tree_add_item (tree, hf_r3_nvramdump_record, tvb, start_offset + 0, 2, TRUE); - proto_tree_add_item (tree, hf_r3_nvramdump_length, tvb, start_offset + 2, 1, TRUE); + proto_tree_add_item (tree, hf_r3_nvramdump_record, tvb, start_offset + 0, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item (tree, hf_r3_nvramdump_length, tvb, start_offset + 2, 1, ENC_LITTLE_ENDIAN); proto_tree_add_item (tree, hf_r3_nvramdump_data, tvb, start_offset + 3, tvb_get_guint8 (tvb, start_offset + 2), ENC_NA); } @@ -3626,9 +3626,9 @@ static void dissect_r3_upstreamcommand_queryconfig (tvbuff_t *tvb, guint32 start upstreamfield_item = proto_tree_add_text (tree, tvb, offset + 0, tvb_get_guint8 (tvb, offset + 0), "Config Field: %s (%u)", ci, tvb_get_guint8 (tvb, offset + 1)); upstreamfield_tree = proto_item_add_subtree (upstreamfield_item, ett_r3upstreamfield); - proto_tree_add_item (upstreamfield_tree, hf_r3_configitemlength, tvb, offset + 0, 1, TRUE); - proto_tree_add_item (upstreamfield_tree, hf_r3_configitem, tvb, offset + 1, 1, TRUE); - proto_tree_add_item (upstreamfield_tree, hf_r3_configitemtype, tvb, offset + 2, 1, TRUE); + proto_tree_add_item (upstreamfield_tree, hf_r3_configitemlength, tvb, offset + 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (upstreamfield_tree, hf_r3_configitem, tvb, offset + 1, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (upstreamfield_tree, hf_r3_configitemtype, tvb, offset + 2, 1, ENC_LITTLE_ENDIAN); switch (tvb_get_guint8 (tvb, offset + 2)) { @@ -3641,15 +3641,15 @@ static void dissect_r3_upstreamcommand_queryconfig (tvbuff_t *tvb, guint32 start break; case CONFIGTYPE_8 : - proto_tree_add_item (upstreamfield_tree, hf_r3_configitemdata_8, tvb, offset + 3, 1, TRUE); + proto_tree_add_item (upstreamfield_tree, hf_r3_configitemdata_8, tvb, offset + 3, 1, ENC_LITTLE_ENDIAN); break; case CONFIGTYPE_16 : - proto_tree_add_item (upstreamfield_tree, hf_r3_configitemdata_16, tvb, offset + 3, 2, TRUE); + proto_tree_add_item (upstreamfield_tree, hf_r3_configitemdata_16, tvb, offset + 3, 2, ENC_LITTLE_ENDIAN); break; case CONFIGTYPE_32 : - proto_tree_add_item (upstreamfield_tree, hf_r3_configitemdata_32, tvb, offset + 3, 4, TRUE); + proto_tree_add_item (upstreamfield_tree, hf_r3_configitemdata_32, tvb, offset + 3, 4, ENC_LITTLE_ENDIAN); break; case CONFIGTYPE_STRING : @@ -3693,12 +3693,12 @@ static void dissect_r3_upstreamcommand_mfg (tvbuff_t *tvb, guint32 start_offset cn = val_to_str_ext_const (tvb_get_guint8 (tvb, 1), &r3_mfgfieldnames_ext, "[Unknown Mfg Field]"); - proto_tree_add_item (tree, hf_r3_mfgfield_length, tvb, 0, 1, TRUE); + proto_tree_add_item (tree, hf_r3_mfgfield_length, tvb, 0, 1, ENC_LITTLE_ENDIAN); mfg_item = proto_tree_add_text (tree, tvb, 1, -1, "Upstream Manufacturing Field: %s (%u)", cn, tvb_get_guint8 (tvb, 1)); mfg_tree = proto_item_add_subtree (mfg_item, ett_r3commandmfg); - proto_tree_add_item (mfg_tree, hf_r3_mfgfield, tvb, 1, 1, TRUE); + proto_tree_add_item (mfg_tree, hf_r3_mfgfield, tvb, 1, 1, ENC_LITTLE_ENDIAN); if (tvb_get_guint8 (tvb, 1) >= MFGFIELD_LAST) expert_add_info_format (pinfo, tree, PI_UNDECODED, PI_WARN, "Unknown manufacturing command value"); @@ -3713,8 +3713,8 @@ static void dissect_r3_upstreamcommand_eventlogwarning (tvbuff_t *tvb, guint32 s static void dissect_r3_upstreamcommand_dumpnvramrle (tvbuff_t *tvb, guint32 start_offset, guint32 length _U_, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item (tree, hf_r3_nvramdumprle_record, tvb, start_offset + 0, 2, TRUE); - proto_tree_add_item (tree, hf_r3_nvramdumprle_length, tvb, start_offset + 3, 1, TRUE); + proto_tree_add_item (tree, hf_r3_nvramdumprle_record, tvb, start_offset + 0, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item (tree, hf_r3_nvramdumprle_length, tvb, start_offset + 3, 1, ENC_LITTLE_ENDIAN); proto_tree_add_item (tree, hf_r3_nvramdumprle_data, tvb, start_offset + 4, tvb_get_guint8 (tvb, start_offset + 3), ENC_NA); } @@ -3738,14 +3738,14 @@ static void dissect_r3_upstreamcommand_dumpdeclinedlog (tvbuff_t *tvb, guint32 s declinedlog_item = proto_tree_add_text (tree, tvb, start_offset, 49, "Declined Log Record %u", tvb_get_letohs (tvb, start_offset + 0)); declinedlog_tree = proto_item_add_subtree (declinedlog_item, ett_r3declinedlogrecord); - proto_tree_add_item (declinedlog_tree, hf_r3_declinedlog_recordnumber, tvb, start_offset, 2, TRUE); start_offset += 2; - proto_tree_add_item (declinedlog_tree, hf_r3_declinedlog_year, tvb, start_offset, 1, TRUE); start_offset += 1; - proto_tree_add_item (declinedlog_tree, hf_r3_declinedlog_month, tvb, start_offset, 1, TRUE); start_offset += 1; - proto_tree_add_item (declinedlog_tree, hf_r3_declinedlog_day, tvb, start_offset, 1, TRUE); start_offset += 1; - proto_tree_add_item (declinedlog_tree, hf_r3_declinedlog_hour, tvb, start_offset, 1, TRUE); start_offset += 1; - proto_tree_add_item (declinedlog_tree, hf_r3_declinedlog_minute, tvb, start_offset, 1, TRUE); start_offset += 1; - proto_tree_add_item (declinedlog_tree, hf_r3_declinedlog_second, tvb, start_offset, 1, TRUE); start_offset += 1; - proto_tree_add_item (declinedlog_tree, hf_r3_declinedlog_usernumber, tvb, start_offset, 2, TRUE); start_offset += 2; + proto_tree_add_item (declinedlog_tree, hf_r3_declinedlog_recordnumber, tvb, start_offset, 2, ENC_LITTLE_ENDIAN); start_offset += 2; + proto_tree_add_item (declinedlog_tree, hf_r3_declinedlog_year, tvb, start_offset, 1, ENC_LITTLE_ENDIAN); start_offset += 1; + proto_tree_add_item (declinedlog_tree, hf_r3_declinedlog_month, tvb, start_offset, 1, ENC_LITTLE_ENDIAN); start_offset += 1; + proto_tree_add_item (declinedlog_tree, hf_r3_declinedlog_day, tvb, start_offset, 1, ENC_LITTLE_ENDIAN); start_offset += 1; + proto_tree_add_item (declinedlog_tree, hf_r3_declinedlog_hour, tvb, start_offset, 1, ENC_LITTLE_ENDIAN); start_offset += 1; + proto_tree_add_item (declinedlog_tree, hf_r3_declinedlog_minute, tvb, start_offset, 1, ENC_LITTLE_ENDIAN); start_offset += 1; + proto_tree_add_item (declinedlog_tree, hf_r3_declinedlog_second, tvb, start_offset, 1, ENC_LITTLE_ENDIAN); start_offset += 1; + proto_tree_add_item (declinedlog_tree, hf_r3_declinedlog_usernumber, tvb, start_offset, 2, ENC_LITTLE_ENDIAN); start_offset += 2; cred1type = tvb_get_guint8 (tvb, start_offset) & 0x07; cred2type = (tvb_get_guint8 (tvb, start_offset) & 0x38) >> 3; @@ -3771,15 +3771,15 @@ static void dissect_r3_upstreamcommand_dumpalarmlog (tvbuff_t *tvb, guint32 star proto_item *alarmlog_item = proto_tree_add_text (tree, tvb, start_offset, 9, "Alarm Log Record %u", tvb_get_letohs (tvb, start_offset + 0)); proto_tree *alarmlog_tree = proto_item_add_subtree (alarmlog_item, ett_r3alarmlogrecord); - proto_tree_add_item (alarmlog_tree, hf_r3_alarmlog_recordnumber, tvb, start_offset + 0, 2, TRUE); - proto_tree_add_item (alarmlog_tree, hf_r3_alarmlog_year, tvb, start_offset + 2, 1, TRUE); - proto_tree_add_item (alarmlog_tree, hf_r3_alarmlog_month, tvb, start_offset + 3, 1, TRUE); - proto_tree_add_item (alarmlog_tree, hf_r3_alarmlog_day, tvb, start_offset + 4, 1, TRUE); - proto_tree_add_item (alarmlog_tree, hf_r3_alarmlog_hour, tvb, start_offset + 5, 1, TRUE); - proto_tree_add_item (alarmlog_tree, hf_r3_alarmlog_minute, tvb, start_offset + 6, 1, TRUE); - proto_tree_add_item (alarmlog_tree, hf_r3_alarmlog_second, tvb, start_offset + 7, 1, TRUE); - proto_tree_add_item (alarmlog_tree, hf_r3_alarmlog_id, tvb, start_offset + 8, 1, TRUE); - proto_tree_add_item (alarmlog_tree, hf_r3_alarmlog_usernumber, tvb, start_offset + 9, 2, TRUE); + proto_tree_add_item (alarmlog_tree, hf_r3_alarmlog_recordnumber, tvb, start_offset + 0, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item (alarmlog_tree, hf_r3_alarmlog_year, tvb, start_offset + 2, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (alarmlog_tree, hf_r3_alarmlog_month, tvb, start_offset + 3, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (alarmlog_tree, hf_r3_alarmlog_day, tvb, start_offset + 4, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (alarmlog_tree, hf_r3_alarmlog_hour, tvb, start_offset + 5, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (alarmlog_tree, hf_r3_alarmlog_minute, tvb, start_offset + 6, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (alarmlog_tree, hf_r3_alarmlog_second, tvb, start_offset + 7, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (alarmlog_tree, hf_r3_alarmlog_id, tvb, start_offset + 8, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (alarmlog_tree, hf_r3_alarmlog_usernumber, tvb, start_offset + 9, 2, ENC_LITTLE_ENDIAN); } static void dissect_r3_upstreamcommand_connectscheduler (tvbuff_t *tvb, guint32 start_offset, guint32 length, packet_info *pinfo, proto_tree *tree) @@ -3802,9 +3802,9 @@ static void dissect_r3_upstreamcommand_dumpdebuglog (tvbuff_t *tvb, guint32 star proto_item *debuglog_item = proto_tree_add_text (tree, tvb, start_offset, 8, "Debug Log Record %u", tvb_get_letohs (tvb, start_offset + 0)); proto_tree *debuglog_tree = proto_item_add_subtree (debuglog_item, ett_r3debuglogrecord); - proto_tree_add_item (debuglog_tree, hf_r3_debuglog_recordnumber, tvb, start_offset + 0, 2, TRUE); - proto_tree_add_item (debuglog_tree, hf_r3_debuglog_flags, tvb, start_offset + 2, 4, TRUE); - proto_tree_add_item (debuglog_tree, hf_r3_debuglog_tick, tvb, start_offset + 6, 2, TRUE); + proto_tree_add_item (debuglog_tree, hf_r3_debuglog_recordnumber, tvb, start_offset + 0, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item (debuglog_tree, hf_r3_debuglog_flags, tvb, start_offset + 2, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item (debuglog_tree, hf_r3_debuglog_tick, tvb, start_offset + 6, 2, ENC_LITTLE_ENDIAN); } /* @@ -3825,9 +3825,9 @@ static void dissect_r3_upstreammfgfield_iopins (tvbuff_t *tvb, guint32 start_off proto_item *port_item = proto_tree_add_text (tree, tvb, start_offset + i, 3, "Port %c Configuration", (portname == 'I') ? ++portname : portname); proto_tree *port_tree = proto_item_add_subtree (port_item, ett_r3iopins); - proto_tree_add_item (port_tree, hf_r3_iopins_lat, tvb, start_offset + i + 0, 1, TRUE); - proto_tree_add_item (port_tree, hf_r3_iopins_port, tvb, start_offset + i + 1, 1, TRUE); - proto_tree_add_item (port_tree, hf_r3_iopins_tris, tvb, start_offset + i + 2, 1, TRUE); + proto_tree_add_item (port_tree, hf_r3_iopins_lat, tvb, start_offset + i + 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (port_tree, hf_r3_iopins_port, tvb, start_offset + i + 1, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (port_tree, hf_r3_iopins_tris, tvb, start_offset + i + 2, 1, ENC_LITTLE_ENDIAN); } } } @@ -3845,9 +3845,9 @@ static void dissect_r3_upstreammfgfield_adcs (tvbuff_t *tvb, guint32 start_offse static void dissect_r3_upstreammfgfield_hardwareid (tvbuff_t *tvb, guint32 start_offset _U_, guint32 length _U_, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item (tree, hf_r3_hardwareid_board, tvb, 0, 1, TRUE); - proto_tree_add_item (tree, hf_r3_hardwareid_cpuid, tvb, 1, 2, TRUE); - proto_tree_add_item (tree, hf_r3_hardwareid_cpurev, tvb, 3, 1, TRUE); + proto_tree_add_item (tree, hf_r3_hardwareid_board, tvb, 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (tree, hf_r3_hardwareid_cpuid, tvb, 1, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item (tree, hf_r3_hardwareid_cpurev, tvb, 3, 1, ENC_LITTLE_ENDIAN); } static void dissect_r3_upstreammfgfield_checkpointlog (tvbuff_t *tvb, guint32 start_offset, guint32 length _U_, packet_info *pinfo _U_, proto_tree *tree) @@ -3858,7 +3858,7 @@ static void dissect_r3_upstreammfgfield_checkpointlog (tvbuff_t *tvb, guint32 st guint l = tvb_length_remaining (tvb, start_offset + 1); guint i; - proto_tree_add_item (tree, hf_r3_checkpointlog_entryptr, tvb, start_offset, 1, TRUE); + proto_tree_add_item (tree, hf_r3_checkpointlog_entryptr, tvb, start_offset, 1, ENC_LITTLE_ENDIAN); cpl_item = proto_tree_add_text (tree, tvb, start_offset + 1, -1, "Checkpoint Log"); cpl_tree = proto_item_add_subtree (cpl_item, ett_r3checkpointlog); @@ -4093,8 +4093,8 @@ static void dissect_r3_upstreammfgfield_taskflags (tvbuff_t *tvb, guint32 start_ proto_item *tf_item = proto_tree_add_text (tfg_tree, tvb, start_offset + i, 5, "Task Flags (%2d: 0x%06x)", tvb_get_guint8 (tvb, start_offset + i + 0), tvb_get_letohl (tvb, start_offset + i + 1)); proto_tree *tf_tree = proto_item_add_subtree (tf_item, ett_r3taskflagsentry); - proto_tree_add_item (tf_tree, hf_r3_taskflags_taskid, tvb, start_offset + i + 0, 1, TRUE); - proto_tree_add_item (tf_tree, hf_r3_taskflags_flags, tvb, start_offset + i + 1, 4, TRUE); + proto_tree_add_item (tf_tree, hf_r3_taskflags_taskid, tvb, start_offset + i + 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (tf_tree, hf_r3_taskflags_flags, tvb, start_offset + i + 1, 4, ENC_LITTLE_ENDIAN); } } @@ -4103,20 +4103,20 @@ static void dissect_r3_upstreammfgfield_timerchain (tvbuff_t *tvb, guint32 start guint l = tvb_length_remaining (tvb, start_offset + 3); guint i; - proto_tree_add_item (tree, hf_r3_timerchain_newtick, tvb, start_offset + 0, 2, TRUE); - proto_tree_add_item (tree, hf_r3_timerchain_currentboundary, tvb, start_offset + 2, 1, TRUE); + proto_tree_add_item (tree, hf_r3_timerchain_newtick, tvb, start_offset + 0, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item (tree, hf_r3_timerchain_currentboundary, tvb, start_offset + 2, 1, ENC_LITTLE_ENDIAN); for (start_offset += 3, i = 0; i < l; i += 12) { proto_item *tc_item = proto_tree_add_text (tree, tvb, start_offset + i, 12, "Timer Chain Entry"); proto_tree *tc_tree = proto_item_add_subtree (tc_item, ett_r3timerchain); - proto_tree_add_item (tc_tree, hf_r3_timerchain_tasktag, tvb, start_offset + i + 0, 1, TRUE); - proto_tree_add_item (tc_tree, hf_r3_timerchain_address, tvb, start_offset + i + 1, 2, TRUE); - proto_tree_add_item (tc_tree, hf_r3_timerchain_reload, tvb, start_offset + i + 3, 2, TRUE); - proto_tree_add_item (tc_tree, hf_r3_timerchain_boundary, tvb, start_offset + i + 5, 1, TRUE); - proto_tree_add_item (tc_tree, hf_r3_timerchain_count, tvb, start_offset + i + 6, 2, TRUE); - proto_tree_add_item (tc_tree, hf_r3_timerchain_flags, tvb, start_offset + i + 8, 4, TRUE); + proto_tree_add_item (tc_tree, hf_r3_timerchain_tasktag, tvb, start_offset + i + 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (tc_tree, hf_r3_timerchain_address, tvb, start_offset + i + 1, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item (tc_tree, hf_r3_timerchain_reload, tvb, start_offset + i + 3, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item (tc_tree, hf_r3_timerchain_boundary, tvb, start_offset + i + 5, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (tc_tree, hf_r3_timerchain_count, tvb, start_offset + i + 6, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item (tc_tree, hf_r3_timerchain_flags, tvb, start_offset + i + 8, 4, ENC_LITTLE_ENDIAN); } } @@ -4130,43 +4130,43 @@ static void dissect_r3_upstreammfgfield_peekpoke (tvbuff_t *tvb, guint32 start_o proto_item *peekpoke_item = proto_tree_add_text (tree, tvb, start_offset + i, 3, "%s", ""); proto_tree *peekpoke_tree = proto_item_add_subtree (peekpoke_item, ett_r3peekpoke); - proto_tree_add_item (peekpoke_tree, hf_r3_peekpoke_operation, tvb, start_offset + i + 0, 1, TRUE); - proto_tree_add_item (peekpoke_tree, hf_r3_peekpoke_address, tvb, start_offset + i + 1, 2, TRUE); + proto_tree_add_item (peekpoke_tree, hf_r3_peekpoke_operation, tvb, start_offset + i + 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (peekpoke_tree, hf_r3_peekpoke_address, tvb, start_offset + i + 1, 2, ENC_LITTLE_ENDIAN); switch (tvb_get_guint8 (tvb, start_offset + i + 0)) { case PEEKPOKE_READU8 : proto_item_append_text (peekpoke_item, "Read (8 Bits @ 0x%04x = 0x%02x)", tvb_get_letohs (tvb, start_offset + i + 1), tvb_get_guint8 (tvb, start_offset + i + 3)); proto_item_set_len (peekpoke_item, 4); - proto_tree_add_item (peekpoke_tree, hf_r3_peekpoke_poke8, tvb, start_offset + i + 3, 1, TRUE); + proto_tree_add_item (peekpoke_tree, hf_r3_peekpoke_poke8, tvb, start_offset + i + 3, 1, ENC_LITTLE_ENDIAN); i += 1; break; case PEEKPOKE_READU16 : proto_item_append_text (peekpoke_item, "Read (16 Bits @ 0x%04x = 0x%04x)", tvb_get_letohs (tvb, start_offset + i + 1), tvb_get_letohs (tvb, start_offset + i + 3)); proto_item_set_len (peekpoke_item, 5); - proto_tree_add_item (peekpoke_tree, hf_r3_peekpoke_poke16, tvb, start_offset + i + 3, 2, TRUE); + proto_tree_add_item (peekpoke_tree, hf_r3_peekpoke_poke16, tvb, start_offset + i + 3, 2, ENC_LITTLE_ENDIAN); i += 2; break; case PEEKPOKE_READU24 : proto_item_append_text (peekpoke_item, "Read (24 Bits @ 0x%04x = 0x%06x)", tvb_get_letohs (tvb, start_offset + i + 1), tvb_get_letoh24 (tvb, start_offset + i + 3)); proto_item_set_len (peekpoke_item, 6); - proto_tree_add_item (peekpoke_tree, hf_r3_peekpoke_poke24, tvb, start_offset + i + 3, 3, TRUE); + proto_tree_add_item (peekpoke_tree, hf_r3_peekpoke_poke24, tvb, start_offset + i + 3, 3, ENC_LITTLE_ENDIAN); i += 3; break; case PEEKPOKE_READU32 : proto_item_append_text (peekpoke_item, "Read (32 Bits @ 0x%04x = 0x%08x)", tvb_get_letohs (tvb, start_offset + i + 1), tvb_get_letohl (tvb, start_offset + i + 3)); proto_item_set_len (peekpoke_item, 7); - proto_tree_add_item (peekpoke_tree, hf_r3_peekpoke_poke32, tvb, start_offset + i + 3, 4, TRUE); + proto_tree_add_item (peekpoke_tree, hf_r3_peekpoke_poke32, tvb, start_offset + i + 3, 4, ENC_LITTLE_ENDIAN); i += 4; break; case PEEKPOKE_READSTRING : proto_item_append_text (peekpoke_item, "Read (%u Bytes @ 0x%04x)", tvb_get_guint8 (tvb, start_offset + i + 3), tvb_get_letohs (tvb, start_offset + i + 1)); proto_item_set_len (peekpoke_item, 3 + 1 + tvb_get_guint8 (tvb, start_offset + i + 3)); - proto_tree_add_item (peekpoke_tree, hf_r3_peekpoke_length, tvb, start_offset + i + 3, 1, TRUE); + proto_tree_add_item (peekpoke_tree, hf_r3_peekpoke_length, tvb, start_offset + i + 3, 1, ENC_LITTLE_ENDIAN); proto_tree_add_item (peekpoke_tree, hf_r3_peekpoke_pokestring, tvb, start_offset + i + 4, tvb_get_guint8 (tvb, start_offset + i + 3), ENC_NA); i += tvb_get_guint8 (tvb, start_offset + i + 3) + 1; break; @@ -4242,9 +4242,9 @@ static void dissect_r3_upstreammfgfield_capabilities (tvbuff_t *tvb, guint32 sta fn = val_to_str_ext_const (tvb_get_guint8 (tvb, start_offset + i + 1), &r3_capabilitiesnames_ext, "[Unknown Field Name]"); proto_item_append_text (tmp_item, " (%s, %u)", fn, tvb_get_letohs (tvb, start_offset + i + 2)); - proto_tree_add_item (tmp_tree, hf_r3_capabilities_length, tvb, start_offset + i + 0, 1, TRUE); - proto_tree_add_item (tmp_tree, hf_r3_capabilities_type, tvb, start_offset + i + 1, 1, TRUE); - proto_tree_add_item (tmp_tree, hf_r3_capabilities_value, tvb, start_offset + i + 2, 2, TRUE); + proto_tree_add_item (tmp_tree, hf_r3_capabilities_length, tvb, start_offset + i + 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (tmp_tree, hf_r3_capabilities_type, tvb, start_offset + i + 1, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (tmp_tree, hf_r3_capabilities_value, tvb, start_offset + i + 2, 2, ENC_LITTLE_ENDIAN); } } @@ -4341,8 +4341,8 @@ static void dissect_r3_upstreammfgfield_dumpm41t81 (tvbuff_t *tvb, guint32 start static void dissect_r3_upstreammfgfield_nvramchecksumvalue (tvbuff_t *tvb, guint32 start_offset, guint32 length _U_, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item (tree, hf_r3_nvramchecksumvalue, tvb, start_offset + 0, 4, TRUE); - proto_tree_add_item (tree, hf_r3_nvramchecksumvalue_fixup, tvb, start_offset + 4, 4, TRUE); + proto_tree_add_item (tree, hf_r3_nvramchecksumvalue, tvb, start_offset + 0, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item (tree, hf_r3_nvramchecksumvalue_fixup, tvb, start_offset + 4, 4, ENC_LITTLE_ENDIAN); } static void dissect_r3_upstreammfgfield_checksumresults (tvbuff_t *tvb, guint32 start_offset, guint32 length _U_, packet_info *pinfo, proto_tree *tree) @@ -4373,8 +4373,8 @@ static void dissect_r3_upstreammfgfield_checksumresults (tvbuff_t *tvb, guint32 proto_item_append_text (res_item, " %s (%s)", fn, tvb_get_guint8 (tvb, start_offset + i + 2) ? "Error" : "No Error"); - proto_tree_add_item (res_tree, hf_r3_checksumresults_length, tvb, start_offset + i + 0, 1, TRUE); - proto_tree_add_item (res_tree, hf_r3_checksumresults_field, tvb, start_offset + i + 1, 1, TRUE); + proto_tree_add_item (res_tree, hf_r3_checksumresults_length, tvb, start_offset + i + 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (res_tree, hf_r3_checksumresults_field, tvb, start_offset + i + 1, 1, ENC_LITTLE_ENDIAN); proto_tree_add_item (res_tree, hf_r3_checksumresults_state, tvb, start_offset + i + 2, 1, TRUE); } } @@ -4385,8 +4385,8 @@ static void dissect_r3_upstreammfgfield_mortisestatelog (tvbuff_t *tvb, guint32 guint l = tvb_length_remaining (tvb, start_offset + 3); guint i = 0; - proto_tree_add_item (tree, hf_r3_mortisestatelog_pointer, tvb, start_offset + 0, 1, TRUE); - proto_tree_add_item (tree, hf_r3_mortisestatelog_mortisetype, tvb, start_offset + 1, 1, TRUE); + proto_tree_add_item (tree, hf_r3_mortisestatelog_pointer, tvb, start_offset + 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (tree, hf_r3_mortisestatelog_mortisetype, tvb, start_offset + 1, 1, ENC_LITTLE_ENDIAN); proto_tree_add_item (tree, hf_r3_mortisestatelog_waiting, tvb, start_offset + 2, 1, TRUE); for (start_offset += 3, i = 0; i < l; i += 3) @@ -4397,9 +4397,9 @@ static void dissect_r3_upstreammfgfield_mortisestatelog (tvbuff_t *tvb, guint32 proto_item *ms_item = proto_tree_add_text (tree, tvb, start_offset + i, 3, "State Log Entry %2d (State=0x%02x, Last=0x%02x, Event=%s (0x%02x))", i / 3, state, last, val_to_str_ext_const (event, &r3_mortiseeventnames_ext, "[Unknown]"), event); proto_tree *ms_tree = proto_item_add_subtree (ms_item, ett_r3mortisestatelog); - proto_tree_add_item (ms_tree, hf_r3_mortisestatelog_state, tvb, start_offset + i + 0, 1, TRUE); - proto_tree_add_item (ms_tree, hf_r3_mortisestatelog_last, tvb, start_offset + i + 1, 1, TRUE); - proto_tree_add_item (ms_tree, hf_r3_mortisestatelog_event, tvb, start_offset + i + 2, 1, TRUE); + proto_tree_add_item (ms_tree, hf_r3_mortisestatelog_state, tvb, start_offset + i + 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (ms_tree, hf_r3_mortisestatelog_last, tvb, start_offset + i + 1, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (ms_tree, hf_r3_mortisestatelog_event, tvb, start_offset + i + 2, 1, ENC_LITTLE_ENDIAN); } } @@ -4436,8 +4436,8 @@ static void dissect_r3_upstreammfgfield_proxcard (tvbuff_t *tvb, guint32 start_o */ static void dissect_r3_response_singlebyte (tvbuff_t *tvb, guint32 start_offset, guint32 length _U_, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item (tree, hf_r3_responsetype, tvb, start_offset + 2, 1, TRUE); - proto_tree_add_item (tree, hf_r3_responsetocommand, tvb, start_offset + 3, 1, TRUE); + proto_tree_add_item (tree, hf_r3_responsetype, tvb, start_offset + 2, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (tree, hf_r3_responsetocommand, tvb, start_offset + 3, 1, ENC_LITTLE_ENDIAN); } /* @@ -4465,12 +4465,12 @@ static void dissect_r3_response_hasdata (tvbuff_t *tvb, guint32 start_offset, gu { ct = val_to_str_ext_const (tvb_get_guint8 (tvb, 3), &r3_upstreamcommandnames_ext, "[Unknown Command Type]"); - proto_tree_add_item (tree, hf_r3_responsetype, tvb, 2, 1, TRUE); + proto_tree_add_item (tree, hf_r3_responsetype, tvb, 2, 1, ENC_LITTLE_ENDIAN); upstreamcommand_item = proto_tree_add_text (tree, tvb, 3, -1, "Upstream Command: %s (%u)", ct, tvb_get_guint8 (tvb, 3)); upstreamcommand_tree = proto_item_add_subtree (upstreamcommand_item, ett_r3upstreamcommand); - proto_tree_add_item (upstreamcommand_tree, hf_r3_upstreamcommand, tvb, 3, 1, TRUE); + proto_tree_add_item (upstreamcommand_tree, hf_r3_upstreamcommand, tvb, 3, 1, ENC_LITTLE_ENDIAN); tvb_ensure_bytes_exist (tvb, start_offset, commandPacketLen - 4); @@ -4494,8 +4494,8 @@ static void dissect_r3_cmd_response (tvbuff_t *tvb, guint32 start_offset, guint3 rt = val_to_str_ext_const (responseType, &r3_responsetypenames_ext, "[Unknown Response Type]"); proto_item_set_text (proto_tree_get_parent (tree), "Response Packet: %s (%u)", rt, responseType); - proto_tree_add_item (tree, hf_r3_responselength, tvb, start_offset + 0, 1, TRUE); - proto_tree_add_item (tree, hf_r3_responsecommand, tvb, start_offset + 1, 1, TRUE); + proto_tree_add_item (tree, hf_r3_responselength, tvb, start_offset + 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (tree, hf_r3_responsecommand, tvb, start_offset + 1, 1, ENC_LITTLE_ENDIAN); if (tvb_get_guint8 (tvb, start_offset + 2) >= RESPONSETYPE_LAST) expert_add_info_format (pinfo, tree, PI_UNDECODED, PI_WARN, "Octet 3 >= UPSTREAMCOMMAND_LAST"); @@ -4508,26 +4508,26 @@ static void dissect_r3_cmd_response (tvbuff_t *tvb, guint32 start_offset, guint3 */ static void dissect_r3_cmd_handshake (tvbuff_t *tvb, guint32 start_offset, guint32 length _U_, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item (tree, hf_r3_commandlength, tvb, start_offset + 0, 1, TRUE); - proto_tree_add_item (tree, hf_r3_command, tvb, start_offset + 1, 1, TRUE); + proto_tree_add_item (tree, hf_r3_commandlength, tvb, start_offset + 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (tree, hf_r3_command, tvb, start_offset + 1, 1, ENC_LITTLE_ENDIAN); } static void dissect_r3_cmd_killsession (tvbuff_t *tvb, guint32 start_offset, guint32 length _U_, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item (tree, hf_r3_commandlength, tvb, start_offset + 0, 1, TRUE); - proto_tree_add_item (tree, hf_r3_command, tvb, start_offset + 1, 1, TRUE); + proto_tree_add_item (tree, hf_r3_commandlength, tvb, start_offset + 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (tree, hf_r3_command, tvb, start_offset + 1, 1, ENC_LITTLE_ENDIAN); } static void dissect_r3_cmd_queryserialnumber (tvbuff_t *tvb, guint32 start_offset, guint32 length _U_, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item (tree, hf_r3_commandlength, tvb, start_offset + 0, 1, TRUE); - proto_tree_add_item (tree, hf_r3_command, tvb, start_offset + 1, 1, TRUE); + proto_tree_add_item (tree, hf_r3_commandlength, tvb, start_offset + 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (tree, hf_r3_command, tvb, start_offset + 1, 1, ENC_LITTLE_ENDIAN); } static void dissect_r3_cmd_queryversion (tvbuff_t *tvb, guint32 start_offset, guint32 length _U_, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item (tree, hf_r3_commandlength, tvb, start_offset + 0, 1, TRUE); - proto_tree_add_item (tree, hf_r3_command, tvb, start_offset + 1, 1, TRUE); + proto_tree_add_item (tree, hf_r3_commandlength, tvb, start_offset + 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (tree, hf_r3_command, tvb, start_offset + 1, 1, ENC_LITTLE_ENDIAN); } static void dissect_r3_cmd_setdatetime (tvbuff_t *tvb, guint32 start_offset, guint32 length _U_, packet_info *pinfo _U_, proto_tree *tree) @@ -4537,25 +4537,25 @@ static void dissect_r3_cmd_setdatetime (tvbuff_t *tvb, guint32 start_offset, gui guint8 cmdLen = tvb_get_guint8 (tvb, start_offset + 0); tvbuff_t *payload_tvb = tvb_new_subset (tvb, start_offset + 2, cmdLen - 2, cmdLen - 2); - proto_tree_add_item (tree, hf_r3_commandlength, tvb, start_offset + 0, 1, TRUE); - proto_tree_add_item (tree, hf_r3_command, tvb, start_offset + 1, 1, TRUE); + proto_tree_add_item (tree, hf_r3_commandlength, tvb, start_offset + 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (tree, hf_r3_command, tvb, start_offset + 1, 1, ENC_LITTLE_ENDIAN); dt_item = proto_tree_add_text (tree, payload_tvb, 0, -1, "Set Date/Time (%02u/%02u/%02u-%u %02u:%02u:%02u)", tvb_get_guint8 (payload_tvb, 0), tvb_get_guint8 (payload_tvb, 1), tvb_get_guint8 (payload_tvb, 2), tvb_get_guint8 (payload_tvb, 3), tvb_get_guint8 (payload_tvb, 4), tvb_get_guint8 (payload_tvb, 5), tvb_get_guint8 (payload_tvb, 6)); dt_tree = proto_item_add_subtree (dt_item, ett_r3setdatetime); - proto_tree_add_item (dt_tree, hf_r3_setdate_year, payload_tvb, 0, 1, TRUE); - proto_tree_add_item (dt_tree, hf_r3_setdate_month, payload_tvb, 1, 1, TRUE); - proto_tree_add_item (dt_tree, hf_r3_setdate_day, payload_tvb, 2, 1, TRUE); - proto_tree_add_item (dt_tree, hf_r3_setdate_dow, payload_tvb, 3, 1, TRUE); - proto_tree_add_item (dt_tree, hf_r3_setdate_hours, payload_tvb, 4, 1, TRUE); - proto_tree_add_item (dt_tree, hf_r3_setdate_minutes, payload_tvb, 5, 1, TRUE); - proto_tree_add_item (dt_tree, hf_r3_setdate_seconds, payload_tvb, 6, 1, TRUE); + proto_tree_add_item (dt_tree, hf_r3_setdate_year, payload_tvb, 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (dt_tree, hf_r3_setdate_month, payload_tvb, 1, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (dt_tree, hf_r3_setdate_day, payload_tvb, 2, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (dt_tree, hf_r3_setdate_dow, payload_tvb, 3, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (dt_tree, hf_r3_setdate_hours, payload_tvb, 4, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (dt_tree, hf_r3_setdate_minutes, payload_tvb, 5, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (dt_tree, hf_r3_setdate_seconds, payload_tvb, 6, 1, ENC_LITTLE_ENDIAN); } static void dissect_r3_cmd_querydatetime (tvbuff_t *tvb, guint32 start_offset, guint32 length _U_, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item (tree, hf_r3_commandlength, tvb, start_offset + 0, 1, TRUE); - proto_tree_add_item (tree, hf_r3_command, tvb, start_offset + 1, 1, TRUE); + proto_tree_add_item (tree, hf_r3_commandlength, tvb, start_offset + 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (tree, hf_r3_command, tvb, start_offset + 1, 1, ENC_LITTLE_ENDIAN); } static void dissect_r3_cmd_setconfig (tvbuff_t *tvb, guint32 start_offset, guint32 length _U_, packet_info *pinfo _U_, proto_tree *tree) @@ -4564,8 +4564,8 @@ static void dissect_r3_cmd_setconfig (tvbuff_t *tvb, guint32 start_offset, guint tvbuff_t *payload_tvb = tvb_new_subset (tvb, start_offset + 2, cmdLen - 2, cmdLen - 2); guint32 offset = 0; - proto_tree_add_item (tree, hf_r3_commandlength, tvb, start_offset + 0, 1, TRUE); - proto_tree_add_item (tree, hf_r3_command, tvb, start_offset + 1, 1, TRUE); + proto_tree_add_item (tree, hf_r3_commandlength, tvb, start_offset + 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (tree, hf_r3_command, tvb, start_offset + 1, 1, ENC_LITTLE_ENDIAN); while (offset < tvb_reported_length (payload_tvb)) { @@ -4578,8 +4578,8 @@ static void dissect_r3_cmd_setconfig (tvbuff_t *tvb, guint32 start_offset, guint sc_item = proto_tree_add_text (tree, payload_tvb, offset + 0, tvb_get_guint8 (payload_tvb, offset + 0), "Config Field: %s (%u)", ci, tvb_get_guint8 (payload_tvb, offset + 1)); sc_tree = proto_item_add_subtree (sc_item, ett_r3upstreamfield); - proto_tree_add_item (sc_tree, hf_r3_configitemlength, payload_tvb, offset + 0, 1, TRUE); - proto_tree_add_item (sc_tree, hf_r3_configitem, payload_tvb, offset + 1, 1, TRUE); + proto_tree_add_item (sc_tree, hf_r3_configitemlength, payload_tvb, offset + 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (sc_tree, hf_r3_configitem, payload_tvb, offset + 1, 1, ENC_LITTLE_ENDIAN); if (tvb_get_guint8 (payload_tvb, offset + 1) < array_length (configMap)) { @@ -4594,15 +4594,15 @@ static void dissect_r3_cmd_setconfig (tvbuff_t *tvb, guint32 start_offset, guint break; case CONFIGTYPE_8 : - proto_tree_add_item (sc_tree, hf_r3_configitemdata_8, payload_tvb, offset + 2, 1, TRUE); + proto_tree_add_item (sc_tree, hf_r3_configitemdata_8, payload_tvb, offset + 2, 1, ENC_LITTLE_ENDIAN); break; case CONFIGTYPE_16 : - proto_tree_add_item (sc_tree, hf_r3_configitemdata_16, payload_tvb, offset + 2, 2, TRUE); + proto_tree_add_item (sc_tree, hf_r3_configitemdata_16, payload_tvb, offset + 2, 2, ENC_LITTLE_ENDIAN); break; case CONFIGTYPE_32 : - proto_tree_add_item (sc_tree, hf_r3_configitemdata_32, payload_tvb, offset + 2, 4, TRUE); + proto_tree_add_item (sc_tree, hf_r3_configitemdata_32, payload_tvb, offset + 2, 4, ENC_LITTLE_ENDIAN); break; case CONFIGTYPE_STRING : @@ -4628,14 +4628,14 @@ static void dissect_r3_cmd_getconfig (tvbuff_t *tvb, guint32 start_offset, guint guint32 cmdLen = tvb_get_guint8 (tvb, start_offset + 0); guint32 i; - proto_tree_add_item (tree, hf_r3_commandlength, tvb, start_offset + 0, 1, TRUE); - proto_tree_add_item (tree, hf_r3_command, tvb, start_offset + 1, 1, TRUE); + proto_tree_add_item (tree, hf_r3_commandlength, tvb, start_offset + 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (tree, hf_r3_command, tvb, start_offset + 1, 1, ENC_LITTLE_ENDIAN); config_item = proto_tree_add_item (tree, hf_r3_configitems, tvb, start_offset + 2, cmdLen - 2, ENC_NA); config_tree = proto_item_add_subtree (config_item, ett_r3configitem); for (i = 2; i < cmdLen; i++) - proto_tree_add_item (config_tree, hf_r3_configitem, tvb, start_offset + i, 1, TRUE); + proto_tree_add_item (config_tree, hf_r3_configitem, tvb, start_offset + i, 1, ENC_LITTLE_ENDIAN); } static void dissect_r3_cmd_manageuser (tvbuff_t *tvb, guint32 start_offset, guint32 length _U_, packet_info *pinfo, proto_tree *tree) @@ -4644,8 +4644,8 @@ static void dissect_r3_cmd_manageuser (tvbuff_t *tvb, guint32 start_offset, guin tvbuff_t *payload_tvb = tvb_new_subset (tvb, start_offset + 2, cmdLen - 2, cmdLen - 2); guint32 offset = 0; - proto_tree_add_item (tree, hf_r3_commandlength, tvb, start_offset + 0, 1, TRUE); - proto_tree_add_item (tree, hf_r3_command, tvb, start_offset + 1, 1, TRUE); + proto_tree_add_item (tree, hf_r3_commandlength, tvb, start_offset + 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (tree, hf_r3_command, tvb, start_offset + 1, 1, ENC_LITTLE_ENDIAN); while (offset < tvb_reported_length (payload_tvb)) { @@ -4659,8 +4659,8 @@ static void dissect_r3_cmd_manageuser (tvbuff_t *tvb, guint32 start_offset, guin mu_tree = proto_item_add_subtree (proto_tree_add_none_format (tree, hf_r3_adduserparamtype, payload_tvb, offset + 0, paramLength, "Manage User Field: %s (%u)", auptn, paramType), ett_r3manageuser); - proto_tree_add_item (mu_tree, hf_r3_adduserparamtypelength, payload_tvb, offset + 0, 1, TRUE); - proto_tree_add_item (mu_tree, hf_r3_adduserparamtypetype, payload_tvb, offset + 1, 1, TRUE); + proto_tree_add_item (mu_tree, hf_r3_adduserparamtypelength, payload_tvb, offset + 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (mu_tree, hf_r3_adduserparamtypetype, payload_tvb, offset + 1, 1, ENC_LITTLE_ENDIAN); offset += 2; @@ -4706,9 +4706,9 @@ static void dissect_r3_cmd_manageuser (tvbuff_t *tvb, guint32 start_offset, guin tvb_get_guint8 (payload_tvb, offset + 2), tvb_get_guint8 (payload_tvb, offset + 0), tvb_get_guint8 (payload_tvb, offset + 1)); expireon_tree = proto_item_add_subtree (expireon_item, ett_r3expireon); - proto_tree_add_item (expireon_tree, hf_r3_expireon_month, payload_tvb, offset + 0, 1, TRUE); - proto_tree_add_item (expireon_tree, hf_r3_expireon_day, payload_tvb, offset + 1, 1, TRUE); - proto_tree_add_item (expireon_tree, hf_r3_expireon_year, payload_tvb, offset + 2, 1, TRUE); + proto_tree_add_item (expireon_tree, hf_r3_expireon_month, payload_tvb, offset + 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (expireon_tree, hf_r3_expireon_day, payload_tvb, offset + 1, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (expireon_tree, hf_r3_expireon_year, payload_tvb, offset + 2, 1, ENC_LITTLE_ENDIAN); } } break; @@ -4748,9 +4748,9 @@ static void dissect_r3_cmd_deleteusers (tvbuff_t *tvb, guint32 start_offset, gui guint8 cmdLen = tvb_get_guint8 (tvb, start_offset + 0); tvbuff_t *payload_tvb = tvb_new_subset (tvb, start_offset + 2, cmdLen - 2, cmdLen - 2); - proto_tree_add_item (tree, hf_r3_commandlength, tvb, start_offset + 0, 1, TRUE); - proto_tree_add_item (tree, hf_r3_command, tvb, start_offset + 1, 1, TRUE); - proto_tree_add_item (tree, hf_r3_deleteusers, payload_tvb, 0, 1, TRUE); + proto_tree_add_item (tree, hf_r3_commandlength, tvb, start_offset + 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (tree, hf_r3_command, tvb, start_offset + 1, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (tree, hf_r3_deleteusers, payload_tvb, 0, 1, ENC_LITTLE_ENDIAN); } static void dissect_r3_cmd_defineexception (tvbuff_t *tvb, guint32 start_offset, guint32 length _U_, packet_info *pinfo _U_, proto_tree *tree) @@ -4762,23 +4762,23 @@ static void dissect_r3_cmd_defineexception (tvbuff_t *tvb, guint32 start_offset, guint8 cmdLen = tvb_get_guint8 (tvb, start_offset + 0); tvbuff_t *payload_tvb = tvb_new_subset (tvb, start_offset + 2, cmdLen - 2, cmdLen - 2); - proto_tree_add_item (tree, hf_r3_commandlength, tvb, start_offset + 0, 1, TRUE); - proto_tree_add_item (tree, hf_r3_command, tvb, start_offset + 1, 1, TRUE); - proto_tree_add_item (tree, hf_r3_defineexception_number, payload_tvb, 0, 1, TRUE); + proto_tree_add_item (tree, hf_r3_commandlength, tvb, start_offset + 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (tree, hf_r3_command, tvb, start_offset + 1, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (tree, hf_r3_defineexception_number, payload_tvb, 0, 1, ENC_LITTLE_ENDIAN); startdate_item = proto_tree_add_text (tree, payload_tvb, 1, 4, "Start MM/DD HH:MM (%02u/%02u %02u:%02u)", tvb_get_guint8 (payload_tvb, 1), tvb_get_guint8 (payload_tvb, 2), tvb_get_guint8 (payload_tvb, 3), tvb_get_guint8 (payload_tvb, 4)); startdate_tree = proto_item_add_subtree (startdate_item, ett_r3defineexceptionstartdate); - proto_tree_add_item (startdate_tree, hf_r3_defineexception_startdate_month, payload_tvb, 1, 1, TRUE); - proto_tree_add_item (startdate_tree, hf_r3_defineexception_startdate_day, payload_tvb, 2, 1, TRUE); - proto_tree_add_item (startdate_tree, hf_r3_defineexception_startdate_hours, payload_tvb, 3, 1, TRUE); - proto_tree_add_item (startdate_tree, hf_r3_defineexception_startdate_minutes, payload_tvb, 4, 1, TRUE); + proto_tree_add_item (startdate_tree, hf_r3_defineexception_startdate_month, payload_tvb, 1, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (startdate_tree, hf_r3_defineexception_startdate_day, payload_tvb, 2, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (startdate_tree, hf_r3_defineexception_startdate_hours, payload_tvb, 3, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (startdate_tree, hf_r3_defineexception_startdate_minutes, payload_tvb, 4, 1, ENC_LITTLE_ENDIAN); enddate_item = proto_tree_add_text (tree, payload_tvb, 5, 4, "End MM/DD HH:MM (%02u/%02u %02u:%02u)", tvb_get_guint8 (payload_tvb, 5), tvb_get_guint8 (payload_tvb, 6), tvb_get_guint8 (payload_tvb, 7), tvb_get_guint8 (payload_tvb, 8)); enddate_tree = proto_item_add_subtree (enddate_item, ett_r3defineexceptionenddate); - proto_tree_add_item (enddate_tree, hf_r3_defineexception_enddate_month, payload_tvb, 5, 1, TRUE); - proto_tree_add_item (enddate_tree, hf_r3_defineexception_enddate_day, payload_tvb, 6, 1, TRUE); - proto_tree_add_item (enddate_tree, hf_r3_defineexception_enddate_hours, payload_tvb, 7, 1, TRUE); - proto_tree_add_item (enddate_tree, hf_r3_defineexception_enddate_minutes, payload_tvb, 8, 1, TRUE); + proto_tree_add_item (enddate_tree, hf_r3_defineexception_enddate_month, payload_tvb, 5, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (enddate_tree, hf_r3_defineexception_enddate_day, payload_tvb, 6, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (enddate_tree, hf_r3_defineexception_enddate_hours, payload_tvb, 7, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (enddate_tree, hf_r3_defineexception_enddate_minutes, payload_tvb, 8, 1, ENC_LITTLE_ENDIAN); } static void dissect_r3_cmd_defineexceptiongroup (tvbuff_t *tvb, guint32 start_offset, guint32 length _U_, packet_info *pinfo _U_, proto_tree *tree) @@ -4790,9 +4790,9 @@ static void dissect_r3_cmd_defineexceptiongroup (tvbuff_t *tvb, guint32 start_of guint32 i = 0; guint32 bit = 0; - proto_tree_add_item (tree, hf_r3_commandlength, tvb, start_offset + 0, 1, TRUE); - proto_tree_add_item (tree, hf_r3_command, tvb, start_offset + 1, 1, TRUE); - proto_tree_add_item (tree, hf_r3_defineexceptiongroup_number, payload_tvb, 0, 1, TRUE); + proto_tree_add_item (tree, hf_r3_commandlength, tvb, start_offset + 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (tree, hf_r3_command, tvb, start_offset + 1, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (tree, hf_r3_defineexceptiongroup_number, payload_tvb, 0, 1, ENC_LITTLE_ENDIAN); bits_item = proto_tree_add_text (tree, payload_tvb, 1, -1, "Exception Group Bit Field"); bits_tree = proto_item_add_subtree (bits_item, ett_r3defineexceptiongroupbits); @@ -4814,9 +4814,9 @@ static void dissect_r3_cmd_definecalendar (tvbuff_t *tvb, guint32 start_offset, const gchar *mn; guint32 i; - proto_tree_add_item (tree, hf_r3_commandlength, tvb, start_offset + 0, 1, TRUE); - proto_tree_add_item (tree, hf_r3_command, tvb, start_offset + 1, 1, TRUE); - proto_tree_add_item (tree, hf_r3_definecalendar_number, payload_tvb, 0, 1, TRUE); + proto_tree_add_item (tree, hf_r3_commandlength, tvb, start_offset + 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (tree, hf_r3_command, tvb, start_offset + 1, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (tree, hf_r3_definecalendar_number, payload_tvb, 0, 1, ENC_LITTLE_ENDIAN); for (i = 0; i < 12; i++) { @@ -4843,19 +4843,19 @@ static void dissect_r3_cmd_definetimezone (tvbuff_t *tvb, guint32 start_offset, guint32 i; guint8 tzmode; - proto_tree_add_item (tree, hf_r3_commandlength, tvb, start_offset + 0, 1, TRUE); - proto_tree_add_item (tree, hf_r3_command, tvb, start_offset + 1, 1, TRUE); - proto_tree_add_item (tree, hf_r3_definetimezone_number, payload_tvb, 0, 1, TRUE); + proto_tree_add_item (tree, hf_r3_commandlength, tvb, start_offset + 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (tree, hf_r3_command, tvb, start_offset + 1, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (tree, hf_r3_definetimezone_number, payload_tvb, 0, 1, ENC_LITTLE_ENDIAN); starttime_item = proto_tree_add_text (tree, payload_tvb, 1, 2, "Start HH:MM (%02u:%02u)", tvb_get_guint8 (payload_tvb, 1), tvb_get_guint8 (payload_tvb, 2)); starttime_tree = proto_item_add_subtree (starttime_item, ett_r3definetimezonestarttime); - proto_tree_add_item (starttime_tree, hf_r3_definetimezone_starttime_hours, payload_tvb, 1, 1, TRUE); - proto_tree_add_item (starttime_tree, hf_r3_definetimezone_starttime_minutes, payload_tvb, 2, 1, TRUE); + proto_tree_add_item (starttime_tree, hf_r3_definetimezone_starttime_hours, payload_tvb, 1, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (starttime_tree, hf_r3_definetimezone_starttime_minutes, payload_tvb, 2, 1, ENC_LITTLE_ENDIAN); endtime_item = proto_tree_add_text (tree, payload_tvb, 3, 2, "End HH:MM (%02u:%02u)", tvb_get_guint8 (payload_tvb, 3), tvb_get_guint8 (payload_tvb, 4)); endtime_tree = proto_item_add_subtree (endtime_item, ett_r3definetimezoneendtime); - proto_tree_add_item (endtime_tree, hf_r3_definetimezone_endtime_hours, payload_tvb, 3, 1, TRUE); - proto_tree_add_item (endtime_tree, hf_r3_definetimezone_endtime_minutes, payload_tvb, 4, 1, TRUE); + proto_tree_add_item (endtime_tree, hf_r3_definetimezone_endtime_hours, payload_tvb, 3, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (endtime_tree, hf_r3_definetimezone_endtime_minutes, payload_tvb, 4, 1, ENC_LITTLE_ENDIAN); daymap_item = proto_tree_add_text (tree, payload_tvb, 5, 1, "Day Map (0x%02x)", tvb_get_guint8 (payload_tvb, 5)); daymap_tree = proto_item_add_subtree (daymap_item, ett_r3definetimezonedaymap); @@ -4863,7 +4863,7 @@ static void dissect_r3_cmd_definetimezone (tvbuff_t *tvb, guint32 start_offset, for (i = 0; i < 7; i++) proto_tree_add_boolean (daymap_tree, hf_r3_definetimezone_daymap [i], payload_tvb, 5, 1, tvb_get_guint8 (payload_tvb, 5)); - proto_tree_add_item (tree, hf_r3_definetimezone_exceptiongroup, payload_tvb, 6, 1, TRUE); + proto_tree_add_item (tree, hf_r3_definetimezone_exceptiongroup, payload_tvb, 6, 1, ENC_LITTLE_ENDIAN); proto_tree_add_uint (tree, hf_r3_definetimezone_mode, payload_tvb, 7, 1, (tzmode = tvb_get_guint8 (payload_tvb, 7)) & 0x0f); proto_tree_add_none_format (tree, hf_r3_definetimezone_calendar, payload_tvb, 7, 1, "Access Always: %s", (tzmode & 0x10) ? "True" : "False"); } @@ -4873,9 +4873,9 @@ static void dissect_r3_cmd_rmtauthretry (tvbuff_t *tvb, guint32 start_offset, gu guint8 cmdLen = tvb_get_guint8 (tvb, start_offset + 0); tvbuff_t *payload_tvb = tvb_new_subset (tvb, start_offset + 2, cmdLen - 2, cmdLen - 2); - proto_tree_add_item (tree, hf_r3_commandlength, tvb, start_offset + 0, 1, TRUE); - proto_tree_add_item (tree, hf_r3_command, tvb, start_offset + 1, 1, TRUE); - proto_tree_add_item (tree, hf_r3_rmtauthretry_sequence, payload_tvb, 0, 2, TRUE); + proto_tree_add_item (tree, hf_r3_commandlength, tvb, start_offset + 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (tree, hf_r3_command, tvb, start_offset + 1, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (tree, hf_r3_rmtauthretry_sequence, payload_tvb, 0, 2, ENC_LITTLE_ENDIAN); proto_tree_add_item (tree, hf_r3_rmtauthretry_retry, payload_tvb, 2, 1, TRUE); } @@ -4887,15 +4887,15 @@ static void dissect_r3_cmd_filters (tvbuff_t *tvb, guint32 start_offset, guint32 tvbuff_t *payload_tvb = tvb_new_subset (tvb, start_offset + 2, cmdLen - 2, cmdLen - 2); guint32 i; - proto_tree_add_item (tree, hf_r3_commandlength, tvb, start_offset + 0, 1, TRUE); - proto_tree_add_item (tree, hf_r3_command, tvb, start_offset + 1, 1, TRUE); - proto_tree_add_item (tree, hf_r3_filter_type, payload_tvb, 1, 1, TRUE); + proto_tree_add_item (tree, hf_r3_commandlength, tvb, start_offset + 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (tree, hf_r3_command, tvb, start_offset + 1, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (tree, hf_r3_filter_type, payload_tvb, 1, 1, ENC_LITTLE_ENDIAN); filter_item = proto_tree_add_text (tree, payload_tvb, 2, -1, "Filters (%u specified)", tvb_get_guint8 (payload_tvb, 0)); filter_tree = proto_item_add_subtree (filter_item, ett_r3filters); for (i = 0; i < tvb_get_guint8 (payload_tvb, 0); i++) - proto_tree_add_item (filter_tree, hf_r3_filter_list, payload_tvb, i + 2, 1, TRUE); + proto_tree_add_item (filter_tree, hf_r3_filter_list, payload_tvb, i + 2, 1, ENC_LITTLE_ENDIAN); } static void dissect_r3_cmd_alarmconfigure (tvbuff_t *tvb, guint32 start_offset, guint32 length _U_, packet_info *pinfo _U_, proto_tree *tree) @@ -4907,8 +4907,8 @@ static void dissect_r3_cmd_alarmconfigure (tvbuff_t *tvb, guint32 start_offset, guint32 offset = 0; guint32 alarms = 0; - proto_tree_add_item (tree, hf_r3_commandlength, tvb, start_offset + 0, 1, TRUE); - proto_tree_add_item (tree, hf_r3_command, tvb, start_offset + 1, 1, TRUE); + proto_tree_add_item (tree, hf_r3_commandlength, tvb, start_offset + 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (tree, hf_r3_command, tvb, start_offset + 1, 1, ENC_LITTLE_ENDIAN); alarm_item = proto_tree_add_text (tree, payload_tvb, 0, -1, "Alarm List (0 items)"); alarm_tree = proto_item_add_subtree (alarm_item, ett_r3alarmlist); @@ -4931,8 +4931,8 @@ static void dissect_r3_cmd_alarmconfigure (tvbuff_t *tvb, guint32 start_offset, alarmcfg_item = proto_tree_add_text (alarm_tree, payload_tvb, offset, tvb_get_guint8 (payload_tvb, offset), "Alarm Item (%s, %s)", ai, as); alarmcfg_tree = proto_item_add_subtree (alarmcfg_item, ett_r3alarmcfg); - proto_tree_add_item (alarmcfg_tree, hf_r3_alarm_length, payload_tvb, offset + 0, 1, TRUE); - proto_tree_add_item (alarmcfg_tree, hf_r3_alarm_id, payload_tvb, offset + 1, 1, TRUE); + proto_tree_add_item (alarmcfg_tree, hf_r3_alarm_length, payload_tvb, offset + 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (alarmcfg_tree, hf_r3_alarm_id, payload_tvb, offset + 1, 1, ENC_LITTLE_ENDIAN); proto_tree_add_item (alarmcfg_tree, hf_r3_alarm_state, payload_tvb, offset + 2, 1, TRUE); alarms++; @@ -4952,26 +4952,26 @@ static void dissect_r3_cmd_eventlogdump (tvbuff_t *tvb, guint32 start_offset, gu guint8 cmdLen = tvb_get_guint8 (tvb, start_offset + 0); tvbuff_t *payload_tvb = tvb_new_subset (tvb, start_offset + 2, cmdLen - 2, cmdLen - 2); - proto_tree_add_item (tree, hf_r3_commandlength, tvb, start_offset + 0, 1, TRUE); - proto_tree_add_item (tree, hf_r3_command, tvb, start_offset + 1, 1, TRUE); + proto_tree_add_item (tree, hf_r3_commandlength, tvb, start_offset + 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (tree, hf_r3_command, tvb, start_offset + 1, 1, ENC_LITTLE_ENDIAN); starttime_item = proto_tree_add_text (tree, payload_tvb, 0, 5, "Start YY/MM/DD HH:MM (%02u/%02u/%02u %02u:%02u)", tvb_get_guint8 (payload_tvb, 0), tvb_get_guint8 (payload_tvb, 1), tvb_get_guint8 (payload_tvb, 2), tvb_get_guint8 (payload_tvb, 3), tvb_get_guint8 (payload_tvb, 4)); starttime_tree = proto_item_add_subtree (starttime_item, ett_r3eventlogdumpstarttime); - proto_tree_add_item (starttime_tree, hf_r3_eventlogdump_starttime_year, payload_tvb, 0, 1, TRUE); - proto_tree_add_item (starttime_tree, hf_r3_eventlogdump_starttime_month, payload_tvb, 1, 1, TRUE); - proto_tree_add_item (starttime_tree, hf_r3_eventlogdump_starttime_day, payload_tvb, 2, 1, TRUE); - proto_tree_add_item (starttime_tree, hf_r3_eventlogdump_starttime_hours, payload_tvb, 3, 1, TRUE); - proto_tree_add_item (starttime_tree, hf_r3_eventlogdump_starttime_minutes, payload_tvb, 4, 1, TRUE); + proto_tree_add_item (starttime_tree, hf_r3_eventlogdump_starttime_year, payload_tvb, 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (starttime_tree, hf_r3_eventlogdump_starttime_month, payload_tvb, 1, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (starttime_tree, hf_r3_eventlogdump_starttime_day, payload_tvb, 2, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (starttime_tree, hf_r3_eventlogdump_starttime_hours, payload_tvb, 3, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (starttime_tree, hf_r3_eventlogdump_starttime_minutes, payload_tvb, 4, 1, ENC_LITTLE_ENDIAN); endtime_item = proto_tree_add_text (tree, payload_tvb, 5, 5, "End YY/MM/DD HH:MM (%02u/%02u/%02u %02u:%02u)", tvb_get_guint8 (payload_tvb, 5), tvb_get_guint8 (payload_tvb, 6), tvb_get_guint8 (payload_tvb, 7), tvb_get_guint8 (payload_tvb, 8), tvb_get_guint8 (payload_tvb, 9)); endtime_tree = proto_item_add_subtree (endtime_item, ett_r3eventlogdumpendtime); - proto_tree_add_item (endtime_tree, hf_r3_eventlogdump_endtime_year, payload_tvb, 5, 1, TRUE); - proto_tree_add_item (endtime_tree, hf_r3_eventlogdump_endtime_month, payload_tvb, 6, 1, TRUE); - proto_tree_add_item (endtime_tree, hf_r3_eventlogdump_endtime_day, payload_tvb, 7, 1, TRUE); - proto_tree_add_item (endtime_tree, hf_r3_eventlogdump_endtime_hours, payload_tvb, 8, 1, TRUE); - proto_tree_add_item (endtime_tree, hf_r3_eventlogdump_endtime_minutes, payload_tvb, 9, 1, TRUE); + proto_tree_add_item (endtime_tree, hf_r3_eventlogdump_endtime_year, payload_tvb, 5, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (endtime_tree, hf_r3_eventlogdump_endtime_month, payload_tvb, 6, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (endtime_tree, hf_r3_eventlogdump_endtime_day, payload_tvb, 7, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (endtime_tree, hf_r3_eventlogdump_endtime_hours, payload_tvb, 8, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (endtime_tree, hf_r3_eventlogdump_endtime_minutes, payload_tvb, 9, 1, ENC_LITTLE_ENDIAN); - proto_tree_add_item (tree, hf_r3_eventlogdump_user, payload_tvb, 10, 2, TRUE); + proto_tree_add_item (tree, hf_r3_eventlogdump_user, payload_tvb, 10, 2, ENC_LITTLE_ENDIAN); } static void dissect_r3_cmd_declinedlogdump (tvbuff_t *tvb, guint32 start_offset, guint32 length _U_, packet_info *pinfo _U_, proto_tree *tree) @@ -4983,24 +4983,24 @@ static void dissect_r3_cmd_declinedlogdump (tvbuff_t *tvb, guint32 start_offset, guint8 cmdLen = tvb_get_guint8 (tvb, start_offset + 0); tvbuff_t *payload_tvb = tvb_new_subset (tvb, start_offset + 2, cmdLen - 2, cmdLen - 2); - proto_tree_add_item (tree, hf_r3_commandlength, tvb, start_offset + 0, 1, TRUE); - proto_tree_add_item (tree, hf_r3_command, tvb, start_offset + 1, 1, TRUE); + proto_tree_add_item (tree, hf_r3_commandlength, tvb, start_offset + 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (tree, hf_r3_command, tvb, start_offset + 1, 1, ENC_LITTLE_ENDIAN); starttime_item = proto_tree_add_text (tree, payload_tvb, 0, 5, "Start YY/MM/DD HH:MM (%02u/%02u/%02u %02u:%02u)", tvb_get_guint8 (payload_tvb, 0), tvb_get_guint8 (payload_tvb, 1), tvb_get_guint8 (payload_tvb, 2), tvb_get_guint8 (payload_tvb, 3), tvb_get_guint8 (payload_tvb, 4)); starttime_tree = proto_item_add_subtree (starttime_item, ett_r3declinedlogdumpstarttime); - proto_tree_add_item (starttime_tree, hf_r3_declinedlogdump_starttime_year, payload_tvb, 0, 1, TRUE); - proto_tree_add_item (starttime_tree, hf_r3_declinedlogdump_starttime_month, payload_tvb, 1, 1, TRUE); - proto_tree_add_item (starttime_tree, hf_r3_declinedlogdump_starttime_day, payload_tvb, 2, 1, TRUE); - proto_tree_add_item (starttime_tree, hf_r3_declinedlogdump_starttime_hours, payload_tvb, 3, 1, TRUE); - proto_tree_add_item (starttime_tree, hf_r3_declinedlogdump_starttime_minutes, payload_tvb, 4, 1, TRUE); + proto_tree_add_item (starttime_tree, hf_r3_declinedlogdump_starttime_year, payload_tvb, 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (starttime_tree, hf_r3_declinedlogdump_starttime_month, payload_tvb, 1, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (starttime_tree, hf_r3_declinedlogdump_starttime_day, payload_tvb, 2, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (starttime_tree, hf_r3_declinedlogdump_starttime_hours, payload_tvb, 3, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (starttime_tree, hf_r3_declinedlogdump_starttime_minutes, payload_tvb, 4, 1, ENC_LITTLE_ENDIAN); endtime_item = proto_tree_add_text (tree, payload_tvb, 5, 5, "End YY/MM/DD HH:MM (%02u/%02u/%02u %02u:%02u)", tvb_get_guint8 (payload_tvb, 5), tvb_get_guint8 (payload_tvb, 6), tvb_get_guint8 (payload_tvb, 7), tvb_get_guint8 (payload_tvb, 8), tvb_get_guint8 (payload_tvb, 9)); endtime_tree = proto_item_add_subtree (endtime_item, ett_r3declinedlogdumpendtime); - proto_tree_add_item (endtime_tree, hf_r3_declinedlogdump_endtime_year, payload_tvb, 5, 1, TRUE); - proto_tree_add_item (endtime_tree, hf_r3_declinedlogdump_endtime_month, payload_tvb, 6, 1, TRUE); - proto_tree_add_item (endtime_tree, hf_r3_declinedlogdump_endtime_day, payload_tvb, 7, 1, TRUE); - proto_tree_add_item (endtime_tree, hf_r3_declinedlogdump_endtime_hours, payload_tvb, 8, 1, TRUE); - proto_tree_add_item (endtime_tree, hf_r3_declinedlogdump_endtime_minutes, payload_tvb, 9, 1, TRUE); + proto_tree_add_item (endtime_tree, hf_r3_declinedlogdump_endtime_year, payload_tvb, 5, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (endtime_tree, hf_r3_declinedlogdump_endtime_month, payload_tvb, 6, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (endtime_tree, hf_r3_declinedlogdump_endtime_day, payload_tvb, 7, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (endtime_tree, hf_r3_declinedlogdump_endtime_hours, payload_tvb, 8, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (endtime_tree, hf_r3_declinedlogdump_endtime_minutes, payload_tvb, 9, 1, ENC_LITTLE_ENDIAN); } static void dissect_r3_cmd_alarmlogdump (tvbuff_t *tvb, guint32 start_offset, guint32 length _U_, packet_info *pinfo _U_, proto_tree *tree) @@ -5012,24 +5012,24 @@ static void dissect_r3_cmd_alarmlogdump (tvbuff_t *tvb, guint32 start_offset, gu guint8 cmdLen = tvb_get_guint8 (tvb, start_offset + 0); tvbuff_t *payload_tvb = tvb_new_subset (tvb, start_offset + 2, cmdLen - 2, cmdLen - 2); - proto_tree_add_item (tree, hf_r3_commandlength, tvb, start_offset + 0, 1, TRUE); - proto_tree_add_item (tree, hf_r3_command, tvb, start_offset + 1, 1, TRUE); + proto_tree_add_item (tree, hf_r3_commandlength, tvb, start_offset + 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (tree, hf_r3_command, tvb, start_offset + 1, 1, ENC_LITTLE_ENDIAN); starttime_item = proto_tree_add_text (tree, payload_tvb, 0, 5, "Start YY/MM/DD HH:MM (%02u/%02u/%02u %02u:%02u)", tvb_get_guint8 (payload_tvb, 0), tvb_get_guint8 (payload_tvb, 1), tvb_get_guint8 (payload_tvb, 2), tvb_get_guint8 (payload_tvb, 3), tvb_get_guint8 (payload_tvb, 4)); starttime_tree = proto_item_add_subtree (starttime_item, ett_r3alarmlogdumpstarttime); - proto_tree_add_item (starttime_tree, hf_r3_alarmlogdump_starttime_year, payload_tvb, 0, 1, TRUE); - proto_tree_add_item (starttime_tree, hf_r3_alarmlogdump_starttime_month, payload_tvb, 1, 1, TRUE); - proto_tree_add_item (starttime_tree, hf_r3_alarmlogdump_starttime_day, payload_tvb, 2, 1, TRUE); - proto_tree_add_item (starttime_tree, hf_r3_alarmlogdump_starttime_hours, payload_tvb, 3, 1, TRUE); - proto_tree_add_item (starttime_tree, hf_r3_alarmlogdump_starttime_minutes, payload_tvb, 4, 1, TRUE); + proto_tree_add_item (starttime_tree, hf_r3_alarmlogdump_starttime_year, payload_tvb, 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (starttime_tree, hf_r3_alarmlogdump_starttime_month, payload_tvb, 1, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (starttime_tree, hf_r3_alarmlogdump_starttime_day, payload_tvb, 2, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (starttime_tree, hf_r3_alarmlogdump_starttime_hours, payload_tvb, 3, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (starttime_tree, hf_r3_alarmlogdump_starttime_minutes, payload_tvb, 4, 1, ENC_LITTLE_ENDIAN); endtime_item = proto_tree_add_text (tree, payload_tvb, 5, 5, "End YY/MM/DD HH:MM (%02u/%02u/%02u %02u:%02u)", tvb_get_guint8 (payload_tvb, 5), tvb_get_guint8 (payload_tvb, 6), tvb_get_guint8 (payload_tvb, 7), tvb_get_guint8 (payload_tvb, 8), tvb_get_guint8 (payload_tvb, 9)); endtime_tree = proto_item_add_subtree (endtime_item, ett_r3alarmlogdumpendtime); - proto_tree_add_item (endtime_tree, hf_r3_alarmlogdump_endtime_year, payload_tvb, 5, 1, TRUE); - proto_tree_add_item (endtime_tree, hf_r3_alarmlogdump_endtime_month, payload_tvb, 6, 1, TRUE); - proto_tree_add_item (endtime_tree, hf_r3_alarmlogdump_endtime_day, payload_tvb, 7, 1, TRUE); - proto_tree_add_item (endtime_tree, hf_r3_alarmlogdump_endtime_hours, payload_tvb, 8, 1, TRUE); - proto_tree_add_item (endtime_tree, hf_r3_alarmlogdump_endtime_minutes, payload_tvb, 9, 1, TRUE); + proto_tree_add_item (endtime_tree, hf_r3_alarmlogdump_endtime_year, payload_tvb, 5, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (endtime_tree, hf_r3_alarmlogdump_endtime_month, payload_tvb, 6, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (endtime_tree, hf_r3_alarmlogdump_endtime_day, payload_tvb, 7, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (endtime_tree, hf_r3_alarmlogdump_endtime_hours, payload_tvb, 8, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (endtime_tree, hf_r3_alarmlogdump_endtime_minutes, payload_tvb, 9, 1, ENC_LITTLE_ENDIAN); } static void dissect_r3_cmd_downloadfirmware (tvbuff_t *tvb, guint32 start_offset, guint32 length _U_, packet_info *pinfo _U_, proto_tree *tree) @@ -5041,28 +5041,28 @@ static void dissect_r3_cmd_downloadfirmware (tvbuff_t *tvb, guint32 start_offset guint32 packetCRC = 0; guint32 calculatedCRC = 0; - proto_tree_add_item (tree, hf_r3_commandlength, tvb, start_offset + 0, 1, TRUE); - proto_tree_add_item (tree, hf_r3_command, tvb, start_offset + 1, 1, TRUE); + proto_tree_add_item (tree, hf_r3_commandlength, tvb, start_offset + 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (tree, hf_r3_command, tvb, start_offset + 1, 1, ENC_LITTLE_ENDIAN); dlfw_item = proto_tree_add_text (tree, payload_tvb, 0, -1, "Download Record (Record #%u, ", tvb_get_letohs (payload_tvb, 2)); dlfw_tree = proto_item_add_subtree (dlfw_item, ett_r3downloadfirmware); - proto_tree_add_item (dlfw_tree, hf_r3_firmwaredownload_length, payload_tvb, 0, 2, TRUE); - proto_tree_add_item (dlfw_tree, hf_r3_firmwaredownload_record, payload_tvb, 2, 2, TRUE); - proto_tree_add_item (dlfw_tree, hf_r3_firmwaredownload_action, payload_tvb, 4, 1, TRUE); + proto_tree_add_item (dlfw_tree, hf_r3_firmwaredownload_length, payload_tvb, 0, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item (dlfw_tree, hf_r3_firmwaredownload_record, payload_tvb, 2, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item (dlfw_tree, hf_r3_firmwaredownload_action, payload_tvb, 4, 1, ENC_LITTLE_ENDIAN); switch (tvb_get_guint8 (payload_tvb, 4)) { case DOWNLOADFIRMWARE_START : proto_item_append_text (dlfw_item, "DOWNLOADFIRMWARE_START)"); - proto_tree_add_item (dlfw_tree, hf_r3_firmwaredownload_timeout, payload_tvb, 5, 1, TRUE); - proto_tree_add_item (dlfw_tree, hf_r3_firmwaredownload_nvram, payload_tvb, 6, 1, TRUE); + proto_tree_add_item (dlfw_tree, hf_r3_firmwaredownload_timeout, payload_tvb, 5, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (dlfw_tree, hf_r3_firmwaredownload_nvram, payload_tvb, 6, 1, ENC_LITTLE_ENDIAN); break; case DOWNLOADFIRMWARE_DATA : proto_item_append_text (dlfw_item, "DOWNLOADFIRMWARE_DATA, Address 0x%08x, %u Bytes)", tvb_get_letohl (payload_tvb, 5), tvb_get_guint8 (payload_tvb, 9)); - proto_tree_add_item (dlfw_tree, hf_r3_firmwaredownload_address, payload_tvb, 5, 4, TRUE); - proto_tree_add_item (dlfw_tree, hf_r3_firmwaredownload_bytes, payload_tvb, 9, 1, TRUE); + proto_tree_add_item (dlfw_tree, hf_r3_firmwaredownload_address, payload_tvb, 5, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item (dlfw_tree, hf_r3_firmwaredownload_bytes, payload_tvb, 9, 1, ENC_LITTLE_ENDIAN); proto_tree_add_item (dlfw_tree, hf_r3_firmwaredownload_data, payload_tvb, 10, tvb_get_guint8 (payload_tvb, 9), ENC_NA); break; @@ -5101,8 +5101,8 @@ static void dissect_r3_cmd_downloadfirmwaretimeout (tvbuff_t *tvb, guint32 start guint8 cmdLen = tvb_get_guint8 (tvb, start_offset + 0); tvbuff_t *payload_tvb = tvb_new_subset (tvb, start_offset + 2, cmdLen - 2, cmdLen - 2); - proto_tree_add_item (tree, hf_r3_commandlength, tvb, start_offset + 0, 1, TRUE); - proto_tree_add_item (tree, hf_r3_command, tvb, start_offset + 1, 1, TRUE); + proto_tree_add_item (tree, hf_r3_commandlength, tvb, start_offset + 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (tree, hf_r3_command, tvb, start_offset + 1, 1, ENC_LITTLE_ENDIAN); proto_tree_add_item (tree, hf_r3_commanddata, payload_tvb, 0, -1, ENC_NA); DISSECTOR_ASSERT (0); /* ### Need nice warning here */ } @@ -5112,9 +5112,9 @@ static void dissect_r3_cmd_powertableselection (tvbuff_t *tvb, guint32 start_off guint8 cmdLen = tvb_get_guint8 (tvb, start_offset + 0); tvbuff_t *payload_tvb = tvb_new_subset (tvb, start_offset + 2, cmdLen - 2, cmdLen - 2); - proto_tree_add_item (tree, hf_r3_commandlength, tvb, start_offset + 0, 1, TRUE); - proto_tree_add_item (tree, hf_r3_command, tvb, start_offset + 1, 1, TRUE); - proto_tree_add_item (tree, hf_r3_powertableselection, payload_tvb, 0, 1, TRUE); + proto_tree_add_item (tree, hf_r3_commandlength, tvb, start_offset + 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (tree, hf_r3_command, tvb, start_offset + 1, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (tree, hf_r3_powertableselection, payload_tvb, 0, 1, ENC_LITTLE_ENDIAN); } static void dissect_r3_cmd_clearnvram (tvbuff_t *tvb, guint32 start_offset, guint32 length _U_, packet_info *pinfo _U_, proto_tree *tree) @@ -5126,8 +5126,8 @@ static void dissect_r3_cmd_clearnvram (tvbuff_t *tvb, guint32 start_offset, guin guint32 nvramclearoptions = tvb_get_letohs (payload_tvb, 0); guint32 i; - proto_tree_add_item (tree, hf_r3_commandlength, tvb, start_offset + 0, 1, TRUE); - proto_tree_add_item (tree, hf_r3_command, tvb, start_offset + 1, 1, TRUE); + proto_tree_add_item (tree, hf_r3_commandlength, tvb, start_offset + 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (tree, hf_r3_command, tvb, start_offset + 1, 1, ENC_LITTLE_ENDIAN); nvram_item = proto_tree_add_text (tree, payload_tvb, 0, 2, "NVRAM Clean Options (0x%04x)", nvramclearoptions); nvram_tree = proto_item_add_subtree (nvram_item, ett_r3clearnvram); @@ -5141,8 +5141,8 @@ static void dissect_r3_cmd_dpac (tvbuff_t *tvb, guint32 start_offset, guint32 le guint8 cmdLen = tvb_get_guint8 (tvb, start_offset + 0); tvbuff_t *payload_tvb = tvb_new_subset (tvb, start_offset + 2, cmdLen - 2, cmdLen - 2); - proto_tree_add_item (tree, hf_r3_commandlength, tvb, start_offset + 0, 1, TRUE); - proto_tree_add_item (tree, hf_r3_command, tvb, start_offset + 1, 1, TRUE); + proto_tree_add_item (tree, hf_r3_commandlength, tvb, start_offset + 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (tree, hf_r3_command, tvb, start_offset + 1, 1, ENC_LITTLE_ENDIAN); proto_tree_add_item (tree, hf_r3_dpac_action, payload_tvb, 0, 1, TRUE); proto_tree_add_item (tree, hf_r3_dpac_waittime, payload_tvb, 1, 2, TRUE); proto_tree_add_item (tree, hf_r3_dpac_command, payload_tvb, 3, -1, TRUE); @@ -5150,14 +5150,14 @@ static void dissect_r3_cmd_dpac (tvbuff_t *tvb, guint32 start_offset, guint32 le static void dissect_r3_cmd_selftest (tvbuff_t *tvb, guint32 start_offset, guint32 length _U_, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item (tree, hf_r3_commandlength, tvb, start_offset + 0, 1, TRUE); - proto_tree_add_item (tree, hf_r3_command, tvb, start_offset + 1, 1, TRUE); + proto_tree_add_item (tree, hf_r3_commandlength, tvb, start_offset + 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (tree, hf_r3_command, tvb, start_offset + 1, 1, ENC_LITTLE_ENDIAN); } static void dissect_r3_cmd_reset (tvbuff_t *tvb, guint32 start_offset, guint32 length _U_, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item (tree, hf_r3_commandlength, tvb, start_offset + 0, 1, TRUE); - proto_tree_add_item (tree, hf_r3_command, tvb, start_offset + 1, 1, TRUE); + proto_tree_add_item (tree, hf_r3_commandlength, tvb, start_offset + 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (tree, hf_r3_command, tvb, start_offset + 1, 1, ENC_LITTLE_ENDIAN); } static void dissect_r3_cmd_logwrite (tvbuff_t *tvb, guint32 start_offset, guint32 length _U_, packet_info *pinfo _U_, proto_tree *tree) @@ -5165,29 +5165,29 @@ static void dissect_r3_cmd_logwrite (tvbuff_t *tvb, guint32 start_offset, guint3 guint8 cmdLen = tvb_get_guint8 (tvb, start_offset + 0); tvbuff_t *payload_tvb = tvb_new_subset (tvb, start_offset + 2, cmdLen - 2, cmdLen - 2); - proto_tree_add_item (tree, hf_r3_commandlength, tvb, start_offset + 0, 1, TRUE); - proto_tree_add_item (tree, hf_r3_command, tvb, start_offset + 1, 1, TRUE); - proto_tree_add_item (tree, hf_r3_writeeventlog_user, payload_tvb, 0, 2, TRUE); - proto_tree_add_item (tree, hf_r3_writeeventlog_event, payload_tvb, 2, 1, TRUE); + proto_tree_add_item (tree, hf_r3_commandlength, tvb, start_offset + 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (tree, hf_r3_command, tvb, start_offset + 1, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (tree, hf_r3_writeeventlog_user, payload_tvb, 0, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item (tree, hf_r3_writeeventlog_event, payload_tvb, 2, 1, ENC_LITTLE_ENDIAN); } static void dissect_r3_cmd_mfgcommand (tvbuff_t *tvb, guint32 start_offset, guint32 length _U_, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item (tree, hf_r3_commandlength, tvb, start_offset + 0, 1, TRUE); - proto_tree_add_item (tree, hf_r3_command, tvb, start_offset + 1, 1, TRUE); + proto_tree_add_item (tree, hf_r3_commandlength, tvb, start_offset + 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (tree, hf_r3_command, tvb, start_offset + 1, 1, ENC_LITTLE_ENDIAN); mfgCommandFlag = TRUE; } static void dissect_r3_cmd_nvrambackup (tvbuff_t *tvb, guint32 start_offset, guint32 length _U_, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item (tree, hf_r3_commandlength, tvb, start_offset + 0, 1, TRUE); - proto_tree_add_item (tree, hf_r3_command, tvb, start_offset + 1, 1, TRUE); + proto_tree_add_item (tree, hf_r3_commandlength, tvb, start_offset + 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (tree, hf_r3_command, tvb, start_offset + 1, 1, ENC_LITTLE_ENDIAN); } static void dissect_r3_cmd_extendedresponse (tvbuff_t *tvb, guint32 start_offset, guint32 length _U_, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item (tree, hf_r3_commandlength, tvb, start_offset + 0, 1, TRUE); - proto_tree_add_item (tree, hf_r3_command, tvb, start_offset + 1, 1, TRUE); + proto_tree_add_item (tree, hf_r3_commandlength, tvb, start_offset + 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (tree, hf_r3_command, tvb, start_offset + 1, 1, ENC_LITTLE_ENDIAN); } /* @@ -5197,78 +5197,78 @@ static void dissect_r3_cmdmfg_setserialnumber (tvbuff_t *tvb, guint32 start_offs { tvbuff_t *sn_tvb = tvb_new_subset (tvb, start_offset + 2, 16, 16); - proto_tree_add_item (tree, hf_r3_commandmfglength, tvb, start_offset + 0, 1, TRUE); - proto_tree_add_item (tree, hf_r3_commandmfg, tvb, start_offset + 1, 1, TRUE); + proto_tree_add_item (tree, hf_r3_commandmfglength, tvb, start_offset + 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (tree, hf_r3_commandmfg, tvb, start_offset + 1, 1, ENC_LITTLE_ENDIAN); dissect_serialnumber (sn_tvb, 0, length, pinfo, tree, hf_r3_mfgsetserialnumber); } static void dissect_r3_cmdmfg_setcryptkey (tvbuff_t *tvb, guint32 start_offset, guint32 length _U_, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item (tree, hf_r3_commandmfglength, tvb, start_offset + 0, 1, TRUE); - proto_tree_add_item (tree, hf_r3_commandmfg, tvb, start_offset + 1, 1, TRUE); + proto_tree_add_item (tree, hf_r3_commandmfglength, tvb, start_offset + 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (tree, hf_r3_commandmfg, tvb, start_offset + 1, 1, ENC_LITTLE_ENDIAN); proto_tree_add_item (tree, hf_r3_mfgsetcryptkey, tvb, start_offset + 2, -1, ENC_NA); } static void dissect_r3_cmdmfg_dumpnvram (tvbuff_t *tvb, guint32 start_offset, guint32 length _U_, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item (tree, hf_r3_commandmfglength, tvb, start_offset + 0, 1, TRUE); - proto_tree_add_item (tree, hf_r3_commandmfg, tvb, start_offset + 1, 1, TRUE); - proto_tree_add_item (tree, hf_r3_mfgdumpnvram, tvb, start_offset + 2, 1, TRUE); + proto_tree_add_item (tree, hf_r3_commandmfglength, tvb, start_offset + 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (tree, hf_r3_commandmfg, tvb, start_offset + 1, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (tree, hf_r3_mfgdumpnvram, tvb, start_offset + 2, 1, ENC_LITTLE_ENDIAN); } static void dissect_r3_cmdmfg_terminal (tvbuff_t *tvb, guint32 start_offset, guint32 length _U_, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item (tree, hf_r3_commandmfglength, tvb, start_offset + 0, 1, TRUE); - proto_tree_add_item (tree, hf_r3_commandmfg, tvb, start_offset + 1, 1, TRUE); + proto_tree_add_item (tree, hf_r3_commandmfglength, tvb, start_offset + 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (tree, hf_r3_commandmfg, tvb, start_offset + 1, 1, ENC_LITTLE_ENDIAN); } static void dissect_r3_cmdmfg_remoteunlock (tvbuff_t *tvb, guint32 start_offset, guint32 length _U_, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item (tree, hf_r3_commandmfglength, tvb, start_offset + 0, 1, TRUE); - proto_tree_add_item (tree, hf_r3_commandmfg, tvb, start_offset + 1, 1, TRUE); - proto_tree_add_item (tree, hf_r3_mfgremoteunlock, tvb, start_offset + 2, 1, TRUE); + proto_tree_add_item (tree, hf_r3_commandmfglength, tvb, start_offset + 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (tree, hf_r3_commandmfg, tvb, start_offset + 1, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (tree, hf_r3_mfgremoteunlock, tvb, start_offset + 2, 1, ENC_LITTLE_ENDIAN); } static void dissect_r3_cmdmfg_auxctlrversion (tvbuff_t *tvb, guint32 start_offset, guint32 length _U_, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item (tree, hf_r3_commandmfglength, tvb, start_offset + 0, 1, TRUE); - proto_tree_add_item (tree, hf_r3_commandmfg, tvb, start_offset + 1, 1, TRUE); + proto_tree_add_item (tree, hf_r3_commandmfglength, tvb, start_offset + 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (tree, hf_r3_commandmfg, tvb, start_offset + 1, 1, ENC_LITTLE_ENDIAN); } static void dissect_r3_cmdmfg_iopins (tvbuff_t *tvb, guint32 start_offset, guint32 length _U_, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item (tree, hf_r3_commandmfglength, tvb, start_offset + 0, 1, TRUE); - proto_tree_add_item (tree, hf_r3_commandmfg, tvb, start_offset + 1, 1, TRUE); + proto_tree_add_item (tree, hf_r3_commandmfglength, tvb, start_offset + 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (tree, hf_r3_commandmfg, tvb, start_offset + 1, 1, ENC_LITTLE_ENDIAN); } static void dissect_r3_cmdmfg_adcs (tvbuff_t *tvb, guint32 start_offset, guint32 length _U_, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item (tree, hf_r3_commandmfglength, tvb, start_offset + 0, 1, TRUE); - proto_tree_add_item (tree, hf_r3_commandmfg, tvb, start_offset + 1, 1, TRUE); + proto_tree_add_item (tree, hf_r3_commandmfglength, tvb, start_offset + 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (tree, hf_r3_commandmfg, tvb, start_offset + 1, 1, ENC_LITTLE_ENDIAN); } static void dissect_r3_cmdmfg_hardwareid (tvbuff_t *tvb, guint32 start_offset, guint32 length _U_, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item (tree, hf_r3_commandmfglength, tvb, start_offset + 0, 1, TRUE); - proto_tree_add_item (tree, hf_r3_commandmfg, tvb, start_offset + 1, 1, TRUE); + proto_tree_add_item (tree, hf_r3_commandmfglength, tvb, start_offset + 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (tree, hf_r3_commandmfg, tvb, start_offset + 1, 1, ENC_LITTLE_ENDIAN); } static void dissect_r3_cmdmfg_checkpointlogdump (tvbuff_t *tvb, guint32 start_offset, guint32 length _U_, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item (tree, hf_r3_commandmfglength, tvb, start_offset + 0, 1, TRUE); - proto_tree_add_item (tree, hf_r3_commandmfg, tvb, start_offset + 1, 1, TRUE); + proto_tree_add_item (tree, hf_r3_commandmfglength, tvb, start_offset + 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (tree, hf_r3_commandmfg, tvb, start_offset + 1, 1, ENC_LITTLE_ENDIAN); } static void dissect_r3_cmdmfg_checkpointlogclear (tvbuff_t *tvb, guint32 start_offset, guint32 length _U_, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item (tree, hf_r3_commandmfglength, tvb, start_offset + 0, 1, TRUE); - proto_tree_add_item (tree, hf_r3_commandmfg, tvb, start_offset + 1, 1, TRUE); + proto_tree_add_item (tree, hf_r3_commandmfglength, tvb, start_offset + 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (tree, hf_r3_commandmfg, tvb, start_offset + 1, 1, ENC_LITTLE_ENDIAN); } static void dissect_r3_cmdmfg_readregisters (tvbuff_t *tvb, guint32 start_offset, guint32 length _U_, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item (tree, hf_r3_commandmfglength, tvb, start_offset + 0, 1, TRUE); - proto_tree_add_item (tree, hf_r3_commandmfg, tvb, start_offset + 1, 1, TRUE); + proto_tree_add_item (tree, hf_r3_commandmfglength, tvb, start_offset + 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (tree, hf_r3_commandmfg, tvb, start_offset + 1, 1, ENC_LITTLE_ENDIAN); } static void dissect_r3_cmdmfg_forceoptions (tvbuff_t *tvb, guint32 start_offset, guint32 length _U_, packet_info *pinfo _U_, proto_tree *tree) @@ -5276,8 +5276,8 @@ static void dissect_r3_cmdmfg_forceoptions (tvbuff_t *tvb, guint32 start_offset, guint i = 0; guint l = 0; - proto_tree_add_item (tree, hf_r3_commandmfglength, tvb, start_offset + 0, 1, TRUE); - proto_tree_add_item (tree, hf_r3_commandmfg, tvb, start_offset + 1, 1, TRUE); + proto_tree_add_item (tree, hf_r3_commandmfglength, tvb, start_offset + 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (tree, hf_r3_commandmfg, tvb, start_offset + 1, 1, ENC_LITTLE_ENDIAN); start_offset += 2; l = tvb_length_remaining (tvb, start_offset); @@ -5287,15 +5287,15 @@ static void dissect_r3_cmdmfg_forceoptions (tvbuff_t *tvb, guint32 start_offset, proto_item *force_item = proto_tree_add_text (tree, tvb, start_offset + i, tvb_get_guint8 (tvb, start_offset + i), "Force Option %s (%u)", val_to_str_ext_const (tvb_get_guint8 (tvb, start_offset + i + 1), &r3_forceitemnames_ext, "[Unknown]"), tvb_get_guint8 (tvb, start_offset + i + 1)); proto_tree *force_tree = proto_item_add_subtree (force_item, ett_r3forceoptions); - proto_tree_add_item (force_tree, hf_r3_forceoptions_length, tvb, start_offset + i + 0, 1, TRUE); - proto_tree_add_item (force_tree, hf_r3_forceoptions_item, tvb, start_offset + i + 1, 1, TRUE); + proto_tree_add_item (force_tree, hf_r3_forceoptions_length, tvb, start_offset + i + 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (force_tree, hf_r3_forceoptions_item, tvb, start_offset + i + 1, 1, ENC_LITTLE_ENDIAN); switch (tvb_get_guint8 (tvb, start_offset + i) - 2) { case 1 : proto_tree_add_item (force_tree, hf_r3_forceoptions_state_8, tvb, start_offset + i + 2, 1, TRUE); break; - case 2 : proto_tree_add_item (force_tree, hf_r3_forceoptions_state_16, tvb, start_offset + i + 2, 2, TRUE); break; - case 3 : proto_tree_add_item (force_tree, hf_r3_forceoptions_state_24, tvb, start_offset + i + 2, 3, TRUE); break; - case 4 : proto_tree_add_item (force_tree, hf_r3_forceoptions_state_32, tvb, start_offset + i + 2, 4, TRUE); break; + case 2 : proto_tree_add_item (force_tree, hf_r3_forceoptions_state_16, tvb, start_offset + i + 2, 2, ENC_LITTLE_ENDIAN); break; + case 3 : proto_tree_add_item (force_tree, hf_r3_forceoptions_state_24, tvb, start_offset + i + 2, 3, ENC_LITTLE_ENDIAN); break; + case 4 : proto_tree_add_item (force_tree, hf_r3_forceoptions_state_32, tvb, start_offset + i + 2, 4, ENC_LITTLE_ENDIAN); break; default : DISSECTOR_ASSERT (0); } } @@ -5303,38 +5303,38 @@ static void dissect_r3_cmdmfg_forceoptions (tvbuff_t *tvb, guint32 start_offset, static void dissect_r3_cmdmfg_commuser (tvbuff_t *tvb, guint32 start_offset, guint32 length _U_, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item (tree, hf_r3_commandmfglength, tvb, start_offset + 0, 1, TRUE); - proto_tree_add_item (tree, hf_r3_commandmfg, tvb, start_offset + 1, 1, TRUE); + proto_tree_add_item (tree, hf_r3_commandmfglength, tvb, start_offset + 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (tree, hf_r3_commandmfg, tvb, start_offset + 1, 1, ENC_LITTLE_ENDIAN); } static void dissect_r3_cmdmfg_dumpkeypad (tvbuff_t *tvb, guint32 start_offset, guint32 length _U_, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item (tree, hf_r3_commandmfglength, tvb, start_offset + 0, 1, TRUE); - proto_tree_add_item (tree, hf_r3_commandmfg, tvb, start_offset + 1, 1, TRUE); + proto_tree_add_item (tree, hf_r3_commandmfglength, tvb, start_offset + 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (tree, hf_r3_commandmfg, tvb, start_offset + 1, 1, ENC_LITTLE_ENDIAN); } static void dissect_r3_cmdmfg_batterycheck (tvbuff_t *tvb, guint32 start_offset, guint32 length _U_, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item (tree, hf_r3_commandmfglength, tvb, start_offset + 0, 1, TRUE); - proto_tree_add_item (tree, hf_r3_commandmfg, tvb, start_offset + 1, 1, TRUE); + proto_tree_add_item (tree, hf_r3_commandmfglength, tvb, start_offset + 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (tree, hf_r3_commandmfg, tvb, start_offset + 1, 1, ENC_LITTLE_ENDIAN); } static void dissect_r3_cmdmfg_ramrefresh (tvbuff_t *tvb, guint32 start_offset, guint32 length _U_, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item (tree, hf_r3_commandmfglength, tvb, start_offset + 0, 1, TRUE); - proto_tree_add_item (tree, hf_r3_commandmfg, tvb, start_offset + 1, 1, TRUE); + proto_tree_add_item (tree, hf_r3_commandmfglength, tvb, start_offset + 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (tree, hf_r3_commandmfg, tvb, start_offset + 1, 1, ENC_LITTLE_ENDIAN); } static void dissect_r3_cmdmfg_taskflags (tvbuff_t *tvb, guint32 start_offset, guint32 length _U_, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item (tree, hf_r3_commandmfglength, tvb, start_offset + 0, 1, TRUE); - proto_tree_add_item (tree, hf_r3_commandmfg, tvb, start_offset + 1, 1, TRUE); + proto_tree_add_item (tree, hf_r3_commandmfglength, tvb, start_offset + 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (tree, hf_r3_commandmfg, tvb, start_offset + 1, 1, ENC_LITTLE_ENDIAN); } static void dissect_r3_cmdmfg_timerchain (tvbuff_t *tvb, guint32 start_offset, guint32 length _U_, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item (tree, hf_r3_commandmfglength, tvb, start_offset + 0, 1, TRUE); - proto_tree_add_item (tree, hf_r3_commandmfg, tvb, start_offset + 1, 1, TRUE); + proto_tree_add_item (tree, hf_r3_commandmfglength, tvb, start_offset + 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (tree, hf_r3_commandmfg, tvb, start_offset + 1, 1, ENC_LITTLE_ENDIAN); } static void dissect_r3_cmdmfg_peekpoke (tvbuff_t *tvb, guint32 start_offset, guint32 length _U_, packet_info *pinfo _U_, proto_tree *tree) @@ -5342,8 +5342,8 @@ static void dissect_r3_cmdmfg_peekpoke (tvbuff_t *tvb, guint32 start_offset, gui guint i = 0; guint l = 0; - proto_tree_add_item (tree, hf_r3_commandmfglength, tvb, start_offset + 0, 1, TRUE); - proto_tree_add_item (tree, hf_r3_commandmfg, tvb, start_offset + 1, 1, TRUE); + proto_tree_add_item (tree, hf_r3_commandmfglength, tvb, start_offset + 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (tree, hf_r3_commandmfg, tvb, start_offset + 1, 1, ENC_LITTLE_ENDIAN); start_offset += 2; l = tvb_length_remaining (tvb, start_offset); @@ -5353,8 +5353,8 @@ static void dissect_r3_cmdmfg_peekpoke (tvbuff_t *tvb, guint32 start_offset, gui proto_item *peekpoke_item = proto_tree_add_text (tree, tvb, start_offset + i, 3, "%s", ""); proto_tree *peekpoke_tree = proto_item_add_subtree (peekpoke_item, ett_r3peekpoke); - proto_tree_add_item (peekpoke_tree, hf_r3_peekpoke_operation, tvb, start_offset + i + 0, 1, TRUE); - proto_tree_add_item (peekpoke_tree, hf_r3_peekpoke_address, tvb, start_offset + i + 1, 2, TRUE); + proto_tree_add_item (peekpoke_tree, hf_r3_peekpoke_operation, tvb, start_offset + i + 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (peekpoke_tree, hf_r3_peekpoke_address, tvb, start_offset + i + 1, 2, ENC_LITTLE_ENDIAN); switch (tvb_get_guint8 (tvb, start_offset + i + 0)) { @@ -5377,42 +5377,42 @@ static void dissect_r3_cmdmfg_peekpoke (tvbuff_t *tvb, guint32 start_offset, gui case PEEKPOKE_READSTRING : proto_item_append_text (peekpoke_item, "Read (%d Bytes @ 0x%04x)", tvb_get_guint8 (tvb, start_offset + i + 3), tvb_get_letohs (tvb, start_offset + i + 1)); proto_item_set_len (peekpoke_item, 4); - proto_tree_add_item (peekpoke_tree, hf_r3_peekpoke_length, tvb, start_offset + i + 3, 1, TRUE); + proto_tree_add_item (peekpoke_tree, hf_r3_peekpoke_length, tvb, start_offset + i + 3, 1, ENC_LITTLE_ENDIAN); i += 1; break; case PEEKPOKE_WRITEU8 : proto_item_append_text (peekpoke_item, "Write (8 Bits: 0x%02x @ 0x%04x)", tvb_get_guint8 (tvb, start_offset + i + 3), tvb_get_letohs (tvb, start_offset + i + 1)); proto_item_set_len (peekpoke_item, 4); - proto_tree_add_item (peekpoke_tree, hf_r3_peekpoke_poke8, tvb, start_offset + i + 3, 1, TRUE); + proto_tree_add_item (peekpoke_tree, hf_r3_peekpoke_poke8, tvb, start_offset + i + 3, 1, ENC_LITTLE_ENDIAN); i += 1; break; case PEEKPOKE_WRITEU16 : proto_item_append_text (peekpoke_item, "Write (16 Bits: 0x%04x @ 0x%04x)", tvb_get_letohs (tvb, start_offset + i + 3), tvb_get_letohs (tvb, start_offset + i + 1)); proto_item_set_len (peekpoke_item, 5); - proto_tree_add_item (peekpoke_tree, hf_r3_peekpoke_poke16, tvb, start_offset + i + 3, 2, TRUE); + proto_tree_add_item (peekpoke_tree, hf_r3_peekpoke_poke16, tvb, start_offset + i + 3, 2, ENC_LITTLE_ENDIAN); i += 2; break; case PEEKPOKE_WRITEU24 : proto_item_append_text (peekpoke_item, "Write (24 Bits: 0x%06x @ 0x%04x)", tvb_get_letoh24 (tvb, start_offset + i + 3), tvb_get_letohs (tvb, start_offset + i + 1)); proto_item_set_len (peekpoke_item, 6); - proto_tree_add_item (peekpoke_tree, hf_r3_peekpoke_poke24, tvb, start_offset + i + 3, 3, TRUE); + proto_tree_add_item (peekpoke_tree, hf_r3_peekpoke_poke24, tvb, start_offset + i + 3, 3, ENC_LITTLE_ENDIAN); i += 3; break; case PEEKPOKE_WRITEU32 : proto_item_append_text (peekpoke_item, "Write (32 Bits: 0x%08x @ 0x%04x)", tvb_get_letohl (tvb, start_offset + i + 3), tvb_get_letohs (tvb, start_offset + i + 1)); proto_item_set_len (peekpoke_item, 7); - proto_tree_add_item (peekpoke_tree, hf_r3_peekpoke_poke32, tvb, start_offset + i + 3, 4, TRUE); + proto_tree_add_item (peekpoke_tree, hf_r3_peekpoke_poke32, tvb, start_offset + i + 3, 4, ENC_LITTLE_ENDIAN); i += 4; break; case PEEKPOKE_WRITESTRING : proto_item_append_text (peekpoke_item, "Write (%d Bytes @ 0x%04x)", tvb_get_guint8 (tvb, start_offset + i + 3), tvb_get_letohs (tvb, start_offset + i + 1)); proto_item_set_len (peekpoke_item, 3 + 1 + tvb_get_guint8 (tvb, start_offset + i + 3)); - proto_tree_add_item (peekpoke_tree, hf_r3_peekpoke_length, tvb, start_offset + i + 3, 1, TRUE); + proto_tree_add_item (peekpoke_tree, hf_r3_peekpoke_length, tvb, start_offset + i + 3, 1, ENC_LITTLE_ENDIAN); proto_tree_add_item (peekpoke_tree, hf_r3_peekpoke_pokestring, tvb, start_offset + i + 4, tvb_get_guint8 (tvb, start_offset + i + 3), ENC_NA); i += tvb_get_guint8 (tvb, start_offset + i + 3) + 1; break; @@ -5425,93 +5425,93 @@ static void dissect_r3_cmdmfg_peekpoke (tvbuff_t *tvb, guint32 start_offset, gui static void dissect_r3_cmdmfg_lockstate (tvbuff_t *tvb, guint32 start_offset, guint32 length _U_, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item (tree, hf_r3_commandmfglength, tvb, start_offset + 0, 1, TRUE); - proto_tree_add_item (tree, hf_r3_commandmfg, tvb, start_offset + 1, 1, TRUE); + proto_tree_add_item (tree, hf_r3_commandmfglength, tvb, start_offset + 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (tree, hf_r3_commandmfg, tvb, start_offset + 1, 1, ENC_LITTLE_ENDIAN); } static void dissect_r3_cmdmfg_capabilities (tvbuff_t *tvb, guint32 start_offset, guint32 length _U_, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item (tree, hf_r3_commandmfglength, tvb, start_offset + 0, 1, TRUE); - proto_tree_add_item (tree, hf_r3_commandmfg, tvb, start_offset + 1, 1, TRUE); + proto_tree_add_item (tree, hf_r3_commandmfglength, tvb, start_offset + 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (tree, hf_r3_commandmfg, tvb, start_offset + 1, 1, ENC_LITTLE_ENDIAN); } static void dissect_r3_cmdmfg_dumpm41t81 (tvbuff_t *tvb, guint32 start_offset, guint32 length _U_, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item (tree, hf_r3_commandmfglength, tvb, start_offset + 0, 1, TRUE); - proto_tree_add_item (tree, hf_r3_commandmfg, tvb, start_offset + 1, 1, TRUE); + proto_tree_add_item (tree, hf_r3_commandmfglength, tvb, start_offset + 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (tree, hf_r3_commandmfg, tvb, start_offset + 1, 1, ENC_LITTLE_ENDIAN); } static void dissect_r3_cmdmfg_debuglogdump (tvbuff_t *tvb, guint32 start_offset, guint32 length _U_, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item (tree, hf_r3_commandmfglength, tvb, start_offset + 0, 1, TRUE); - proto_tree_add_item (tree, hf_r3_commandmfg, tvb, start_offset + 1, 1, TRUE); + proto_tree_add_item (tree, hf_r3_commandmfglength, tvb, start_offset + 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (tree, hf_r3_commandmfg, tvb, start_offset + 1, 1, ENC_LITTLE_ENDIAN); } static void dissect_r3_cmdmfg_debuglogclear (tvbuff_t *tvb, guint32 start_offset, guint32 length _U_, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item (tree, hf_r3_commandmfglength, tvb, start_offset + 0, 1, TRUE); - proto_tree_add_item (tree, hf_r3_commandmfg, tvb, start_offset + 1, 1, TRUE); + proto_tree_add_item (tree, hf_r3_commandmfglength, tvb, start_offset + 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (tree, hf_r3_commandmfg, tvb, start_offset + 1, 1, ENC_LITTLE_ENDIAN); } static void dissect_r3_cmdmfg_testwdt (tvbuff_t *tvb, guint32 start_offset, guint32 length _U_, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item (tree, hf_r3_commandmfglength, tvb, start_offset + 0, 1, TRUE); - proto_tree_add_item (tree, hf_r3_commandmfg, tvb, start_offset + 1, 1, TRUE); + proto_tree_add_item (tree, hf_r3_commandmfglength, tvb, start_offset + 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (tree, hf_r3_commandmfg, tvb, start_offset + 1, 1, ENC_LITTLE_ENDIAN); } static void dissect_r3_cmdmfg_querycksum (tvbuff_t *tvb, guint32 start_offset, guint32 length _U_, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item (tree, hf_r3_commandmfglength, tvb, start_offset + 0, 1, TRUE); - proto_tree_add_item (tree, hf_r3_commandmfg, tvb, start_offset + 1, 1, TRUE); + proto_tree_add_item (tree, hf_r3_commandmfglength, tvb, start_offset + 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (tree, hf_r3_commandmfg, tvb, start_offset + 1, 1, ENC_LITTLE_ENDIAN); } static void dissect_r3_cmdmfg_validatechecksums (tvbuff_t *tvb, guint32 start_offset, guint32 length _U_, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item (tree, hf_r3_commandmfglength, tvb, start_offset + 0, 1, TRUE); - proto_tree_add_item (tree, hf_r3_commandmfg, tvb, start_offset + 1, 1, TRUE); + proto_tree_add_item (tree, hf_r3_commandmfglength, tvb, start_offset + 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (tree, hf_r3_commandmfg, tvb, start_offset + 1, 1, ENC_LITTLE_ENDIAN); } static void dissect_r3_cmdmfg_rebuildlrucache (tvbuff_t *tvb, guint32 start_offset, guint32 length _U_, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item (tree, hf_r3_commandmfglength, tvb, start_offset + 0, 1, TRUE); - proto_tree_add_item (tree, hf_r3_commandmfg, tvb, start_offset + 1, 1, TRUE); + proto_tree_add_item (tree, hf_r3_commandmfglength, tvb, start_offset + 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (tree, hf_r3_commandmfg, tvb, start_offset + 1, 1, ENC_LITTLE_ENDIAN); } static void dissect_r3_cmdmfg_tzupdate (tvbuff_t *tvb, guint32 start_offset, guint32 length _U_, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item (tree, hf_r3_commandmfglength, tvb, start_offset + 0, 1, TRUE); - proto_tree_add_item (tree, hf_r3_commandmfg, tvb, start_offset + 1, 1, TRUE); + proto_tree_add_item (tree, hf_r3_commandmfglength, tvb, start_offset + 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (tree, hf_r3_commandmfg, tvb, start_offset + 1, 1, ENC_LITTLE_ENDIAN); } static void dissect_r3_cmdmfg_testpreserve (tvbuff_t *tvb, guint32 start_offset, guint32 length _U_, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item (tree, hf_r3_commandmfglength, tvb, start_offset + 0, 1, TRUE); - proto_tree_add_item (tree, hf_r3_commandmfg, tvb, start_offset + 1, 1, TRUE); - proto_tree_add_item (tree, hf_r3_mfgtestpreserve, tvb, start_offset + 2, 1, TRUE); + proto_tree_add_item (tree, hf_r3_commandmfglength, tvb, start_offset + 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (tree, hf_r3_commandmfg, tvb, start_offset + 1, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (tree, hf_r3_mfgtestpreserve, tvb, start_offset + 2, 1, ENC_LITTLE_ENDIAN); } static void dissect_r3_cmdmfg_mortisestatelogdump (tvbuff_t *tvb, guint32 start_offset, guint32 length _U_, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item (tree, hf_r3_commandmfglength, tvb, start_offset + 0, 1, TRUE); - proto_tree_add_item (tree, hf_r3_commandmfg, tvb, start_offset + 1, 1, TRUE); + proto_tree_add_item (tree, hf_r3_commandmfglength, tvb, start_offset + 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (tree, hf_r3_commandmfg, tvb, start_offset + 1, 1, ENC_LITTLE_ENDIAN); } static void dissect_r3_cmdmfg_mortisestatelogclear (tvbuff_t *tvb, guint32 start_offset, guint32 length _U_, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item (tree, hf_r3_commandmfglength, tvb, start_offset + 0, 1, TRUE); - proto_tree_add_item (tree, hf_r3_commandmfg, tvb, start_offset + 1, 1, TRUE); + proto_tree_add_item (tree, hf_r3_commandmfglength, tvb, start_offset + 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (tree, hf_r3_commandmfg, tvb, start_offset + 1, 1, ENC_LITTLE_ENDIAN); } static void dissect_r3_cmdmfg_mortisepins (tvbuff_t *tvb, guint32 start_offset, guint32 length _U_, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item (tree, hf_r3_commandmfglength, tvb, start_offset + 0, 1, TRUE); - proto_tree_add_item (tree, hf_r3_commandmfg, tvb, start_offset + 1, 1, TRUE); + proto_tree_add_item (tree, hf_r3_commandmfglength, tvb, start_offset + 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (tree, hf_r3_commandmfg, tvb, start_offset + 1, 1, ENC_LITTLE_ENDIAN); } static void dissect_r3_cmdmfg_haltandcatchfire (tvbuff_t *tvb, guint32 start_offset, guint32 length _U_, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item (tree, hf_r3_commandmfglength, tvb, start_offset + 0, 1, TRUE); - proto_tree_add_item (tree, hf_r3_commandmfg, tvb, start_offset + 1, 1, TRUE); + proto_tree_add_item (tree, hf_r3_commandmfglength, tvb, start_offset + 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (tree, hf_r3_commandmfg, tvb, start_offset + 1, 1, ENC_LITTLE_ENDIAN); } /* @@ -5613,11 +5613,11 @@ static gint dissect_r3_packet (tvbuff_t *tvb, guint start_offset, packet_info *p proto_item *header_item = proto_tree_add_item (r3_tree, hf_r3_header, tvb, start_offset + 0, 5, ENC_NA); proto_tree *header_tree = proto_item_add_subtree (header_item, ett_r3header); - proto_tree_add_item (header_tree, hf_r3_sigil, tvb, start_offset + 0, 1, TRUE); - proto_tree_add_item (header_tree, hf_r3_address, tvb, start_offset + 1, 1, TRUE); - proto_tree_add_item (header_tree, hf_r3_packetnumber, tvb, start_offset + 2, 1, TRUE); - proto_tree_add_item (header_tree, hf_r3_packetlength, tvb, start_offset + 3, 1, TRUE); - proto_tree_add_item (header_tree, hf_r3_encryption, tvb, start_offset + 4, 1, TRUE); + proto_tree_add_item (header_tree, hf_r3_sigil, tvb, start_offset + 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (header_tree, hf_r3_address, tvb, start_offset + 1, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (header_tree, hf_r3_packetnumber, tvb, start_offset + 2, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (header_tree, hf_r3_packetlength, tvb, start_offset + 3, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (header_tree, hf_r3_encryption, tvb, start_offset + 4, 1, ENC_LITTLE_ENDIAN); } /* diff --git a/epan/dissectors/packet-ax4000.c b/epan/dissectors/packet-ax4000.c index 06a0a390dc..9a4fbf254f 100644 --- a/epan/dissectors/packet-ax4000.c +++ b/epan/dissectors/packet-ax4000.c @@ -83,7 +83,7 @@ dissect_ax4000(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_uint(ax4000_tree, hf_ax4000_chassis, tvb, 1, 1, ax_chassis); proto_tree_add_item(ax4000_tree, - hf_ax4000_fill, tvb, 2, 1, FALSE); + hf_ax4000_fill, tvb, 2, 1, ENC_BIG_ENDIAN); proto_tree_add_uint(ax4000_tree, hf_ax4000_index, tvb, 2, 2, ax_index); proto_tree_add_uint(ax4000_tree, diff --git a/epan/dissectors/packet-bacapp.c b/epan/dissectors/packet-bacapp.c index 6e62060c12..185ab9d00a 100644 --- a/epan/dissectors/packet-bacapp.c +++ b/epan/dissectors/packet-bacapp.c @@ -4795,25 +4795,25 @@ fTagHeaderTree (tvbuff_t *tvb, proto_tree *tree, guint offset, "Extended Tag Number"); proto_tree_add_item(subtree, hf_BACnetExtendedTagNumber, - tvb, offset + 1, 1, FALSE); + tvb, offset + 1, 1, ENC_BIG_ENDIAN); } else { if (tag_is_context_specific(tag)) proto_tree_add_item(subtree, hf_BACnetContextTagNumber, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); else proto_tree_add_item(subtree, hf_BACnetApplicationTagNumber, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); } if (tag_is_closing(tag) || tag_is_opening(tag)) proto_tree_add_item(subtree, hf_BACnetNamedTag, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); else if (tag_is_extended_value(tag)) { proto_tree_add_item(subtree, hf_BACnetNamedTag, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_uint(subtree, hf_bacapp_tag_lvt, tvb, lvt_offset, lvt_len, *lvt); } else @@ -5424,8 +5424,8 @@ fObjectIdentifier (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint of subtree = proto_item_add_subtree(ti, ett_bacapp_tag); fTagHeaderTree (tvb, subtree, offset, &tag_no, &tag_info, &lvt); offset += tag_length; - proto_tree_add_item(subtree, hf_bacapp_objectType, tvb, offset, 4, FALSE); - proto_tree_add_item(subtree, hf_bacapp_instanceNumber, tvb, offset, 4, FALSE); + proto_tree_add_item(subtree, hf_bacapp_objectType, tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(subtree, hf_bacapp_instanceNumber, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; return offset; @@ -5684,7 +5684,7 @@ fPropertyIdentifier (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint subtree = proto_item_add_subtree(ti, ett_bacapp_tag); fTagHeaderTree (tvb, subtree, offset, &tag_no, &tag_info, &lvt); proto_tree_add_item(subtree, hf_BACnetPropertyIdentifier, tvb, - offset+tag_len, lvt, FALSE); + offset+tag_len, lvt, ENC_BIG_ENDIAN); return offset+tag_len+lvt; } @@ -5795,7 +5795,7 @@ fCharacterString (tvbuff_t *tvb, proto_tree *tree, guint offset, const gchar *la subtree = proto_item_add_subtree(ti, ett_bacapp_tag); fTagHeaderTree (tvb, subtree, start, &tag_no, &tag_info, &lvt); - proto_tree_add_item(subtree, hf_BACnetCharacterSet, tvb, start+offs, 1, FALSE); + proto_tree_add_item(subtree, hf_BACnetCharacterSet, tvb, start+offs, 1, ENC_BIG_ENDIAN); if (character_set == 1) { proto_tree_add_text(subtree, tvb, start+offs+1, 2, "Code Page: %d", tvb_get_ntohs(tvb, start+offs+1)); @@ -6448,7 +6448,7 @@ fVendorIdentifier (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint of } proto_tree_add_item(subtree, hf_BACnetVendorIdentifier, tvb, - offset+tag_len, lvt, FALSE); + offset+tag_len, lvt, ENC_BIG_ENDIAN); return offset+tag_len+lvt; } @@ -6484,7 +6484,7 @@ fRestartReason (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint offse } proto_tree_add_item(subtree, hf_BACnetRestartReason, tvb, - offset+tag_len, lvt, FALSE); + offset+tag_len, lvt, ENC_BIG_ENDIAN); return offset+tag_len+lvt; } diff --git a/epan/dissectors/packet-bacnet.c b/epan/dissectors/packet-bacnet.c index 7179215b1f..545233c52a 100644 --- a/epan/dissectors/packet-bacnet.c +++ b/epan/dissectors/packet-bacnet.c @@ -232,7 +232,7 @@ dissect_bacnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset ++; if (bacnet_control & BAC_CONTROL_DEST) { /* DNET, DLEN, DADR */ proto_tree_add_item(bacnet_tree, hf_bacnet_dnet, - tvb, offset, 2, FALSE); + tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; bacnet_dlen = tvb_get_guint8(tvb, offset); /* DLEN = 0 is broadcast on dest.network */ @@ -260,7 +260,7 @@ dissect_bacnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* MS/TP or ARCNET MAC */ proto_tree_add_item(bacnet_tree, hf_bacnet_dadr_mstp, tvb, offset, - bacnet_dlen, FALSE); + bacnet_dlen, ENC_BIG_ENDIAN); offset += bacnet_dlen; } else if (bacnet_dlen<7) { proto_tree_add_uint(bacnet_tree, hf_bacnet_dlen, @@ -308,7 +308,7 @@ dissect_bacnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* MS/TP or ARCNET MAC */ proto_tree_add_item(bacnet_tree, hf_bacnet_sadr_mstp, tvb, offset, - bacnet_slen, FALSE); + bacnet_slen, ENC_BIG_ENDIAN); offset += bacnet_slen; } else if (bacnet_slen<6) { /* LON MAC */ /* SLEN */ @@ -330,7 +330,7 @@ dissect_bacnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } if (bacnet_control & BAC_CONTROL_DEST) { /* Hopcount */ proto_tree_add_item(bacnet_tree, hf_bacnet_hopc, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); offset ++; } /* Network Layer Message Type */ @@ -353,7 +353,7 @@ dissect_bacnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) */ if (bacnet_mesgtyp > 0x7f) { proto_tree_add_item(bacnet_tree, hf_bacnet_vendor, - tvb, offset, 2, FALSE); + tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; call_dissector(data_handle, tvb_new_subset_remaining(tvb, offset), pinfo, tree); @@ -361,10 +361,10 @@ dissect_bacnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Performance Index (in I-Could-Be-Router-To-Network) */ if (bacnet_mesgtyp == BAC_NET_ICB_R) { proto_tree_add_item(bacnet_tree, hf_bacnet_dnet, - tvb, offset, 2, FALSE); + tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(bacnet_tree, hf_bacnet_perf, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); offset ++; } /* Reason, DNET (in Reject-Message-To-Network) */ @@ -378,7 +378,7 @@ dissect_bacnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) bacnet_rejectreason_name(bacnet_rejectreason)); offset ++; proto_tree_add_item(bacnet_tree, hf_bacnet_dnet, - tvb, offset, 2, FALSE); + tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; } /* N*DNET (in Router-Busy-To-Network,Router-Available-To-Network) */ @@ -388,7 +388,7 @@ dissect_bacnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) (bacnet_mesgtyp == BAC_NET_IAM_R) ) { while(tvb_reported_length_remaining(tvb, offset) > 1 ) { proto_tree_add_item(bacnet_tree, hf_bacnet_dnet, - tvb, offset, 2, FALSE); + tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; } } @@ -403,11 +403,11 @@ dissect_bacnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) for(i=0; i<bacnet_rportnum; i++) { /* Connected DNET */ proto_tree_add_item(bacnet_tree, hf_bacnet_dnet, - tvb, offset, 2, FALSE); + tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; /* Port ID */ proto_tree_add_item(bacnet_tree, hf_bacnet_portid, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); offset ++; /* Port Info Length */ bacnet_pinfolen = tvb_get_guint8(tvb, offset); @@ -423,16 +423,16 @@ dissect_bacnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Establish-Connection-To-Network */ if (bacnet_mesgtyp == BAC_NET_EST_CON) { proto_tree_add_item(bacnet_tree, hf_bacnet_dnet, - tvb, offset, 2, FALSE); + tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(bacnet_tree, hf_bacnet_term_time_value, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); offset ++; } /* Disconnect-Connection-To-Network */ if (bacnet_mesgtyp == BAC_NET_DISC_CON) { proto_tree_add_item(bacnet_tree, hf_bacnet_dnet, - tvb, offset, 2, FALSE); + tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; } } diff --git a/epan/dissectors/packet-banana.c b/epan/dissectors/packet-banana.c index bf89489e4a..f4ce94192f 100644 --- a/epan/dissectors/packet-banana.c +++ b/epan/dissectors/packet-banana.c @@ -191,7 +191,7 @@ dissect_banana_element(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int proto_tree_add_int(tree, hf_banana_neg_int, tvb, start_offset, offset - start_offset, (gint32) val * -1); break; case BE_FLOAT: - proto_tree_add_item(tree, hf_banana_float, tvb, offset, 8, FALSE); + proto_tree_add_item(tree, hf_banana_float, tvb, offset, 8, ENC_BIG_ENDIAN); offset += 8; break; case BE_LG_INT: @@ -208,7 +208,7 @@ dissect_banana_element(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int * The spec says the pb dictionary value comes after the tag. * In real-world captures it comes before. */ - proto_tree_add_item(tree, hf_banana_pb, tvb, offset - 2, 1, FALSE); + proto_tree_add_item(tree, hf_banana_pb, tvb, offset - 2, 1, ENC_BIG_ENDIAN); break; default: return 0; diff --git a/epan/dissectors/packet-bctp.c b/epan/dissectors/packet-bctp.c index 98cb5d033f..02575453f7 100644 --- a/epan/dissectors/packet-bctp.c +++ b/epan/dissectors/packet-bctp.c @@ -75,10 +75,10 @@ static void dissect_bctp(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree) { tvbuff_t* sub_tvb = tvb_new_subset_remaining(tvb, 2); guint8 tpi = tvb_get_guint8(tvb,1) & 0x3f; - proto_tree_add_item(pt, hf_bctp_bvei, tvb,0,2, FALSE); - proto_tree_add_item(pt, hf_bctp_bvi, tvb,0,2, FALSE); - proto_tree_add_item(pt, hf_bctp_tpei, tvb,0,2, FALSE); - proto_tree_add_item(pt, hf_bctp_tpi, tvb,0,2, FALSE); + proto_tree_add_item(pt, hf_bctp_bvei, tvb,0,2, ENC_BIG_ENDIAN); + proto_tree_add_item(pt, hf_bctp_bvi, tvb,0,2, ENC_BIG_ENDIAN); + proto_tree_add_item(pt, hf_bctp_tpei, tvb,0,2, ENC_BIG_ENDIAN); + proto_tree_add_item(pt, hf_bctp_tpi, tvb,0,2, ENC_BIG_ENDIAN); if ( dissector_try_uint(bctp_dissector_table, tpi, sub_tvb, pinfo, tree) ) { return; diff --git a/epan/dissectors/packet-bgp.c b/epan/dissectors/packet-bgp.c index 1951afcd11..33d48e5149 100644 --- a/epan/dissectors/packet-bgp.c +++ b/epan/dissectors/packet-bgp.c @@ -876,7 +876,7 @@ decode_prefix_MP(proto_tree *tree, int hf_addr4, int hf_addr6, proto_tree_add_text(prefix_tree, tvb, start_offset, 1, "%s Prefix length: %u", tag, plen + 16); proto_tree_add_item(prefix_tree, hf_bgp_mp_nlri_tnl_id, tvb, - start_offset + 1, 2, FALSE); + start_offset + 1, 2, ENC_BIG_ENDIAN); if (hf_addr4 != -1) { proto_tree_add_ipv4(prefix_tree, hf_addr4, tvb, offset, length, ip4addr.addr); @@ -2181,7 +2181,7 @@ dissect_bgp_update(tvbuff_t *tvb, proto_tree *tree) plurality(tlen, "", "s")); } else { proto_tree_add_item(subtree2, hf_bgp_origin, tvb, - o + i + aoff, 1, FALSE); + o + i + aoff, 1, ENC_BIG_ENDIAN); } break; case BGPTYPE_AS_PATH: @@ -2287,7 +2287,7 @@ dissect_bgp_update(tvbuff_t *tvb, proto_tree *tree) tlen, plurality(tlen, "", "s")); } else { proto_tree_add_item(subtree2, hf_bgp_multi_exit_disc, tvb, - o + i + aoff, tlen, FALSE); + o + i + aoff, tlen, ENC_BIG_ENDIAN); } break; case BGPTYPE_LOCAL_PREF: @@ -2297,7 +2297,7 @@ dissect_bgp_update(tvbuff_t *tvb, proto_tree *tree) plurality(tlen, "", "s")); } else { proto_tree_add_item(subtree2, hf_bgp_local_pref, tvb, - o + i + aoff, tlen, FALSE); + o + i + aoff, tlen, ENC_BIG_ENDIAN); } break; case BGPTYPE_ATOMIC_AGGREGATE: @@ -2367,9 +2367,9 @@ dissect_bgp_update(tvbuff_t *tvb, proto_tree *tree) community_tree = proto_item_add_subtree(ti, ett_bgp_communities); proto_tree_add_item(community_tree, hf_bgp_community_as, - tvb, q - 3 + aoff, 2, FALSE); + tvb, q - 3 + aoff, 2, ENC_BIG_ENDIAN); proto_tree_add_item(community_tree, hf_bgp_community_value, - tvb, q - 1 + aoff, 2, FALSE); + tvb, q - 1 + aoff, 2, ENC_BIG_ENDIAN); } q += 4; @@ -2740,7 +2740,7 @@ dissect_bgp_update(tvbuff_t *tvb, proto_tree *tree) proto_tree_add_item(subtree3, hf_bgp_ssa_t, tvb, q, 1, FALSE); hidden_item = proto_tree_add_item(subtree3, hf_bgp_ssa_type, tvb, - q, 2, FALSE); + q, 2, ENC_BIG_ENDIAN); PROTO_ITEM_SET_HIDDEN(hidden_item); proto_tree_add_text(subtree3, tvb, q, 2, "Type: %s", val_to_str(ssa_type, bgp_ssa_type, "Unknown")); @@ -2750,12 +2750,12 @@ dissect_bgp_update(tvbuff_t *tvb, proto_tree *tree) break; } proto_tree_add_item(subtree3, hf_bgp_ssa_len, tvb, - q + 2, 2, FALSE); + q + 2, 2, ENC_BIG_ENDIAN); switch (ssa_type) { case BGP_SSA_L2TPv3: proto_tree_add_item(subtree3, hf_bgp_ssa_l2tpv3_pref, tvb, - q + 4, 2, FALSE); + q + 4, 2, ENC_BIG_ENDIAN); ti = proto_tree_add_text(subtree3, tvb, q + 6, 1, "Flags"); subtree4 = proto_item_add_subtree(ti, ett_bgp_ssa_subtree) ; @@ -2767,7 +2767,7 @@ dissect_bgp_update(tvbuff_t *tvb, proto_tree *tree) ssa_v3_len = tvb_get_guint8(tvb, q + 7); if (ssa_v3_len + 8 == ssa_len){ proto_tree_add_item(subtree3, hf_bgp_ssa_l2tpv3_cookie_len, tvb, - q + 7, 1, FALSE); + q + 7, 1, ENC_BIG_ENDIAN); } else { proto_tree_add_text(subtree3, tvb, q + 7, 1, "Invalid Cookie Length of %u", ssa_v3_len); @@ -2775,7 +2775,7 @@ dissect_bgp_update(tvbuff_t *tvb, proto_tree *tree) break; } proto_tree_add_item(subtree3, hf_bgp_ssa_l2tpv3_session_id, tvb, - q + 8, 4, FALSE); + q + 8, 4, ENC_BIG_ENDIAN); if (ssa_v3_len) proto_tree_add_item(subtree3, hf_bgp_ssa_l2tpv3_cookie, tvb, q + 12, ssa_v3_len, ENC_NA); diff --git a/epan/dissectors/packet-bootp.c b/epan/dissectors/packet-bootp.c index 70c44b8b93..85916b3c87 100644 --- a/epan/dissectors/packet-bootp.c +++ b/epan/dissectors/packet-bootp.c @@ -1919,9 +1919,9 @@ bootp_option(tvbuff_t *tvb, packet_info *pinfo, proto_tree *bp_tree, int voff, if (id_type == 0x01) { proto_tree_add_item(v_tree, hf_bootp_option_client_network_id_major_ver, - tvb, optoff + 1, 1, TRUE); + tvb, optoff + 1, 1, ENC_LITTLE_ENDIAN); proto_tree_add_item(v_tree, hf_bootp_option_client_network_id_minor_ver, - tvb, optoff + 2, 1, TRUE); + tvb, optoff + 2, 1, ENC_LITTLE_ENDIAN); } break; diff --git a/epan/dissectors/packet-brdwlk.c b/epan/dissectors/packet-brdwlk.c index 6725a85129..5c66e16821 100644 --- a/epan/dissectors/packet-brdwlk.c +++ b/epan/dissectors/packet-brdwlk.c @@ -252,8 +252,8 @@ dissect_brdwlk (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) brdwlk_tree = proto_item_add_subtree (ti, ett_brdwlk); - proto_tree_add_item (brdwlk_tree, hf_brdwlk_sof, tvb, offset, 1, 0); - proto_tree_add_item (brdwlk_tree, hf_brdwlk_vsan, tvb, offset, 2, 0); + proto_tree_add_item (brdwlk_tree, hf_brdwlk_sof, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (brdwlk_tree, hf_brdwlk_vsan, tvb, offset, 2, ENC_BIG_ENDIAN); } @@ -350,7 +350,7 @@ dissect_brdwlk (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { proto_tree_add_item (brdwlk_tree, hf_brdwlk_eof, tvb, offset+3, - 1, 0); + 1, ENC_BIG_ENDIAN); } if ((error & BRDWLK_HAS_PLEN) && tree) { diff --git a/epan/dissectors/packet-bt-utp.c b/epan/dissectors/packet-bt-utp.c index 7cf6955dce..51babb08ca 100644 --- a/epan/dissectors/packet-bt-utp.c +++ b/epan/dissectors/packet-bt-utp.c @@ -201,26 +201,26 @@ static int dissect_utp_header_v0(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset, guint8 *extension_type) { /* "Original" (V0) */ - proto_tree_add_item(tree, hf_bt_utp_connection_id_v0, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_bt_utp_connection_id_v0, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(tree, hf_bt_utp_timestamp_sec, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_bt_utp_timestamp_sec, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(tree, hf_bt_utp_timestamp_us, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_bt_utp_timestamp_us, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(tree, hf_bt_utp_timestamp_diff_us, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_bt_utp_timestamp_diff_us, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(tree, hf_bt_utp_wnd_size_v0, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_bt_utp_wnd_size_v0, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(tree, hf_bt_utp_next_extension_type, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_bt_utp_next_extension_type, tvb, offset, 1, ENC_BIG_ENDIAN); *extension_type = tvb_get_guint8(tvb, offset); offset += 1; - proto_tree_add_item(tree, hf_bt_utp_flags, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_bt_utp_flags, tvb, offset, 1, ENC_BIG_ENDIAN); col_append_fstr(pinfo->cinfo, COL_INFO, " Type: %s", val_to_str(tvb_get_guint8(tvb, offset), bt_utp_type_vals, "Unknown %d")); offset += 1; - proto_tree_add_item(tree, hf_bt_utp_seq_nr, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_bt_utp_seq_nr, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(tree, hf_bt_utp_ack_nr, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_bt_utp_ack_nr, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; return offset; @@ -234,24 +234,24 @@ dissect_utp_header_v1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int o packet_type (4 high bits) protocol version (4 low bits) */ - proto_tree_add_item(tree, hf_bt_utp_ver, tvb, offset, 1, FALSE); - proto_tree_add_item(tree, hf_bt_utp_type, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_bt_utp_ver, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_bt_utp_type, tvb, offset, 1, ENC_BIG_ENDIAN); col_append_fstr(pinfo->cinfo, COL_INFO, " Type: %s", val_to_str((tvb_get_guint8(tvb, offset) >> 4), bt_utp_type_vals, "Unknown %d")); offset += 1; - proto_tree_add_item(tree, hf_bt_utp_next_extension_type, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_bt_utp_next_extension_type, tvb, offset, 1, ENC_BIG_ENDIAN); *extension_type = tvb_get_guint8(tvb, offset); offset += 1; - proto_tree_add_item(tree, hf_bt_utp_connection_id_v1, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_bt_utp_connection_id_v1, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(tree, hf_bt_utp_timestamp_us, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_bt_utp_timestamp_us, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(tree, hf_bt_utp_timestamp_diff_us, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_bt_utp_timestamp_diff_us, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(tree, hf_bt_utp_wnd_size_v1, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_bt_utp_wnd_size_v1, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(tree, hf_bt_utp_seq_nr, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_bt_utp_seq_nr, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(tree, hf_bt_utp_ack_nr, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_bt_utp_ack_nr, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; return offset; @@ -277,11 +277,11 @@ dissect_utp_extension(tvbuff_t *tvb, packet_info _U_*pinfo, proto_tree *tree, in ti = proto_tree_add_item(tree, hf_bt_utp_extension, tvb, offset, -1, ENC_NA); ext_tree = proto_item_add_subtree(ti, ett_bt_utp_extension); - proto_tree_add_item(ext_tree, hf_bt_utp_next_extension_type, tvb, offset, 1, FALSE); + proto_tree_add_item(ext_tree, hf_bt_utp_next_extension_type, tvb, offset, 1, ENC_BIG_ENDIAN); *extension_type = tvb_get_guint8(tvb, offset); offset += 1; - proto_tree_add_item(ext_tree, hf_bt_utp_extension_len, tvb, offset, 1, FALSE); + proto_tree_add_item(ext_tree, hf_bt_utp_extension_len, tvb, offset, 1, ENC_BIG_ENDIAN); extension_length = tvb_get_guint8(tvb, offset); proto_item_append_text(ti, " Selection Acks, Len=%d", extension_length); offset += 1; @@ -296,11 +296,11 @@ dissect_utp_extension(tvbuff_t *tvb, packet_info _U_*pinfo, proto_tree *tree, in ti = proto_tree_add_item(tree, hf_bt_utp_extension, tvb, offset, -1, ENC_NA); ext_tree = proto_item_add_subtree(ti, ett_bt_utp_extension); - proto_tree_add_item(ext_tree, hf_bt_utp_next_extension_type, tvb, offset, 1, FALSE); + proto_tree_add_item(ext_tree, hf_bt_utp_next_extension_type, tvb, offset, 1, ENC_BIG_ENDIAN); *extension_type = tvb_get_guint8(tvb, offset); offset += 1; - proto_tree_add_item(ext_tree, hf_bt_utp_extension_len, tvb, offset, 1, FALSE); + proto_tree_add_item(ext_tree, hf_bt_utp_extension_len, tvb, offset, 1, ENC_BIG_ENDIAN); extension_length = tvb_get_guint8(tvb, offset); proto_item_append_text(ti, " Extension Bits, Len=%d", extension_length); offset += 1; @@ -314,11 +314,11 @@ dissect_utp_extension(tvbuff_t *tvb, packet_info _U_*pinfo, proto_tree *tree, in ti = proto_tree_add_item(tree, hf_bt_utp_extension, tvb, offset, -1, ENC_NA); ext_tree = proto_item_add_subtree(ti, ett_bt_utp_extension); - proto_tree_add_item(ext_tree, hf_bt_utp_next_extension_type, tvb, offset, 1, FALSE); + proto_tree_add_item(ext_tree, hf_bt_utp_next_extension_type, tvb, offset, 1, ENC_BIG_ENDIAN); *extension_type = tvb_get_guint8(tvb, offset); offset += 1; - proto_tree_add_item(ext_tree, hf_bt_utp_extension_len, tvb, offset, 1, FALSE); + proto_tree_add_item(ext_tree, hf_bt_utp_extension_len, tvb, offset, 1, ENC_BIG_ENDIAN); extension_length = tvb_get_guint8(tvb, offset); proto_item_append_text(ti, " Unknown, Len=%d", extension_length); offset += 1; diff --git a/epan/dissectors/packet-btamp.c b/epan/dissectors/packet-btamp.c index 359f422fef..9e615a6f4e 100644 --- a/epan/dissectors/packet-btamp.c +++ b/epan/dissectors/packet-btamp.c @@ -137,7 +137,7 @@ dissect_comrej(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tr guint16 reason; reason = tvb_get_letohs(tvb, offset); - proto_tree_add_item(tree, hf_btamp_rej_reason, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_btamp_rej_reason, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset+=2; switch(reason){ @@ -154,10 +154,10 @@ dissect_comrej(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tr static int dissect_discoverrequest(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item(tree, hf_btamp_mtu, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_btamp_mtu, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset+=2; - proto_tree_add_item(tree, hf_btamp_extfeatures, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_btamp_extfeatures, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset+=2; return offset; @@ -175,13 +175,13 @@ dissect_controller_entry(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, prot "Entry: %u", idx); btamp_controller_entry_tree=proto_item_add_subtree(ti_controller_entry, ett_btamp_controller_entry); - proto_tree_add_item(btamp_controller_entry_tree, hf_btamp_controller_id, tvb, offset, 1, TRUE); + proto_tree_add_item(btamp_controller_entry_tree, hf_btamp_controller_id, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset+=1; - proto_tree_add_item(btamp_controller_entry_tree, hf_btamp_controller_type, tvb, offset, 1, TRUE); + proto_tree_add_item(btamp_controller_entry_tree, hf_btamp_controller_type, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset+=1; - proto_tree_add_item(btamp_controller_entry_tree, hf_btamp_controller_status, tvb, offset, 1, TRUE); + proto_tree_add_item(btamp_controller_entry_tree, hf_btamp_controller_status, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset+=1; return offset; @@ -195,10 +195,10 @@ dissect_discoverresponse(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tr proto_tree *btamp_controller_list_tree=NULL; proto_item *ti_controller_list=NULL; - proto_tree_add_item(tree, hf_btamp_mtu, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_btamp_mtu, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset+=2; - proto_tree_add_item(tree, hf_btamp_extfeatures, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_btamp_extfeatures, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset+=2; length = tvb_length_remaining(tvb, offset); @@ -248,7 +248,7 @@ dissect_changeresponse(tvbuff_t *tvb _U_, int offset, packet_info *pinfo _U_, pr static int dissect_getinforequest(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item(tree, hf_btamp_controller_id, tvb, offset, 1, TRUE); + proto_tree_add_item(tree, hf_btamp_controller_id, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset+=1; return offset; @@ -260,19 +260,19 @@ dissect_getinforesponse(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto proto_tree *btamp_controller_tree=NULL; proto_item *ti_controller=NULL; - proto_tree_add_item(tree, hf_btamp_controller_id, tvb, offset, 1, TRUE); + proto_tree_add_item(tree, hf_btamp_controller_id, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset+=1; - proto_tree_add_item(tree, hf_btamp_status, tvb, offset, 1, TRUE); + proto_tree_add_item(tree, hf_btamp_status, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset+=1; - proto_tree_add_item(tree, hf_btamp_total_bw, tvb, offset, 4, TRUE); + proto_tree_add_item(tree, hf_btamp_total_bw, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset+=4; - proto_tree_add_item(tree, hf_btamp_max_guaran_bw, tvb, offset, 4, TRUE); + proto_tree_add_item(tree, hf_btamp_max_guaran_bw, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset+=4; - proto_tree_add_item(tree, hf_btamp_min_latency, tvb, offset, 4, TRUE); + proto_tree_add_item(tree, hf_btamp_min_latency, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset+=4; ti_controller=proto_tree_add_none_format(tree, @@ -283,7 +283,7 @@ dissect_getinforesponse(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto proto_tree_add_item(btamp_controller_tree, hf_btamp_pal_caps_guaranteed, tvb, offset, 2, TRUE); offset+=2; - proto_tree_add_item(tree, hf_btamp_amp_assoc_size, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_btamp_amp_assoc_size, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset+=2; return offset; @@ -292,7 +292,7 @@ dissect_getinforesponse(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto static int dissect_getampassocrequest(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item(tree, hf_btamp_controller_id, tvb, offset, 1, TRUE); + proto_tree_add_item(tree, hf_btamp_controller_id, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset+=1; return offset; @@ -310,10 +310,10 @@ dissect_ampassoc(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree * static int dissect_getampassocresponse(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - proto_tree_add_item(tree, hf_btamp_controller_id, tvb, offset, 1, TRUE); + proto_tree_add_item(tree, hf_btamp_controller_id, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset+=1; - proto_tree_add_item(tree, hf_btamp_status, tvb, offset, 1, TRUE); + proto_tree_add_item(tree, hf_btamp_status, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset+=1; offset=dissect_ampassoc(tvb, offset, pinfo, tree); @@ -324,10 +324,10 @@ dissect_getampassocresponse(tvbuff_t *tvb, int offset, packet_info *pinfo, proto static int dissect_createphysicalrequest(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - proto_tree_add_item(tree, hf_btamp_lcontroller_id, tvb, offset, 1, TRUE); + proto_tree_add_item(tree, hf_btamp_lcontroller_id, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset+=1; - proto_tree_add_item(tree, hf_btamp_rcontroller_id, tvb, offset, 1, TRUE); + proto_tree_add_item(tree, hf_btamp_rcontroller_id, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset+=1; offset=dissect_ampassoc(tvb, offset, pinfo, tree); @@ -338,13 +338,13 @@ dissect_createphysicalrequest(tvbuff_t *tvb, int offset, packet_info *pinfo, pro static int dissect_createphysicalresponse(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item(tree, hf_btamp_lcontroller_id, tvb, offset, 1, TRUE); + proto_tree_add_item(tree, hf_btamp_lcontroller_id, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset+=1; - proto_tree_add_item(tree, hf_btamp_rcontroller_id, tvb, offset, 1, TRUE); + proto_tree_add_item(tree, hf_btamp_rcontroller_id, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset+=1; - proto_tree_add_item(tree, hf_btamp_status, tvb, offset, 1, TRUE); + proto_tree_add_item(tree, hf_btamp_status, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset+=1; return offset; @@ -353,10 +353,10 @@ dissect_createphysicalresponse(tvbuff_t *tvb, int offset, packet_info *pinfo _U_ static int dissect_discphysicalchanrequest(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item(tree, hf_btamp_lcontroller_id, tvb, offset, 1, TRUE); + proto_tree_add_item(tree, hf_btamp_lcontroller_id, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset+=1; - proto_tree_add_item(tree, hf_btamp_rcontroller_id, tvb, offset, 1, TRUE); + proto_tree_add_item(tree, hf_btamp_rcontroller_id, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset+=1; return offset; @@ -365,13 +365,13 @@ dissect_discphysicalchanrequest(tvbuff_t *tvb, int offset, packet_info *pinfo _U static int dissect_discphysicalchanresponse(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item(tree, hf_btamp_lcontroller_id, tvb, offset, 1, TRUE); + proto_tree_add_item(tree, hf_btamp_lcontroller_id, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset+=1; - proto_tree_add_item(tree, hf_btamp_rcontroller_id, tvb, offset, 1, TRUE); + proto_tree_add_item(tree, hf_btamp_rcontroller_id, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset+=1; - proto_tree_add_item(tree, hf_btamp_controller_status, tvb, offset, 1, TRUE); + proto_tree_add_item(tree, hf_btamp_controller_status, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset+=1; return offset; @@ -422,14 +422,14 @@ static void dissect_btamp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) btamp_cmd_tree=proto_item_add_subtree(ti_command, ett_btamp_cmd); cmd_code=tvb_get_guint8(tvb, offset); - proto_tree_add_item(btamp_cmd_tree, hf_btamp_cmd_code, tvb, offset, 1, TRUE); + proto_tree_add_item(btamp_cmd_tree, hf_btamp_cmd_code, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; - proto_tree_add_item(btamp_cmd_tree, hf_btamp_cmd_ident, tvb, offset, 1, TRUE); + proto_tree_add_item(btamp_cmd_tree, hf_btamp_cmd_ident, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; cmd_length=tvb_get_letohs(tvb, offset); - proto_tree_add_item(btamp_cmd_tree, hf_btamp_cmd_length, tvb, offset, 2, TRUE); + proto_tree_add_item(btamp_cmd_tree, hf_btamp_cmd_length, tvb, offset, 2, ENC_LITTLE_ENDIAN); proto_item_set_len(ti_command, cmd_length+4); offset+=2; diff --git a/epan/dissectors/packet-bthci_sco.c b/epan/dissectors/packet-bthci_sco.c index febcaf808d..dda9e0199e 100644 --- a/epan/dissectors/packet-bthci_sco.c +++ b/epan/dissectors/packet-bthci_sco.c @@ -57,10 +57,10 @@ dissect_btsco(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) btsco_tree = proto_item_add_subtree(ti, ett_btsco); - proto_tree_add_item(btsco_tree, hf_btsco_chandle, tvb, offset, 2, TRUE); + proto_tree_add_item(btsco_tree, hf_btsco_chandle, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset+=2; - proto_tree_add_item(btsco_tree, hf_btsco_length, tvb, offset, 1, TRUE); + proto_tree_add_item(btsco_tree, hf_btsco_length, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; proto_tree_add_item(btsco_tree, hf_btsco_data, tvb, offset, -1, ENC_NA); diff --git a/epan/dissectors/packet-btl2cap.c b/epan/dissectors/packet-btl2cap.c index d9a299a3b3..53b8204eb2 100644 --- a/epan/dissectors/packet-btl2cap.c +++ b/epan/dissectors/packet-btl2cap.c @@ -327,7 +327,7 @@ dissect_comrej(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tr guint16 reason; reason = tvb_get_letohs(tvb, offset); - proto_tree_add_item(tree, hf_btl2cap_rej_reason, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_btl2cap_rej_reason, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset+=2; switch(reason){ @@ -335,15 +335,15 @@ dissect_comrej(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tr break; case 0x0001: /* Signaling MTU exceeded */ - proto_tree_add_item(tree, hf_btl2cap_sig_mtu, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_btl2cap_sig_mtu, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset+=2; break; case 0x0002: /* Invalid CID in requets */ - proto_tree_add_item(tree, hf_btl2cap_scid, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_btl2cap_scid, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset+=2; - proto_tree_add_item(tree, hf_btl2cap_dcid, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_btl2cap_dcid, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset+=2; break; @@ -364,14 +364,14 @@ dissect_connrequest(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *t psm=tvb_get_letohs(tvb, offset); if( psm < BTL2CAP_DYNAMIC_PSM_START ) { - proto_tree_add_item(tree, hf_btl2cap_psm, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_btl2cap_psm, tvb, offset, 2, ENC_LITTLE_ENDIAN); psm_str = val_to_str(psm, psm_vals, "Unknown PSM"); } else { guint32 *service, token; proto_item *item; - item = proto_tree_add_item(tree, hf_btl2cap_psm_dynamic, tvb, offset, 2, TRUE); + item = proto_tree_add_item(tree, hf_btl2cap_psm_dynamic, tvb, offset, 2, ENC_LITTLE_ENDIAN); token = psm | ((pinfo->p2p_dir == P2P_DIR_RECV)?0x80000000:0x00000000); service = se_tree_lookup32(psm_to_service_table, token); @@ -383,7 +383,7 @@ dissect_connrequest(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *t offset+=2; scid=tvb_get_letohs(tvb, offset); - proto_tree_add_item(tree, hf_btl2cap_scid, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_btl2cap_scid, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset+=2; if( psm_str ) @@ -392,7 +392,7 @@ dissect_connrequest(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *t col_append_fstr(pinfo->cinfo, COL_INFO, " (SCID: 0x%04x)", scid); if( is_ch_request ) { - proto_tree_add_item(tree, hf_btl2cap_controller, tvb, offset, 1, TRUE); + proto_tree_add_item(tree, hf_btl2cap_controller, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset+=1; } @@ -419,11 +419,11 @@ dissect_movechanrequest(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto guint8 ctrl_id; icid = tvb_get_letohs(tvb, offset); - proto_tree_add_item(tree, hf_btl2cap_icid, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_btl2cap_icid, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset+=2; ctrl_id = tvb_get_guint8(tvb, offset); - proto_tree_add_item(tree, hf_btl2cap_dcontroller, tvb, offset, 1, TRUE); + proto_tree_add_item(tree, hf_btl2cap_dcontroller, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset+=1; col_append_fstr(pinfo->cinfo, COL_INFO, " (ICID: 0x%04x, move to %s)", icid, val_to_str(ctrl_id, ctrl_id_code_vals, "Unknown controller")); @@ -447,46 +447,46 @@ dissect_options(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *t offset, option_length + 2, "Option: "); ti_option_subtree = proto_item_add_subtree(ti_option, ett_btl2cap_option); - proto_tree_add_item(ti_option_subtree, hf_btl2cap_option_type, tvb, offset, 1, TRUE); - proto_tree_add_item(ti_option_subtree, hf_btl2cap_option_length, tvb, offset+1, 1, TRUE); + proto_tree_add_item(ti_option_subtree, hf_btl2cap_option_type, tvb, offset, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(ti_option_subtree, hf_btl2cap_option_length, tvb, offset+1, 1, ENC_LITTLE_ENDIAN); offset+=2; if(option_length>0){ switch(option_type){ case 0x01: /* MTU */ - proto_tree_add_item(ti_option_subtree, hf_btl2cap_option_mtu, tvb, offset, 2, TRUE); + proto_tree_add_item(ti_option_subtree, hf_btl2cap_option_mtu, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset+=2; proto_item_append_text(ti_option, "MTU"); break; case 0x02: /* Flush timeout */ - proto_tree_add_item(ti_option_subtree, hf_btl2cap_option_flushTO, tvb, offset, 2, TRUE); + proto_tree_add_item(ti_option_subtree, hf_btl2cap_option_flushTO, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset+=2; proto_item_append_text(ti_option, "Flush Timeout"); break; case 0x03: /* QOS */ - proto_tree_add_item(ti_option_subtree, hf_btl2cap_option_flags, tvb, offset, 1, TRUE); + proto_tree_add_item(ti_option_subtree, hf_btl2cap_option_flags, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; - proto_tree_add_item(ti_option_subtree, hf_btl2cap_option_service_type, tvb, offset, 1, TRUE); + proto_tree_add_item(ti_option_subtree, hf_btl2cap_option_service_type, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; - proto_tree_add_item(ti_option_subtree, hf_btl2cap_option_tokenrate, tvb, offset, 4, TRUE); + proto_tree_add_item(ti_option_subtree, hf_btl2cap_option_tokenrate, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset+=4; - proto_tree_add_item(ti_option_subtree, hf_btl2cap_option_tokenbucketsize, tvb, offset, 4, TRUE); + proto_tree_add_item(ti_option_subtree, hf_btl2cap_option_tokenbucketsize, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset+=4; - proto_tree_add_item(ti_option_subtree, hf_btl2cap_option_peakbandwidth, tvb, offset, 4, TRUE); + proto_tree_add_item(ti_option_subtree, hf_btl2cap_option_peakbandwidth, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset+=4; - proto_tree_add_item(ti_option_subtree, hf_btl2cap_option_latency, tvb, offset, 4, TRUE); + proto_tree_add_item(ti_option_subtree, hf_btl2cap_option_latency, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset+=4; - proto_tree_add_item(ti_option_subtree, hf_btl2cap_option_delayvariation, tvb, offset, 4, TRUE); + proto_tree_add_item(ti_option_subtree, hf_btl2cap_option_delayvariation, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset+=4; proto_item_append_text(ti_option, "QOS"); @@ -498,58 +498,58 @@ dissect_options(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *t config_data->mode = tvb_get_guint8(tvb, offset); config_data->txwindow = tvb_get_guint8(tvb, offset+1); } - proto_tree_add_item(ti_option_subtree, hf_btl2cap_option_retransmissionmode, tvb, offset, 1, TRUE); + proto_tree_add_item(ti_option_subtree, hf_btl2cap_option_retransmissionmode, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; - proto_tree_add_item(ti_option_subtree, hf_btl2cap_option_txwindow, tvb, offset, 1, TRUE); + proto_tree_add_item(ti_option_subtree, hf_btl2cap_option_txwindow, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; - proto_tree_add_item(ti_option_subtree, hf_btl2cap_option_maxtransmit, tvb, offset, 1, TRUE); + proto_tree_add_item(ti_option_subtree, hf_btl2cap_option_maxtransmit, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; - proto_tree_add_item(ti_option_subtree, hf_btl2cap_option_retransmittimeout, tvb, offset, 2, TRUE); + proto_tree_add_item(ti_option_subtree, hf_btl2cap_option_retransmittimeout, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset+= 2; - proto_tree_add_item(ti_option_subtree, hf_btl2cap_option_monitortimeout, tvb, offset, 2, TRUE); + proto_tree_add_item(ti_option_subtree, hf_btl2cap_option_monitortimeout, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset+= 2; - proto_tree_add_item(ti_option_subtree, hf_btl2cap_option_mps, tvb, offset, 2, TRUE); + proto_tree_add_item(ti_option_subtree, hf_btl2cap_option_mps, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset+= 2; proto_item_append_text(ti_option, "Retransmission and Flow Control"); break; case 0x05: /* FCS */ - proto_tree_add_item(ti_option_subtree, hf_btl2cap_option_fcs, tvb, offset, 1, TRUE); + proto_tree_add_item(ti_option_subtree, hf_btl2cap_option_fcs, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset+=1; proto_item_append_text(ti_option, "FCS"); break; case 0x06: /* Extended Flow Specification */ - proto_tree_add_item(ti_option_subtree, hf_btl2cap_option_identifier, tvb, offset, 1, TRUE); + proto_tree_add_item(ti_option_subtree, hf_btl2cap_option_identifier, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; - proto_tree_add_item(ti_option_subtree, hf_btl2cap_option_service_type, tvb, offset, 1, TRUE); + proto_tree_add_item(ti_option_subtree, hf_btl2cap_option_service_type, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; - proto_tree_add_item(ti_option_subtree, hf_btl2cap_option_sdu_size, tvb, offset, 2, TRUE); + proto_tree_add_item(ti_option_subtree, hf_btl2cap_option_sdu_size, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset+=2; - proto_tree_add_item(ti_option_subtree, hf_btl2cap_option_sdu_arrival_time, tvb, offset, 4, TRUE); + proto_tree_add_item(ti_option_subtree, hf_btl2cap_option_sdu_arrival_time, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset+=4; - proto_tree_add_item(ti_option_subtree, hf_btl2cap_option_access_latency, tvb, offset, 4, TRUE); + proto_tree_add_item(ti_option_subtree, hf_btl2cap_option_access_latency, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset+=4; - proto_tree_add_item(ti_option_subtree, hf_btl2cap_option_flush_to_us, tvb, offset, 4, TRUE); + proto_tree_add_item(ti_option_subtree, hf_btl2cap_option_flush_to_us, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset+=4; proto_item_append_text(ti_option, "Extended Flow Specification"); break; case 0x07: /* Extended Window Size */ - proto_tree_add_item(ti_option_subtree, hf_btl2cap_option_window, tvb, offset, 2, TRUE); + proto_tree_add_item(ti_option_subtree, hf_btl2cap_option_window, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset+=2; proto_item_append_text(ti_option, "Extended Window Size"); @@ -577,7 +577,7 @@ dissect_configrequest(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_t dcid = tvb_get_letohs(tvb, offset); psm_data=se_tree_lookup32(cid_to_psm_table, dcid|((pinfo->p2p_dir==P2P_DIR_RECV)?0x0000:0x8000)); - proto_tree_add_item(tree, hf_btl2cap_dcid, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_btl2cap_dcid, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset+=2; col_append_fstr(pinfo->cinfo, COL_INFO, " (DCID: 0x%04x)", dcid); @@ -606,7 +606,7 @@ dissect_inforequest(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tre guint16 info_type; info_type=tvb_get_letohs(tvb, offset); - proto_tree_add_item(tree, hf_btl2cap_info_type, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_btl2cap_info_type, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset+=2; col_append_fstr(pinfo->cinfo, COL_INFO, " (%s)", val_to_str(info_type, info_type_vals, "Unknown type")); @@ -622,11 +622,11 @@ dissect_inforesponse(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tr guint32 features; info_type=tvb_get_letohs(tvb, offset); - proto_tree_add_item(tree, hf_btl2cap_info_type, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_btl2cap_info_type, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset+=2; result = tvb_get_letohs(tvb, offset); - proto_tree_add_item(tree, hf_btl2cap_info_result, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_btl2cap_info_result, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset+=2; col_append_fstr(pinfo->cinfo, COL_INFO, " (%s, %s)", @@ -636,7 +636,7 @@ dissect_inforesponse(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tr if(tvb_length_remaining(tvb, offset)) { switch(info_type){ case 0x0001: /* Connectionless MTU */ - proto_tree_add_item(tree, hf_btl2cap_info_mtu, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_btl2cap_info_mtu, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset+=2; break; @@ -667,16 +667,16 @@ dissect_inforesponse(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tr proto_item_append_text(ti_features, "WindowSize "); if(features & 0x200) proto_item_append_text(ti_features, "Unicast "); - proto_tree_add_item(ti_features_subtree, hf_btl2cap_info_flowcontrol, tvb, offset, 4, TRUE); - proto_tree_add_item(ti_features_subtree, hf_btl2cap_info_retransmission, tvb, offset, 4, TRUE); - proto_tree_add_item(ti_features_subtree, hf_btl2cap_info_bidirqos, tvb, offset, 4, TRUE); - proto_tree_add_item(ti_features_subtree, hf_btl2cap_info_enh_retransmission, tvb, offset, 4, TRUE); - proto_tree_add_item(ti_features_subtree, hf_btl2cap_info_streaming, tvb, offset, 4, TRUE); - proto_tree_add_item(ti_features_subtree, hf_btl2cap_info_fcs, tvb, offset, 4, TRUE); - proto_tree_add_item(ti_features_subtree, hf_btl2cap_info_flow_spec, tvb, offset, 4, TRUE); - proto_tree_add_item(ti_features_subtree, hf_btl2cap_info_fixedchan, tvb, offset, 4, TRUE); - proto_tree_add_item(ti_features_subtree, hf_btl2cap_info_window, tvb, offset, 4, TRUE); - proto_tree_add_item(ti_features_subtree, hf_btl2cap_info_unicast, tvb, offset, 4, TRUE); + proto_tree_add_item(ti_features_subtree, hf_btl2cap_info_flowcontrol, tvb, offset, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(ti_features_subtree, hf_btl2cap_info_retransmission, tvb, offset, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(ti_features_subtree, hf_btl2cap_info_bidirqos, tvb, offset, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(ti_features_subtree, hf_btl2cap_info_enh_retransmission, tvb, offset, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(ti_features_subtree, hf_btl2cap_info_streaming, tvb, offset, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(ti_features_subtree, hf_btl2cap_info_fcs, tvb, offset, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(ti_features_subtree, hf_btl2cap_info_flow_spec, tvb, offset, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(ti_features_subtree, hf_btl2cap_info_fixedchan, tvb, offset, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(ti_features_subtree, hf_btl2cap_info_window, tvb, offset, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(ti_features_subtree, hf_btl2cap_info_unicast, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset+=4; break; @@ -687,12 +687,12 @@ dissect_inforesponse(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tr offset, 8, "Fixed Channels Supported:"); ti_features_subtree = proto_item_add_subtree(ti_features, ett_btl2cap_fixedchans); - proto_tree_add_item(ti_features_subtree, hf_btl2cap_info_fixedchans_null, tvb, offset, 4, TRUE); - proto_tree_add_item(ti_features_subtree, hf_btl2cap_info_fixedchans_signal, tvb, offset, 4, TRUE); - proto_tree_add_item(ti_features_subtree, hf_btl2cap_info_fixedchans_connless, tvb, offset, 4, TRUE); - proto_tree_add_item(ti_features_subtree, hf_btl2cap_info_fixedchans_amp_man, tvb, offset, 4, TRUE); + proto_tree_add_item(ti_features_subtree, hf_btl2cap_info_fixedchans_null, tvb, offset, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(ti_features_subtree, hf_btl2cap_info_fixedchans_signal, tvb, offset, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(ti_features_subtree, hf_btl2cap_info_fixedchans_connless, tvb, offset, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(ti_features_subtree, hf_btl2cap_info_fixedchans_amp_man, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset+=4; - proto_tree_add_item(ti_features_subtree, hf_btl2cap_info_fixedchans_amp_test, tvb, offset, 4, TRUE); + proto_tree_add_item(ti_features_subtree, hf_btl2cap_info_fixedchans_amp_test, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset+=4; break; @@ -717,14 +717,14 @@ dissect_configresponse(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_ scid = tvb_get_letohs(tvb, offset); psm_data=se_tree_lookup32(cid_to_psm_table, scid|((pinfo->p2p_dir==P2P_DIR_RECV)?0x0000:0x8000)); - proto_tree_add_item(tree, hf_btl2cap_scid, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_btl2cap_scid, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset+=2; proto_tree_add_item(tree, hf_btl2cap_continuation_flag, tvb, offset, 2, TRUE); offset+=2; result = tvb_get_letohs(tvb, offset); - proto_tree_add_item(tree, hf_btl2cap_configuration_result, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_btl2cap_configuration_result, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset+=2; col_append_fstr(pinfo->cinfo, COL_INFO, " - %s (SCID: 0x%04x)", val_to_str(result, configuration_result_vals, "Unknown"), scid); @@ -750,18 +750,18 @@ dissect_connresponse(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree * psm_data_t *psm_data; dcid = tvb_get_letohs(tvb, offset); - proto_tree_add_item(tree, hf_btl2cap_dcid, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_btl2cap_dcid, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset+=2; scid = tvb_get_letohs(tvb, offset); - proto_tree_add_item(tree, hf_btl2cap_scid, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_btl2cap_scid, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset+=2; result = tvb_get_letohs(tvb, offset); - proto_tree_add_item(tree, hf_btl2cap_result, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_btl2cap_result, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset+=2; - proto_tree_add_item(tree, hf_btl2cap_status, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_btl2cap_status, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset+=2; if(!result) { @@ -792,11 +792,11 @@ dissect_movechanresponse(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, prot guint16 icid, result; icid = tvb_get_letohs(tvb, offset); - proto_tree_add_item(tree, hf_btl2cap_icid, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_btl2cap_icid, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset+=2; result = tvb_get_letohs(tvb, offset); - proto_tree_add_item(tree, hf_btl2cap_move_result, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_btl2cap_move_result, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset+=2; col_append_fstr(pinfo->cinfo, COL_INFO, " (ICID: 0x%04x, %s)", icid, val_to_str(result, move_result_vals, "Unknown result")); @@ -810,11 +810,11 @@ dissect_movechanconfirmation(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, guint16 icid, result; icid = tvb_get_letohs(tvb, offset); - proto_tree_add_item(tree, hf_btl2cap_icid, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_btl2cap_icid, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset+=2; result = tvb_get_letohs(tvb, offset); - proto_tree_add_item(tree, hf_btl2cap_move_confirmation_result, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_btl2cap_move_confirmation_result, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset+=2; col_append_fstr(pinfo->cinfo, COL_INFO, " (ICID: 0x%04x, %s)", icid, val_to_str(result, move_result_confirmation_vals, "Unknown result")); @@ -828,7 +828,7 @@ dissect_movechanconfirmationresponse(tvbuff_t *tvb, int offset, packet_info *pin guint16 icid; icid = tvb_get_letohs(tvb, offset); - proto_tree_add_item(tree, hf_btl2cap_icid, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_btl2cap_icid, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset+=2; col_append_fstr(pinfo->cinfo, COL_INFO, " (ICID: 0x%04x)", icid); @@ -841,11 +841,11 @@ dissect_disconnrequestresponse(tvbuff_t *tvb, int offset, packet_info *pinfo _U_ guint16 scid, dcid; dcid = tvb_get_letohs(tvb, offset); - proto_tree_add_item(tree, hf_btl2cap_dcid, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_btl2cap_dcid, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset+=2; scid = tvb_get_letohs(tvb, offset); - proto_tree_add_item(tree, hf_btl2cap_scid, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_btl2cap_scid, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset+=2; col_append_fstr(pinfo->cinfo, COL_INFO, " (SCID: 0x%04x, DCID: 0x%04x)", scid, dcid); @@ -936,18 +936,18 @@ dissect_i_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_tree (control & 0x0080) >> 7, (control & 0x007E) >> 1); ti_control_subtree = proto_item_add_subtree(ti_control, ett_btl2cap_control); - proto_tree_add_item(ti_control_subtree, hf_btl2cap_control_sar, tvb, offset, 2, TRUE); - proto_tree_add_item(ti_control_subtree, hf_btl2cap_control_reqseq, tvb, offset, 2, TRUE); - proto_tree_add_item(ti_control_subtree, hf_btl2cap_control_retransmissiondisable, tvb, offset, 2, TRUE); - proto_tree_add_item(ti_control_subtree, hf_btl2cap_control_txseq, tvb, offset, 2, TRUE); - proto_tree_add_item(ti_control_subtree, hf_btl2cap_control_type, tvb, offset, 2, TRUE); + proto_tree_add_item(ti_control_subtree, hf_btl2cap_control_sar, tvb, offset, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item(ti_control_subtree, hf_btl2cap_control_reqseq, tvb, offset, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item(ti_control_subtree, hf_btl2cap_control_retransmissiondisable, tvb, offset, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item(ti_control_subtree, hf_btl2cap_control_txseq, tvb, offset, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item(ti_control_subtree, hf_btl2cap_control_type, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; /*Segmented frames with SAR = start have an extra SDU length header field*/ if(segment == 0x01) { proto_item *pi; sdulen = tvb_get_letohs(tvb, offset); - pi = proto_tree_add_item(btl2cap_tree, hf_btl2cap_sdulength, tvb, offset, 2, TRUE); + pi = proto_tree_add_item(btl2cap_tree, hf_btl2cap_sdulength, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; length -= 6; /*Control, SDUlength, FCS*/ @@ -1034,7 +1034,7 @@ dissect_i_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_tree } } offset+=(tvb_length_remaining(tvb, offset) - 2); - proto_tree_add_item(btl2cap_tree, hf_btl2cap_fcs, tvb, offset, 2, TRUE); + proto_tree_add_item(btl2cap_tree, hf_btl2cap_fcs, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; } @@ -1064,12 +1064,12 @@ dissect_s_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree _U_, proto_t (control & 0x3F00) >> 8, (control & 0x0080) >> 7); ti_control_subtree = proto_item_add_subtree(ti_control, ett_btl2cap_control); - proto_tree_add_item(ti_control_subtree, hf_btl2cap_control_reqseq, tvb, offset, 2, TRUE); - proto_tree_add_item(ti_control_subtree, hf_btl2cap_control_retransmissiondisable, tvb, offset, 2, TRUE); - proto_tree_add_item(ti_control_subtree, hf_btl2cap_control_supervisory, tvb, offset, 2, TRUE); - proto_tree_add_item(ti_control_subtree, hf_btl2cap_control_type, tvb, offset, 2, TRUE); + proto_tree_add_item(ti_control_subtree, hf_btl2cap_control_reqseq, tvb, offset, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item(ti_control_subtree, hf_btl2cap_control_retransmissiondisable, tvb, offset, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item(ti_control_subtree, hf_btl2cap_control_supervisory, tvb, offset, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item(ti_control_subtree, hf_btl2cap_control_type, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; - proto_tree_add_item(ti_control_subtree, hf_btl2cap_fcs, tvb, offset, 2, TRUE); + proto_tree_add_item(ti_control_subtree, hf_btl2cap_fcs, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; } @@ -1121,11 +1121,11 @@ dissect_btl2cap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } length = tvb_get_letohs(tvb, offset); - proto_tree_add_item(btl2cap_tree, hf_btl2cap_length, tvb, offset, 2, TRUE); + proto_tree_add_item(btl2cap_tree, hf_btl2cap_length, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset+=2; cid = tvb_get_letohs(tvb, offset); - proto_tree_add_item(btl2cap_tree, hf_btl2cap_cid, tvb, offset, 2, TRUE); + proto_tree_add_item(btl2cap_tree, hf_btl2cap_cid, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset+=2; acl_data=(bthci_acl_data_t *)pinfo->private_data; @@ -1150,14 +1150,14 @@ dissect_btl2cap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) btl2cap_cmd_tree=proto_item_add_subtree(ti_command, ett_btl2cap_cmd); cmd_code=tvb_get_guint8(tvb, offset); - proto_tree_add_item(btl2cap_cmd_tree, hf_btl2cap_cmd_code, tvb, offset, 1, TRUE); + proto_tree_add_item(btl2cap_cmd_tree, hf_btl2cap_cmd_code, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; - proto_tree_add_item(btl2cap_cmd_tree, hf_btl2cap_cmd_ident, tvb, offset, 1, TRUE); + proto_tree_add_item(btl2cap_cmd_tree, hf_btl2cap_cmd_ident, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; cmd_length=tvb_get_letohs(tvb, offset); - proto_tree_add_item(btl2cap_cmd_tree, hf_btl2cap_cmd_length, tvb, offset, 2, TRUE); + proto_tree_add_item(btl2cap_cmd_tree, hf_btl2cap_cmd_length, tvb, offset, 2, ENC_LITTLE_ENDIAN); proto_item_set_len(ti_command, cmd_length+4); offset+=2; @@ -1245,7 +1245,7 @@ dissect_btl2cap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_append_str(pinfo->cinfo, COL_INFO, "Connectionless reception channel"); psm = tvb_get_letohs(tvb, offset); - proto_tree_add_item(btl2cap_tree, hf_btl2cap_psm, tvb, offset, 2, TRUE); + proto_tree_add_item(btl2cap_tree, hf_btl2cap_psm, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset+=2; next_tvb = tvb_new_subset(tvb, offset, tvb_length_remaining(tvb, offset), length); @@ -1279,13 +1279,13 @@ dissect_btl2cap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) (control & 0x0080) >> 7, (control & 0x007E) >> 1); ti_control_subtree = proto_item_add_subtree(ti_control, ett_btl2cap_control); - proto_tree_add_item(ti_control_subtree, hf_btl2cap_control_sar, tvb, offset, 2, TRUE); - proto_tree_add_item(ti_control_subtree, hf_btl2cap_control_reqseq, tvb, offset, 2, TRUE); - proto_tree_add_item(ti_control_subtree, hf_btl2cap_control_retransmissiondisable, tvb, offset, 2, TRUE); - proto_tree_add_item(ti_control_subtree, hf_btl2cap_control_txseq, tvb, offset, 2, TRUE); - proto_tree_add_item(ti_control_subtree, hf_btl2cap_control_type, tvb, offset, 2, TRUE); + proto_tree_add_item(ti_control_subtree, hf_btl2cap_control_sar, tvb, offset, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item(ti_control_subtree, hf_btl2cap_control_reqseq, tvb, offset, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item(ti_control_subtree, hf_btl2cap_control_retransmissiondisable, tvb, offset, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item(ti_control_subtree, hf_btl2cap_control_txseq, tvb, offset, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item(ti_control_subtree, hf_btl2cap_control_type, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; - proto_tree_add_item(btl2cap_tree, hf_btl2cap_fcs, tvb, tvb_length(tvb)-2, 2, TRUE); + proto_tree_add_item(btl2cap_tree, hf_btl2cap_fcs, tvb, tvb_length(tvb)-2, 2, ENC_LITTLE_ENDIAN); next_tvb = tvb_new_subset(tvb, offset, tvb_length_remaining(tvb, offset)-2, length); } diff --git a/epan/dissectors/packet-btobex.c b/epan/dissectors/packet-btobex.c index 6874d2497e..390a552f56 100644 --- a/epan/dissectors/packet-btobex.c +++ b/epan/dissectors/packet-btobex.c @@ -343,7 +343,7 @@ dissect_headers(proto_tree *tree, tvbuff_t *tvb, int offset, packet_info *pinfo) hdr = proto_tree_add_text(hdrs_tree, tvb, offset, item_length, "%s", val_to_str(hdr_id, header_id_vals, "Unknown")); hdr_tree=proto_item_add_subtree(hdr, ett_btobex_hdr); - proto_tree_add_item(hdr_tree, hf_hdr_id, tvb, offset, 1, FALSE); + proto_tree_add_item(hdr_tree, hf_hdr_id, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; @@ -351,7 +351,7 @@ dissect_headers(proto_tree *tree, tvbuff_t *tvb, int offset, packet_info *pinfo) { case 0x00: /* null terminated unicode */ { - proto_tree_add_item(hdr_tree, hf_hdr_length, tvb, offset, 2, FALSE); + proto_tree_add_item(hdr_tree, hf_hdr_length, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; if( (item_length - 3) > 0 ) { @@ -369,7 +369,7 @@ dissect_headers(proto_tree *tree, tvbuff_t *tvb, int offset, packet_info *pinfo) } break; case 0x40: /* byte sequence */ - proto_tree_add_item(hdr_tree, hf_hdr_length, tvb, offset, 2, FALSE); + proto_tree_add_item(hdr_tree, hf_hdr_length, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; handle_item = proto_tree_add_item(hdr_tree, hf_hdr_val_byte_seq, tvb, offset, item_length - 3, ENC_NA); @@ -400,12 +400,12 @@ dissect_headers(proto_tree *tree, tvbuff_t *tvb, int offset, packet_info *pinfo) break; case 0x80: /* 1 byte */ proto_item_append_text(hdr_tree, " (%i)", tvb_get_ntohl(tvb, offset)); - proto_tree_add_item(hdr_tree, hf_hdr_val_byte, tvb, offset, 1, FALSE); + proto_tree_add_item(hdr_tree, hf_hdr_val_byte, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; break; case 0xc0: /* 4 bytes */ proto_item_append_text(hdr_tree, " (%i)", tvb_get_ntohl(tvb, offset)); - proto_tree_add_item(hdr_tree, hf_hdr_val_long, tvb, offset, 4, FALSE); + proto_tree_add_item(hdr_tree, hf_hdr_val_long, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; break; default: @@ -511,31 +511,31 @@ dissect_btobex(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) val_to_str(code, code_vals, "Unknown")); if( (code < BTOBEX_CODE_VALS_CONTINUE) || (code == BTOBEX_CODE_VALS_ABORT)) { - proto_tree_add_item(st, hf_opcode, next_tvb, offset, 1, FALSE); + proto_tree_add_item(st, hf_opcode, next_tvb, offset, 1, ENC_BIG_ENDIAN); if (pinfo->p2p_dir == P2P_DIR_SENT || pinfo->p2p_dir == P2P_DIR_RECV) { last_opcode[pinfo->p2p_dir] = code; } } else { - proto_tree_add_item(st, hf_response_code, next_tvb, offset, 1, FALSE); + proto_tree_add_item(st, hf_response_code, next_tvb, offset, 1, ENC_BIG_ENDIAN); } proto_tree_add_item(st, hf_final_flag, next_tvb, offset, 1, FALSE); offset++; /* length */ - proto_tree_add_item(st, hf_length, next_tvb, offset, 2, FALSE); + proto_tree_add_item(st, hf_length, next_tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; switch(code) { case BTOBEX_CODE_VALS_CONNECT: - proto_tree_add_item(st, hf_version, next_tvb, offset, 1, FALSE); + proto_tree_add_item(st, hf_version, next_tvb, offset, 1, ENC_BIG_ENDIAN); offset++; - proto_tree_add_item(st, hf_flags, next_tvb, offset, 1, FALSE); + proto_tree_add_item(st, hf_flags, next_tvb, offset, 1, ENC_BIG_ENDIAN); offset++; - proto_tree_add_item(st, hf_max_pkt_len, next_tvb, offset, 2, FALSE); + proto_tree_add_item(st, hf_max_pkt_len, next_tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; break; @@ -545,12 +545,12 @@ dissect_btobex(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; case BTOBEX_CODE_VALS_SET_PATH: - proto_tree_add_item(st, hf_flags, next_tvb, offset, 1, FALSE); + proto_tree_add_item(st, hf_flags, next_tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(st, hf_set_path_flags_0, next_tvb, offset, 1, FALSE); proto_tree_add_item(st, hf_set_path_flags_1, next_tvb, offset, 1, FALSE); offset++; - proto_tree_add_item(st, hf_constants, next_tvb, offset, 1, FALSE); + proto_tree_add_item(st, hf_constants, next_tvb, offset, 1, ENC_BIG_ENDIAN); offset++; break; @@ -563,13 +563,13 @@ dissect_btobex(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint8 response_opcode = last_opcode[(pinfo->p2p_dir + 1) & 0x01]; if(response_opcode == BTOBEX_CODE_VALS_CONNECT) { - proto_tree_add_item(st, hf_version, next_tvb, offset, 1, FALSE); + proto_tree_add_item(st, hf_version, next_tvb, offset, 1, ENC_BIG_ENDIAN); offset++; - proto_tree_add_item(st, hf_flags, next_tvb, offset, 1, FALSE); + proto_tree_add_item(st, hf_flags, next_tvb, offset, 1, ENC_BIG_ENDIAN); offset++; - proto_tree_add_item(st, hf_max_pkt_len, next_tvb, offset, 2, FALSE); + proto_tree_add_item(st, hf_max_pkt_len, next_tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; } } diff --git a/epan/dissectors/packet-btsdp.c b/epan/dissectors/packet-btsdp.c index bd2bf63e2e..c6f966e640 100644 --- a/epan/dissectors/packet-btsdp.c +++ b/epan/dissectors/packet-btsdp.c @@ -253,7 +253,7 @@ dissect_attribute_id_list(proto_tree *t, tvbuff_t *tvb, int offset, packet_info static int dissect_sdp_error_response(proto_tree *t, tvbuff_t *tvb, int offset) { - proto_tree_add_item(t, hf_error_code, tvb, offset, 2, FALSE); + proto_tree_add_item(t, hf_error_code, tvb, offset, 2, ENC_BIG_ENDIAN); offset+=2; return offset; @@ -663,7 +663,7 @@ dissect_sdp_service_attribute_list_array(proto_tree *tree, tvbuff_t *tvb, int of static int dissect_sdp_service_search_attribute_response(proto_tree *tree, tvbuff_t *tvb, int offset, packet_info *pinfo, guint32 token) { - proto_tree_add_item(tree, hf_ssares_al_bytecount, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_ssares_al_bytecount, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; offset += dissect_sdp_service_attribute_list_array(tree, tvb, offset, pinfo, token); @@ -828,11 +828,11 @@ dissect_sdp_service_search_response(proto_tree *t, tvbuff_t *tvb, int offset) proto_item *ti; gint curr_count; - proto_tree_add_item(t, hf_ssr_total_count, tvb, offset, 2, FALSE); + proto_tree_add_item(t, hf_ssr_total_count, tvb, offset, 2, ENC_BIG_ENDIAN); offset+=2; curr_count = tvb_get_ntohs(tvb, offset); - proto_tree_add_item(t, hf_ssr_current_count, tvb, offset, 2, FALSE); + proto_tree_add_item(t, hf_ssr_current_count, tvb, offset, 2, ENC_BIG_ENDIAN); offset+=2; ti = proto_tree_add_text(t, tvb, offset, @@ -870,7 +870,7 @@ dissect_btsdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* pdu id */ pdu = tvb_get_guint8(tvb, offset); - proto_tree_add_item(st, hf_pduid, tvb, offset, 1, FALSE); + proto_tree_add_item(st, hf_pduid, tvb, offset, 1, ENC_BIG_ENDIAN); pdu_name = val_to_str(pdu, vs_pduid, "Unknown"); switch (pinfo->p2p_dir) { @@ -896,11 +896,11 @@ dissect_btsdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset++; /* tid */ - proto_tree_add_item(st, hf_tid, tvb, offset, 2, FALSE); + proto_tree_add_item(st, hf_tid, tvb, offset, 2, ENC_BIG_ENDIAN); offset+=2; /* plen */ - proto_tree_add_item(st, hf_plen, tvb, offset, 2, FALSE); + proto_tree_add_item(st, hf_plen, tvb, offset, 2, ENC_BIG_ENDIAN); offset+=2; acl_handle = ((btl2cap_data_t *) pinfo->private_data)->chandle; diff --git a/epan/dissectors/packet-bvlc.c b/epan/dissectors/packet-bvlc.c index 4bb051691f..198d43a116 100644 --- a/epan/dissectors/packet-bvlc.c +++ b/epan/dissectors/packet-bvlc.c @@ -214,7 +214,7 @@ dissect_bvlc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvb, offset, 4, FALSE); offset += 4; proto_tree_add_item(bdt_tree, hf_bvlc_bdt_port, - tvb, offset, 2, FALSE); + tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(bdt_tree, hf_bvlc_bdt_mask, tvb, offset, 4, @@ -229,7 +229,7 @@ dissect_bvlc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case 0x05: /* Register-Foreign-Device */ /* Time-to-Live 2-octets T, Time-to-Live T, in seconds */ proto_tree_add_item(bvlc_tree, hf_bvlc_reg_ttl, - tvb, offset, 2, FALSE); + tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; break; case 0x06: /* Read-Foreign-Device-Table */ @@ -254,15 +254,15 @@ dissect_bvlc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvb, offset, 4, FALSE); offset += 4; proto_tree_add_item(fdt_tree, hf_bvlc_fdt_port, - tvb, offset, 2, FALSE); + tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(fdt_tree, hf_bvlc_fdt_ttl, tvb, offset, 2, - FALSE); + ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(fdt_tree, hf_bvlc_fdt_timeout, tvb, offset, 2, - FALSE); + ENC_BIG_ENDIAN); offset += 2; } /* We check this if we get a FDT-packet somewhere */ @@ -273,7 +273,7 @@ dissect_bvlc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvb, offset, 4, FALSE); offset += 4; proto_tree_add_item(bvlc_tree, hf_bvlc_fdt_port, - tvb, offset, 2, FALSE); + tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; break; /* We check this if we get a FDT-packet somewhere */ @@ -287,7 +287,7 @@ dissect_bvlc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvb, offset, 4, FALSE); offset += 4; proto_tree_add_item(bvlc_tree, hf_bvlc_fwd_port, - tvb, offset, 2, FALSE); + tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; default:/* Distribute-Broadcast-To-Network * Original-Unicast-NPDU diff --git a/epan/dissectors/packet-catapult-dct2000.c b/epan/dissectors/packet-catapult-dct2000.c index 2095e924a1..77c770fea5 100644 --- a/epan/dissectors/packet-catapult-dct2000.c +++ b/epan/dissectors/packet-catapult-dct2000.c @@ -651,7 +651,7 @@ static void dissect_rrc_lte(tvbuff_t *tvb, gint offset, logicalChannelType = Channel_DCCH; /* UEId */ - proto_tree_add_item(tree, hf_catapult_dct2000_lte_ueid, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_catapult_dct2000_lte_ueid, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; /* Get tag of channel type */ @@ -663,7 +663,7 @@ static void dissect_rrc_lte(tvbuff_t *tvb, gint offset, col_append_fstr(pinfo->cinfo, COL_INFO, " SRB:%u", tvb_get_guint8(tvb, offset)); proto_tree_add_item(tree, hf_catapult_dct2000_lte_srbid, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); offset++; break; case 1: @@ -671,7 +671,7 @@ static void dissect_rrc_lte(tvbuff_t *tvb, gint offset, col_append_fstr(pinfo->cinfo, COL_INFO, " DRB:%u", tvb_get_guint8(tvb, offset)); proto_tree_add_item(tree, hf_catapult_dct2000_lte_drbid, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); offset++; break; @@ -690,13 +690,13 @@ static void dissect_rrc_lte(tvbuff_t *tvb, gint offset, /* Cell-id */ proto_tree_add_item(tree, hf_catapult_dct2000_lte_cellid, - tvb, offset, 2, FALSE); + tvb, offset, 2, ENC_BIG_ENDIAN); cell_id = tvb_get_ntohs(tvb, offset); offset += 2; /* Logical channel type */ proto_tree_add_item(tree, hf_catapult_dct2000_lte_rlc_channel_type, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); logicalChannelType = (LogicalChannelType)tvb_get_guint8(tvb, offset); offset++; @@ -715,7 +715,7 @@ static void dissect_rrc_lte(tvbuff_t *tvb, gint offset, /* Transport channel type */ bcch_transport = tvb_get_guint8(tvb, offset); proto_tree_add_item(tree, hf_catapult_dct2000_lte_bcch_transport, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); offset++; break; @@ -725,7 +725,7 @@ static void dissect_rrc_lte(tvbuff_t *tvb, gint offset, /* UEId */ proto_tree_add_item(tree, hf_catapult_dct2000_lte_ueid, - tvb, offset, 2, FALSE); + tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; break; @@ -812,7 +812,7 @@ static void dissect_ccpri_lte(tvbuff_t *tvb, gint offset, guint16 length; /* Top-level opcode */ - proto_tree_add_item(tree, hf_catapult_dct2000_lte_ccpri_opcode, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_catapult_dct2000_lte_ccpri_opcode, tvb, offset, 1, ENC_BIG_ENDIAN); opcode = tvb_get_guint8(tvb, offset++); /* Skip 2-byte length field */ @@ -820,7 +820,7 @@ static void dissect_ccpri_lte(tvbuff_t *tvb, gint offset, /* Cell-id */ proto_tree_add_item(tree, hf_catapult_dct2000_lte_cellid, - tvb, offset, 2, FALSE); + tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; /* Status (ind only) */ @@ -828,7 +828,7 @@ static void dissect_ccpri_lte(tvbuff_t *tvb, gint offset, proto_item *ti; guint8 status = tvb_get_guint8(tvb, offset); ti = proto_tree_add_item(tree, hf_catapult_dct2000_lte_ccpri_status, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); offset++; if (status != 0) { @@ -840,7 +840,7 @@ static void dissect_ccpri_lte(tvbuff_t *tvb, gint offset, /* Channel ID */ proto_tree_add_item(tree, hf_catapult_dct2000_lte_ccpri_channel, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); offset++; /* Data tag must follow */ @@ -887,7 +887,7 @@ static void dissect_pdcp_lte(tvbuff_t *tvb, gint offset, /* Top-level opcode */ opcode = tvb_get_guint8(tvb, offset); if (tree) { - proto_tree_add_item(tree, hf_catapult_dct2000_lte_rlc_op, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_catapult_dct2000_lte_rlc_op, tvb, offset, 1, ENC_BIG_ENDIAN); } offset++; @@ -928,7 +928,7 @@ static void dissect_pdcp_lte(tvbuff_t *tvb, gint offset, /* UEId */ ueid = tvb_get_ntohs(tvb, offset); - proto_tree_add_item(tree, hf_catapult_dct2000_lte_ueid, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_catapult_dct2000_lte_ueid, tvb, offset, 2, ENC_BIG_ENDIAN); col_append_fstr(pinfo->cinfo, COL_INFO, " UEId=%u", ueid); p_pdcp_lte_info->ueid = ueid; @@ -944,7 +944,7 @@ static void dissect_pdcp_lte(tvbuff_t *tvb, gint offset, col_append_fstr(pinfo->cinfo, COL_INFO, " SRB:%u", channelId); proto_tree_add_item(tree, hf_catapult_dct2000_lte_srbid, - tvb, offset++, 1, FALSE); + tvb, offset++, 1, ENC_BIG_ENDIAN); p_pdcp_lte_info->channelId = channelId; break; case 1: @@ -953,7 +953,7 @@ static void dissect_pdcp_lte(tvbuff_t *tvb, gint offset, col_append_fstr(pinfo->cinfo, COL_INFO, " DRB:%u", channelId); proto_tree_add_item(tree, hf_catapult_dct2000_lte_drbid, - tvb, offset++, 1, FALSE); + tvb, offset++, 1, ENC_BIG_ENDIAN); p_pdcp_lte_info->channelId = channelId; break; @@ -972,12 +972,12 @@ static void dissect_pdcp_lte(tvbuff_t *tvb, gint offset, /* Cell-id */ proto_tree_add_item(tree, hf_catapult_dct2000_lte_cellid, - tvb, offset, 2, FALSE); + tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; /* Logical channel type */ proto_tree_add_item(tree, hf_catapult_dct2000_lte_rlc_channel_type, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); p_pdcp_lte_info->channelType = tvb_get_guint8(tvb, offset++); col_append_fstr(pinfo->cinfo, COL_INFO, " %s", val_to_str_const(p_pdcp_lte_info->channelType, rlc_logical_channel_vals, @@ -991,7 +991,7 @@ static void dissect_pdcp_lte(tvbuff_t *tvb, gint offset, /* Transport channel type */ p_pdcp_lte_info->BCCHTransport = tvb_get_guint8(tvb, offset); proto_tree_add_item(tree, hf_catapult_dct2000_lte_bcch_transport, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); offset++; break; @@ -1001,7 +1001,7 @@ static void dissect_pdcp_lte(tvbuff_t *tvb, gint offset, /* UEId */ proto_tree_add_item(tree, hf_catapult_dct2000_lte_ueid, - tvb, offset, 2, FALSE); + tvb, offset, 2, ENC_BIG_ENDIAN); ueid = tvb_get_ntohs(tvb, offset); offset += 2; @@ -1026,7 +1026,7 @@ static void dissect_pdcp_lte(tvbuff_t *tvb, gint offset, /* This is MUI */ offset++; proto_tree_add_item(tree, hf_catapult_dct2000_lte_rlc_mui, - tvb, offset, 2, FALSE); + tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; /* CNF follows MUI in AM */ @@ -1789,7 +1789,7 @@ dissect_catapult_dct2000(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) port_number = tvb_get_guint8(tvb, offset); if (dct2000_tree) { proto_tree_add_item(dct2000_tree, hf_catapult_dct2000_port_number, tvb, - offset, 1, FALSE); + offset, 1, ENC_BIG_ENDIAN); } offset++; @@ -1836,13 +1836,13 @@ dissect_catapult_dct2000(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) direction = tvb_get_guint8(tvb, offset); if (dct2000_tree) { proto_tree_add_item(dct2000_tree, hf_catapult_dct2000_direction, tvb, - offset, 1, FALSE); + offset, 1, ENC_BIG_ENDIAN); } offset++; /* Read frame encapsulation set by wiretap */ if (!is_comment) { - proto_tree_add_item(dct2000_tree, hf_catapult_dct2000_encap, tvb, offset, 1, FALSE); + proto_tree_add_item(dct2000_tree, hf_catapult_dct2000_encap, tvb, offset, 1, ENC_BIG_ENDIAN); } encap = tvb_get_guint8(tvb, offset); offset++; @@ -2224,7 +2224,7 @@ dissect_catapult_dct2000(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (conn_id_offset != 0) { proto_tree_add_item(ipprim_tree, hf_catapult_dct2000_ipprim_conn_id, - tvb, conn_id_offset, 2, FALSE); + tvb, conn_id_offset, 2, ENC_BIG_ENDIAN); } @@ -2323,7 +2323,7 @@ dissect_catapult_dct2000(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(sctpprim_tree, hf_catapult_dct2000_sctpprim_dst_port, - tvb, dest_port_offset, 2, FALSE); + tvb, dest_port_offset, 2, ENC_BIG_ENDIAN); } /* Set length for SCTPPrim tree */ diff --git a/epan/dissectors/packet-ccsds.c b/epan/dissectors/packet-ccsds.c index d3cb58fcba..bc31a6feed 100644 --- a/epan/dissectors/packet-ccsds.c +++ b/epan/dissectors/packet-ccsds.c @@ -352,11 +352,11 @@ dissect_ccsds(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_uint(primary_header_tree, hf_ccsds_apid, tvb, offset, 2, first_word); offset += 2; - proto_tree_add_item(primary_header_tree, hf_ccsds_seqflag, tvb, offset, 2, FALSE); - proto_tree_add_item(primary_header_tree, hf_ccsds_seqnum, tvb, offset, 2, FALSE); + proto_tree_add_item(primary_header_tree, hf_ccsds_seqflag, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(primary_header_tree, hf_ccsds_seqnum, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - item = proto_tree_add_item(primary_header_tree, hf_ccsds_length, tvb, offset, 2, FALSE); + item = proto_tree_add_item(primary_header_tree, hf_ccsds_length, tvb, offset, 2, ENC_BIG_ENDIAN); if (ccsds_length > reported_length) { expert_add_info_format(pinfo, item, PI_MALFORMED, PI_ERROR, "Length field value is greater than the packet seen on the wire"); @@ -372,17 +372,17 @@ dissect_ccsds(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* command ccsds secondary header flags */ coarse_time=tvb_get_ntohl(tvb, offset); - proto_tree_add_item(secondary_header_tree, hf_ccsds_coarse_time, tvb, offset, 4, FALSE); + proto_tree_add_item(secondary_header_tree, hf_ccsds_coarse_time, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; fine_time=tvb_get_guint8(tvb, offset); - proto_tree_add_item(secondary_header_tree, hf_ccsds_fine_time, tvb, offset, 1, FALSE); + proto_tree_add_item(secondary_header_tree, hf_ccsds_fine_time, tvb, offset, 1, ENC_BIG_ENDIAN); ++offset; time_string = embedded_time_to_string ( coarse_time, fine_time ); proto_tree_add_text(secondary_header_tree, tvb, offset-5, 5, "%s = Embedded Time", time_string); - proto_tree_add_item(secondary_header_tree, hf_ccsds_timeid, tvb, offset, 1, FALSE); + proto_tree_add_item(secondary_header_tree, hf_ccsds_timeid, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(secondary_header_tree, hf_ccsds_checkword_flag, tvb, offset, 1, FALSE); /* Global Preference: how to handle checkword flag */ @@ -404,35 +404,35 @@ dissect_ccsds(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* payload specific ccsds secondary header flags */ if ( first_word & HDR_TYPE ) { - proto_tree_add_item(secondary_header_tree, hf_ccsds_zoe, tvb, offset, 1, FALSE); - proto_tree_add_item(secondary_header_tree, hf_ccsds_packet_type_unused, tvb, offset, 1, FALSE); + proto_tree_add_item(secondary_header_tree, hf_ccsds_zoe, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(secondary_header_tree, hf_ccsds_packet_type_unused, tvb, offset, 1, ENC_BIG_ENDIAN); ++offset; - proto_tree_add_item(secondary_header_tree, hf_ccsds_vid, tvb, offset, 2, FALSE); + proto_tree_add_item(secondary_header_tree, hf_ccsds_vid, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(secondary_header_tree, hf_ccsds_dcc, tvb, offset, 2, FALSE); + proto_tree_add_item(secondary_header_tree, hf_ccsds_dcc, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; } /* core specific ccsds secondary header flags */ else { - /* proto_tree_add_item(secondary_header_tree, hf_ccsds_spare1, tvb, offset, 1, FALSE); */ - proto_tree_add_item(secondary_header_tree, hf_ccsds_packet_type, tvb, offset, 1, FALSE); + /* proto_tree_add_item(secondary_header_tree, hf_ccsds_spare1, tvb, offset, 1, ENC_BIG_ENDIAN); */ + proto_tree_add_item(secondary_header_tree, hf_ccsds_packet_type, tvb, offset, 1, ENC_BIG_ENDIAN); ++offset; - /* proto_tree_add_item(secondary_header_tree, hf_ccsds_spare2, tvb, offset, 2, FALSE); */ - proto_tree_add_item(secondary_header_tree, hf_ccsds_element_id, tvb, offset, 2, FALSE); - proto_tree_add_item(secondary_header_tree, hf_ccsds_cmd_data_packet, tvb, offset, 2, FALSE); - proto_tree_add_item(secondary_header_tree, hf_ccsds_format_version_id, tvb, offset, 2, FALSE); - proto_tree_add_item(secondary_header_tree, hf_ccsds_extended_format_id, tvb, offset, 2, FALSE); + /* proto_tree_add_item(secondary_header_tree, hf_ccsds_spare2, tvb, offset, 2, ENC_BIG_ENDIAN); */ + proto_tree_add_item(secondary_header_tree, hf_ccsds_element_id, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(secondary_header_tree, hf_ccsds_cmd_data_packet, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(secondary_header_tree, hf_ccsds_format_version_id, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(secondary_header_tree, hf_ccsds_extended_format_id, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - /* proto_tree_add_item(secondary_header_tree, hf_ccsds_spare3, tvb, offset, 1, FALSE); */ + /* proto_tree_add_item(secondary_header_tree, hf_ccsds_spare3, tvb, offset, 1, ENC_BIG_ENDIAN); */ ++offset; - proto_tree_add_item(secondary_header_tree, hf_ccsds_frame_id, tvb, offset, 1, FALSE); + proto_tree_add_item(secondary_header_tree, hf_ccsds_frame_id, tvb, offset, 1, ENC_BIG_ENDIAN); ++offset; } diff --git a/epan/dissectors/packet-cdp.c b/epan/dissectors/packet-cdp.c index a3200d48c4..10044eb0e3 100644 --- a/epan/dissectors/packet-cdp.c +++ b/epan/dissectors/packet-cdp.c @@ -200,7 +200,7 @@ dissect_cdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) cdp_tree = proto_item_add_subtree(ti, ett_cdp); /* CDP header */ - proto_tree_add_item(cdp_tree, hf_cdp_version, tvb, offset, 1, FALSE); + proto_tree_add_item(cdp_tree, hf_cdp_version, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; proto_tree_add_uint_format_value(cdp_tree, hf_cdp_ttl, tvb, offset, 1, @@ -285,8 +285,8 @@ dissect_cdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) "TLV with invalid length %u (< 4)", length); tlv_tree = proto_item_add_subtree(tlvi, ett_cdp_tlv); - proto_tree_add_item(tlv_tree, hf_cdp_tlvtype, tvb, offset + TLV_TYPE, 2, FALSE); - proto_tree_add_item(tlv_tree, hf_cdp_tlvlength, tvb, offset + TLV_LENGTH, 2, FALSE); + proto_tree_add_item(tlv_tree, hf_cdp_tlvtype, tvb, offset + TLV_TYPE, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_cdp_tlvlength, tvb, offset + TLV_LENGTH, 2, ENC_BIG_ENDIAN); } offset += 4; break; @@ -306,8 +306,8 @@ dissect_cdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) length, "Device ID: %s", tvb_format_stringzpad(tvb, offset + 4, length - 4)); tlv_tree = proto_item_add_subtree(tlvi, ett_cdp_tlv); - proto_tree_add_item(tlv_tree, hf_cdp_tlvtype, tvb, offset + TLV_TYPE, 2, FALSE); - proto_tree_add_item(tlv_tree, hf_cdp_tlvlength, tvb, offset + TLV_LENGTH, 2, FALSE); + proto_tree_add_item(tlv_tree, hf_cdp_tlvtype, tvb, offset + TLV_TYPE, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_cdp_tlvlength, tvb, offset + TLV_LENGTH, 2, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_tree, hf_cdp_deviceid, tvb, offset + 4, length - 4, FALSE); } offset += length; @@ -335,8 +335,8 @@ dissect_cdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) real_length, "Port ID: %s", tvb_format_text(tvb, offset + 4, real_length - 4)); tlv_tree = proto_item_add_subtree(tlvi, ett_cdp_tlv); - proto_tree_add_item(tlv_tree, hf_cdp_tlvtype, tvb, offset + TLV_TYPE, 2, FALSE); - proto_tree_add_item(tlv_tree, hf_cdp_tlvlength, tvb, offset + TLV_LENGTH, 2, FALSE); + proto_tree_add_item(tlv_tree, hf_cdp_tlvtype, tvb, offset + TLV_TYPE, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_cdp_tlvlength, tvb, offset + TLV_LENGTH, 2, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_tree, hf_cdp_portid, tvb, offset + 4, real_length - 4, FALSE); } offset += real_length; @@ -348,8 +348,8 @@ dissect_cdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tlvi = proto_tree_add_text(cdp_tree, tvb, offset, length, "Addresses"); tlv_tree = proto_item_add_subtree(tlvi, ett_cdp_tlv); - proto_tree_add_item(tlv_tree, hf_cdp_tlvtype, tvb, offset + TLV_TYPE, 2, FALSE); - proto_tree_add_item(tlv_tree, hf_cdp_tlvlength, tvb, offset + TLV_LENGTH, 2, FALSE); + proto_tree_add_item(tlv_tree, hf_cdp_tlvtype, tvb, offset + TLV_TYPE, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_cdp_tlvlength, tvb, offset + TLV_LENGTH, 2, ENC_BIG_ENDIAN); } offset += 4; length -= 4; @@ -378,8 +378,8 @@ dissect_cdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tlvi = proto_tree_add_text(cdp_tree, tvb, offset, length, "Capabilities"); tlv_tree = proto_item_add_subtree(tlvi, ett_cdp_tlv); - proto_tree_add_item(tlv_tree, hf_cdp_tlvtype, tvb, offset + TLV_TYPE, 2, FALSE); - proto_tree_add_item(tlv_tree, hf_cdp_tlvlength, tvb, offset + TLV_LENGTH, 2, FALSE); + proto_tree_add_item(tlv_tree, hf_cdp_tlvtype, tvb, offset + TLV_TYPE, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_cdp_tlvlength, tvb, offset + TLV_LENGTH, 2, ENC_BIG_ENDIAN); } offset += 4; length -= 4; @@ -392,8 +392,8 @@ dissect_cdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tlvi = proto_tree_add_text(cdp_tree, tvb, offset, length, "Software Version"); tlv_tree = proto_item_add_subtree(tlvi, ett_cdp_tlv); - proto_tree_add_item(tlv_tree, hf_cdp_tlvtype, tvb, offset + TLV_TYPE, 2, FALSE); - proto_tree_add_item(tlv_tree, hf_cdp_tlvlength, tvb, offset + TLV_LENGTH, 2, FALSE); + proto_tree_add_item(tlv_tree, hf_cdp_tlvtype, tvb, offset + TLV_TYPE, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_cdp_tlvlength, tvb, offset + TLV_LENGTH, 2, ENC_BIG_ENDIAN); add_multi_line_string_to_tree(tlv_tree, tvb, offset + 4, length - 4, "Software Version: "); } @@ -407,8 +407,8 @@ dissect_cdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset, length, "Platform: %s", tvb_format_text(tvb, offset + 4, length - 4)); tlv_tree = proto_item_add_subtree(tlvi, ett_cdp_tlv); - proto_tree_add_item(tlv_tree, hf_cdp_tlvtype, tvb, offset + TLV_TYPE, 2, FALSE); - proto_tree_add_item(tlv_tree, hf_cdp_tlvlength, tvb, offset + TLV_LENGTH, 2, FALSE); + proto_tree_add_item(tlv_tree, hf_cdp_tlvtype, tvb, offset + TLV_TYPE, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_cdp_tlvlength, tvb, offset + TLV_LENGTH, 2, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_tree, hf_cdp_platform, tvb, offset + 4, length - 4, FALSE); } offset += length; @@ -422,8 +422,8 @@ dissect_cdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) length, "ODR Default gateway: %s", tvb_ip_to_str(tvb, offset+4)); tlv_tree = proto_item_add_subtree(tlvi, ett_cdp_tlv); - proto_tree_add_item(tlv_tree, hf_cdp_tlvtype, tvb, offset + TLV_TYPE, 2, FALSE); - proto_tree_add_item(tlv_tree, hf_cdp_tlvlength, tvb, offset + TLV_LENGTH, 2, FALSE); + proto_tree_add_item(tlv_tree, hf_cdp_tlvtype, tvb, offset + TLV_TYPE, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_cdp_tlvlength, tvb, offset + TLV_LENGTH, 2, ENC_BIG_ENDIAN); proto_tree_add_text(tlv_tree, tvb, offset+4, 4, "ODR Default gateway = %s", tvb_ip_to_str(tvb, offset+4)); @@ -439,8 +439,8 @@ dissect_cdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) then length/5=(length-4)/5 :) */ tlv_tree = proto_item_add_subtree(tlvi, ett_cdp_tlv); - proto_tree_add_item(tlv_tree, hf_cdp_tlvtype, tvb, offset + TLV_TYPE, 2, FALSE); - proto_tree_add_item(tlv_tree, hf_cdp_tlvlength, tvb, offset + TLV_LENGTH, 2, FALSE); + proto_tree_add_item(tlv_tree, hf_cdp_tlvtype, tvb, offset + TLV_TYPE, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_cdp_tlvlength, tvb, offset + TLV_LENGTH, 2, ENC_BIG_ENDIAN); } offset += 4; length -= 4; @@ -463,8 +463,8 @@ dissect_cdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset,length, "Protocol Hello: %s", val_to_str(tvb_get_ntohs(tvb, offset+7), type_hello_vals, "Unknown (0x%04x)")); tlv_tree = proto_item_add_subtree(tlvi, ett_cdp_tlv); - proto_tree_add_item(tlv_tree, hf_cdp_tlvtype, tvb, offset + TLV_TYPE, 2, FALSE); - proto_tree_add_item(tlv_tree, hf_cdp_tlvlength, tvb, offset + TLV_LENGTH, 2, FALSE); + proto_tree_add_item(tlv_tree, hf_cdp_tlvtype, tvb, offset + TLV_TYPE, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_cdp_tlvlength, tvb, offset + TLV_LENGTH, 2, ENC_BIG_ENDIAN); proto_tree_add_text(tlv_tree, tvb, offset+4, 3, "OUI: 0x%06X (%s)", tvb_get_ntoh24(tvb,offset+4), @@ -527,8 +527,8 @@ dissect_cdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset, length, "VTP Management Domain: %s", tvb_format_text(tvb, offset + 4, length - 4)); tlv_tree = proto_item_add_subtree(tlvi, ett_cdp_tlv); - proto_tree_add_item(tlv_tree, hf_cdp_tlvtype, tvb, offset + TLV_TYPE, 2, FALSE); - proto_tree_add_item(tlv_tree, hf_cdp_tlvlength, tvb, offset + TLV_LENGTH, 2, FALSE); + proto_tree_add_item(tlv_tree, hf_cdp_tlvtype, tvb, offset + TLV_TYPE, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_cdp_tlvlength, tvb, offset + TLV_LENGTH, 2, ENC_BIG_ENDIAN); proto_tree_add_text(tlv_tree, tvb, offset + 4, length - 4, "VTP Management Domain: %s", tvb_format_text(tvb, offset + 4, length - 4)); @@ -542,8 +542,8 @@ dissect_cdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset, length, "Native VLAN: %u", tvb_get_ntohs(tvb, offset + 4)); tlv_tree = proto_item_add_subtree(tlvi, ett_cdp_tlv); - proto_tree_add_item(tlv_tree, hf_cdp_tlvtype, tvb, offset + TLV_TYPE, 2, FALSE); - proto_tree_add_item(tlv_tree, hf_cdp_tlvlength, tvb, offset + TLV_LENGTH, 2, FALSE); + proto_tree_add_item(tlv_tree, hf_cdp_tlvtype, tvb, offset + TLV_TYPE, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_cdp_tlvlength, tvb, offset + TLV_LENGTH, 2, ENC_BIG_ENDIAN); proto_tree_add_text(tlv_tree, tvb, offset + 4, length - 4, "Native VLAN: %u", tvb_get_ntohs(tvb, offset + 4)); @@ -558,8 +558,8 @@ dissect_cdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvb_get_guint8(tvb, offset + 4) ? "Full" : "Half" ); tlv_tree = proto_item_add_subtree(tlvi, ett_cdp_tlv); - proto_tree_add_item(tlv_tree, hf_cdp_tlvtype, tvb, offset + TLV_TYPE, 2, FALSE); - proto_tree_add_item(tlv_tree, hf_cdp_tlvlength, tvb, offset + TLV_LENGTH, 2, FALSE); + proto_tree_add_item(tlv_tree, hf_cdp_tlvtype, tvb, offset + TLV_TYPE, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_cdp_tlvlength, tvb, offset + TLV_LENGTH, 2, ENC_BIG_ENDIAN); proto_tree_add_text(tlv_tree, tvb, offset + 4, length - 4, "Duplex: %s", tvb_get_guint8(tvb, offset + 4) ? @@ -585,8 +585,8 @@ dissect_cdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset, length, "VoIP VLAN Reply"); } tlv_tree = proto_item_add_subtree(tlvi, ett_cdp_tlv); - proto_tree_add_item(tlv_tree, hf_cdp_tlvtype, tvb, offset + TLV_TYPE, 2, FALSE); - proto_tree_add_item(tlv_tree, hf_cdp_tlvlength, tvb, offset + TLV_LENGTH, 2, FALSE); + proto_tree_add_item(tlv_tree, hf_cdp_tlvtype, tvb, offset + TLV_TYPE, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_cdp_tlvlength, tvb, offset + TLV_LENGTH, 2, ENC_BIG_ENDIAN); proto_tree_add_text(tlv_tree, tvb, offset + 4, 1, "Data"); if (length >= 7) { @@ -615,8 +615,8 @@ dissect_cdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset, length, "VoIP VLAN Query"); } tlv_tree = proto_item_add_subtree(tlvi, ett_cdp_tlv); - proto_tree_add_item(tlv_tree, hf_cdp_tlvtype, tvb, offset + TLV_TYPE, 2, FALSE); - proto_tree_add_item(tlv_tree, hf_cdp_tlvlength, tvb, offset + TLV_LENGTH, 2, FALSE); + proto_tree_add_item(tlv_tree, hf_cdp_tlvtype, tvb, offset + TLV_TYPE, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_cdp_tlvlength, tvb, offset + TLV_LENGTH, 2, ENC_BIG_ENDIAN); proto_tree_add_text(tlv_tree, tvb, offset + 4, 1, "Data"); if (length >= 7) { @@ -634,8 +634,8 @@ dissect_cdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset, length, "Power Consumption: %u mW", tvb_get_ntohs(tvb, offset + 4)); tlv_tree = proto_item_add_subtree(tlvi, ett_cdp_tlv); - proto_tree_add_item(tlv_tree, hf_cdp_tlvtype, tvb, offset + TLV_TYPE, 2, FALSE); - proto_tree_add_item(tlv_tree, hf_cdp_tlvlength, tvb, offset + TLV_LENGTH, 2, FALSE); + proto_tree_add_item(tlv_tree, hf_cdp_tlvtype, tvb, offset + TLV_TYPE, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_cdp_tlvlength, tvb, offset + TLV_LENGTH, 2, ENC_BIG_ENDIAN); proto_tree_add_text(tlv_tree, tvb, offset + 4, length - 4, "Power Consumption: %u mW", tvb_get_ntohs(tvb, offset + 4)); @@ -649,8 +649,8 @@ dissect_cdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset, length, "MTU: %u", tvb_get_ntohl(tvb,offset + 4)); tlv_tree = proto_item_add_subtree(tlvi, ett_cdp_tlv); - proto_tree_add_item(tlv_tree, hf_cdp_tlvtype, tvb, offset + TLV_TYPE, 2, FALSE); - proto_tree_add_item(tlv_tree, hf_cdp_tlvlength, tvb, offset + TLV_LENGTH, 2, FALSE); + proto_tree_add_item(tlv_tree, hf_cdp_tlvtype, tvb, offset + TLV_TYPE, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_cdp_tlvlength, tvb, offset + TLV_LENGTH, 2, ENC_BIG_ENDIAN); proto_tree_add_text(tlv_tree, tvb, offset + 4, length - 4, "MTU: %u", tvb_get_ntohl(tvb,offset + 4)); @@ -664,8 +664,8 @@ dissect_cdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset, length, "Trust Bitmap: 0x%02X", tvb_get_guint8(tvb, offset + 4)); tlv_tree = proto_item_add_subtree(tlvi, ett_cdp_tlv); - proto_tree_add_item(tlv_tree, hf_cdp_tlvtype, tvb, offset + TLV_TYPE, 2, FALSE); - proto_tree_add_item(tlv_tree, hf_cdp_tlvlength, tvb, offset + TLV_LENGTH, 2, FALSE); + proto_tree_add_item(tlv_tree, hf_cdp_tlvtype, tvb, offset + TLV_TYPE, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_cdp_tlvlength, tvb, offset + TLV_LENGTH, 2, ENC_BIG_ENDIAN); proto_tree_add_text(tlv_tree, tvb, offset + 4, length - 4, "Trust Bitmap: %02x", tvb_get_guint8(tvb, offset + 4)); @@ -679,8 +679,8 @@ dissect_cdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset, length, "Untrusted port CoS: 0x%02X", tvb_get_guint8(tvb, offset + 4)); tlv_tree = proto_item_add_subtree(tlvi, ett_cdp_tlv); - proto_tree_add_item(tlv_tree, hf_cdp_tlvtype, tvb, offset + TLV_TYPE, 2, FALSE); - proto_tree_add_item(tlv_tree, hf_cdp_tlvlength, tvb, offset + TLV_LENGTH, 2, FALSE); + proto_tree_add_item(tlv_tree, hf_cdp_tlvtype, tvb, offset + TLV_TYPE, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_cdp_tlvlength, tvb, offset + TLV_LENGTH, 2, ENC_BIG_ENDIAN); proto_tree_add_text(tlv_tree, tvb, offset + 4, length - 4, "Untrusted port CoS: %02x", tvb_get_guint8(tvb, offset + 4)); @@ -694,8 +694,8 @@ dissect_cdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset, length, "System Name: %s", tvb_format_text(tvb, offset + 4, length - 4)); tlv_tree = proto_item_add_subtree(tlvi, ett_cdp_tlv); - proto_tree_add_item(tlv_tree, hf_cdp_tlvtype, tvb, offset + TLV_TYPE, 2, FALSE); - proto_tree_add_item(tlv_tree, hf_cdp_tlvlength, tvb, offset + TLV_LENGTH, 2, FALSE); + proto_tree_add_item(tlv_tree, hf_cdp_tlvtype, tvb, offset + TLV_TYPE, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_cdp_tlvlength, tvb, offset + TLV_LENGTH, 2, ENC_BIG_ENDIAN); proto_tree_add_text(tlv_tree, tvb, offset + 4, length - 4, "System Name: %s", tvb_format_text(tvb, offset + 4, length - 4)); @@ -708,8 +708,8 @@ dissect_cdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tlvi = proto_tree_add_text(cdp_tree, tvb, offset, length, "System Object Identifier"); tlv_tree = proto_item_add_subtree(tlvi, ett_cdp_tlv); - proto_tree_add_item(tlv_tree, hf_cdp_tlvtype, tvb, offset + TLV_TYPE, 2, FALSE); - proto_tree_add_item(tlv_tree, hf_cdp_tlvlength, tvb, offset + TLV_LENGTH, 2, FALSE); + proto_tree_add_item(tlv_tree, hf_cdp_tlvtype, tvb, offset + TLV_TYPE, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_cdp_tlvlength, tvb, offset + TLV_LENGTH, 2, ENC_BIG_ENDIAN); proto_tree_add_text(tlv_tree, tvb, offset + 4, length - 4, "System Object Identifier: %s", tvb_bytes_to_str(tvb, offset + 4, length - 4)); @@ -722,8 +722,8 @@ dissect_cdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tlvi = proto_tree_add_text(cdp_tree, tvb, offset, length, "Management Addresses"); tlv_tree = proto_item_add_subtree(tlvi, ett_cdp_tlv); - proto_tree_add_item(tlv_tree, hf_cdp_tlvtype, tvb, offset + TLV_TYPE, 2, FALSE); - proto_tree_add_item(tlv_tree, hf_cdp_tlvlength, tvb, offset + TLV_LENGTH, 2, FALSE); + proto_tree_add_item(tlv_tree, hf_cdp_tlvtype, tvb, offset + TLV_TYPE, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_cdp_tlvlength, tvb, offset + TLV_LENGTH, 2, ENC_BIG_ENDIAN); } offset += 4; length -= 4; @@ -753,8 +753,8 @@ dissect_cdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset, length, "Location: %s", tvb_format_text(tvb, offset + 5, length - 5)); tlv_tree = proto_item_add_subtree(tlvi, ett_cdp_tlv); - proto_tree_add_item(tlv_tree, hf_cdp_tlvtype, tvb, offset + TLV_TYPE, 2, FALSE); - proto_tree_add_item(tlv_tree, hf_cdp_tlvlength, tvb, offset + TLV_LENGTH, 2, FALSE); + proto_tree_add_item(tlv_tree, hf_cdp_tlvtype, tvb, offset + TLV_TYPE, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_cdp_tlvlength, tvb, offset + TLV_LENGTH, 2, ENC_BIG_ENDIAN); proto_tree_add_text(tlv_tree, tvb, offset + 4, 1 , "UNKNOWN: 0x%02X", tvb_get_guint8(tvb, offset + 4)); @@ -770,8 +770,8 @@ dissect_cdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tlvi = proto_tree_add_text(cdp_tree, tvb, offset, length, "Power Request: "); tlv_tree = proto_item_add_subtree(tlvi, ett_cdp_tlv); - proto_tree_add_item(tlv_tree, hf_cdp_tlvtype, tvb, offset + TLV_TYPE, 2, FALSE); - proto_tree_add_item(tlv_tree, hf_cdp_tlvlength, tvb, offset + TLV_LENGTH, 2, FALSE); + proto_tree_add_item(tlv_tree, hf_cdp_tlvtype, tvb, offset + TLV_TYPE, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_cdp_tlvlength, tvb, offset + TLV_LENGTH, 2, ENC_BIG_ENDIAN); proto_tree_add_text(tlv_tree, tvb, offset + 4, 2, "Request-ID: %u", tvb_get_ntohs(tvb, offset + 4)); @@ -812,8 +812,8 @@ dissect_cdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tlvi = proto_tree_add_text(cdp_tree, tvb, offset, length, "Power Available: "); tlv_tree = proto_item_add_subtree(tlvi, ett_cdp_tlv); - proto_tree_add_item(tlv_tree, hf_cdp_tlvtype, tvb, offset + TLV_TYPE, 2, FALSE); - proto_tree_add_item(tlv_tree, hf_cdp_tlvlength, tvb, offset + TLV_LENGTH, 2, FALSE); + proto_tree_add_item(tlv_tree, hf_cdp_tlvtype, tvb, offset + TLV_TYPE, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_cdp_tlvlength, tvb, offset + TLV_LENGTH, 2, ENC_BIG_ENDIAN); proto_tree_add_text(tlv_tree, tvb, offset + 4, 2, "Request-ID: %u", tvb_get_ntohs(tvb, offset + 4)); @@ -846,8 +846,8 @@ dissect_cdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tlvi = proto_tree_add_text(cdp_tree, tvb, offset, length, "EnergyWise"); tlv_tree = proto_item_add_subtree(tlvi, ett_cdp_tlv); - proto_tree_add_item(tlv_tree, hf_cdp_tlvtype, tvb, offset + TLV_TYPE, 2, FALSE); - proto_tree_add_item(tlv_tree, hf_cdp_tlvlength, tvb, offset + TLV_LENGTH, 2, FALSE); + proto_tree_add_item(tlv_tree, hf_cdp_tlvtype, tvb, offset + TLV_TYPE, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_cdp_tlvlength, tvb, offset + TLV_LENGTH, 2, ENC_BIG_ENDIAN); proto_tree_add_text(tlv_tree, tvb, offset + 4, 20, "Encrypted Data"); proto_tree_add_text(tlv_tree, tvb, offset + 24, @@ -897,8 +897,8 @@ dissect_cdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) "Spare Pair PoE"); tlv_tree = proto_item_add_subtree(tlvi, ett_cdp_tlv); - proto_tree_add_item(tlv_tree, hf_cdp_tlvtype, tvb, offset + TLV_TYPE, 2, FALSE); - proto_tree_add_item(tlv_tree, hf_cdp_tlvlength, tvb, offset + TLV_LENGTH, 2, FALSE); + proto_tree_add_item(tlv_tree, hf_cdp_tlvtype, tvb, offset + TLV_TYPE, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_cdp_tlvlength, tvb, offset + TLV_LENGTH, 2, ENC_BIG_ENDIAN); } offset += 4; length -= 4; @@ -913,8 +913,8 @@ dissect_cdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) val_to_str(type, type_vals, "Unknown (0x%04x)"), length); tlv_tree = proto_item_add_subtree(tlvi, ett_cdp_tlv); - proto_tree_add_item(tlv_tree, hf_cdp_tlvtype, tvb, offset + TLV_TYPE, 2, FALSE); - proto_tree_add_item(tlv_tree, hf_cdp_tlvlength, tvb, offset + TLV_LENGTH, 2, FALSE); + proto_tree_add_item(tlv_tree, hf_cdp_tlvtype, tvb, offset + TLV_TYPE, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_cdp_tlvlength, tvb, offset + TLV_LENGTH, 2, ENC_BIG_ENDIAN); if (length > 4) { proto_tree_add_text(tlv_tree, tvb, offset + 4, length - 4, "Data"); diff --git a/epan/dissectors/packet-cgmp.c b/epan/dissectors/packet-cgmp.c index 4411aefb47..f641ec689e 100644 --- a/epan/dissectors/packet-cgmp.c +++ b/epan/dissectors/packet-cgmp.c @@ -69,9 +69,9 @@ dissect_cgmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) cgmp_tree = proto_item_add_subtree(ti, ett_cgmp); proto_tree_add_item(cgmp_tree, hf_cgmp_version, tvb, offset, 1, - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item(cgmp_tree, hf_cgmp_type, tvb, offset, 1, - FALSE); + ENC_BIG_ENDIAN); offset += 1; offset += 2; /* skip reserved field */ diff --git a/epan/dissectors/packet-cimetrics.c b/epan/dissectors/packet-cimetrics.c index 17c53ee685..1dcefca829 100644 --- a/epan/dissectors/packet-cimetrics.c +++ b/epan/dissectors/packet-cimetrics.c @@ -78,10 +78,10 @@ dissect_cimetrics_mstp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) #endif subtree = proto_item_add_subtree(ti, ett_cimetrics_mstp); proto_tree_add_item(subtree, hf_cimetrics_mstp_timer, tvb, - offset++, 2, TRUE); + offset++, 2, ENC_LITTLE_ENDIAN); offset++; proto_tree_add_item(subtree, hf_cimetrics_mstp_value, tvb, - offset++, 1, TRUE); + offset++, 1, ENC_LITTLE_ENDIAN); dissect_mstp(tvb, pinfo, tree, subtree, offset); } diff --git a/epan/dissectors/packet-cip.c b/epan/dissectors/packet-cip.c index 6666e6fad7..846d7552fa 100644 --- a/epan/dissectors/packet-cip.c +++ b/epan/dissectors/packet-cip.c @@ -634,7 +634,7 @@ dissect_epath( tvbuff_t *tvb, proto_item *epath_item, int offset, int path_lengt PROTO_ITEM_SET_GENERATED(it); } else - proto_tree_add_item( port_tree, hf_cip_port, tvb, offset + pathpos, 1, TRUE ); + proto_tree_add_item( port_tree, hf_cip_port, tvb, offset + pathpos, 1, ENC_LITTLE_ENDIAN ); proto_item_append_text( epath_item, "Port: %d", ( segment_type & 0x0F ) ); proto_item_append_text( port_item, ": Port: %d", ( segment_type & 0x0F ) ); @@ -700,7 +700,7 @@ dissect_epath( tvbuff_t *tvb, proto_item *epath_item, int offset, int path_lengt PROTO_ITEM_SET_GENERATED(it); } else - proto_tree_add_item( port_tree, hf_cip_link_address_byte, tvb, offset+pathpos+1, 1, FALSE ); + proto_tree_add_item( port_tree, hf_cip_link_address_byte, tvb, offset+pathpos+1, 1, ENC_BIG_ENDIAN ); proto_item_append_text( epath_item, ", Address: %d",tvb_get_guint8( tvb, offset + pathpos + 1 ) ); proto_item_append_text( port_item, ", Address: %d",tvb_get_guint8( tvb, offset + pathpos + 1 ) ); @@ -741,7 +741,7 @@ dissect_epath( tvbuff_t *tvb, proto_item *epath_item, int offset, int path_lengt PROTO_ITEM_SET_GENERATED(it); } else - proto_tree_add_item( cia_tree, hf_cip_class8, tvb, offset + pathpos + 1, 1, TRUE ); + proto_tree_add_item( cia_tree, hf_cip_class8, tvb, offset + pathpos + 1, 1, ENC_LITTLE_ENDIAN ); proto_item_append_text( epath_item, "%s", val_to_str( temp_data, cip_class_names_vals , "Class: 0x%02X" ) ); /* 2 bytes of path used */ @@ -768,7 +768,7 @@ dissect_epath( tvbuff_t *tvb, proto_item *epath_item, int offset, int path_lengt PROTO_ITEM_SET_GENERATED(it); } else - proto_tree_add_item( cia_tree, hf_cip_class16, tvb, offset + pathpos + 2, 2, TRUE ); + proto_tree_add_item( cia_tree, hf_cip_class16, tvb, offset + pathpos + 2, 2, ENC_LITTLE_ENDIAN ); proto_item_append_text( epath_item, "%s", val_to_str( temp_data, cip_class_names_vals , "Class: 0x%04X" ) ); /* 4 bytes of path used */ @@ -795,7 +795,7 @@ dissect_epath( tvbuff_t *tvb, proto_item *epath_item, int offset, int path_lengt PROTO_ITEM_SET_GENERATED(it); } else - proto_tree_add_item( cia_tree, hf_cip_class32, tvb, offset + pathpos + 2, 4, TRUE ); + proto_tree_add_item( cia_tree, hf_cip_class32, tvb, offset + pathpos + 2, 4, ENC_LITTLE_ENDIAN ); proto_item_append_text( epath_item, "%s", val_to_str( temp_data, cip_class_names_vals , "Class: 0x%08X" ) ); /* 6 bytes of path used */ @@ -835,7 +835,7 @@ dissect_epath( tvbuff_t *tvb, proto_item *epath_item, int offset, int path_lengt PROTO_ITEM_SET_GENERATED(it); } else - proto_tree_add_item( cia_tree, hf_cip_instance8, tvb, offset + pathpos + 1, 1, TRUE ); + proto_tree_add_item( cia_tree, hf_cip_instance8, tvb, offset + pathpos + 1, 1, ENC_LITTLE_ENDIAN ); proto_item_append_text( epath_item, "Instance: 0x%02X", temp_data ); /* 2 bytes of path used */ @@ -862,7 +862,7 @@ dissect_epath( tvbuff_t *tvb, proto_item *epath_item, int offset, int path_lengt PROTO_ITEM_SET_GENERATED(it); } else - proto_tree_add_item( cia_tree, hf_cip_instance16, tvb, offset + pathpos + 2, 2, TRUE ); + proto_tree_add_item( cia_tree, hf_cip_instance16, tvb, offset + pathpos + 2, 2, ENC_LITTLE_ENDIAN ); proto_item_append_text( epath_item, "Instance: 0x%04X", temp_data ); /* 4 bytes of path used */ @@ -889,7 +889,7 @@ dissect_epath( tvbuff_t *tvb, proto_item *epath_item, int offset, int path_lengt PROTO_ITEM_SET_GENERATED(it); } else - proto_tree_add_item( cia_tree, hf_cip_instance32, tvb, offset + pathpos + 2, 4, TRUE ); + proto_tree_add_item( cia_tree, hf_cip_instance32, tvb, offset + pathpos + 2, 4, ENC_LITTLE_ENDIAN ); proto_item_append_text( epath_item, "Instance: 0x%08X", temp_data ); @@ -930,7 +930,7 @@ dissect_epath( tvbuff_t *tvb, proto_item *epath_item, int offset, int path_lengt PROTO_ITEM_SET_GENERATED(it); } else - proto_tree_add_item( cia_tree, hf_cip_member8, tvb, offset + pathpos + 1, 1, TRUE ); + proto_tree_add_item( cia_tree, hf_cip_member8, tvb, offset + pathpos + 1, 1, ENC_LITTLE_ENDIAN ); proto_item_append_text( epath_item, "Member: 0x%02X", temp_data ); /* 2 bytes of path used */ @@ -957,7 +957,7 @@ dissect_epath( tvbuff_t *tvb, proto_item *epath_item, int offset, int path_lengt PROTO_ITEM_SET_GENERATED(it); } else - proto_tree_add_item( cia_tree, hf_cip_member16, tvb, offset + pathpos + 2, 2, TRUE ); + proto_tree_add_item( cia_tree, hf_cip_member16, tvb, offset + pathpos + 2, 2, ENC_LITTLE_ENDIAN ); proto_item_append_text( epath_item, "Member: 0x%04X", temp_data ); /* 4 bytes of path used */ @@ -984,7 +984,7 @@ dissect_epath( tvbuff_t *tvb, proto_item *epath_item, int offset, int path_lengt PROTO_ITEM_SET_GENERATED(it); } else - proto_tree_add_item( cia_tree, hf_cip_member32, tvb, offset + pathpos + 2, 4, TRUE ); + proto_tree_add_item( cia_tree, hf_cip_member32, tvb, offset + pathpos + 2, 4, ENC_LITTLE_ENDIAN ); proto_item_append_text( epath_item, "Member: 0x%08X", temp_data ); /* 6 bytes of path used */ @@ -1023,7 +1023,7 @@ dissect_epath( tvbuff_t *tvb, proto_item *epath_item, int offset, int path_lengt PROTO_ITEM_SET_GENERATED(it); } else - proto_tree_add_item( cia_tree, hf_cip_attribute8, tvb, offset + pathpos + 1, 1, TRUE ); + proto_tree_add_item( cia_tree, hf_cip_attribute8, tvb, offset + pathpos + 1, 1, ENC_LITTLE_ENDIAN ); proto_item_append_text( epath_item, "Attribute: 0x%02X", temp_data ); /* 2 bytes of path used */ @@ -1050,7 +1050,7 @@ dissect_epath( tvbuff_t *tvb, proto_item *epath_item, int offset, int path_lengt PROTO_ITEM_SET_GENERATED(it); } else - proto_tree_add_item( cia_tree, hf_cip_attribute16, tvb, offset + pathpos + 2, 2, TRUE ); + proto_tree_add_item( cia_tree, hf_cip_attribute16, tvb, offset + pathpos + 2, 2, ENC_LITTLE_ENDIAN ); proto_item_append_text( epath_item, "Attribute: 0x%04X", temp_data ); /* 4 bytes of path used */ @@ -1077,7 +1077,7 @@ dissect_epath( tvbuff_t *tvb, proto_item *epath_item, int offset, int path_lengt PROTO_ITEM_SET_GENERATED(it); } else - proto_tree_add_item( cia_tree, hf_cip_attribute32, tvb, offset + pathpos + 2, 4, TRUE ); + proto_tree_add_item( cia_tree, hf_cip_attribute32, tvb, offset + pathpos + 2, 4, ENC_LITTLE_ENDIAN ); proto_item_append_text( epath_item, "Attribute: 0x%08X", temp_data ); /* 6 bytes of path used */ @@ -1105,7 +1105,7 @@ dissect_epath( tvbuff_t *tvb, proto_item *epath_item, int offset, int path_lengt cia_tree = proto_item_add_subtree( cia_item, ett_cia_path ); /* Display the 8-bit connection point number */ - proto_tree_add_item( cia_tree, hf_cip_conpoint8, tvb, offset + pathpos + 1, 1, TRUE ); + proto_tree_add_item( cia_tree, hf_cip_conpoint8, tvb, offset + pathpos + 1, 1, ENC_LITTLE_ENDIAN ); proto_item_append_text( epath_item, "Connection Point: 0x%02X", temp_data ); /* 2 bytes of path used */ @@ -1120,7 +1120,7 @@ dissect_epath( tvbuff_t *tvb, proto_item *epath_item, int offset, int path_lengt cia_tree = proto_item_add_subtree( cia_item, ett_cia_path ); /* Display the 16-bit connection point number */ - proto_tree_add_item( cia_tree, hf_cip_conpoint16, tvb, offset + pathpos + 2, 2, TRUE ); + proto_tree_add_item( cia_tree, hf_cip_conpoint16, tvb, offset + pathpos + 2, 2, ENC_LITTLE_ENDIAN ); proto_item_append_text( epath_item, "Connection Point: 0x%04X", temp_data ); /* 4 bytes of path used */ @@ -1135,7 +1135,7 @@ dissect_epath( tvbuff_t *tvb, proto_item *epath_item, int offset, int path_lengt cia_tree = proto_item_add_subtree( cia_item, ett_cia_path ); /* Display the 32-bit connection point number */ - proto_tree_add_item( cia_tree, hf_cip_conpoint32, tvb, offset + pathpos + 2, 4, TRUE ); + proto_tree_add_item( cia_tree, hf_cip_conpoint32, tvb, offset + pathpos + 2, 4, ENC_LITTLE_ENDIAN ); proto_item_append_text( epath_item, "Connection Point: 0x%08X", temp_data ); /* 6 bytes of path used */ @@ -1192,7 +1192,7 @@ dissect_epath( tvbuff_t *tvb, proto_item *epath_item, int offset, int path_lengt /* Add Compatibility bit info */ proto_tree_add_item(mc_tree, hf_cip_fwo_comp, - tvb, offset + pathpos + 8, 1, TRUE ); + tvb, offset + pathpos + 8, 1, ENC_LITTLE_ENDIAN ); proto_item_append_text( mcpi, "%s, Major Revision: %d", val_to_str( ( temp_data & 0x80 )>>7, cip_com_bit_vals , "" ), @@ -1200,7 +1200,7 @@ dissect_epath( tvbuff_t *tvb, proto_item *epath_item, int offset, int path_lengt /* Major revision */ proto_tree_add_item(mc_tree, hf_cip_fwo_mrev, - tvb, offset + pathpos + 8, 1, TRUE ); + tvb, offset + pathpos + 8, 1, ENC_LITTLE_ENDIAN ); /* Minor revision */ temp_data2 = tvb_get_guint8( tvb, offset + pathpos + 9 ); @@ -1873,7 +1873,7 @@ typedef struct mr_mult_req_info { rrsc_tree = proto_item_add_subtree( rrsc_item, ett_mr_rrsc ); /* Add Request/Response */ - proto_tree_add_item( rrsc_tree, hf_cip_rr, tvb, offset, 1, TRUE ); + proto_tree_add_item( rrsc_tree, hf_cip_rr, tvb, offset, 1, ENC_LITTLE_ENDIAN ); /* watch for service collisions */ service = tvb_get_guint8( tvb, offset ); @@ -1885,7 +1885,7 @@ typedef struct mr_mult_req_info { cip_sc_rr, "") ); /* Add Service code */ - proto_tree_add_item(rrsc_tree, hf_cip_sc, tvb, offset, 1, TRUE ); + proto_tree_add_item(rrsc_tree, hf_cip_sc, tvb, offset, 1, ENC_LITTLE_ENDIAN ); if( tvb_get_guint8( tvb, offset ) & 0x80 ) { @@ -2220,11 +2220,11 @@ dissect_cip_cm_fwd_open_req(proto_tree *cmd_tree, tvbuff_t *tvb, int offset, gbo ncp_tree = proto_item_add_subtree(ncppi, ett_cm_ncp); /* Add the data to the tree */ - proto_tree_add_item(ncp_tree, hf_cip_cm_lfwo_own, tvb, offset+26, 4, TRUE ); - proto_tree_add_item(ncp_tree, hf_cip_cm_lfwo_typ, tvb, offset+26, 4, TRUE ); - proto_tree_add_item(ncp_tree, hf_cip_cm_lfwo_prio, tvb, offset+26, 4, TRUE ); - proto_tree_add_item(ncp_tree, hf_cip_cm_lfwo_fixed_var, tvb, offset+26, 4, TRUE ); - proto_tree_add_item(ncp_tree, hf_cip_cm_lfwo_con_size, tvb, offset+26, 4, TRUE ); + proto_tree_add_item(ncp_tree, hf_cip_cm_lfwo_own, tvb, offset+26, 4, ENC_LITTLE_ENDIAN ); + proto_tree_add_item(ncp_tree, hf_cip_cm_lfwo_typ, tvb, offset+26, 4, ENC_LITTLE_ENDIAN ); + proto_tree_add_item(ncp_tree, hf_cip_cm_lfwo_prio, tvb, offset+26, 4, ENC_LITTLE_ENDIAN ); + proto_tree_add_item(ncp_tree, hf_cip_cm_lfwo_fixed_var, tvb, offset+26, 4, ENC_LITTLE_ENDIAN ); + proto_tree_add_item(ncp_tree, hf_cip_cm_lfwo_con_size, tvb, offset+26, 4, ENC_LITTLE_ENDIAN ); net_param_offset = 4; } @@ -2235,11 +2235,11 @@ dissect_cip_cm_fwd_open_req(proto_tree *cmd_tree, tvbuff_t *tvb, int offset, gbo ncp_tree = proto_item_add_subtree(ncppi, ett_cm_ncp); /* Add the data to the tree */ - proto_tree_add_item(ncp_tree, hf_cip_cm_fwo_own, tvb, offset+26, 2, TRUE ); - proto_tree_add_item(ncp_tree, hf_cip_cm_fwo_typ, tvb, offset+26, 2, TRUE ); - proto_tree_add_item(ncp_tree, hf_cip_cm_fwo_prio, tvb, offset+26, 2, TRUE ); - proto_tree_add_item(ncp_tree, hf_cip_cm_fwo_fixed_var, tvb, offset+26, 2, TRUE ); - proto_tree_add_item(ncp_tree, hf_cip_cm_fwo_con_size, tvb, offset+26, 2, TRUE ); + proto_tree_add_item(ncp_tree, hf_cip_cm_fwo_own, tvb, offset+26, 2, ENC_LITTLE_ENDIAN ); + proto_tree_add_item(ncp_tree, hf_cip_cm_fwo_typ, tvb, offset+26, 2, ENC_LITTLE_ENDIAN ); + proto_tree_add_item(ncp_tree, hf_cip_cm_fwo_prio, tvb, offset+26, 2, ENC_LITTLE_ENDIAN ); + proto_tree_add_item(ncp_tree, hf_cip_cm_fwo_fixed_var, tvb, offset+26, 2, ENC_LITTLE_ENDIAN ); + proto_tree_add_item(ncp_tree, hf_cip_cm_fwo_con_size, tvb, offset+26, 2, ENC_LITTLE_ENDIAN ); net_param_offset = 2; } @@ -2255,11 +2255,11 @@ dissect_cip_cm_fwd_open_req(proto_tree *cmd_tree, tvbuff_t *tvb, int offset, gbo ncp_tree = proto_item_add_subtree(ncppi, ett_cm_ncp); /* Add the data to the tree */ - proto_tree_add_item(ncp_tree, hf_cip_cm_lfwo_own, tvb, offset+26+net_param_offset+4, 4, TRUE ); - proto_tree_add_item(ncp_tree, hf_cip_cm_lfwo_typ, tvb, offset+26+net_param_offset+4, 4, TRUE ); - proto_tree_add_item(ncp_tree, hf_cip_cm_lfwo_prio, tvb, offset+26+net_param_offset+4, 4, TRUE ); - proto_tree_add_item(ncp_tree, hf_cip_cm_lfwo_fixed_var, tvb, offset+26+net_param_offset+4, 4, TRUE ); - proto_tree_add_item(ncp_tree, hf_cip_cm_lfwo_con_size, tvb, offset+26+net_param_offset+4, 4, TRUE ); + proto_tree_add_item(ncp_tree, hf_cip_cm_lfwo_own, tvb, offset+26+net_param_offset+4, 4, ENC_LITTLE_ENDIAN ); + proto_tree_add_item(ncp_tree, hf_cip_cm_lfwo_typ, tvb, offset+26+net_param_offset+4, 4, ENC_LITTLE_ENDIAN ); + proto_tree_add_item(ncp_tree, hf_cip_cm_lfwo_prio, tvb, offset+26+net_param_offset+4, 4, ENC_LITTLE_ENDIAN ); + proto_tree_add_item(ncp_tree, hf_cip_cm_lfwo_fixed_var, tvb, offset+26+net_param_offset+4, 4, ENC_LITTLE_ENDIAN ); + proto_tree_add_item(ncp_tree, hf_cip_cm_lfwo_con_size, tvb, offset+26+net_param_offset+4, 4, ENC_LITTLE_ENDIAN ); net_param_offset += 4; } @@ -2270,11 +2270,11 @@ dissect_cip_cm_fwd_open_req(proto_tree *cmd_tree, tvbuff_t *tvb, int offset, gbo ncp_tree = proto_item_add_subtree(ncppi, ett_cm_ncp); /* Add the data to the tree */ - proto_tree_add_item(ncp_tree, hf_cip_cm_fwo_own, tvb, offset+26+net_param_offset+4, 2, TRUE ); - proto_tree_add_item(ncp_tree, hf_cip_cm_fwo_typ, tvb, offset+26+net_param_offset+4, 2, TRUE ); - proto_tree_add_item(ncp_tree, hf_cip_cm_fwo_prio, tvb, offset+26+net_param_offset+4, 2, TRUE ); - proto_tree_add_item(ncp_tree, hf_cip_cm_fwo_fixed_var, tvb, offset+26+net_param_offset+4, 2, TRUE ); - proto_tree_add_item(ncp_tree, hf_cip_cm_fwo_con_size, tvb, offset+26+net_param_offset+4, 2, TRUE ); + proto_tree_add_item(ncp_tree, hf_cip_cm_fwo_own, tvb, offset+26+net_param_offset+4, 2, ENC_LITTLE_ENDIAN ); + proto_tree_add_item(ncp_tree, hf_cip_cm_fwo_typ, tvb, offset+26+net_param_offset+4, 2, ENC_LITTLE_ENDIAN ); + proto_tree_add_item(ncp_tree, hf_cip_cm_fwo_prio, tvb, offset+26+net_param_offset+4, 2, ENC_LITTLE_ENDIAN ); + proto_tree_add_item(ncp_tree, hf_cip_cm_fwo_fixed_var, tvb, offset+26+net_param_offset+4, 2, ENC_LITTLE_ENDIAN ); + proto_tree_add_item(ncp_tree, hf_cip_cm_fwo_con_size, tvb, offset+26+net_param_offset+4, 2, ENC_LITTLE_ENDIAN ); net_param_offset += 2; } @@ -2285,9 +2285,9 @@ dissect_cip_cm_fwd_open_req(proto_tree *cmd_tree, tvbuff_t *tvb, int offset, gbo ncp_tree = proto_item_add_subtree(ncppi, ett_cm_ncp); /* Add the data to the tree */ - proto_tree_add_item(ncp_tree, hf_cip_cm_fwo_dir, tvb, offset+26+net_param_offset+4, 1, TRUE ); - proto_tree_add_item(ncp_tree, hf_cip_cm_fwo_trigg, tvb, offset+26+net_param_offset+4, 1, TRUE ); - proto_tree_add_item(ncp_tree, hf_cip_cm_fwo_class, tvb, offset+26+net_param_offset+4, 1, TRUE ); + proto_tree_add_item(ncp_tree, hf_cip_cm_fwo_dir, tvb, offset+26+net_param_offset+4, 1, ENC_LITTLE_ENDIAN ); + proto_tree_add_item(ncp_tree, hf_cip_cm_fwo_trigg, tvb, offset+26+net_param_offset+4, 1, ENC_LITTLE_ENDIAN ); + proto_tree_add_item(ncp_tree, hf_cip_cm_fwo_class, tvb, offset+26+net_param_offset+4, 1, ENC_LITTLE_ENDIAN ); /* Add path size */ conn_path_size = tvb_get_guint8( tvb, offset+26+net_param_offset+5 )*2; @@ -2367,7 +2367,7 @@ dissect_cip_cm_data( proto_tree *item_tree, tvbuff_t *tvb, int offset, int item_ rrsc_tree = proto_item_add_subtree( rrsc_item, ett_cm_rrsc ); /* Add Request/Response */ - proto_tree_add_item( rrsc_tree, hf_cip_rr, tvb, offset, 1, TRUE ); + proto_tree_add_item( rrsc_tree, hf_cip_rr, tvb, offset, 1, ENC_LITTLE_ENDIAN ); /* watch for service collisions */ proto_item_append_text( rrsc_item, "%s (%s)", @@ -2377,7 +2377,7 @@ dissect_cip_cm_data( proto_tree *item_tree, tvbuff_t *tvb, int offset, int item_ cip_sc_rr, "") ); /* Add Service code */ - proto_tree_add_item(rrsc_tree, hf_cip_sc, tvb, offset, 1, TRUE ); + proto_tree_add_item(rrsc_tree, hf_cip_sc, tvb, offset, 1, ENC_LITTLE_ENDIAN ); if( service & 0x80 ) { @@ -2439,7 +2439,7 @@ dissect_cip_cm_data( proto_tree *item_tree, tvbuff_t *tvb, int offset, int item_ proto_tree_add_text( cmd_data_tree, tvb, offset+4+add_stat_size+24, 1, "Application Reply Size: %d (words)", app_rep_size / 2 ); /* Display the Reserved byte */ - proto_tree_add_item(cmd_data_tree, hf_cip_reserved8, tvb, offset+4+add_stat_size+25, 1, TRUE ); + proto_tree_add_item(cmd_data_tree, hf_cip_reserved8, tvb, offset+4+add_stat_size+25, 1, ENC_LITTLE_ENDIAN ); if( app_rep_size != 0 ) { @@ -2482,7 +2482,7 @@ dissect_cip_cm_data( proto_tree *item_tree, tvbuff_t *tvb, int offset, int item_ proto_tree_add_text( cmd_data_tree, tvb, offset+4+add_stat_size+8, 1, "Application Reply Size: %d (words)", app_rep_size / 2 ); /* Display the Reserved byte */ - proto_tree_add_item(cmd_data_tree, hf_cip_reserved8, tvb, offset+4+add_stat_size+9, 1, TRUE ); + proto_tree_add_item(cmd_data_tree, hf_cip_reserved8, tvb, offset+4+add_stat_size+9, 1, ENC_LITTLE_ENDIAN ); if( app_rep_size != 0 ) { @@ -2580,7 +2580,7 @@ dissect_cip_cm_data( proto_tree *item_tree, tvbuff_t *tvb, int offset, int item_ proto_tree_add_text( cmd_data_tree, tvb, offset+4+add_stat_size+8, 1, "Remaining Path Size: %d", temp_data ); /* Display the Reserved byte */ - proto_tree_add_item(cmd_data_tree, hf_cip_reserved8, tvb, offset+4+add_stat_size+9, 1, TRUE ); + proto_tree_add_item(cmd_data_tree, hf_cip_reserved8, tvb, offset+4+add_stat_size+9, 1, ENC_LITTLE_ENDIAN ); break; case SC_CM_UNCON_SEND: /* Unconnected send response (Unsuccess) */ @@ -2647,7 +2647,7 @@ dissect_cip_cm_data( proto_tree *item_tree, tvbuff_t *tvb, int offset, int item_ proto_tree_add_text( cmd_data_tree, tvb, offset+2+req_path_size+10, 1, "Connection Path Size: %d (words)", conn_path_size / 2 ); /* Display the Reserved byte */ - proto_tree_add_item(cmd_data_tree, hf_cip_reserved8, tvb, offset+2+req_path_size+11, 1, TRUE ); + proto_tree_add_item(cmd_data_tree, hf_cip_reserved8, tvb, offset+2+req_path_size+11, 1, ENC_LITTLE_ENDIAN ); /* Add the EPATH */ pi = proto_tree_add_text(cmd_data_tree, tvb, offset+2+req_path_size+12, conn_path_size, "Connection Path: "); @@ -2710,7 +2710,7 @@ dissect_cip_cm_data( proto_tree *item_tree, tvbuff_t *tvb, int offset, int item_ proto_tree_add_text( cmd_data_tree, tvb, offset+2+req_path_size+4+msg_req_siz, 1, "Route Path Size: %d (words)", route_path_size/2 ); /* Display the Reserved byte */ - proto_tree_add_item(cmd_data_tree, hf_cip_reserved8, tvb, offset+2+req_path_size+5+msg_req_siz, 1, TRUE ); + proto_tree_add_item(cmd_data_tree, hf_cip_reserved8, tvb, offset+2+req_path_size+5+msg_req_siz, 1, ENC_LITTLE_ENDIAN ); /* Route Path */ temp_item = proto_tree_add_text(cmd_data_tree, tvb, offset+2+req_path_size+6+msg_req_siz, route_path_size, "Route Path: "); @@ -2721,7 +2721,7 @@ dissect_cip_cm_data( proto_tree *item_tree, tvbuff_t *tvb, int offset, int item_ /* Get Connection Owner Request */ /* Display the Reserved byte */ - proto_tree_add_item(cmd_data_tree, hf_cip_reserved8, tvb, offset+2+req_path_size, 1, TRUE ); + proto_tree_add_item(cmd_data_tree, hf_cip_reserved8, tvb, offset+2+req_path_size, 1, ENC_LITTLE_ENDIAN ); /* Add path size */ conn_path_size = tvb_get_guint8( tvb, offset+2+req_path_size+1 )*2; @@ -2807,7 +2807,7 @@ dissect_cip_cco_all_attribute_common( proto_tree *cmd_tree, tvbuff_t *tvb, int o confg_tree = proto_item_add_subtree(confgi, ett_cco_con_flag); /* Add the data to the tree */ - proto_tree_add_item(confg_tree, hf_cip_cco_con_type, tvb, offset, 2, TRUE ); + proto_tree_add_item(confg_tree, hf_cip_cco_con_type, tvb, offset, 2, ENC_LITTLE_ENDIAN ); proto_tree_add_item(confg_tree, hf_cip_cco_ot_rtf, tvb, offset, 2, TRUE ); proto_tree_add_item(confg_tree, hf_cip_cco_to_rtf, tvb, offset, 2, TRUE ); @@ -2849,9 +2849,9 @@ dissect_cip_cco_all_attribute_common( proto_tree *cmd_tree, tvbuff_t *tvb, int o ncpp_tree = proto_item_add_subtree(ncppi, ett_cm_ncp); /* Add the data to the tree */ - proto_tree_add_item(ncpp_tree, hf_cip_cm_fwo_dir, tvb, offset+15, 1, TRUE ); - proto_tree_add_item(ncpp_tree, hf_cip_cm_fwo_trigg, tvb, offset+15, 1, TRUE ); - proto_tree_add_item(ncpp_tree, hf_cip_cm_fwo_class, tvb, offset+15, 1, TRUE ); + proto_tree_add_item(ncpp_tree, hf_cip_cm_fwo_dir, tvb, offset+15, 1, ENC_LITTLE_ENDIAN ); + proto_tree_add_item(ncpp_tree, hf_cip_cm_fwo_trigg, tvb, offset+15, 1, ENC_LITTLE_ENDIAN ); + proto_tree_add_item(ncpp_tree, hf_cip_cm_fwo_class, tvb, offset+15, 1, ENC_LITTLE_ENDIAN ); temp_data = tvb_get_letohl( tvb, offset+16); proto_tree_add_text(ncp_tree, tvb, offset+16, 4, "O->T RPI: %dms (0x%08X)", temp_data / 1000, temp_data ); @@ -2862,11 +2862,11 @@ dissect_cip_cco_all_attribute_common( proto_tree *cmd_tree, tvbuff_t *tvb, int o ncpp_tree = proto_item_add_subtree(ncppi, ett_cm_ncp); /* Add the data to the tree */ - proto_tree_add_item(ncpp_tree, hf_cip_cm_fwo_own, tvb, offset+20, 2, TRUE ); - proto_tree_add_item(ncpp_tree, hf_cip_cm_fwo_typ, tvb, offset+20, 2, TRUE ); - proto_tree_add_item(ncpp_tree, hf_cip_cm_fwo_prio, tvb, offset+20, 2, TRUE ); - proto_tree_add_item(ncpp_tree, hf_cip_cm_fwo_fixed_var, tvb, offset+20, 2, TRUE ); - proto_tree_add_item(ncpp_tree, hf_cip_cm_fwo_con_size, tvb, offset+20, 2, TRUE ); + proto_tree_add_item(ncpp_tree, hf_cip_cm_fwo_own, tvb, offset+20, 2, ENC_LITTLE_ENDIAN ); + proto_tree_add_item(ncpp_tree, hf_cip_cm_fwo_typ, tvb, offset+20, 2, ENC_LITTLE_ENDIAN ); + proto_tree_add_item(ncpp_tree, hf_cip_cm_fwo_prio, tvb, offset+20, 2, ENC_LITTLE_ENDIAN ); + proto_tree_add_item(ncpp_tree, hf_cip_cm_fwo_fixed_var, tvb, offset+20, 2, ENC_LITTLE_ENDIAN ); + proto_tree_add_item(ncpp_tree, hf_cip_cm_fwo_con_size, tvb, offset+20, 2, ENC_LITTLE_ENDIAN ); temp_data = tvb_get_letohl( tvb, offset+22); proto_tree_add_text(ncp_tree, tvb, offset+22, 4, "T->O RPI: %dms (0x%08X)", temp_data / 1000, temp_data ); @@ -2877,18 +2877,18 @@ dissect_cip_cco_all_attribute_common( proto_tree *cmd_tree, tvbuff_t *tvb, int o ncpp_tree = proto_item_add_subtree(ncppi, ett_cm_ncp); /* Add the data to the tree */ - proto_tree_add_item(ncpp_tree, hf_cip_cm_fwo_own, tvb, offset+26, 2, TRUE ); - proto_tree_add_item(ncpp_tree, hf_cip_cm_fwo_typ, tvb, offset+26, 2, TRUE ); - proto_tree_add_item(ncpp_tree, hf_cip_cm_fwo_prio, tvb, offset+26, 2, TRUE ); - proto_tree_add_item(ncpp_tree, hf_cip_cm_fwo_fixed_var, tvb, offset+26, 2, TRUE ); - proto_tree_add_item(ncpp_tree, hf_cip_cm_fwo_con_size, tvb, offset+26, 2, TRUE ); + proto_tree_add_item(ncpp_tree, hf_cip_cm_fwo_own, tvb, offset+26, 2, ENC_LITTLE_ENDIAN ); + proto_tree_add_item(ncpp_tree, hf_cip_cm_fwo_typ, tvb, offset+26, 2, ENC_LITTLE_ENDIAN ); + proto_tree_add_item(ncpp_tree, hf_cip_cm_fwo_prio, tvb, offset+26, 2, ENC_LITTLE_ENDIAN ); + proto_tree_add_item(ncpp_tree, hf_cip_cm_fwo_fixed_var, tvb, offset+26, 2, ENC_LITTLE_ENDIAN ); + proto_tree_add_item(ncpp_tree, hf_cip_cm_fwo_con_size, tvb, offset+26, 2, ENC_LITTLE_ENDIAN ); /* Connection Path */ conn_path_size = tvb_get_guint8( tvb, offset+28 )*2; proto_tree_add_text( cmd_tree, tvb, offset+28, 1, "Connection Path Size: %d (words)", conn_path_size / 2 ); /* Display the Reserved byte */ - proto_tree_add_item(cmd_tree, hf_cip_reserved8, tvb, offset+29, 1, TRUE ); + proto_tree_add_item(cmd_tree, hf_cip_reserved8, tvb, offset+29, 1, ENC_LITTLE_ENDIAN ); /* Add the epath */ pi = proto_tree_add_text(cmd_tree, tvb, offset+30, conn_path_size, "Connection Path: "); @@ -3006,9 +3006,9 @@ dissect_cip_cco_all_attribute_common( proto_tree *cmd_tree, tvbuff_t *tvb, int o ncpp_tree = proto_item_add_subtree(ncppi, ett_cm_ncp); /* Add the data to the tree */ - proto_tree_add_item(ncpp_tree, hf_cip_cm_fwo_dir, tvb, offset+variable_data_size+1, 1, TRUE ); - proto_tree_add_item(ncpp_tree, hf_cip_cm_fwo_trigg, tvb, offset+variable_data_size+1, 1, TRUE ); - proto_tree_add_item(ncpp_tree, hf_cip_cm_fwo_class, tvb, offset+variable_data_size+1, 1, TRUE ); + proto_tree_add_item(ncpp_tree, hf_cip_cm_fwo_dir, tvb, offset+variable_data_size+1, 1, ENC_LITTLE_ENDIAN ); + proto_tree_add_item(ncpp_tree, hf_cip_cm_fwo_trigg, tvb, offset+variable_data_size+1, 1, ENC_LITTLE_ENDIAN ); + proto_tree_add_item(ncpp_tree, hf_cip_cm_fwo_class, tvb, offset+variable_data_size+1, 1, ENC_LITTLE_ENDIAN ); temp_data = tvb_get_letohl( tvb, offset+variable_data_size+2); proto_tree_add_text(ncp_tree, tvb, offset+variable_data_size+2, 4, "O->T RPI: %dms (0x%08X)", temp_data / 1000, temp_data ); @@ -3019,11 +3019,11 @@ dissect_cip_cco_all_attribute_common( proto_tree *cmd_tree, tvbuff_t *tvb, int o ncpp_tree = proto_item_add_subtree(ncppi, ett_cm_ncp); /* Add the data to the tree */ - proto_tree_add_item(ncpp_tree, hf_cip_cm_lfwo_own, tvb, offset+variable_data_size+6, 4, TRUE ); - proto_tree_add_item(ncpp_tree, hf_cip_cm_lfwo_typ, tvb, offset+variable_data_size+6, 4, TRUE ); - proto_tree_add_item(ncpp_tree, hf_cip_cm_lfwo_prio, tvb, offset+variable_data_size+6, 4, TRUE ); - proto_tree_add_item(ncpp_tree, hf_cip_cm_lfwo_fixed_var, tvb, offset+variable_data_size+6, 4, TRUE ); - proto_tree_add_item(ncpp_tree, hf_cip_cm_lfwo_con_size, tvb, offset+variable_data_size+6, 4, TRUE ); + proto_tree_add_item(ncpp_tree, hf_cip_cm_lfwo_own, tvb, offset+variable_data_size+6, 4, ENC_LITTLE_ENDIAN ); + proto_tree_add_item(ncpp_tree, hf_cip_cm_lfwo_typ, tvb, offset+variable_data_size+6, 4, ENC_LITTLE_ENDIAN ); + proto_tree_add_item(ncpp_tree, hf_cip_cm_lfwo_prio, tvb, offset+variable_data_size+6, 4, ENC_LITTLE_ENDIAN ); + proto_tree_add_item(ncpp_tree, hf_cip_cm_lfwo_fixed_var, tvb, offset+variable_data_size+6, 4, ENC_LITTLE_ENDIAN ); + proto_tree_add_item(ncpp_tree, hf_cip_cm_lfwo_con_size, tvb, offset+variable_data_size+6, 4, ENC_LITTLE_ENDIAN ); temp_data = tvb_get_letohl( tvb, offset+variable_data_size+10); proto_tree_add_text(ncp_tree, tvb, offset+variable_data_size+10, 4, "T->O RPI: %dms (0x%08X)", temp_data / 1000, temp_data ); @@ -3034,11 +3034,11 @@ dissect_cip_cco_all_attribute_common( proto_tree *cmd_tree, tvbuff_t *tvb, int o ncpp_tree = proto_item_add_subtree(ncppi, ett_cm_ncp); /* Add the data to the tree */ - proto_tree_add_item(ncpp_tree, hf_cip_cm_lfwo_own, tvb, offset+variable_data_size+14, 4, TRUE ); - proto_tree_add_item(ncpp_tree, hf_cip_cm_lfwo_typ, tvb, offset+variable_data_size+14, 4, TRUE ); - proto_tree_add_item(ncpp_tree, hf_cip_cm_lfwo_prio, tvb, offset+variable_data_size+14, 4, TRUE ); - proto_tree_add_item(ncpp_tree, hf_cip_cm_lfwo_fixed_var, tvb, offset+variable_data_size+14, 4, TRUE ); - proto_tree_add_item(ncpp_tree, hf_cip_cm_lfwo_con_size, tvb, offset+variable_data_size+14, 4, TRUE ); + proto_tree_add_item(ncpp_tree, hf_cip_cm_lfwo_own, tvb, offset+variable_data_size+14, 4, ENC_LITTLE_ENDIAN ); + proto_tree_add_item(ncpp_tree, hf_cip_cm_lfwo_typ, tvb, offset+variable_data_size+14, 4, ENC_LITTLE_ENDIAN ); + proto_tree_add_item(ncpp_tree, hf_cip_cm_lfwo_prio, tvb, offset+variable_data_size+14, 4, ENC_LITTLE_ENDIAN ); + proto_tree_add_item(ncpp_tree, hf_cip_cm_lfwo_fixed_var, tvb, offset+variable_data_size+14, 4, ENC_LITTLE_ENDIAN ); + proto_tree_add_item(ncpp_tree, hf_cip_cm_lfwo_con_size, tvb, offset+variable_data_size+14, 4, ENC_LITTLE_ENDIAN ); variable_data_size += 18; } @@ -3066,7 +3066,7 @@ dissect_cip_cco_data( proto_tree *item_tree, tvbuff_t *tvb, int offset, int item rrsc_tree = proto_item_add_subtree( rrsc_item, ett_cco_rrsc ); /* Add Request/Response */ - proto_tree_add_item( rrsc_tree, hf_cip_rr, tvb, offset, 1, TRUE ); + proto_tree_add_item( rrsc_tree, hf_cip_rr, tvb, offset, 1, ENC_LITTLE_ENDIAN ); proto_item_append_text( rrsc_item, "%s (%s)", val_to_str( ( service & 0x7F ), @@ -3075,7 +3075,7 @@ dissect_cip_cco_data( proto_tree *item_tree, tvbuff_t *tvb, int offset, int item cip_sc_rr, "") ); /* Add Service code */ - proto_tree_add_item(rrsc_tree, hf_cip_sc, tvb, offset, 1, TRUE ); + proto_tree_add_item(rrsc_tree, hf_cip_sc, tvb, offset, 1, ENC_LITTLE_ENDIAN ); /* Get path information for further dissection */ req_data.iClass = (guint32)-1; @@ -3124,13 +3124,13 @@ dissect_cip_cco_data( proto_tree *item_tree, tvbuff_t *tvb, int offset, int item /* Get Attribute All (class) request */ /* Revision */ - proto_tree_add_item(cmd_data_tree, hf_cip_class_rev, tvb, offset+4+add_stat_size, 2, TRUE ); + proto_tree_add_item(cmd_data_tree, hf_cip_class_rev, tvb, offset+4+add_stat_size, 2, ENC_LITTLE_ENDIAN ); /* Max Instance */ - proto_tree_add_item(cmd_data_tree, hf_cip_class_max_inst32, tvb, offset+4+add_stat_size+2, 4, TRUE ); + proto_tree_add_item(cmd_data_tree, hf_cip_class_max_inst32, tvb, offset+4+add_stat_size+2, 4, ENC_LITTLE_ENDIAN ); /* Num Instance */ - proto_tree_add_item(cmd_data_tree, hf_cip_class_num_inst32, tvb, offset+4+add_stat_size+6, 4, TRUE ); + proto_tree_add_item(cmd_data_tree, hf_cip_class_num_inst32, tvb, offset+4+add_stat_size+6, 4, ENC_LITTLE_ENDIAN ); /* Format Number */ temp_data = tvb_get_letohl( tvb, offset+4+add_stat_size+8); @@ -3149,7 +3149,7 @@ dissect_cip_cco_data( proto_tree *item_tree, tvbuff_t *tvb, int offset, int item con_st_tree = proto_item_add_subtree(con_sti, ett_cco_con_status); /* General Status */ - proto_tree_add_item(con_st_tree, hf_cip_genstat, tvb, offset+4+add_stat_size, 1, TRUE ); + proto_tree_add_item(con_st_tree, hf_cip_genstat, tvb, offset+4+add_stat_size, 1, ENC_LITTLE_ENDIAN ); /* Pad */ temp_data = tvb_get_guint8( tvb, offset+4+add_stat_size+1); @@ -3314,7 +3314,7 @@ dissect_cip_data( proto_tree *item_tree, tvbuff_t *tvb, int offset, packet_info rrsc_tree = proto_item_add_subtree( rrsc_item, ett_rrsc ); /* Add Request/Response */ - proto_tree_add_item( rrsc_tree, hf_cip_rr, tvb, offset, 1, TRUE ); + proto_tree_add_item( rrsc_tree, hf_cip_rr, tvb, offset, 1, ENC_LITTLE_ENDIAN ); /* watch for service collisions */ service = tvb_get_guint8( tvb, offset ); @@ -3325,7 +3325,7 @@ dissect_cip_data( proto_tree *item_tree, tvbuff_t *tvb, int offset, packet_info cip_sc_rr, "") ); /* Add Service code */ - proto_tree_add_item(rrsc_tree, hf_cip_sc, tvb, offset, 1, TRUE ); + proto_tree_add_item(rrsc_tree, hf_cip_sc, tvb, offset, 1, ENC_LITTLE_ENDIAN ); if( service & 0x80 ) { @@ -3335,7 +3335,7 @@ dissect_cip_data( proto_tree *item_tree, tvbuff_t *tvb, int offset, packet_info /* Add general status */ gen_status = tvb_get_guint8( tvb, offset+2 ); - proto_tree_add_item(status_tree, hf_cip_genstat, tvb, offset+2, 1, TRUE ); + proto_tree_add_item(status_tree, hf_cip_genstat, tvb, offset+2, 1, ENC_LITTLE_ENDIAN ); proto_item_append_text( status_item, "%s", val_to_str( gen_status, cip_gs_vals , "Unknown Response (%x)") ); diff --git a/epan/dissectors/packet-classicstun.c b/epan/dissectors/packet-classicstun.c index 64b93dd240..0dc3dd46ef 100644 --- a/epan/dissectors/packet-classicstun.c +++ b/epan/dissectors/packet-classicstun.c @@ -404,10 +404,10 @@ dissect_classicstun(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case REMOTE_ADDRESS: if (att_length < 2) break; - proto_tree_add_item(att_tree, classicstun_att_family, tvb, offset+1, 1, FALSE); + proto_tree_add_item(att_tree, classicstun_att_family, tvb, offset+1, 1, ENC_BIG_ENDIAN); if (att_length < 4) break; - proto_tree_add_item(att_tree, classicstun_att_port, tvb, offset+2, 2, FALSE); + proto_tree_add_item(att_tree, classicstun_att_port, tvb, offset+2, 2, ENC_BIG_ENDIAN); switch( tvb_get_guint8(tvb, offset+1) ){ case 1: if (att_length < 8) @@ -443,10 +443,10 @@ dissect_classicstun(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case ERROR_CODE: if (att_length < 3) break; - proto_tree_add_item(att_tree, classicstun_att_error_class, tvb, offset+2, 1, FALSE); + proto_tree_add_item(att_tree, classicstun_att_error_class, tvb, offset+2, 1, ENC_BIG_ENDIAN); if (att_length < 4) break; - proto_tree_add_item(att_tree, classicstun_att_error_number, tvb, offset+3, 1, FALSE); + proto_tree_add_item(att_tree, classicstun_att_error_number, tvb, offset+3, 1, ENC_BIG_ENDIAN); if (att_length < 5) break; proto_tree_add_item(att_tree, classicstun_att_error_reason, tvb, offset+4, (att_length-4), FALSE); @@ -455,19 +455,19 @@ dissect_classicstun(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case LIFETIME: if (att_length < 4) break; - proto_tree_add_item(att_tree, classicstun_att_lifetime, tvb, offset, 4, FALSE); + proto_tree_add_item(att_tree, classicstun_att_lifetime, tvb, offset, 4, ENC_BIG_ENDIAN); break; case MAGIC_COOKIE: if (att_length < 4) break; - proto_tree_add_item(att_tree, classicstun_att_magic_cookie, tvb, offset, 4, FALSE); + proto_tree_add_item(att_tree, classicstun_att_magic_cookie, tvb, offset, 4, ENC_BIG_ENDIAN); break; case BANDWIDTH: if (att_length < 4) break; - proto_tree_add_item(att_tree, classicstun_att_bandwidth, tvb, offset, 4, FALSE); + proto_tree_add_item(att_tree, classicstun_att_bandwidth, tvb, offset, 4, ENC_BIG_ENDIAN); break; case DATA: @@ -476,8 +476,8 @@ dissect_classicstun(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case UNKNOWN_ATTRIBUTES: for (i = 0; i < att_length; i += 4) { - proto_tree_add_item(att_tree, classicstun_att_unknown, tvb, offset+i, 2, FALSE); - proto_tree_add_item(att_tree, classicstun_att_unknown, tvb, offset+i+2, 2, FALSE); + proto_tree_add_item(att_tree, classicstun_att_unknown, tvb, offset+i, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(att_tree, classicstun_att_unknown, tvb, offset+i+2, 2, ENC_BIG_ENDIAN); } break; @@ -488,10 +488,10 @@ dissect_classicstun(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case XOR_MAPPED_ADDRESS: if (att_length < 2) break; - proto_tree_add_item(att_tree, classicstun_att_family, tvb, offset+1, 1, FALSE); + proto_tree_add_item(att_tree, classicstun_att_family, tvb, offset+1, 1, ENC_BIG_ENDIAN); if (att_length < 4) break; - proto_tree_add_item(att_tree, classicstun_att_xor_port, tvb, offset+2, 2, FALSE); + proto_tree_add_item(att_tree, classicstun_att_xor_port, tvb, offset+2, 2, ENC_BIG_ENDIAN); /* Show the port 'in the clear' XOR (host order) transid with (host order) xor-port. @@ -529,7 +529,7 @@ dissect_classicstun(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case REQUESTED_ADDRESS_TYPE: if (att_length < 2) break; - proto_tree_add_item(att_tree, classicstun_att_family, tvb, offset+1, 1, FALSE); + proto_tree_add_item(att_tree, classicstun_att_family, tvb, offset+1, 1, ENC_BIG_ENDIAN); break; case CONNECTION_REQUEST_BINDING: diff --git a/epan/dissectors/packet-coap.c b/epan/dissectors/packet-coap.c index 9fa14e11cf..191f81d681 100644 --- a/epan/dissectors/packet-coap.c +++ b/epan/dissectors/packet-coap.c @@ -298,7 +298,7 @@ dissect_coap_opt_block(tvbuff_t *tvb, packet_info *pinfo, proto_tree *subtree, g proto_tree_add_item(subtree, hfindex, tvb, offset + opt_length - 1, 1, FALSE); block_size = 1 << (encoded_block_size + 4); - item = proto_tree_add_item(subtree, hf_coap_opt_block_size, tvb, offset + opt_length - 1, 1, FALSE); + item = proto_tree_add_item(subtree, hf_coap_opt_block_size, tvb, offset + opt_length - 1, 1, ENC_BIG_ENDIAN); proto_item_append_text(item, ", Result: %d", block_size); } @@ -372,7 +372,7 @@ dissect_coap_options(tvbuff_t *tvb, packet_info *pinfo, proto_tree *coap_tree, g opt_count, val_to_str(*opt_code, vals_opt_type, *opt_code % 14 == 0 ? "No-Op" : "Unknown Option"), *opt_code); subtree = proto_item_add_subtree(item, ett_coap_option); - proto_tree_add_item(subtree, hf_coap_opt_delta, tvb, offset, 1, FALSE); + proto_tree_add_item(subtree, hf_coap_opt_delta, tvb, offset, 1, ENC_BIG_ENDIAN); tvb_lenbuf = tvb_new_subset(tvb, offset, opt_hlen, opt_hlen); proto_tree_add_uint_bits_format_value(subtree, hf_coap_opt_length, tvb_lenbuf, 4, opt_hlen == 1 ? 4 : 12, opt_length, "%d", opt_length); @@ -471,22 +471,22 @@ dissect_coap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) coap_root = proto_tree_add_item(parent_tree, proto_coap, tvb, offset, -1, FALSE); coap_tree = proto_item_add_subtree(coap_root, ett_coap); - proto_tree_add_item(coap_tree, hf_coap_version, tvb, offset, 1, FALSE); + proto_tree_add_item(coap_tree, hf_coap_version, tvb, offset, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(coap_tree, hf_coap_ttype, tvb, offset, 1, FALSE); + proto_tree_add_item(coap_tree, hf_coap_ttype, tvb, offset, 1, ENC_BIG_ENDIAN); ttype = (tvb_get_guint8(tvb, offset) & 0x30) >> 4; col_add_fstr(pinfo->cinfo, COL_INFO, "%s", val_to_str(ttype, vals_ttype, "Unknown %d")); - proto_tree_add_item(coap_tree, hf_coap_opt_count, tvb, offset, 1, FALSE); + proto_tree_add_item(coap_tree, hf_coap_opt_count, tvb, offset, 1, ENC_BIG_ENDIAN); opt_count = tvb_get_guint8(tvb, offset) & 0x0f; offset += 1; - proto_tree_add_item(coap_tree, hf_coap_code, tvb, offset, 1, FALSE); + proto_tree_add_item(coap_tree, hf_coap_code, tvb, offset, 1, ENC_BIG_ENDIAN); code = tvb_get_guint8(tvb, offset); col_append_fstr(pinfo->cinfo, COL_INFO, ", %s", val_to_str(code, vals_code, "Unknown %d")); offset += 1; - proto_tree_add_item(coap_tree, hf_coap_tid, tvb, offset, 2, FALSE); + proto_tree_add_item(coap_tree, hf_coap_tid, tvb, offset, 2, ENC_BIG_ENDIAN); tid = tvb_get_ntohs(tvb, offset); offset += 2; diff --git a/epan/dissectors/packet-collectd.c b/epan/dissectors/packet-collectd.c index d2706809c4..29768da3ef 100644 --- a/epan/dissectors/packet-collectd.c +++ b/epan/dissectors/packet-collectd.c @@ -432,10 +432,10 @@ dissect_collectd_values(tvbuff_t *tvb, gint msg_off, gint val_cnt, value_tree = proto_item_add_subtree (pi, ett_collectd_valinfo); proto_tree_add_item (value_tree, hf_collectd_val_type, - tvb, value_type_offset, 1, FALSE); + tvb, value_type_offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item (value_tree, hf_collectd_val_counter, tvb, - value_offset, 8, FALSE); + value_offset, 8, ENC_BIG_ENDIAN); break; } @@ -451,11 +451,11 @@ dissect_collectd_values(tvbuff_t *tvb, gint msg_off, gint val_cnt, value_tree = proto_item_add_subtree (pi, ett_collectd_valinfo); proto_tree_add_item (value_tree, hf_collectd_val_type, - tvb, value_type_offset, 1, FALSE); + tvb, value_type_offset, 1, ENC_BIG_ENDIAN); /* Set the `little endian' flag to TRUE here, because * collectd stores doubles in x86 representation. */ proto_tree_add_item (value_tree, hf_collectd_val_gauge, - tvb, value_offset, 8, TRUE); + tvb, value_offset, 8, ENC_LITTLE_ENDIAN); break; } @@ -471,10 +471,10 @@ dissect_collectd_values(tvbuff_t *tvb, gint msg_off, gint val_cnt, value_tree = proto_item_add_subtree (pi, ett_collectd_valinfo); proto_tree_add_item (value_tree, hf_collectd_val_type, - tvb, value_type_offset, 1, FALSE); + tvb, value_type_offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item (value_tree, hf_collectd_val_derive, tvb, - value_offset, 8, FALSE); + value_offset, 8, ENC_BIG_ENDIAN); break; } @@ -490,10 +490,10 @@ dissect_collectd_values(tvbuff_t *tvb, gint msg_off, gint val_cnt, value_tree = proto_item_add_subtree (pi, ett_collectd_valinfo); proto_tree_add_item (value_tree, hf_collectd_val_type, - tvb, value_type_offset, 1, FALSE); + tvb, value_type_offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item (value_tree, hf_collectd_val_absolute, tvb, - value_offset, 8, FALSE); + value_offset, 8, ENC_BIG_ENDIAN); break; } @@ -510,9 +510,9 @@ dissect_collectd_values(tvbuff_t *tvb, gint msg_off, gint val_cnt, value_tree = proto_item_add_subtree (pi, ett_collectd_valinfo); proto_tree_add_item (value_tree, hf_collectd_val_type, - tvb, value_type_offset, 1, FALSE); + tvb, value_type_offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item (value_tree, hf_collectd_val_unknown, - tvb, value_offset, 8, FALSE); + tvb, value_offset, 8, ENC_BIG_ENDIAN); break; } } /* switch (value_type) */ @@ -602,7 +602,7 @@ dissect_collectd_part_values (tvbuff_t *tvb, packet_info *pinfo, gint offset, proto_tree_add_uint (pt, hf_collectd_length, tvb, offset + 2, 2, length); pi = proto_tree_add_item (pt, hf_collectd_data_valcnt, tvb, - offset + 4, 2, FALSE); + offset + 4, 2, ENC_BIG_ENDIAN); if (values_count != corrected_values_count) expert_add_info_format (pinfo, pi, PI_MALFORMED, PI_WARN, "Number of values and length of part do not match. " diff --git a/epan/dissectors/packet-cops.c b/epan/dissectors/packet-cops.c index a8f9050601..566f1ad6ef 100644 --- a/epan/dissectors/packet-cops.c +++ b/epan/dissectors/packet-cops.c @@ -934,9 +934,9 @@ dissect_cops_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_uint(ver_flags_tree, hf_cops_flags, tvb, offset, 1, ver_flags); offset++; - proto_tree_add_item(cops_tree, hf_cops_op_code, tvb, offset, 1, FALSE); + proto_tree_add_item(cops_tree, hf_cops_op_code, tvb, offset, 1, ENC_BIG_ENDIAN); offset ++; - proto_tree_add_item(cops_tree, hf_cops_client_type, tvb, offset, 2, FALSE); + proto_tree_add_item(cops_tree, hf_cops_client_type, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; msg_len = tvb_get_ntohl(tvb, offset); @@ -1263,7 +1263,7 @@ static void dissect_cops_object_data(tvbuff_t *tvb, packet_info *pinfo, guint32 if (c_type != 1) break; - proto_tree_add_item(tree, hf_cops_katimer, tvb, offset + 2, 2, FALSE); + proto_tree_add_item(tree, hf_cops_katimer, tvb, offset + 2, 2, ENC_BIG_ENDIAN); if (tvb_get_ntohs(tvb, offset + 2) == 0) proto_tree_add_text(tree, tvb, offset, 0, "Value of zero implies infinity."); @@ -1288,7 +1288,7 @@ static void dissect_cops_object_data(tvbuff_t *tvb, packet_info *pinfo, guint32 if (c_type != 1) break; - proto_tree_add_item(tree, hf_cops_report_type, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_cops_report_type, tvb, offset, 2, ENC_BIG_ENDIAN); break; case COPS_OBJ_PDPREDIRADDR: @@ -1324,7 +1324,7 @@ static void dissect_cops_object_data(tvbuff_t *tvb, packet_info *pinfo, guint32 if (c_type != 1) break; - proto_tree_add_item(tree, hf_cops_accttimer, tvb, offset + 2, 2, FALSE); + proto_tree_add_item(tree, hf_cops_accttimer, tvb, offset + 2, 2, ENC_BIG_ENDIAN); if (tvb_get_ntohs(tvb, offset + 2) == 0) proto_tree_add_text(tree, tvb, offset, 0, "Value of zero means " "there SHOULD be no unsolicited accounting updates."); @@ -1334,8 +1334,8 @@ static void dissect_cops_object_data(tvbuff_t *tvb, packet_info *pinfo, guint32 if (c_type != 1) break; /* Not HMAC digest */ - proto_tree_add_item(tree, hf_cops_key_id, tvb, offset, 4, FALSE); - proto_tree_add_item(tree, hf_cops_seq_num, tvb, offset + 4, 4, FALSE); + proto_tree_add_item(tree, hf_cops_key_id, tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_cops_seq_num, tvb, offset + 4, 4, ENC_BIG_ENDIAN); proto_tree_add_text(tree, tvb, offset + 8 , len - 8, "Contents: Keyed Message Digest"); break; @@ -3203,9 +3203,9 @@ cops_mm_gate_spec(tvbuff_t *tvb, proto_tree *st, guint n, guint32 offset) { /* Session Class */ ti = info_to_display(tvb,stt,offset,1,"Session Class",table_cops_session_class,FMT_DEC,&hf_cops_pcmm_gate_spec_session_class_id); object_tree = proto_item_add_subtree(ti, ett_cops_subtree); - proto_tree_add_item(object_tree, hf_cops_pcmm_gate_spec_session_class_id_priority, tvb, offset, 1, FALSE); - proto_tree_add_item(object_tree, hf_cops_pcmm_gate_spec_session_class_id_preemption, tvb, offset, 1, FALSE); - proto_tree_add_item(object_tree, hf_cops_pcmm_gate_spec_session_class_id_configurable, tvb, offset, 1, FALSE); + proto_tree_add_item(object_tree, hf_cops_pcmm_gate_spec_session_class_id_priority, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(object_tree, hf_cops_pcmm_gate_spec_session_class_id_preemption, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(object_tree, hf_cops_pcmm_gate_spec_session_class_id_configurable, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; /* Timer T1 Value */ @@ -5417,7 +5417,7 @@ cops_volume_based_usage_limit(tvbuff_t *tvb, proto_tree *st, guint object_len, g /* Usage Limit */ proto_tree_add_item(stt, hf_cops_pcmm_volume_based_usage_limit, tvb, offset, 8, - FALSE); + ENC_BIG_ENDIAN); } /* Cops - Section : Time-Based Usage Limit */ diff --git a/epan/dissectors/packet-dcc.c b/epan/dissectors/packet-dcc.c index b5ea3e9208..00359be689 100644 --- a/epan/dissectors/packet-dcc.c +++ b/epan/dissectors/packet-dcc.c @@ -103,7 +103,7 @@ static gint ett_dcc_trace = -1; #define D_TARGET() \ hidden_item = proto_tree_add_item(dcc_tree, hf_dcc_target, tvb, \ - offset, sizeof(DCC_TGTS), FALSE); \ + offset, sizeof(DCC_TGTS), ENC_BIG_ENDIAN); \ PROTO_ITEM_SET_HIDDEN(hidden_item); \ proto_tree_add_text(dcc_optree, tvb, offset, sizeof(DCC_TGTS), "%s", \ val_to_str(tvb_get_ntohl(tvb,offset), dcc_target_vals, "Targets (%u)")); \ @@ -125,9 +125,9 @@ static gint ett_dcc_trace = -1; dcc_cktype_vals, \ "Unknown Type: %u")); \ cktree = proto_item_add_subtree(ckti, ett_dcc_ck); \ - proto_tree_add_item(cktree, hf_dcc_ck_type, tvb, offset, 1, FALSE); \ + proto_tree_add_item(cktree, hf_dcc_ck_type, tvb, offset, 1, ENC_BIG_ENDIAN); \ offset += 1; \ - proto_tree_add_item(cktree, hf_dcc_ck_len, tvb, offset, 1, FALSE); \ + proto_tree_add_item(cktree, hf_dcc_ck_len, tvb, offset, 1, ENC_BIG_ENDIAN); \ offset += 1; \ proto_tree_add_item(cktree, hf_dcc_ck_sum, tvb, offset, \ sizeof(DCC_SUM), ENC_NA); \ @@ -243,7 +243,7 @@ dissect_dcc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) dcc_tree = proto_item_add_subtree(ti, ett_dcc); proto_tree_add_item(dcc_tree, hf_dcc_len, tvb, - offset, 2, FALSE); + offset, 2, ENC_BIG_ENDIAN); if ( tvb_length(tvb) < tvb_get_ntohs(tvb, offset)) { /* Doesn't have number of bytes that header claims. */ @@ -252,16 +252,16 @@ dissect_dcc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset += 2; proto_tree_add_item(dcc_tree, hf_dcc_pkt_vers, tvb, - offset, 1, FALSE); + offset, 1, ENC_BIG_ENDIAN); offset += 1; op = tvb_get_guint8(tvb, offset); proto_tree_add_item(dcc_tree, hf_dcc_op, tvb, - offset, 1, FALSE); + offset, 1, ENC_BIG_ENDIAN); offset += 1; proto_tree_add_item(dcc_tree, hf_dcc_clientid, tvb, - offset, 4, FALSE); + offset, 4, ENC_BIG_ENDIAN); offset += 4; ti = proto_tree_add_text(dcc_tree, tvb, offset, -1, "Operation Numbers (Opaque to Server)"); @@ -348,7 +348,7 @@ dissect_dcc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) aop = tvb_get_guint8(tvb, offset+4); proto_tree_add_item(dcc_optree, hf_dcc_adminop, tvb, offset+4, - 1, FALSE); + 1, ENC_BIG_ENDIAN); col_append_fstr(pinfo->cinfo, COL_INFO, ", %s", val_to_str(tvb_get_guint8(tvb,offset+4), dcc_adminop_vals, "Unknown (%u)")); @@ -356,7 +356,7 @@ dissect_dcc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (aop == DCC_AOP_TRACE_ON || aop == DCC_AOP_TRACE_OFF ) { ti = proto_tree_add_item(dcc_optree, hf_dcc_trace, tvb, offset, - 4, FALSE); + 4, ENC_BIG_ENDIAN); dcc_tracetree = proto_item_add_subtree(ti, ett_dcc_trace); proto_tree_add_item(dcc_tracetree, hf_dcc_trace_admin, tvb, offset, 4, FALSE); proto_tree_add_item(dcc_tracetree, hf_dcc_trace_anon, tvb, offset, 4, FALSE); @@ -369,7 +369,7 @@ dissect_dcc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) else if ( aop == DCC_AOP_FLOD ) { proto_tree_add_item(dcc_optree, hf_dcc_floodop, - tvb, offset, 4, FALSE); + tvb, offset, 4, ENC_BIG_ENDIAN); col_append_fstr(pinfo->cinfo, COL_INFO, ", %s", val_to_str(tvb_get_ntohl(tvb,offset), dcc_floodop_vals, "Unknown (%u)")); @@ -377,7 +377,7 @@ dissect_dcc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) else { proto_tree_add_item(dcc_optree, hf_dcc_adminval, - tvb, offset, 4, FALSE); + tvb, offset, 4, ENC_BIG_ENDIAN); } offset += 4; @@ -389,13 +389,13 @@ dissect_dcc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case DCC_OP_OK: proto_tree_add_item(dcc_optree, hf_dcc_max_pkt_vers, tvb, - offset, 1, FALSE); + offset, 1, ENC_BIG_ENDIAN); offset += 1; D_LABEL("Unused", 1); proto_tree_add_item(dcc_optree, hf_dcc_qdelay_ms, tvb, - offset, 2, FALSE); + offset, 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(dcc_optree, hf_dcc_brand, tvb, diff --git a/epan/dissectors/packet-dcerpc-epm.c b/epan/dissectors/packet-dcerpc-epm.c index 772a04086a..86321510be 100644 --- a/epan/dissectors/packet-dcerpc-epm.c +++ b/epan/dissectors/packet-dcerpc-epm.c @@ -406,15 +406,15 @@ epm_dissect_tower_data (tvbuff_t *tvb, int offset, case PROTO_ID_UUID: /* XXX - is this big or little endian? */ - proto_tree_add_item(tr, hf_epm_ver_min, tvb, offset, 2, FALSE); + proto_tree_add_item(tr, hf_epm_ver_min, tvb, offset, 2, ENC_BIG_ENDIAN); break; case PROTO_ID_TCP: /* this one is always big endian */ - proto_tree_add_item(tr, hf_epm_proto_tcp_port, tvb, offset, 2, FALSE); + proto_tree_add_item(tr, hf_epm_proto_tcp_port, tvb, offset, 2, ENC_BIG_ENDIAN); proto_item_append_text(tr, "TCP Port:%d", tvb_get_ntohs(tvb, offset)); break; case PROTO_ID_UDP: /* this one is always big endian */ - proto_tree_add_item(tr, hf_epm_proto_udp_port, tvb, offset, 2, FALSE); + proto_tree_add_item(tr, hf_epm_proto_udp_port, tvb, offset, 2, ENC_BIG_ENDIAN); proto_item_append_text(tr, "UDP Port:%d", tvb_get_ntohs(tvb, offset)); break; @@ -430,7 +430,7 @@ epm_dissect_tower_data (tvbuff_t *tvb, int offset, case PROTO_ID_RPC_CL: proto_item_append_text(tr, "RPC connectionless protocol"); /* XXX - is this big or little endian? */ - proto_tree_add_item(tr, hf_epm_ver_min, tvb, offset, 2, FALSE); + proto_tree_add_item(tr, hf_epm_ver_min, tvb, offset, 2, ENC_BIG_ENDIAN); break; case PROTO_ID_NAMED_PIPES: /* \\PIPE\xxx named pipe */ @@ -448,7 +448,7 @@ epm_dissect_tower_data (tvbuff_t *tvb, int offset, proto_item_append_text(tr, "NetBIOS:%s", tvb_get_ephemeral_string(tvb, offset, len)); break; case PROTO_ID_HTTP: /* RPC over HTTP */ - proto_tree_add_item(tr, hf_epm_proto_http_port, tvb, offset, 2, FALSE); + proto_tree_add_item(tr, hf_epm_proto_http_port, tvb, offset, 2, ENC_BIG_ENDIAN); proto_item_append_text(tr, "RPC over HTTP Port:%d", tvb_get_ntohs(tvb, offset)); break; diff --git a/epan/dissectors/packet-dcerpc-netlogon.c b/epan/dissectors/packet-dcerpc-netlogon.c index ce6f235933..89f58a1075 100644 --- a/epan/dissectors/packet-dcerpc-netlogon.c +++ b/epan/dissectors/packet-dcerpc-netlogon.c @@ -8018,9 +8018,9 @@ dissect_secchan_verf(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, subtree = proto_item_add_subtree(vf, ett_secchan_verf); proto_tree_add_item(subtree, hf_netlogon_secchan_verf_signalg, tvb, - offset, 2, TRUE); + offset, 2, ENC_LITTLE_ENDIAN); proto_tree_add_item(subtree, hf_netlogon_secchan_verf_sealalg, tvb, - offset+2, 2, TRUE); + offset+2, 2, ENC_LITTLE_ENDIAN); /* 2 pad bytes */ proto_tree_add_item(subtree, hf_netlogon_secchan_verf_flag, tvb, offset+6, 2, ENC_NA); diff --git a/epan/dissectors/packet-dcerpc.c b/epan/dissectors/packet-dcerpc.c index ec9971c088..f6673d9666 100644 --- a/epan/dissectors/packet-dcerpc.c +++ b/epan/dissectors/packet-dcerpc.c @@ -4723,7 +4723,7 @@ dissect_dcerpc_dg_auth (tvbuff_t *tvb, int offset, proto_tree *dcerpc_tree, *auth_level_p = protection_level; proto_tree_add_uint (auth_tree, hf_dcerpc_krb5_av_prot_level, tvb, offset, 1, protection_level); offset++; - proto_tree_add_item (auth_tree, hf_dcerpc_krb5_av_key_vers_num, tvb, offset, 1, FALSE); + proto_tree_add_item (auth_tree, hf_dcerpc_krb5_av_key_vers_num, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; if (protection_level == DCE_C_AUTHN_LEVEL_PKT_PRIVACY) offset += 6; /* 6 bytes of padding */ diff --git a/epan/dissectors/packet-dcm.c b/epan/dissectors/packet-dcm.c index fe7d4277d8..f2f1a4d5d3 100644 --- a/epan/dissectors/packet-dcm.c +++ b/epan/dissectors/packet-dcm.c @@ -6382,7 +6382,7 @@ dissect_dcm_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, return endpos; } - proto_tree_add_item(pdv_ptree, hf_dcm_pdv_len, tvb, offset, 4, FALSE); + proto_tree_add_item(pdv_ptree, hf_dcm_pdv_len, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; offset = dissect_dcm_pdv_fragmented(tvb, pinfo, pdv_ptree, assoc, offset, pdv_len, &pdv_description); @@ -6604,7 +6604,7 @@ dissect_dcm_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint32 off offset += 2; pdu_len = tvb_get_ntohl(tvb, offset); - proto_tree_add_item(dcm_ptree, hf_dcm_pdu_len, tvb, offset, 4, FALSE); + proto_tree_add_item(dcm_ptree, hf_dcm_pdu_len, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; /* Find previously detected association, else create a new one object*/ diff --git a/epan/dissectors/packet-ddtp.c b/epan/dissectors/packet-ddtp.c index e25669a190..40b0d8c080 100644 --- a/epan/dissectors/packet-ddtp.c +++ b/epan/dissectors/packet-ddtp.c @@ -111,13 +111,13 @@ dissect_ddtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ti = proto_tree_add_item(tree, proto_ddtp, tvb, 0, -1, FALSE); ddtp_tree = proto_item_add_subtree(ti, ett_ddtp); - proto_tree_add_item(ddtp_tree, hf_ddtp_version, tvb, 0, 4, FALSE); - proto_tree_add_item(ddtp_tree, hf_ddtp_encrypt, tvb, 4, 4, FALSE); - proto_tree_add_item(ddtp_tree, hf_ddtp_hostid, tvb, 8, 4, FALSE); + proto_tree_add_item(ddtp_tree, hf_ddtp_version, tvb, 0, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(ddtp_tree, hf_ddtp_encrypt, tvb, 4, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(ddtp_tree, hf_ddtp_hostid, tvb, 8, 4, ENC_BIG_ENDIAN); } if (tvb_get_ntohl(tvb, 4) == DDTP_ENCRYPT_PLAINTEXT) { if (tree) - proto_tree_add_item(ddtp_tree, hf_ddtp_msgtype, tvb, 12, 4, FALSE); + proto_tree_add_item(ddtp_tree, hf_ddtp_msgtype, tvb, 12, 4, ENC_BIG_ENDIAN); switch (tvb_get_ntohl(tvb, 12)) { case DDTP_MESSAGE_ERROR : col_set_str(pinfo->cinfo, COL_INFO, "Message Error"); @@ -126,7 +126,7 @@ dissect_ddtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_INFO, "Update Query"); if (tree) { proto_tree_add_item(ddtp_tree, hf_ddtp_opcode, tvb, 16, 4, - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item(ddtp_tree, hf_ddtp_ipaddr, tvb, 20, 4, FALSE); } @@ -135,7 +135,7 @@ dissect_ddtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_INFO, "Update Reply"); if (tree) { proto_tree_add_item(ddtp_tree, hf_ddtp_status, tvb, 16, 4, - FALSE); + ENC_BIG_ENDIAN); } break; case DDTP_ALIVE_QUERY : diff --git a/epan/dissectors/packet-dec-dnart.c b/epan/dissectors/packet-dec-dnart.c index 1ed5384ded..ab247ea9c0 100644 --- a/epan/dissectors/packet-dec-dnart.c +++ b/epan/dissectors/packet-dec-dnart.c @@ -517,11 +517,11 @@ dissect_dec_rt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset++; dst_node = tvb_get_letohs(tvb, offset); proto_tree_add_item(rt_tree, hf_dec_rt_dst_node, tvb, - offset, 2, TRUE); + offset, 2, ENC_LITTLE_ENDIAN); offset += 2; src_node = tvb_get_letohs(tvb, offset); proto_tree_add_item(rt_tree, hf_dec_rt_src_node, tvb, - offset, 2, TRUE); + offset, 2, ENC_LITTLE_ENDIAN); offset += 2; forward = tvb_get_guint8(tvb, offset); proto_tree_add_uint(rt_tree, hf_dec_rt_visited_nodes, tvb, @@ -548,7 +548,7 @@ dissect_dec_rt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset++; dst_node_local = tvb_get_letohs(tvb, offset); proto_tree_add_item( - nsp_msg_tree, hf_dec_rt_dst_node, tvb, offset, 2, TRUE); + nsp_msg_tree, hf_dec_rt_dst_node, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; if (nsp_msg_type == CONN_ACK_MSG) { col_set_str(pinfo->cinfo, COL_INFO, "NSP connect acknowledgement"); @@ -558,7 +558,7 @@ dissect_dec_rt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* All other messages have a source node */ src_node_local = tvb_get_letohs(tvb, offset); proto_tree_add_item( - nsp_msg_tree, hf_dec_rt_src_node, tvb, offset, 2, TRUE); + nsp_msg_tree, hf_dec_rt_src_node, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; offset = @@ -583,13 +583,13 @@ do_initialization_msg( col_set_str(pinfo->cinfo, COL_INFO, "Routing control, initialization message"); proto_tree_add_item(tree, hf_dec_rt_src_node, tvb, - my_offset, 2, TRUE); + my_offset, 2, ENC_LITTLE_ENDIAN); offset += 2; proto_tree_add_item(tree, hf_dec_rt_tiinfo, tvb, - my_offset, 2, TRUE); + my_offset, 2, ENC_LITTLE_ENDIAN); my_offset += 2; proto_tree_add_item(tree, hf_dec_rt_blk_size, tvb, - my_offset, 2, TRUE); + my_offset, 2, ENC_LITTLE_ENDIAN); my_offset += 2; version = tvb_get_guint8(tvb, my_offset); eco_nr = tvb_get_guint8(tvb, my_offset + 1); @@ -599,7 +599,7 @@ do_initialization_msg( version, eco_nr, user_eco); my_offset +=3; proto_tree_add_item(tree, hf_dec_rt_timer, tvb, - my_offset, 2, TRUE); + my_offset, 2, ENC_LITTLE_ENDIAN); my_offset += 2; remainder_count = tvb_get_guint8(tvb, my_offset); if (remainder_count != 0) { @@ -622,7 +622,7 @@ do_verification_msg( col_set_str(pinfo->cinfo, COL_INFO, "Routing control, verification message"); proto_tree_add_item(tree, hf_dec_rt_src_node, tvb, - my_offset, 2, TRUE); + my_offset, 2, ENC_LITTLE_ENDIAN); offset += 2; remainder_count = tvb_get_guint8(tvb, my_offset); if (remainder_count != 0) { @@ -645,7 +645,7 @@ do_hello_test_msg( col_set_str(pinfo->cinfo, COL_INFO, "Routing control, hello/test message"); proto_tree_add_item(tree, hf_dec_rt_src_node, tvb, - my_offset, 2, TRUE); + my_offset, 2, ENC_LITTLE_ENDIAN); my_offset += 2; remainder_count = tvb_length_remaining(tvb, my_offset); if (remainder_count != 0) { @@ -671,7 +671,7 @@ do_routing_msg( guint remainder_count; proto_tree_add_item(tree, hf_dec_rt_src_node, tvb, - my_offset, 2, TRUE); + my_offset, 2, ENC_LITTLE_ENDIAN); /* Skip the 1-byte reserved field */ my_offset += 3; remainder_count = tvb_length_remaining(tvb, my_offset); @@ -764,7 +764,7 @@ do_hello_msg( tvb, my_offset, 1, iinfo); my_offset++; proto_tree_add_item(tree, hf_dec_rt_blk_size, tvb, - my_offset, 2, TRUE); + my_offset, 2, ENC_LITTLE_ENDIAN); my_offset += 2; if (msg == 5) { /* Ethernet router hello message @@ -795,7 +795,7 @@ do_hello_msg( 'mpd' field is reserved */ timer = tvb_get_letohs(tvb, my_offset); proto_tree_add_item(tree, hf_dec_rt_timer, tvb, - my_offset, 2, TRUE); + my_offset, 2, ENC_LITTLE_ENDIAN); my_offset += 3; if (msg == 5) { /* The Ethernet router hello message contains @@ -925,7 +925,7 @@ handle_nsp_msg( } /* This is the last field, the rest are data */ proto_tree_add_item(tree, hf_dec_rt_segnum, - tvb, my_offset, 2, TRUE); + tvb, my_offset, 2, ENC_LITTLE_ENDIAN); proto_tree_add_boolean(tree, hf_dec_rt_delay, tvb, my_offset, 2, seg_num); my_offset += 2; @@ -953,7 +953,7 @@ handle_nsp_msg( } else { /* There are no ack/nak fields */ proto_tree_add_item(tree, hf_dec_rt_segnum, - tvb, my_offset, 2, TRUE); + tvb, my_offset, 2, ENC_LITTLE_ENDIAN); proto_tree_add_boolean(tree, hf_dec_rt_delay, tvb, my_offset, 2, ack_num); my_offset += 2; @@ -973,7 +973,7 @@ handle_nsp_msg( seg_num = tvb_get_letohs(tvb, my_offset); /* This is the last field, the rest are data */ proto_tree_add_item(tree, hf_dec_rt_segnum, - tvb, my_offset, 2, TRUE); + tvb, my_offset, 2, ENC_LITTLE_ENDIAN); proto_tree_add_boolean(tree, hf_dec_rt_delay, tvb, my_offset, 2, seg_num); my_offset += 2; @@ -993,7 +993,7 @@ handle_nsp_msg( } else { /* There are no ack/nak fields */ proto_tree_add_item(tree, hf_dec_rt_segnum, - tvb, my_offset, 2, TRUE); + tvb, my_offset, 2, ENC_LITTLE_ENDIAN); proto_tree_add_boolean(tree, hf_dec_rt_delay, tvb, my_offset, 2, ack_num); my_offset += 2; @@ -1012,7 +1012,7 @@ handle_nsp_msg( } seg_num = tvb_get_letohs(tvb, my_offset); proto_tree_add_item(tree, hf_dec_rt_segnum, - tvb, my_offset, 2, TRUE); + tvb, my_offset, 2, ENC_LITTLE_ENDIAN); proto_tree_add_boolean(tree, hf_dec_rt_delay, tvb, my_offset, 2, seg_num); my_offset += 2; @@ -1110,7 +1110,7 @@ handle_nsp_msg( my_offset++; seg_size = tvb_get_letohs(tvb, my_offset); proto_tree_add_item(tree, hf_dec_rt_seg_size, tvb, - my_offset, 2, TRUE); + my_offset, 2, ENC_LITTLE_ENDIAN); my_offset += 2; my_offset = handle_connect_contents( @@ -1121,7 +1121,7 @@ handle_nsp_msg( col_set_str(pinfo->cinfo, COL_INFO, "NSP disconnect initiate/confirm message"); reason = tvb_get_letohs(tvb, my_offset); proto_tree_add_item(tree, hf_dec_disc_reason, tvb, - my_offset, 2, TRUE); + my_offset, 2, ENC_LITTLE_ENDIAN); my_offset += 2; if (nsp_msg_type == DISCONN_INITIATE_MSG) { my_offset = @@ -1159,11 +1159,11 @@ handle_connect_contents( if (dst_format == 2) { grp_code = tvb_get_letohs(tvb, my_offset); proto_tree_add_item(contents_tree, hf_dec_sess_grp_code, - tvb, my_offset, 2, TRUE); + tvb, my_offset, 2, ENC_LITTLE_ENDIAN); my_offset += 2; usr_code = tvb_get_letohs(tvb, my_offset); proto_tree_add_item(contents_tree, hf_dec_sess_usr_code, - tvb, my_offset, 2, TRUE); + tvb, my_offset, 2, ENC_LITTLE_ENDIAN); my_offset += 2; } if (dst_format != 0) { @@ -1184,11 +1184,11 @@ handle_connect_contents( if (src_format == 2) { grp_code = tvb_get_letohs(tvb, my_offset); proto_tree_add_item(contents_tree, hf_dec_sess_grp_code, - tvb, my_offset, 2, TRUE); + tvb, my_offset, 2, ENC_LITTLE_ENDIAN); my_offset += 2; usr_code = tvb_get_letohs(tvb, my_offset); proto_tree_add_item(contents_tree, hf_dec_sess_usr_code, - tvb, my_offset, 2, TRUE); + tvb, my_offset, 2, ENC_LITTLE_ENDIAN); my_offset += 2; } if (dst_format != 0) { diff --git a/epan/dissectors/packet-dect.c b/epan/dissectors/packet-dect.c index 373540d06f..33678a3082 100644 --- a/epan/dissectors/packet-dect.c +++ b/epan/dissectors/packet-dect.c @@ -1443,17 +1443,17 @@ dissect_afield(gboolean dect_packet_type, guint8 *ba, AField = proto_item_add_subtree(afieldti, ett_afield); /* Header */ - aheadti = proto_tree_add_item(AField, hf_dect_A_Head, tvb, offset, 1, FALSE); + aheadti = proto_tree_add_item(AField, hf_dect_A_Head, tvb, offset, 1, ENC_BIG_ENDIAN); AHead = proto_item_add_subtree(aheadti, ett_ahead); if(dect_packet_type==DECT_PACKET_FP) - proto_tree_add_item(AHead, hf_dect_A_Head_TA_FP, tvb, offset, 1, FALSE); + proto_tree_add_item(AHead, hf_dect_A_Head_TA_FP, tvb, offset, 1, ENC_BIG_ENDIAN); else - proto_tree_add_item(AHead, hf_dect_A_Head_TA_PP, tvb, offset, 1, FALSE); + proto_tree_add_item(AHead, hf_dect_A_Head_TA_PP, tvb, offset, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(AHead, hf_dect_A_Head_Q1, tvb, offset, 1, FALSE); - proto_tree_add_item(AHead, hf_dect_A_Head_BA, tvb, offset, 1, FALSE); - proto_tree_add_item(AHead, hf_dect_A_Head_Q2, tvb, offset, 1, FALSE); + proto_tree_add_item(AHead, hf_dect_A_Head_Q1, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(AHead, hf_dect_A_Head_BA, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(AHead, hf_dect_A_Head_Q2, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; /* Tail */ @@ -1497,7 +1497,7 @@ dissect_afield(gboolean dect_packet_type, guint8 *ba, /* ETSI EN 300 175-3 V2.3.0 7.2.3 */ proto_tree_add_string(ColumnsTree, hf_dect_cc_TA, tvb, offset, 1, "[Qt]"); - proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_Qh, tvb, offset, 1, FALSE); + proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_Qh, tvb, offset, 1, ENC_BIG_ENDIAN); switch(tail_0>>4) { @@ -1506,14 +1506,14 @@ dissect_afield(gboolean dect_packet_type, guint8 *ba, /* ETSI EN 300 175-3 V2.3.0 7.2.3.2 */ proto_tree_add_string(ColumnsTree, hf_dect_cc_AField, tvb, offset, 1, "Static System Info"); - proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_0_Nr, tvb, offset, 1, FALSE); - proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_0_Sn, tvb, offset, 1, FALSE); + proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_0_Nr, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_0_Sn, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; - proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_0_Sp, tvb, offset, 1, FALSE); - proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_0_Esc, tvb, offset, 1, FALSE); - proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_0_Txs, tvb, offset, 1, FALSE); - proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_0_Mc, tvb, offset, 1, FALSE); + proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_0_Sp, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_0_Esc, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_0_Txs, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_0_Mc, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_none_format(ATail, hf_dect_A_Tail_Qt_0_CA, tvb, offset, 2, " Carrier%s%s%s%s%s%s%s%s%s%s available", (tail_1&0x02)?" 0":"", (tail_1&0x01)?" 1":"", (tail_2&0x80)?" 2":"", @@ -1522,12 +1522,12 @@ dissect_afield(gboolean dect_packet_type, guint8 *ba, (tail_2&0x01)?" 9":""); offset+=2; - proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_0_Spr1, tvb, offset, 1, FALSE); - proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_0_Cn, tvb, offset, 1, FALSE); + proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_0_Spr1, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_0_Cn, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; - proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_0_Spr2, tvb, offset, 1, FALSE); - proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_0_PSCN, tvb, offset, 1, FALSE); + proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_0_Spr2, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_0_PSCN, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; /* due to addition further down */ offset-=5; @@ -1541,52 +1541,52 @@ dissect_afield(gboolean dect_packet_type, guint8 *ba, /* ETSI EN 300 175-3 V2.3.0 7.2.3.4 */ proto_tree_add_string(ColumnsTree, hf_dect_cc_AField, tvb, offset, 1, "Fixed Part Capabilities"); - proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_3_A12, tvb, offset, 1, FALSE); - proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_3_A13, tvb, offset, 1, FALSE); - proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_3_A14, tvb, offset, 1, FALSE); - proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_3_A15, tvb, offset, 1, FALSE); + proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_3_A12, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_3_A13, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_3_A14, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_3_A15, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; - proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_3_A16, tvb, offset, 1, FALSE); - proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_3_A17, tvb, offset, 1, FALSE); - proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_3_A18, tvb, offset, 1, FALSE); - proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_3_A19, tvb, offset, 1, FALSE); - proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_3_A20, tvb, offset, 1, FALSE); - proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_3_A21, tvb, offset, 1, FALSE); - proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_3_A22, tvb, offset, 1, FALSE); - proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_3_A23, tvb, offset, 1, FALSE); + proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_3_A16, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_3_A17, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_3_A18, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_3_A19, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_3_A20, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_3_A21, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_3_A22, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_3_A23, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; - proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_3_A24, tvb, offset, 1, FALSE); - proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_3_A25, tvb, offset, 1, FALSE); - proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_3_A26, tvb, offset, 1, FALSE); - proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_3_A27, tvb, offset, 1, FALSE); - proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_3_A28, tvb, offset, 1, FALSE); - proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_3_A29, tvb, offset, 1, FALSE); - proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_3_A30, tvb, offset, 1, FALSE); - proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_3_A31, tvb, offset, 1, FALSE); + proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_3_A24, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_3_A25, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_3_A26, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_3_A27, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_3_A28, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_3_A29, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_3_A30, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_3_A31, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; /* higher layer capabilities */ - proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_3_A32, tvb, offset, 1, FALSE); - proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_3_A33, tvb, offset, 1, FALSE); - proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_3_A34, tvb, offset, 1, FALSE); - proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_3_A35, tvb, offset, 1, FALSE); - proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_3_A36, tvb, offset, 1, FALSE); - proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_3_A37, tvb, offset, 1, FALSE); - proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_3_A38, tvb, offset, 1, FALSE); - proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_3_A39, tvb, offset, 1, FALSE); + proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_3_A32, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_3_A33, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_3_A34, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_3_A35, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_3_A36, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_3_A37, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_3_A38, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_3_A39, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; - proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_3_A40, tvb, offset, 1, FALSE); - proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_3_A41, tvb, offset, 1, FALSE); - proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_3_A42, tvb, offset, 1, FALSE); - proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_3_A43, tvb, offset, 1, FALSE); - proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_3_A44, tvb, offset, 1, FALSE); - proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_3_A45, tvb, offset, 1, FALSE); - proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_3_A46, tvb, offset, 1, FALSE); - proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_3_A47, tvb, offset, 1, FALSE); + proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_3_A40, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_3_A41, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_3_A42, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_3_A43, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_3_A44, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_3_A45, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_3_A46, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_3_A47, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; /* due to addition further down */ @@ -1597,51 +1597,51 @@ dissect_afield(gboolean dect_packet_type, guint8 *ba, proto_tree_add_string(ColumnsTree, hf_dect_cc_AField, tvb, offset, 1, "Extended Fixed Part Capabilities"); - proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_4_CRFPHops, tvb, offset, 1, FALSE); - proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_4_CRFPEnc, tvb, offset, 1, FALSE); - proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_4_REFHops, tvb, offset, 2, FALSE); + proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_4_CRFPHops, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_4_CRFPEnc, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_4_REFHops, tvb, offset, 2, ENC_BIG_ENDIAN); offset++; - proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_4_REPCap, tvb, offset, 1, FALSE); - proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_4_Sync, tvb, offset, 1, FALSE); - proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_4_A20, tvb, offset, 1, FALSE); - proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_4_MACSusp, tvb, offset, 1, FALSE); - proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_4_MACIpq, tvb, offset, 1, FALSE); - proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_4_A23, tvb, offset, 1, FALSE); + proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_4_REPCap, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_4_Sync, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_4_A20, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_4_MACSusp, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_4_MACIpq, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_4_A23, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; - proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_4_A24, tvb, offset, 1, FALSE); + proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_4_A24, tvb, offset, 1, ENC_BIG_ENDIAN); /* higher layer capabilities */ - proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_4_A25, tvb, offset, 1, FALSE); - proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_4_A26, tvb, offset, 1, FALSE); - proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_4_A27, tvb, offset, 1, FALSE); - proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_4_A28, tvb, offset, 1, FALSE); - proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_4_A29, tvb, offset, 1, FALSE); - proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_4_A30, tvb, offset, 1, FALSE); - proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_4_A31, tvb, offset, 1, FALSE); + proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_4_A25, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_4_A26, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_4_A27, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_4_A28, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_4_A29, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_4_A30, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_4_A31, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; - proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_4_A32, tvb, offset, 1, FALSE); - proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_4_A33, tvb, offset, 1, FALSE); - proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_4_A34, tvb, offset, 1, FALSE); - proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_4_A35, tvb, offset, 1, FALSE); - proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_4_A36, tvb, offset, 1, FALSE); - proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_4_A37, tvb, offset, 1, FALSE); - proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_4_A38, tvb, offset, 1, FALSE); - proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_4_A39, tvb, offset, 1, FALSE); + proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_4_A32, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_4_A33, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_4_A34, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_4_A35, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_4_A36, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_4_A37, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_4_A38, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_4_A39, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; - proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_4_A40, tvb, offset, 1, FALSE); - proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_4_A41, tvb, offset, 1, FALSE); - proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_4_A42, tvb, offset, 1, FALSE); - proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_4_A43, tvb, offset, 1, FALSE); - proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_4_A44, tvb, offset, 1, FALSE); - proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_4_A45, tvb, offset, 1, FALSE); - proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_4_A46, tvb, offset, 1, FALSE); - proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_4_A47, tvb, offset, 1, FALSE); + proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_4_A40, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_4_A41, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_4_A42, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_4_A43, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_4_A44, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_4_A45, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_4_A46, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_4_A47, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; /* due to addition further down */ @@ -1654,7 +1654,7 @@ dissect_afield(gboolean dect_packet_type, guint8 *ba, break; case 6: /* Multi-Frame No */ /* ETSI EN 300 175-3 V2.3.0 7.2.3.7 */ - proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_6_Spare, tvb, offset, 2, FALSE); + proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_6_Spare, tvb, offset, 2, ENC_BIG_ENDIAN); offset+=2; ep_strbuf_append_printf(afield_str,"Multi-Frame No.: %s",tvb_bytes_to_str(tvb, offset, 3)); @@ -1715,7 +1715,7 @@ dissect_afield(gboolean dect_packet_type, guint8 *ba, case 0: /* Basic Connection Control */ /* ETSI EN 300 175-3 V2.3.0 7.2.5.2 */ proto_tree_add_string(ColumnsTree, hf_dect_cc_AField, tvb, offset, 1, "Basic Connection Control"); - proto_tree_add_item(ATail, hf_dect_A_Tail_Mt_BasicConCtrl, tvb, offset, 1, FALSE); + proto_tree_add_item(ATail, hf_dect_A_Tail_Mt_BasicConCtrl, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; if(((tail_0 & 0x0f)==6)||((tail_0 & 0x0f)==7)) @@ -1726,10 +1726,10 @@ dissect_afield(gboolean dect_packet_type, guint8 *ba, } else { - proto_tree_add_item(ATail, hf_dect_A_Tail_Mt_Mh_fmid, tvb, offset, 2, FALSE); + proto_tree_add_item(ATail, hf_dect_A_Tail_Mt_Mh_fmid, tvb, offset, 2, ENC_BIG_ENDIAN); offset++; - proto_tree_add_item(ATail, hf_dect_A_Tail_Mt_Mh_pmid, tvb, offset, 3, FALSE); + proto_tree_add_item(ATail, hf_dect_A_Tail_Mt_Mh_pmid, tvb, offset, 3, ENC_BIG_ENDIAN); offset+=3; } @@ -1760,14 +1760,14 @@ dissect_afield(gboolean dect_packet_type, guint8 *ba, proto_tree_add_string(ColumnsTree, hf_dect_cc_AField, tvb, offset, 1, afield_str->str); - proto_tree_add_item(ATail, hf_dect_A_Tail_Mt_Encr_Cmd1, tvb, offset, 1, FALSE); - proto_tree_add_item(ATail, hf_dect_A_Tail_Mt_Encr_Cmd2, tvb, offset, 1, FALSE); + proto_tree_add_item(ATail, hf_dect_A_Tail_Mt_Encr_Cmd1, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ATail, hf_dect_A_Tail_Mt_Encr_Cmd2, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; - proto_tree_add_item(ATail, hf_dect_A_Tail_Mt_Mh_fmid, tvb, offset, 2, FALSE); + proto_tree_add_item(ATail, hf_dect_A_Tail_Mt_Mh_fmid, tvb, offset, 2, ENC_BIG_ENDIAN); offset++; - proto_tree_add_item(ATail, hf_dect_A_Tail_Mt_Mh_pmid, tvb, offset, 3, FALSE); + proto_tree_add_item(ATail, hf_dect_A_Tail_Mt_Mh_pmid, tvb, offset, 3, ENC_BIG_ENDIAN); offset+=3; /* due to addition further down */ @@ -1804,8 +1804,8 @@ dissect_afield(gboolean dect_packet_type, guint8 *ba, /* ETSI EN 300 175-3 V2.3.0 7.2.4 */ proto_tree_add_string(ColumnsTree, hf_dect_cc_TA, tvb, offset, 1, "[Pt]"); - proto_tree_add_item(ATail, hf_dect_A_Tail_Pt_ExtFlag, tvb, offset, 1, FALSE); - proto_tree_add_item(ATail, hf_dect_A_Tail_Pt_SDU, tvb, offset, 1, FALSE); + proto_tree_add_item(ATail, hf_dect_A_Tail_Pt_ExtFlag, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ATail, hf_dect_A_Tail_Pt_SDU, tvb, offset, 1, ENC_BIG_ENDIAN); if(((tail_0&0x70)>>4)&0xfe) ep_strbuf_append_printf(afield_str,"%s, ",val_to_str((tail_0&0x70)>>4, PTSDU_vals, "Error, please report: %d")); @@ -1820,7 +1820,7 @@ dissect_afield(gboolean dect_packet_type, guint8 *ba, proto_tree_add_none_format(atailti, hf_dect_A_Tail_Pt_RFPI, tvb, offset, 3, "RFPI: xxxxx%.1x%.2x%.2x", (tail_0&0x0f), tail_1, tail_2); offset+=3; - proto_tree_add_item(ATail, hf_dect_A_Tail_Pt_InfoType, tvb, offset, 1, FALSE); + proto_tree_add_item(ATail, hf_dect_A_Tail_Pt_InfoType, tvb, offset, 1, ENC_BIG_ENDIAN); } else { @@ -1828,7 +1828,7 @@ dissect_afield(gboolean dect_packet_type, guint8 *ba, proto_tree_add_none_format(atailti, hf_dect_A_Tail_Pt_BsData, tvb, offset, 3, "Bs Data: %.1x%.2x%.2x", (tail_0&0x0f), tail_1, tail_2); offset+=3; - proto_tree_add_item(ATail, hf_dect_A_Tail_Pt_InfoType, tvb, offset, 1, FALSE); + proto_tree_add_item(ATail, hf_dect_A_Tail_Pt_InfoType, tvb, offset, 1, ENC_BIG_ENDIAN); } ep_strbuf_append_printf(afield_str,"%s",val_to_str(tail_3>>4, PTInfoType_vals, "Error, please report: %d")); @@ -1859,11 +1859,11 @@ dissect_afield(gboolean dect_packet_type, guint8 *ba, case 4: /* Good RFP Bearer */ case 5: /* Dummy or connectionless Bearer Position */ case 12: /* Connectionless Bearer Position */ - proto_tree_add_item(ATail, hf_dect_A_Tail_Pt_Bearer_Sn, tvb, offset, 1, FALSE); + proto_tree_add_item(ATail, hf_dect_A_Tail_Pt_Bearer_Sn, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; - proto_tree_add_item(ATail, hf_dect_A_Tail_Pt_Bearer_Sp, tvb, offset, 1, FALSE); - proto_tree_add_item(ATail, hf_dect_A_Tail_Pt_Bearer_Cn, tvb, offset, 1, FALSE); + proto_tree_add_item(ATail, hf_dect_A_Tail_Pt_Bearer_Sp, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ATail, hf_dect_A_Tail_Pt_Bearer_Cn, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; break; case 6: /* Extended Modulation Types */ @@ -1962,19 +1962,19 @@ dissect_dect(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ti=proto_tree_add_item(tree, proto_dect, tvb, 0, -1, FALSE); DectTree=proto_item_add_subtree(ti, ett_dect); - proto_tree_add_item(DectTree, hf_dect_transceivermode, tvb, offset, 1, FALSE); + proto_tree_add_item(DectTree, hf_dect_transceivermode, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; - proto_tree_add_item(DectTree, hf_dect_channel, tvb, offset, 1, FALSE); + proto_tree_add_item(DectTree, hf_dect_channel, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; - proto_tree_add_item(DectTree, hf_dect_slot, tvb, offset, 2, FALSE); + proto_tree_add_item(DectTree, hf_dect_slot, tvb, offset, 2, ENC_BIG_ENDIAN); offset+=2; proto_tree_add_item(DectTree, hf_dect_framenumber, tvb, offset, 1, FALSE); offset++; - proto_tree_add_item(DectTree, hf_dect_rssi, tvb, offset, 1, FALSE); + proto_tree_add_item(DectTree, hf_dect_rssi, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; proto_tree_add_item(DectTree, hf_dect_preamble, tvb, offset, 3, ENC_NA); diff --git a/epan/dissectors/packet-dhcpv6.c b/epan/dissectors/packet-dhcpv6.c index 47e341fa4a..48f486b556 100644 --- a/epan/dissectors/packet-dhcpv6.c +++ b/epan/dissectors/packet-dhcpv6.c @@ -1117,8 +1117,8 @@ dhcpv6_option(tvbuff_t *tvb, packet_info *pinfo, proto_tree *bp_tree, "%s", val_to_str(opttype, opttype_vals, "DHCP option %u")); subtree = proto_item_add_subtree(ti, ett_dhcpv6_option); - proto_tree_add_item(subtree, hf_option_type, tvb, off, 2, FALSE); - proto_tree_add_item(subtree, hf_option_length, tvb, off + 2, 2, FALSE); + proto_tree_add_item(subtree, hf_option_type, tvb, off, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(subtree, hf_option_length, tvb, off + 2, 2, ENC_BIG_ENDIAN); off += 4; /* Right now, none of the options can be filtered at, so provide a hex array for minimalistic filtering */ @@ -1169,7 +1169,7 @@ dhcpv6_option(tvbuff_t *tvb, packet_info *pinfo, proto_tree *bp_tree, optlen, "DUID: malformed option"); break; } - proto_tree_add_item(subtree, hf_duiden_enterprise, tvb, off + 2, 4, FALSE); + proto_tree_add_item(subtree, hf_duiden_enterprise, tvb, off + 2, 4, ENC_BIG_ENDIAN); if (optlen > 6) { buf = tvb_bytes_to_str(tvb, off + 6, optlen - 6); proto_tree_add_text(subtree, tvb, off + 6, @@ -1399,7 +1399,7 @@ dhcpv6_option(tvbuff_t *tvb, packet_info *pinfo, proto_tree *bp_tree, optlen, "VENDOR_CLASS: malformed option"); break; } - proto_tree_add_item(subtree, hf_vendorclass_enterprise, tvb, off, 4, FALSE); + proto_tree_add_item(subtree, hf_vendorclass_enterprise, tvb, off, 4, ENC_BIG_ENDIAN); if (optlen > 4) { proto_tree_add_text(subtree, tvb, off+6, optlen-6, "vendor-class-data: \"%s\"", tvb_format_stringzpad(tvb, off + 6, optlen - 6)); @@ -1413,7 +1413,7 @@ dhcpv6_option(tvbuff_t *tvb, packet_info *pinfo, proto_tree *bp_tree, } enterprise_no = tvb_get_ntohl(tvb, off); - proto_tree_add_item(subtree, hf_vendoropts_enterprise, tvb, off, 4, FALSE); + proto_tree_add_item(subtree, hf_vendoropts_enterprise, tvb, off, 4, ENC_BIG_ENDIAN); if (optlen >= 4) { if (enterprise_no == 4491) { @@ -1604,7 +1604,7 @@ dhcpv6_option(tvbuff_t *tvb, packet_info *pinfo, proto_tree *bp_tree, optlen, "REMOTE_ID: malformed option"); break; } - proto_tree_add_item(subtree, hf_remoteid_enterprise, tvb, off, 4, FALSE); + proto_tree_add_item(subtree, hf_remoteid_enterprise, tvb, off, 4, ENC_BIG_ENDIAN); off += 4; buf = tvb_bytes_to_str(tvb, off, optlen - 4); proto_tree_add_text(subtree, tvb, off, optlen - 4, "Remote-ID: %s", buf); @@ -1628,7 +1628,7 @@ dhcpv6_option(tvbuff_t *tvb, packet_info *pinfo, proto_tree *bp_tree, * | MBZ |N|O|S| * +-----+-+-+-+ */ - proto_tree_add_item(subtree, hf_clientfqdn_reserved, tvb, off, 1, FALSE); + proto_tree_add_item(subtree, hf_clientfqdn_reserved, tvb, off, 1, ENC_BIG_ENDIAN); proto_tree_add_item(subtree, hf_clientfqdn_n, tvb, off, 1, FALSE); proto_tree_add_item(subtree, hf_clientfqdn_o, tvb, off, 1, FALSE); proto_tree_add_item(subtree, hf_clientfqdn_s, tvb, off, 1, FALSE); @@ -1878,8 +1878,8 @@ dissect_dhcpv6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (msgtype == RELAY_FORW || msgtype == RELAY_REPLY) { if (tree) { - proto_tree_add_item(bp_tree, hf_dhcpv6_msgtype, tvb, off, 1, FALSE); - proto_tree_add_item(bp_tree, hf_dhcpv6_hopcount, tvb, off + 1, 1, FALSE); + proto_tree_add_item(bp_tree, hf_dhcpv6_msgtype, tvb, off, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(bp_tree, hf_dhcpv6_hopcount, tvb, off + 1, 1, ENC_BIG_ENDIAN); proto_tree_add_item(bp_tree, hf_dhcpv6_linkaddr, tvb, off + 2, 16, FALSE); tvb_get_ipv6(tvb, off + 2, &in6); col_append_fstr(pinfo->cinfo, COL_INFO, "L: %s ", ip6_to_str(&in6)); @@ -1888,8 +1888,8 @@ dissect_dhcpv6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, off += 34; } else { if (tree) { - proto_tree_add_item(bp_tree, hf_dhcpv6_msgtype, tvb, off, 1, FALSE); - proto_tree_add_item(bp_tree, hf_dhcpv6_xid, tvb, off + 1, 3, FALSE); + proto_tree_add_item(bp_tree, hf_dhcpv6_msgtype, tvb, off, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(bp_tree, hf_dhcpv6_xid, tvb, off + 1, 3, ENC_BIG_ENDIAN); } col_append_fstr(pinfo->cinfo, COL_INFO, "XID: 0x%x ", tvb_get_ntoh24(tvb, off + 1)); off += 4; diff --git a/epan/dissectors/packet-diameter.c b/epan/dissectors/packet-diameter.c index 01aecaf9c0..7fadc8da82 100644 --- a/epan/dissectors/packet-diameter.c +++ b/epan/dissectors/packet-diameter.c @@ -319,7 +319,7 @@ dissect_diameter_vedor_id(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree int offset = 0; - proto_tree_add_item(tree, hf_diameter_vendor_id, tvb, 0, 4, FALSE); + proto_tree_add_item(tree, hf_diameter_vendor_id, tvb, 0, 4, ENC_BIG_ENDIAN); offset++; return offset; @@ -398,7 +398,7 @@ dissect_diameter_avp(diam_ctx_t* c, tvbuff_t* tvb, int offset) avp_item = proto_tree_add_item(c->tree,hf_diameter_avp,tvb,offset,len,ENC_NA); avp_tree = proto_item_add_subtree(avp_item,a->ett); - pi = proto_tree_add_item(avp_tree,hf_diameter_avp_code,tvb,offset,4,FALSE); + pi = proto_tree_add_item(avp_tree,hf_diameter_avp_code,tvb,offset,4,ENC_BIG_ENDIAN); code_str = val_to_str_ext_const(code, vendor->vs_avps_ext, "Unknown"); proto_item_append_text(pi," %s", code_str); @@ -418,7 +418,7 @@ dissect_diameter_avp(diam_ctx_t* c, tvbuff_t* tvb, int offset) proto_item_set_text(avp_item,"AVP: %s(%u) l=%u f=%s", code_str, code, len, avpflags_str[flags_bits_idx]); /* Flags */ - pi = proto_tree_add_item(avp_tree,hf_diameter_avp_flags,tvb,offset,1,FALSE); + pi = proto_tree_add_item(avp_tree,hf_diameter_avp_flags,tvb,offset,1,ENC_BIG_ENDIAN); { proto_tree* flags_tree = proto_item_add_subtree(pi,ett_diameter_avp_flags); proto_tree_add_item(flags_tree,hf_diameter_avp_flags_vendor_specific,tvb,offset,1,FALSE); @@ -438,13 +438,13 @@ dissect_diameter_avp(diam_ctx_t* c, tvbuff_t* tvb, int offset) offset += 1; /* Length */ - proto_tree_add_item(avp_tree,hf_diameter_avp_len,tvb,offset,3,FALSE); + proto_tree_add_item(avp_tree,hf_diameter_avp_len,tvb,offset,3,ENC_BIG_ENDIAN); offset += 3; /* Vendor flag */ if (vendor_flag) { proto_item_append_text(avp_item," vnd=%s", val_to_str(vendorid, vnd_short_vs, "%d")); - pi = proto_tree_add_item(avp_tree,hf_diameter_avp_vendor_id,tvb,offset,4,FALSE); + pi = proto_tree_add_item(avp_tree,hf_diameter_avp_vendor_id,tvb,offset,4,ENC_BIG_ENDIAN); if (vendor == &unknown_vendor) { proto_tree* tu = proto_item_add_subtree(pi,ett_unknown); proto_item* iu = proto_tree_add_text(tu,tvb,offset,4,"Unknown Vendor, " @@ -826,10 +826,10 @@ dissect_diameter_common(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree) c->tree = diam_tree; c->pinfo = pinfo; - version_item = proto_tree_add_item(diam_tree,hf_diameter_version,tvb,0,1,FALSE); - proto_tree_add_item(diam_tree,hf_diameter_length,tvb,1,3,FALSE); + version_item = proto_tree_add_item(diam_tree,hf_diameter_version,tvb,0,1,ENC_BIG_ENDIAN); + proto_tree_add_item(diam_tree,hf_diameter_length,tvb,1,3,ENC_BIG_ENDIAN); - pi = proto_tree_add_item(diam_tree,hf_diameter_flags,tvb,4,1,FALSE); + pi = proto_tree_add_item(diam_tree,hf_diameter_flags,tvb,4,1,ENC_BIG_ENDIAN); { proto_tree* pt = proto_item_add_subtree(pi,ett_diameter_flags); proto_tree_add_item(pt,hf_diameter_flags_request,tvb,4,1,FALSE); @@ -846,7 +846,7 @@ dissect_diameter_common(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree) if(flags_bits & 0x01) proto_item_set_expert_flags(pi, PI_MALFORMED, PI_WARN); } - cmd_item = proto_tree_add_item(diam_tree,hf_diameter_code,tvb,5,3,FALSE); + cmd_item = proto_tree_add_item(diam_tree,hf_diameter_code,tvb,5,3,ENC_BIG_ENDIAN); switch (version) { case DIAMETER_V16: { @@ -858,7 +858,7 @@ dissect_diameter_common(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree) } cmd_vs = VND_CMD_VS(vendor); - proto_tree_add_item(diam_tree, hf_diameter_vendor_id,tvb,8,4,FALSE); + proto_tree_add_item(diam_tree, hf_diameter_vendor_id,tvb,8,4,ENC_BIG_ENDIAN); c->version_rfc = FALSE; break; @@ -922,8 +922,8 @@ dissect_diameter_common(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree) hop_by_hop_id = tvb_get_ntohl(tvb, 12); - proto_tree_add_item(diam_tree,hf_diameter_hopbyhopid,tvb,12,4,FALSE); - proto_tree_add_item(diam_tree,hf_diameter_endtoendid,tvb,16,4,FALSE); + proto_tree_add_item(diam_tree,hf_diameter_hopbyhopid,tvb,12,4,ENC_BIG_ENDIAN); + proto_tree_add_item(diam_tree,hf_diameter_endtoendid,tvb,16,4,ENC_BIG_ENDIAN); /* Conversation tracking stuff */ /* diff --git a/epan/dissectors/packet-dns.c b/epan/dissectors/packet-dns.c index e06b4ed59b..a3fcc38288 100644 --- a/epan/dissectors/packet-dns.c +++ b/epan/dissectors/packet-dns.c @@ -1989,19 +1989,19 @@ dissect_dns_answer(tvbuff_t *tvb, int offsetx, int dns_data_offset, proto_tree *flags_tree; - proto_tree_add_item(rr_tree, hf_dns_nsec3_algo, tvb, cur_offset++, 1, FALSE); - flags_item = proto_tree_add_item(rr_tree, hf_dns_nsec3_flags, tvb, cur_offset, 1, FALSE); + proto_tree_add_item(rr_tree, hf_dns_nsec3_algo, tvb, cur_offset++, 1, ENC_BIG_ENDIAN); + flags_item = proto_tree_add_item(rr_tree, hf_dns_nsec3_flags, tvb, cur_offset, 1, ENC_BIG_ENDIAN); flags_tree = proto_item_add_subtree(flags_item, ett_nsec3_flags); proto_tree_add_item(flags_tree, hf_dns_nsec3_flag_optout, tvb, cur_offset, 1, FALSE); cur_offset++; - proto_tree_add_item(rr_tree, hf_dns_nsec3_iterations, tvb, cur_offset, 2, FALSE); + proto_tree_add_item(rr_tree, hf_dns_nsec3_iterations, tvb, cur_offset, 2, ENC_BIG_ENDIAN); cur_offset += 2; salt_len = tvb_get_guint8(tvb, cur_offset); - proto_tree_add_item(rr_tree, hf_dns_nsec3_salt_length, tvb, cur_offset++, 1, FALSE); + proto_tree_add_item(rr_tree, hf_dns_nsec3_salt_length, tvb, cur_offset++, 1, ENC_BIG_ENDIAN); proto_tree_add_item(rr_tree, hf_dns_nsec3_salt_value, tvb, cur_offset, salt_len, ENC_NA); cur_offset += salt_len; hash_len = tvb_get_guint8(tvb, cur_offset); - proto_tree_add_item(rr_tree, hf_dns_nsec3_hash_length, tvb, cur_offset++, 1, FALSE); + proto_tree_add_item(rr_tree, hf_dns_nsec3_hash_length, tvb, cur_offset++, 1, ENC_BIG_ENDIAN); proto_tree_add_item(rr_tree, hf_dns_nsec3_hash_value, tvb, cur_offset, hash_len, ENC_NA); cur_offset += hash_len; rr_len = data_len - (cur_offset - initial_offset); @@ -2017,14 +2017,14 @@ dissect_dns_answer(tvbuff_t *tvb, int offsetx, int dns_data_offset, col_append_fstr(cinfo, COL_INFO, " %s", name); - proto_tree_add_item(rr_tree, hf_dns_nsec3_algo, tvb, cur_offset, 1, FALSE); + proto_tree_add_item(rr_tree, hf_dns_nsec3_algo, tvb, cur_offset, 1, ENC_BIG_ENDIAN); cur_offset ++; - proto_tree_add_item(rr_tree, hf_dns_nsec3_flags, tvb, cur_offset, 1, FALSE); + proto_tree_add_item(rr_tree, hf_dns_nsec3_flags, tvb, cur_offset, 1, ENC_BIG_ENDIAN); cur_offset ++; - proto_tree_add_item(rr_tree, hf_dns_nsec3_iterations, tvb, cur_offset, 2, FALSE); + proto_tree_add_item(rr_tree, hf_dns_nsec3_iterations, tvb, cur_offset, 2, ENC_BIG_ENDIAN); cur_offset += 2; salt_len = tvb_get_guint8(tvb, cur_offset); - proto_tree_add_item(rr_tree, hf_dns_nsec3_salt_length, tvb, cur_offset, 1, FALSE); + proto_tree_add_item(rr_tree, hf_dns_nsec3_salt_length, tvb, cur_offset, 1, ENC_BIG_ENDIAN); cur_offset ++; proto_tree_add_item(rr_tree, hf_dns_nsec3_salt_value, tvb, cur_offset, salt_len, ENC_NA); @@ -2358,14 +2358,14 @@ dissect_dns_answer(tvbuff_t *tvb, int offsetx, int dns_data_offset, if (rr_len < 2) goto bad_rr; - proto_tree_add_item(rr_tree, hf_dns_tsig_fudge, tvb, cur_offset, 2, FALSE); + proto_tree_add_item(rr_tree, hf_dns_tsig_fudge, tvb, cur_offset, 2, ENC_BIG_ENDIAN); cur_offset += 2; rr_len -= 2; if (rr_len < 2) goto bad_rr; tsig_siglen = tvb_get_ntohs(tvb, cur_offset); - proto_tree_add_item(rr_tree, hf_dns_tsig_mac_size, tvb, cur_offset, 2, FALSE); + proto_tree_add_item(rr_tree, hf_dns_tsig_mac_size, tvb, cur_offset, 2, ENC_BIG_ENDIAN); cur_offset += 2; rr_len -= 2; @@ -2392,7 +2392,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offsetx, int dns_data_offset, if (rr_len < 2) goto bad_rr; - proto_tree_add_item(rr_tree, hf_dns_tsig_original_id, tvb, cur_offset, 2, FALSE); + proto_tree_add_item(rr_tree, hf_dns_tsig_original_id, tvb, cur_offset, 2, ENC_BIG_ENDIAN); cur_offset += 2; rr_len -= 2; @@ -2408,7 +2408,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offsetx, int dns_data_offset, if (rr_len < 2) goto bad_rr; tsig_otherlen = tvb_get_ntohs(tvb, cur_offset); - proto_tree_add_item(rr_tree, hf_dns_tsig_other_len, tvb, cur_offset, 2, FALSE); + proto_tree_add_item(rr_tree, hf_dns_tsig_other_len, tvb, cur_offset, 2, ENC_BIG_ENDIAN); cur_offset += 2; rr_len -= 2; @@ -2778,7 +2778,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offsetx, int dns_data_offset, if (rr_len < 1) goto bad_rr; - proto_tree_add_item(rr_tree, hf_dns_apl_coded_prefix, tvb, cur_offset, 1, FALSE); + proto_tree_add_item(rr_tree, hf_dns_apl_coded_prefix, tvb, cur_offset, 1, ENC_BIG_ENDIAN); cur_offset += 1; rr_len -= 1; @@ -3206,7 +3206,7 @@ dissect_dns_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (is_tcp) { /* Put the length indication into the tree. */ - proto_tree_add_item(dns_tree, hf_dns_length, tvb, offset - 2, 2, FALSE); + proto_tree_add_item(dns_tree, hf_dns_length, tvb, offset - 2, 2, ENC_BIG_ENDIAN); } proto_tree_add_uint(dns_tree, hf_dns_transaction_id, tvb, @@ -3230,7 +3230,7 @@ dissect_dns_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_tree_add_item(field_tree, hf_dns_flags_response, tvb, offset + DNS_FLAGS, 2, FALSE); proto_tree_add_item(field_tree, hf_dns_flags_opcode, - tvb, offset + DNS_FLAGS, 2, FALSE); + tvb, offset + DNS_FLAGS, 2, ENC_BIG_ENDIAN); if (is_llmnr) { if (flags & F_RESPONSE) { proto_tree_add_item(field_tree, hf_dns_flags_conflict_response, @@ -3245,7 +3245,7 @@ dissect_dns_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, tvb, offset + DNS_FLAGS, 2, FALSE); if (flags & F_RESPONSE) { proto_tree_add_item(field_tree, hf_dns_flags_rcode, - tvb, offset + DNS_FLAGS, 2, FALSE); + tvb, offset + DNS_FLAGS, 2, ENC_BIG_ENDIAN); } } else { if (flags & F_RESPONSE) { @@ -3270,7 +3270,7 @@ dissect_dns_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, tvb, offset + DNS_FLAGS, 2, FALSE); if (flags & F_RESPONSE) { proto_tree_add_item(field_tree, hf_dns_flags_rcode, - tvb, offset + DNS_FLAGS, 2, FALSE); + tvb, offset + DNS_FLAGS, 2, ENC_BIG_ENDIAN); } } diff --git a/epan/dissectors/packet-dsi.c b/epan/dissectors/packet-dsi.c index 8fc96ddc26..996b68b73b 100644 --- a/epan/dissectors/packet-dsi.c +++ b/epan/dissectors/packet-dsi.c @@ -222,20 +222,20 @@ dissect_dsi_open_session(tvbuff_t *tvb, proto_tree *dsi_tree, gint offset, gint while( dsi_length >2 ) { type = tvb_get_guint8(tvb, offset); - proto_tree_add_item(tree, hf_dsi_open_type, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_dsi_open_type, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; len = tvb_get_guint8(tvb, offset); - proto_tree_add_item(tree, hf_dsi_open_len, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_dsi_open_len, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; switch (type) { case 0: - proto_tree_add_item(tree, hf_dsi_open_quantum, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_dsi_open_quantum, tvb, offset, 4, ENC_BIG_ENDIAN); break; case 1: - proto_tree_add_item(tree, hf_dsi_open_quantum, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_dsi_open_quantum, tvb, offset, 4, ENC_BIG_ENDIAN); break; case 2: - proto_tree_add_item(tree, hf_dsi_replay_cache_size, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_dsi_replay_cache_size, tvb, offset, 4, ENC_BIG_ENDIAN); break; default: proto_tree_add_item(tree, hf_dsi_open_option, tvb, offset, len, ENC_NA); @@ -262,7 +262,7 @@ dissect_dsi_attention(tvbuff_t *tvb, proto_tree *dsi_tree, gint offset) ti = proto_tree_add_text(dsi_tree, tvb, offset, -1, "Attention"); tree = proto_item_add_subtree(ti, ett_dsi_attn); - ti = proto_tree_add_item(tree, hf_dsi_attn_flag, tvb, offset, 2, FALSE); + ti = proto_tree_add_item(tree, hf_dsi_attn_flag, tvb, offset, 2, ENC_BIG_ENDIAN); tree = proto_item_add_subtree(ti, ett_dsi_attn_flag); proto_tree_add_item(tree, hf_dsi_attn_flag_shutdown, tvb, offset, 2, FALSE); proto_tree_add_item(tree, hf_dsi_attn_flag_crash, tvb, offset, 2, FALSE); @@ -270,9 +270,9 @@ dissect_dsi_attention(tvbuff_t *tvb, proto_tree *dsi_tree, gint offset) proto_tree_add_item(tree, hf_dsi_attn_flag_reconnect, tvb, offset, 2, FALSE); /* FIXME */ if ((flag & 0xf000) != 0x3000) - proto_tree_add_item(tree, hf_dsi_attn_flag_time, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_dsi_attn_flag_time, tvb, offset, 2, ENC_BIG_ENDIAN); else - proto_tree_add_item(tree, hf_dsi_attn_flag_bitmap, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_dsi_attn_flag_bitmap, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; return offset; } @@ -315,7 +315,7 @@ dissect_dsi_reply_get_status(tvbuff_t *tvb, proto_tree *tree, gint offset) proto_tree_add_text(tree, tvb, offset +AFPSTATUS_ICONOFF, 2, "Icon offset: %d", ofs); ofs = offset +AFPSTATUS_FLAGOFF; - ti = proto_tree_add_item(tree, hf_dsi_server_flag, tvb, ofs, 2, FALSE); + ti = proto_tree_add_item(tree, hf_dsi_server_flag, tvb, ofs, 2, ENC_BIG_ENDIAN); sub_tree = proto_item_add_subtree(ti, ett_dsi_status_server_flag); proto_tree_add_item(sub_tree, hf_dsi_server_flag_copyfile , tvb, ofs, 2, FALSE); proto_tree_add_item(sub_tree, hf_dsi_server_flag_passwd , tvb, ofs, 2, FALSE); @@ -461,9 +461,9 @@ dissect_dsi_reply_get_status(tvbuff_t *tvb, proto_tree *tree, gint offset) } len -= 2; sub_tree = proto_item_add_subtree(ti,ett_dsi_addr_line); - proto_tree_add_item(sub_tree, hf_dsi_server_addr_len, tvb, ofs, 1, FALSE); + proto_tree_add_item(sub_tree, hf_dsi_server_addr_len, tvb, ofs, 1, ENC_BIG_ENDIAN); ofs++; - proto_tree_add_item(sub_tree, hf_dsi_server_addr_type, tvb, ofs, 1, FALSE); + proto_tree_add_item(sub_tree, hf_dsi_server_addr_type, tvb, ofs, 1, ENC_BIG_ENDIAN); ofs++; proto_tree_add_item(sub_tree, hf_dsi_server_addr_value,tvb, ofs, len, ENC_NA); ofs += len; diff --git a/epan/dissectors/packet-dtls.c b/epan/dissectors/packet-dtls.c index 1ca1c4ea4c..677841c6af 100644 --- a/epan/dissectors/packet-dtls.c +++ b/epan/dissectors/packet-dtls.c @@ -672,12 +672,12 @@ dissect_dtls_record(tvbuff_t *tvb, packet_info *pinfo, /* show the one-byte content type */ proto_tree_add_item(dtls_record_tree, hf_dtls_record_content_type, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); offset++; /* add the version */ proto_tree_add_item(dtls_record_tree, hf_dtls_record_version, tvb, - offset, 2, FALSE); + offset, 2, ENC_BIG_ENDIAN); offset += 2; /* show epoch */ @@ -943,10 +943,10 @@ dissect_dtls_alert(tvbuff_t *tvb, packet_info *pinfo, val_to_str_const(*conv_version, ssl_version_short_names, "SSL"), level, desc); proto_tree_add_item(ssl_alert_tree, hf_dtls_alert_message_level, - tvb, offset++, 1, FALSE); + tvb, offset++, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ssl_alert_tree, hf_dtls_alert_message_description, - tvb, offset++, 1, FALSE); + tvb, offset++, 1, ENC_BIG_ENDIAN); } else { @@ -1347,7 +1347,7 @@ dissect_dtls_hnd_hello_common(tvbuff_t *tvb, proto_tree *tree, /* show the session id */ session_id_length = tvb_get_guint8(tvb, offset); proto_tree_add_item(tree, hf_dtls_handshake_session_id_len, - tvb, offset++, 1, 0); + tvb, offset++, 1, ENC_BIG_ENDIAN); if (session_id_length > 0) { proto_tree_add_bytes_format(tree, hf_dtls_handshake_session_id, @@ -1448,7 +1448,7 @@ dissect_dtls_hnd_cli_hello(tvbuff_t *tvb, /* show the client version */ if (tree) proto_tree_add_item(tree, hf_dtls_handshake_client_version, tvb, - offset, 2, FALSE); + offset, 2, ENC_BIG_ENDIAN); offset += 2; /* show the fields in common with server hello */ @@ -1500,7 +1500,7 @@ dissect_dtls_hnd_cli_hello(tvbuff_t *tvb, while (cipher_suite_length > 0) { proto_tree_add_item(cs_tree, hf_dtls_handshake_cipher_suite, - tvb, offset, 2, FALSE); + tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; cipher_suite_length -= 2; } @@ -1578,7 +1578,7 @@ dissect_dtls_hnd_hello_verify_request(tvbuff_t *tvb, proto_tree *tree, /* show the client version */ if (tree) proto_tree_add_item(tree, hf_dtls_handshake_server_version, tvb, - offset, 2, FALSE); + offset, 2, ENC_BIG_ENDIAN); offset += 2; @@ -1625,7 +1625,7 @@ dissect_dtls_hnd_srv_hello(tvbuff_t *tvb, /* show the server version */ if (tree) proto_tree_add_item(tree, hf_dtls_handshake_server_version, tvb, - offset, 2, FALSE); + offset, 2, ENC_BIG_ENDIAN); offset += 2; /* first display the elements conveniently in @@ -1669,12 +1669,12 @@ dissect_dtls_hnd_srv_hello(tvbuff_t *tvb, /* now the server-selected cipher suite */ proto_tree_add_item(tree, hf_dtls_handshake_cipher_suite, - tvb, offset, 2, FALSE); + tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; /* and the server-selected compression method */ proto_tree_add_item(tree, hf_dtls_handshake_comp_method, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); offset++; if (length > offset - start_offset) @@ -1736,7 +1736,7 @@ dissect_dtls_hnd_cert(tvbuff_t *tvb, certificate_list_length -= 3 + cert_length; proto_tree_add_item(subtree, hf_dtls_handshake_certificate_len, - tvb, offset, 3, FALSE); + tvb, offset, 3, ENC_BIG_ENDIAN); offset += 3; dissect_x509af_Certificate(FALSE, tvb, offset, &asn1_ctx, subtree, hf_dtls_handshake_certificate); @@ -1796,7 +1796,7 @@ dissect_dtls_hnd_cert_req(tvbuff_t *tvb, while (cert_types_count > 0) { proto_tree_add_item(subtree, hf_dtls_handshake_cert_type, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); offset++; cert_types_count--; } @@ -1829,7 +1829,7 @@ dissect_dtls_hnd_cert_req(tvbuff_t *tvb, dnames_length -= 2 + name_length; proto_tree_add_item(subtree, hf_dtls_handshake_dname_len, - tvb, offset, 2, FALSE); + tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_bytes_format(subtree, diff --git a/epan/dissectors/packet-dtn.c b/epan/dissectors/packet-dtn.c index 528023827b..47ad594d22 100644 --- a/epan/dissectors/packet-dtn.c +++ b/epan/dissectors/packet-dtn.c @@ -457,7 +457,7 @@ dissect_tcp_bundle(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) shutdown_flags = conv_hdr; shutdown_flag_item = proto_tree_add_item(conv_tree, hf_tcp_convergence_shutdown_flags, tvb, - frame_offset, 1, FALSE); + frame_offset, 1, ENC_BIG_ENDIAN); shutdown_flag_tree = proto_item_add_subtree(shutdown_flag_item, ett_shutdown_flags); proto_tree_add_boolean(shutdown_flag_tree, @@ -472,14 +472,14 @@ dissect_tcp_bundle(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if(conv_hdr & TCP_CONVERGENCE_SHUTDOWN_REASON) { proto_tree_add_item(conv_tree, hf_tcp_convergence_shutdown_reason, tvb, - frame_offset, 1, FALSE); + frame_offset, 1, ENC_BIG_ENDIAN); frame_offset += 1; field_length += 1; } if(conv_hdr & TCP_CONVERGENCE_SHUTDOWN_DELAY) { proto_tree_add_item(conv_tree, hf_tcp_convergence_shutdown_delay, tvb, - frame_offset, 2, FALSE); + frame_offset, 2, ENC_BIG_ENDIAN); frame_offset += 2; field_length += 2; } @@ -581,7 +581,7 @@ dissect_tcp_convergence_data_header(tvbuff_t *tvb, proto_tree *tree) /* Add tree for Start/End bits */ tcp_convergence_hdr_procflags = tvb_get_guint8(tvb, 0); conv_flag_item = proto_tree_add_item(conv_tree, hf_tcp_convergence_data_procflags, tvb, - 0, 1, FALSE); + 0, 1, ENC_BIG_ENDIAN); conv_flag_tree = proto_item_add_subtree(conv_flag_item, ett_conv_flags); proto_tree_add_boolean(conv_flag_tree, hf_tcp_convergence_data_procflags_start, tvb, 0, 1, tcp_convergence_hdr_procflags); @@ -667,7 +667,7 @@ dissect_primary_header(packet_info *pinfo, proto_tree *primary_tree, tvbuff_t *t return 0; } - proto_tree_add_item(primary_tree, hf_bundle_pdu_version, tvb, offset, 1, FALSE); + proto_tree_add_item(primary_tree, hf_bundle_pdu_version, tvb, offset, 1, ENC_BIG_ENDIAN); if (version == 4) { return dissect_version_4_primary_header(pinfo, primary_tree, tvb); } @@ -715,7 +715,7 @@ dissect_version_4_primary_header(packet_info *pinfo, proto_tree *primary_tree, t /* Primary Header Processing Flags */ pri_hdr_procflags = tvb_get_guint8(tvb, offset); proc_flag_item = proto_tree_add_item(primary_tree, hf_bundle_procflags, tvb, - offset, 1, FALSE); + offset, 1, ENC_BIG_ENDIAN); proc_flag_tree = proto_item_add_subtree(proc_flag_item, ett_proc_flags); proto_tree_add_boolean(proc_flag_tree, hf_bundle_procflags_fragment, tvb, offset, 1, pri_hdr_procflags); @@ -732,7 +732,7 @@ dissect_version_4_primary_header(packet_info *pinfo, proto_tree *primary_tree, t ++offset; cosflags = tvb_get_guint8(tvb, offset); cos_flag_item = proto_tree_add_item(primary_tree, hf_bundle_cosflags, tvb, - offset, 1, FALSE); + offset, 1, ENC_BIG_ENDIAN); cos_flag_tree = proto_item_add_subtree(cos_flag_item, ett_cos_flags); proto_tree_add_uint(cos_flag_tree, hf_bundle_cosflags_priority, tvb, offset, 1, cosflags); @@ -740,7 +740,7 @@ dissect_version_4_primary_header(packet_info *pinfo, proto_tree *primary_tree, t ++offset; srrflags = tvb_get_guint8(tvb, offset); srr_flag_item = proto_tree_add_item(primary_tree, hf_bundle_srrflags, tvb, - offset, 1, FALSE); + offset, 1, ENC_BIG_ENDIAN); srr_flag_tree = proto_item_add_subtree(srr_flag_item, ett_srr_flags); proto_tree_add_boolean(srr_flag_tree, hf_bundle_srrflags_report_receipt, @@ -776,59 +776,59 @@ dissect_version_4_primary_header(packet_info *pinfo, proto_tree *primary_tree, t dst_scheme_pos = offset; dst_scheme_len = 2; proto_tree_add_item(primary_tree, hf_bundle_dest_scheme_offset, - tvb, offset, 2, FALSE); + tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; dest_ssp_offset = tvb_get_ntohs(tvb, offset); dst_ssp_len = 2; proto_tree_add_item(primary_tree, hf_bundle_dest_ssp_offset, - tvb, offset, 2, FALSE); + tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; source_scheme_offset = tvb_get_ntohs(tvb, offset); src_scheme_pos = offset; src_scheme_len = 2; proto_tree_add_item(primary_tree, hf_bundle_source_scheme_offset, - tvb, offset, 2, FALSE); + tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; source_ssp_offset = tvb_get_ntohs(tvb, offset); src_ssp_len = 2; proto_tree_add_item(primary_tree, hf_bundle_source_ssp_offset, - tvb, offset, 2, FALSE); + tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; report_scheme_offset = tvb_get_ntohs(tvb, offset); rpt_scheme_pos = offset; rpt_scheme_len = 2; proto_tree_add_item(primary_tree, hf_bundle_report_scheme_offset, - tvb, offset, 2, FALSE); + tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; report_ssp_offset = tvb_get_ntohs(tvb, offset); rpt_ssp_len = 2; proto_tree_add_item(primary_tree, hf_bundle_report_ssp_offset, - tvb, offset, 2, FALSE); + tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; cust_scheme_offset = tvb_get_ntohs(tvb, offset); cust_scheme_pos = offset; cust_scheme_len = 2; proto_tree_add_item(primary_tree, hf_bundle_cust_scheme_offset, - tvb, offset, 2, FALSE); + tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; cust_ssp_offset = tvb_get_ntohs(tvb, offset); cust_ssp_len = 2; proto_tree_add_item(primary_tree, hf_bundle_cust_ssp_offset, - tvb, offset, 2, FALSE); + tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(primary_tree, hf_bundle_creation_timestamp, - tvb, offset, 8, FALSE); + tvb, offset, 8, ENC_BIG_ENDIAN); offset += 8; - proto_tree_add_item(primary_tree, hf_bundle_lifetime, tvb, offset, 4, FALSE); + proto_tree_add_item(primary_tree, hf_bundle_lifetime, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; bundle_header_dict_length = evaluate_sdnv(tvb, offset, &sdnv_length); @@ -1072,7 +1072,7 @@ dissect_version_5_and_6_primary_header(packet_info *pinfo, return 0; } proc_flag_item = proto_tree_add_item(primary_tree, hf_bundle_control_flags, tvb, - offset, sdnv_length, FALSE); + offset, sdnv_length, ENC_BIG_ENDIAN); proc_flag_tree = proto_item_add_subtree(proc_flag_item, ett_proc_flags); gen_flag_item = proto_tree_add_text(proc_flag_tree, tvb, offset, @@ -1532,7 +1532,7 @@ dissect_payload_header(proto_tree *tree, tvbuff_t *tvb, int offset, gboolean *la *lastheader = FALSE; } proc_flag_item = proto_tree_add_item(payload_tree, hf_bundle_payload_flags, tvb, - offset, 1, FALSE); + offset, 1, ENC_BIG_ENDIAN); proc_flag_tree = proto_item_add_subtree(proc_flag_item, ett_payload_flags); proto_tree_add_boolean(proc_flag_tree, hf_bundle_payload_flags_replicate_hdr, tvb, offset, 1, procflags); @@ -1557,7 +1557,7 @@ dissect_payload_header(proto_tree *tree, tvbuff_t *tvb, int offset, gboolean *la *lastheader = FALSE; } block_flag_item = proto_tree_add_item(payload_tree, hf_block_control_flags, tvb, - offset, sdnv_length, FALSE); + offset, sdnv_length, ENC_BIG_ENDIAN); block_flag_tree = proto_item_add_subtree(block_flag_item, ett_block_flags); proto_tree_add_boolean(block_flag_tree, hf_block_control_replicate, @@ -1653,7 +1653,7 @@ dissect_admin_record(proto_tree *primary_tree, tvbuff_t *tvb, int offset) /* Decode Bundle Status Report Flags */ status = tvb_get_guint8(tvb, offset); status_flag_item = proto_tree_add_item(admin_record_tree, - hf_bundle_admin_statflags, tvb, offset, 1, FALSE); + hf_bundle_admin_statflags, tvb, offset, 1, ENC_BIG_ENDIAN); status_flag_tree = proto_item_add_subtree(status_flag_item, ett_admin_rec_status); proto_tree_add_boolean(status_flag_tree, hf_bundle_admin_rcvd, @@ -1906,12 +1906,12 @@ dissect_contact_header(tvbuff_t *tvb, packet_info *pinfo, */ proto_tree_add_text(conv_tree, tvb, 0, 4, "Pkt Type: Contact Header"); - proto_tree_add_item(conv_tree, hf_contact_hdr_version, tvb, 4, 1, FALSE); + proto_tree_add_item(conv_tree, hf_contact_hdr_version, tvb, 4, 1, ENC_BIG_ENDIAN); /* Subtree to expand the bits in the Contact Header Flags */ contact_hdr_flags = tvb_get_guint8(tvb, 5); contact_hdr_flag_item = - proto_tree_add_item(conv_tree, hf_contact_hdr_flags, tvb, 5, 1, FALSE); + proto_tree_add_item(conv_tree, hf_contact_hdr_flags, tvb, 5, 1, ENC_BIG_ENDIAN); contact_hdr_flag_tree = proto_item_add_subtree(contact_hdr_flag_item, ett_contact_hdr_flags); proto_tree_add_boolean(contact_hdr_flag_tree, hf_contact_hdr_flags_ack_req, @@ -1920,7 +1920,7 @@ dissect_contact_header(tvbuff_t *tvb, packet_info *pinfo, tvb, 5, 1, contact_hdr_flags); proto_tree_add_boolean(contact_hdr_flag_tree, hf_contact_hdr_flags_nak, tvb, 5, 1, contact_hdr_flags); - proto_tree_add_item(conv_tree, hf_contact_hdr_keep_alive, tvb, 6, 2, FALSE); + proto_tree_add_item(conv_tree, hf_contact_hdr_keep_alive, tvb, 6, 2, ENC_BIG_ENDIAN); /* * New format Contact header has length field followed by Bundle Header. diff --git a/epan/dissectors/packet-dtp.c b/epan/dissectors/packet-dtp.c index d52fa7f0a7..9bec86fa7e 100644 --- a/epan/dissectors/packet-dtp.c +++ b/epan/dissectors/packet-dtp.c @@ -86,7 +86,7 @@ dissect_dtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } /* We assume version */ - proto_tree_add_item(dtp_tree, hf_dtp_version, tvb, offset, 1, FALSE); + proto_tree_add_item(dtp_tree, hf_dtp_version, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; while (tvb_reported_length_remaining(tvb, offset) > 0) { diff --git a/epan/dissectors/packet-dvmrp.c b/epan/dissectors/packet-dvmrp.c index 3c096e499a..a01c7532e9 100644 --- a/epan/dissectors/packet-dvmrp.c +++ b/epan/dissectors/packet-dvmrp.c @@ -370,18 +370,18 @@ dissect_dvmrp_v3(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int offset += 1; /* minor version */ - proto_tree_add_item(parent_tree, hf_min_ver, tvb, offset, 1, FALSE); + proto_tree_add_item(parent_tree, hf_min_ver, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; /* major version */ - proto_tree_add_item(parent_tree, hf_maj_ver, tvb, offset, 1, FALSE); + proto_tree_add_item(parent_tree, hf_maj_ver, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; switch (code) { case DVMRP_V3_PROBE: /* generation id */ proto_tree_add_item(parent_tree, hf_genid, tvb, - offset, 4, FALSE); + offset, 4, ENC_BIG_ENDIAN); offset += 4; while (tvb_reported_length_remaining(tvb, offset)>=4) { proto_tree_add_item(parent_tree, hf_neighbor, @@ -403,7 +403,7 @@ dissect_dvmrp_v3(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int offset += 4; /* prune lifetime */ proto_tree_add_item(parent_tree, hf_life, - tvb, offset, 4, FALSE); + tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; /* source netmask */ if (tvb_reported_length_remaining(tvb, offset)>=4) { @@ -461,11 +461,11 @@ dissect_dvmrp_v3(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int offset += 4; /* Metric */ proto_tree_add_item(parent_tree, hf_metric, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; /* Threshold */ proto_tree_add_item(parent_tree, hf_threshold, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; /* Flags */ { @@ -493,7 +493,7 @@ dissect_dvmrp_v3(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int /* Neighbor count */ neighbor_count = tvb_get_guint8(tvb, offset); proto_tree_add_item(parent_tree, hf_ncount, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; while ((tvb_reported_length_remaining(tvb, offset)>=4) @@ -599,7 +599,7 @@ dissect_dvmrp_v1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int break; case V1_COMMAND_METRIC: proto_tree_add_item(tree, hf_metric, tvb, - offset, 1, FALSE); + offset, 1, ENC_BIG_ENDIAN); if (item) { proto_item_set_text(item, "%s: %d", val_to_str(cmd, command, "Unknown Command:0x%02x"), @@ -619,7 +619,7 @@ dissect_dvmrp_v1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int break; case V1_COMMAND_INFINITY: proto_tree_add_item(tree, hf_infinity, tvb, - offset, 1, FALSE); + offset, 1, ENC_BIG_ENDIAN); if (item) { proto_item_set_text(item, "%s: %d", val_to_str(cmd, command, "Unknown Command:0x%02x"), tvb_get_guint8(tvb, offset)); @@ -652,7 +652,7 @@ dissect_dvmrp_v1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int tvb, offset, 4, FALSE); offset += 4; proto_tree_add_item(tree, hf_hold, tvb, - offset, 4, FALSE); + offset, 4, ENC_BIG_ENDIAN); offset += 4; } if (item) { diff --git a/epan/dissectors/packet-e100.c b/epan/dissectors/packet-e100.c index e215c877e4..1130078ec9 100644 --- a/epan/dissectors/packet-e100.c +++ b/epan/dissectors/packet-e100.c @@ -92,15 +92,15 @@ dissect_e100(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) e100_tree = proto_item_add_subtree(ti, ett_e100); proto_tree_add_item(e100_tree, hf_e100_header, tvb, - e100_header_ver.offset, e100_header_ver.len, FALSE); + e100_header_ver.offset, e100_header_ver.len, ENC_BIG_ENDIAN); proto_tree_add_item(e100_tree, hf_e100_port, tvb, - e100_port_recv.offset, e100_port_recv.len, FALSE); + e100_port_recv.offset, e100_port_recv.len, ENC_BIG_ENDIAN); proto_tree_add_item(e100_tree, hf_e100_seq, tvb, - e100_seq.offset, e100_seq.len, FALSE); + e100_seq.offset, e100_seq.len, ENC_BIG_ENDIAN); proto_tree_add_item(e100_tree, hf_e100_ip, tvb, e100_ip.offset, e100_ip.len, FALSE); proto_tree_add_item(e100_tree, hf_e100_mon_pkt_id, tvb, - e100_mon_pkt_id.offset, e100_mon_pkt_id.len, FALSE); + e100_mon_pkt_id.offset, e100_mon_pkt_id.len, ENC_BIG_ENDIAN); { nstime_t ts; ts.secs = tvb_get_ntohl(tvb, e100_ts.offset); @@ -109,9 +109,9 @@ dissect_e100(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) e100_ts.offset, e100_ts.len, &ts); } proto_tree_add_item(e100_tree, hf_e100_bytes_cap, tvb, - e100_bytes_cap.offset, e100_bytes_cap.len, FALSE); + e100_bytes_cap.offset, e100_bytes_cap.len, ENC_BIG_ENDIAN); proto_tree_add_item(e100_tree, hf_e100_bytes_orig, tvb, - e100_bytes_orig.offset, e100_bytes_orig.len, FALSE); + e100_bytes_orig.offset, e100_bytes_orig.len, ENC_BIG_ENDIAN); } /* if(tree) */ bytes_captured = tvb_get_ntohl(tvb, e100_bytes_cap.offset); diff --git a/epan/dissectors/packet-eap.c b/epan/dissectors/packet-eap.c index 0bd7f8114d..f38a6e5771 100644 --- a/epan/dissectors/packet-eap.c +++ b/epan/dissectors/packet-eap.c @@ -262,10 +262,10 @@ dissect_exteap(proto_tree *eap_tree, tvbuff_t *tvb, int offset, gint size, packet_info* pinfo) { - proto_tree_add_item(eap_tree, hf_eapext_vendorid, tvb, offset, 3, FALSE); + proto_tree_add_item(eap_tree, hf_eapext_vendorid, tvb, offset, 3, ENC_BIG_ENDIAN); offset += 3; size -= 3; - proto_tree_add_item(eap_tree, hf_eapext_vendortype, tvb, offset, 4, FALSE); + proto_tree_add_item(eap_tree, hf_eapext_vendortype, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; size -= 4; /* Generic method to support multiple vendor-defined extended types goes here :-) */ @@ -716,7 +716,7 @@ dissect_eap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } if (tree) - proto_tree_add_item(eap_tree, hf_eap_identifier, tvb, 1, 1, FALSE); + proto_tree_add_item(eap_tree, hf_eap_identifier, tvb, 1, 1, ENC_BIG_ENDIAN); if (tree) proto_tree_add_uint(eap_tree, hf_eap_len, tvb, 2, 2, eap_len); @@ -771,7 +771,7 @@ dissect_eap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case EAP_TYPE_NAK: if (tree) { proto_tree_add_item(eap_tree, hf_eap_type_nak, tvb, - offset, 1, FALSE); + offset, 1, ENC_BIG_ENDIAN); } break; /********************************************************************* diff --git a/epan/dissectors/packet-eapol.c b/epan/dissectors/packet-eapol.c index 6a1ab76b73..2224a6f247 100644 --- a/epan/dissectors/packet-eapol.c +++ b/epan/dissectors/packet-eapol.c @@ -151,7 +151,7 @@ dissect_eapol(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ti = proto_tree_add_item(tree, proto_eapol, tvb, 0, -1, FALSE); eapol_tree = proto_item_add_subtree(ti, ett_eapol); - proto_tree_add_item(eapol_tree, hf_eapol_version, tvb, offset, 1, FALSE); + proto_tree_add_item(eapol_tree, hf_eapol_version, tvb, offset, 1, ENC_BIG_ENDIAN); } offset++; @@ -182,7 +182,7 @@ dissect_eapol(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case EAPOL_KEY: if (tree) { keydesc_type = tvb_get_guint8(tvb, offset); - proto_tree_add_item(eapol_tree, hf_eapol_keydes_type, tvb, offset, 1, FALSE); + proto_tree_add_item(eapol_tree, hf_eapol_keydes_type, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; if (keydesc_type == EAPOL_WPA_KEY || keydesc_type == EAPOL_RSN_KEY) { keyinfo = tvb_get_ntohs(tvb, offset); @@ -239,7 +239,7 @@ dissect_eapol(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) 2, tvb_get_ntohs(tvb, offset)); offset += 2; proto_tree_add_item(eapol_tree, hf_eapol_keydes_replay_counter, tvb, - offset, 8, FALSE); + offset, 8, ENC_BIG_ENDIAN); offset += 8; proto_tree_add_item(eapol_tree, hf_eapol_wpa_keydes_nonce, tvb, offset, 32, ENC_NA); @@ -281,7 +281,7 @@ dissect_eapol(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_uint(eapol_tree, hf_eapol_keydes_keylen, tvb, offset, 2, eapol_key_len); offset += 2; proto_tree_add_item(eapol_tree, hf_eapol_keydes_replay_counter, tvb, - offset, 8, FALSE); + offset, 8, ENC_BIG_ENDIAN); offset += 8; proto_tree_add_item(eapol_tree, hf_eapol_keydes_key_iv, tvb, offset, 16, ENC_NA); diff --git a/epan/dissectors/packet-edonkey.c b/epan/dissectors/packet-edonkey.c index c9b0f9a5b2..2c7921e412 100644 --- a/epan/dissectors/packet-edonkey.c +++ b/epan/dissectors/packet-edonkey.c @@ -626,14 +626,14 @@ static proto_item* edonkey_tree_add_metatag_name(proto_tree *tree, tvbuff_t *tvb static int dissect_kademlia_search_condition_argument_uint64(tvbuff_t *tvb, packet_info *pinfo _U_, int offset, proto_tree *tree) { - proto_tree_add_item( tree, hf_kademlia_search_condition_argument_uint64, tvb, offset, 8, TRUE ); + proto_tree_add_item( tree, hf_kademlia_search_condition_argument_uint64, tvb, offset, 8, ENC_LITTLE_ENDIAN ); return offset + 8; } static int dissect_kademlia_search_condition_argument_uint32(tvbuff_t *tvb, packet_info *pinfo _U_, int offset, proto_tree *tree) { - proto_tree_add_item( tree, hf_kademlia_search_condition_argument_uint32, tvb, offset, 4, TRUE ); + proto_tree_add_item( tree, hf_kademlia_search_condition_argument_uint32, tvb, offset, 4, ENC_LITTLE_ENDIAN ); return offset + 4; } @@ -642,7 +642,7 @@ static int dissect_kademlia_search_condition(tvbuff_t *tvb, packet_info *pinfo _ { proto_item * ti; guint16 value = tvb_get_guint8(tvb, offset); - ti = proto_tree_add_item( tree, hf_kademlia_search_condition, tvb, offset, 1, FALSE ); + ti = proto_tree_add_item( tree, hf_kademlia_search_condition, tvb, offset, 1, ENC_BIG_ENDIAN ); proto_item_append_text(ti, " [%s]", val_to_str( value, kademlia_search_conds, "Unknown") ); return offset + 1; @@ -858,7 +858,7 @@ static int dissect_edonkey_address(tvbuff_t *tvb, packet_info *pinfo _U_, /* guint32 ip = tvb_get_letohl(tvb, offset); proto_tree_add_ipv4(tree, hf_edonkey_ip, tvb, offset, 4, ip); */ proto_tree_add_item(tree, hf_edonkey_ip, tvb, offset, 4, FALSE); - proto_tree_add_item(tree, hf_edonkey_port, tvb, offset+4, 2, TRUE); + proto_tree_add_item(tree, hf_edonkey_port, tvb, offset+4, 2, ENC_LITTLE_ENDIAN); return offset+6; } @@ -866,14 +866,14 @@ static int dissect_edonkey_address(tvbuff_t *tvb, packet_info *pinfo _U_, static int dissect_kademlia_udp_port(tvbuff_t *tvb, packet_info *pinfo _U_, int offset, proto_tree *tree) { - proto_tree_add_item(tree, hf_kademlia_udp_port, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_kademlia_udp_port, tvb, offset, 2, ENC_LITTLE_ENDIAN); return offset +2; } static int dissect_kademlia_tcp_port(tvbuff_t *tvb, packet_info *pinfo _U_, int offset, proto_tree *tree) { - proto_tree_add_item(tree, hf_kademlia_tcp_port, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_kademlia_tcp_port, tvb, offset, 2, ENC_LITTLE_ENDIAN); return offset +2; } @@ -925,7 +925,7 @@ static int dissect_kademlia_tagname(tvbuff_t *tvb, packet_info *pinfo _U_, tag_full_name = val_to_str( tagname_value, kademlia_tags, tag_full_name ); } - ti = proto_tree_add_item(tree, hf_kademlia_tag_name, tvb, offset+2, string_length, FALSE); + ti = proto_tree_add_item(tree, hf_kademlia_tag_name, tvb, offset+2, string_length, ENC_BIG_ENDIAN); proto_item_append_text(ti, " [%s]", tag_full_name); if (outputTagName) @@ -1197,7 +1197,7 @@ static int dissect_emule_sourceOBFU(tvbuff_t *tvb, packet_info *pinfo _U_, sourceOBFU_tree = proto_item_add_subtree(ti, ett_emule_sourceOBFU); proto_tree_add_item(sourceOBFU_tree, hf_edonkey_ip, tvb, offset, 4, FALSE); - proto_tree_add_item(sourceOBFU_tree, hf_edonkey_port, tvb, offset+4, 2, TRUE); + proto_tree_add_item(sourceOBFU_tree, hf_edonkey_port, tvb, offset+4, 2, ENC_LITTLE_ENDIAN); proto_tree_add_text(sourceOBFU_tree, tvb, offset+6, 1, "Obfuscation Settings: %u", settings); offset += 7; if (settings & 0x80) @@ -1240,7 +1240,7 @@ static int dissect_edonkey_port(tvbuff_t *tvb, packet_info *pinfo _U_, int offset, proto_tree *tree) { /* <Port> ::= guint16 */ - proto_tree_add_item(tree, hf_edonkey_port, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_edonkey_port, tvb, offset, 2, ENC_LITTLE_ENDIAN); return offset+2; } @@ -1554,7 +1554,7 @@ static int dissect_kademlia_peertype(tvbuff_t *tvb, packet_info *pinfo _U_, int offset, proto_tree *tree) { /* <Peer type> ::= 1bytes */ - proto_tree_add_item( tree, hf_kademlia_peertype, tvb, offset, 1, FALSE ); + proto_tree_add_item( tree, hf_kademlia_peertype, tvb, offset, 1, ENC_BIG_ENDIAN ); return offset + 1; } @@ -1580,7 +1580,7 @@ static int dissect_kademlia_peer(tvbuff_t *tvb, packet_info *pinfo _U_, /* 1 */ /* offset = dissect_kademlia_peertype(tvb, pinfo, offset, peer_tree); */ kad_version = tvb_get_guint8(tvb, offset); - ti = proto_tree_add_item(peer_tree, hf_kademlia_version, tvb, offset, 1, FALSE); + ti = proto_tree_add_item(peer_tree, hf_kademlia_version, tvb, offset, 1, ENC_BIG_ENDIAN); proto_item_append_text(ti, "%s", val_to_str(kad_version, kademlia_versions, " Unknown")); return offset + 1; } @@ -2220,7 +2220,7 @@ static int dissect_edonkey_udp_message(guint8 msg_type, break; case OVERNET_MSG_UDP_IP_QUERY: /* IP Query: <TCP Port> */ - proto_tree_add_item(tree, hf_edonkey_port, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_edonkey_port, tvb, offset, 2, ENC_LITTLE_ENDIAN); break; case OVERNET_MSG_UDP_IP_QUERY_ANSWER: /* IP Query Answer: <IP> */ @@ -2234,12 +2234,12 @@ static int dissect_edonkey_udp_message(guint8 msg_type, break; case OVERNET_MSG_UDP_IDENTIFY_ACK: /* Identify Reply: <TCP Port (sender)> */ - proto_tree_add_item(tree, hf_edonkey_port, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_edonkey_port, tvb, offset, 2, ENC_LITTLE_ENDIAN); break; case OVERNET_MSG_UDP_FIREWALL_CONNECTION: /* Firewall Connnection Ack: <Hash> <TCP Port> */ offset = dissect_edonkey_client_hash(tvb, pinfo, offset, tree); - proto_tree_add_item(tree, hf_edonkey_port, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_edonkey_port, tvb, offset, 2, ENC_LITTLE_ENDIAN); break; case OVERNET_MSG_UDP_FIREWALL_CONNECTION_ACK: /* Firewall Connnection Ack: <Hash> */ @@ -2279,7 +2279,7 @@ static int dissect_emule_udp_message(guint8 msg_type, if ( msg_end == offset + 2 ) { /* Udp version > 2 */ - proto_tree_add_item( tree, hf_emule_source_count, tvb, offset, 2, TRUE ); + proto_tree_add_item( tree, hf_emule_source_count, tvb, offset, 2, ENC_LITTLE_ENDIAN ); offset += 2; } break; @@ -2348,7 +2348,7 @@ static int dissect_kademlia_tag(tvbuff_t *tvb, packet_info *pinfo _U_, { proto_item * ti_tagtype; - ti_tagtype = proto_tree_add_item( subtree, hf_kademlia_tag_type, tvb, offset, 1, TRUE ); + ti_tagtype = proto_tree_add_item( subtree, hf_kademlia_tag_type, tvb, offset, 1, ENC_LITTLE_ENDIAN ); proto_item_append_text( ti_tagtype, " [%s]", str_type ); } @@ -2388,7 +2388,7 @@ static int dissect_kademlia_tag(tvbuff_t *tvb, packet_info *pinfo _U_, case KADEMLIA_TAGTYPE_UINT8: { guint8 value; - ti = proto_tree_add_item( subtree, hf_kademlia_tag_uint8, tvb, offset, 1, TRUE); + ti = proto_tree_add_item( subtree, hf_kademlia_tag_uint8, tvb, offset, 1, ENC_LITTLE_ENDIAN); value = tvb_get_guint8( tvb, offset ); proto_item_append_text( tag_node, "%u (0x%02X)", value, value ); @@ -2408,7 +2408,7 @@ static int dissect_kademlia_tag(tvbuff_t *tvb, packet_info *pinfo _U_, case KADEMLIA_TAGTYPE_UINT16: { guint16 value; - proto_tree_add_item( subtree, hf_kademlia_tag_uint16, tvb, offset, 2, TRUE); + proto_tree_add_item( subtree, hf_kademlia_tag_uint16, tvb, offset, 2, ENC_LITTLE_ENDIAN); value = tvb_get_letohs( tvb, offset ); proto_item_append_text( tag_node, "%u (0x%04X)", value, value ); @@ -2419,7 +2419,7 @@ static int dissect_kademlia_tag(tvbuff_t *tvb, packet_info *pinfo _U_, case KADEMLIA_TAGTYPE_UINT64: { guint64 value; - proto_tree_add_item( subtree, hf_kademlia_tag_uint64, tvb, offset, 8, TRUE); + proto_tree_add_item( subtree, hf_kademlia_tag_uint64, tvb, offset, 8, ENC_LITTLE_ENDIAN); value = tvb_get_letoh64( tvb, offset ); proto_item_append_text( tag_node, "%" G_GINT64_MODIFIER "u (0x%08" G_GINT64_MODIFIER "X)", value, value ); @@ -2446,7 +2446,7 @@ static int dissect_kademlia_tag(tvbuff_t *tvb, packet_info *pinfo _U_, } break; default: - proto_tree_add_item( subtree, hf_kademlia_tag_uint32, tvb, offset, 4, TRUE); + proto_tree_add_item( subtree, hf_kademlia_tag_uint32, tvb, offset, 4, ENC_LITTLE_ENDIAN); value = tvb_get_letohl( tvb, offset ); proto_item_append_text( tag_node, "%u (0x%02X) ", value, value ); } @@ -2457,7 +2457,7 @@ static int dissect_kademlia_tag(tvbuff_t *tvb, packet_info *pinfo _U_, case KADEMLIA_TAGTYPE_FLOAT32: { float value; - proto_tree_add_item( subtree, hf_kademlia_tag_float, tvb, offset, 4, TRUE); + proto_tree_add_item( subtree, hf_kademlia_tag_float, tvb, offset, 4, ENC_LITTLE_ENDIAN); value = tvb_get_letohieee_float( tvb, offset ); proto_item_append_text( tag_node, "%f", value ); @@ -2606,7 +2606,7 @@ static int dissect_kademlia2_prolog( tvbuff_t *tvb, packet_info *pinfo _U_, kad_version = tvb_get_guint8(tvb, offset); /* ti = proto_tree_add_text(tree, tvb, offset, 1, "Kad Version: %d", kad_version ); */ - ti = proto_tree_add_item(tree, hf_kademlia_version, tvb, offset, 1, FALSE); + ti = proto_tree_add_item(tree, hf_kademlia_version, tvb, offset, 1, ENC_BIG_ENDIAN); proto_item_append_text(ti, "%s", val_to_str(kad_version, kademlia_versions, " Unknown")); offset++; @@ -2633,7 +2633,7 @@ static int dissect_kademlia_udp_message(guint8 msg_type, if ((length < 0) || (length > bytes_remaining)) length = bytes_remaining; if (length <= 0) return offset; - hidden_item = proto_tree_add_item(tree, hf_kademlia, tvb, offset, 1, FALSE); + hidden_item = proto_tree_add_item(tree, hf_kademlia, tvb, offset, 1, ENC_BIG_ENDIAN); PROTO_ITEM_SET_HIDDEN(hidden_item); msg_end = offset + length; diff --git a/epan/dissectors/packet-egd.c b/epan/dissectors/packet-egd.c index 10c9ff8d3d..eca5497e2b 100644 --- a/epan/dissectors/packet-egd.c +++ b/epan/dissectors/packet-egd.c @@ -117,22 +117,22 @@ static void dissect_egd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ti = proto_tree_add_item(tree, proto_egd, tvb, 0, -1, FALSE); egd_tree = proto_item_add_subtree(ti, ett_egd); - proto_tree_add_item(egd_tree, hf_egd_type, tvb, offset, 1, TRUE); + proto_tree_add_item(egd_tree, hf_egd_type, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; - proto_tree_add_item(egd_tree, hf_egd_ver, tvb, offset, 1, TRUE); + proto_tree_add_item(egd_tree, hf_egd_ver, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; - proto_tree_add_item(egd_tree, hf_egd_rid, tvb, offset, 2, TRUE); + proto_tree_add_item(egd_tree, hf_egd_rid, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; proto_tree_add_item(egd_tree, hf_egd_pid, tvb, offset, 4, FALSE); offset += 4; - proto_tree_add_item(egd_tree, hf_egd_exid, tvb, offset, 4, TRUE); + proto_tree_add_item(egd_tree, hf_egd_exid, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; /* time */ sectime = tvb_get_letohl(tvb, offset); if (0 == sectime) { - notime = proto_tree_add_item(egd_tree, hf_egd_notime, tvb, offset, 8, TRUE); + notime = proto_tree_add_item(egd_tree, hf_egd_notime, tvb, offset, 8, ENC_LITTLE_ENDIAN); proto_item_append_text(notime, "--No TimeStamp"); } else @@ -143,11 +143,11 @@ static void dissect_egd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } offset += 8; - proto_tree_add_item(egd_tree, hf_egd_stat, tvb, offset, 4, TRUE); + proto_tree_add_item(egd_tree, hf_egd_stat, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; - proto_tree_add_item(egd_tree, hf_egd_csig, tvb, offset, 4, TRUE); + proto_tree_add_item(egd_tree, hf_egd_csig, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; - proto_tree_add_item(egd_tree, hf_egd_resv, tvb, offset, 4, TRUE); + proto_tree_add_item(egd_tree, hf_egd_resv, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; data_length = tvb_length_remaining(tvb, offset); diff --git a/epan/dissectors/packet-ehs.c b/epan/dissectors/packet-ehs.c index e511e439ad..8be33a2204 100644 --- a/epan/dissectors/packet-ehs.c +++ b/epan/dissectors/packet-ehs.c @@ -471,26 +471,26 @@ static int ehs_secondary_header_size ( int protocol, tvbuff_t* tvb, int offset ) /* common EHS secondary header dissector */ static void common_secondary_header_dissector ( proto_tree* ehs_secondary_header_tree, tvbuff_t* tvb, int* offset ) { - proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_vcdu_sequence_number, tvb, *offset, 3, FALSE ); + proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_vcdu_sequence_number, tvb, *offset, 3, ENC_BIG_ENDIAN ); *offset += 3; - proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_data_stream_id, tvb, *offset, 1, FALSE ); - /* proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_pdss_reserved_1, tvb, *offset, 1, FALSE ); */ + proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_data_stream_id, tvb, *offset, 1, ENC_BIG_ENDIAN ); + /* proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_pdss_reserved_1, tvb, *offset, 1, ENC_BIG_ENDIAN ); */ ++(*offset); - /* proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_pdss_reserved_2, tvb, *offset, 1, FALSE ); */ + /* proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_pdss_reserved_2, tvb, *offset, 1, ENC_BIG_ENDIAN ); */ ++(*offset); - /* proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_pdss_reserved_3, tvb, *offset, 2, FALSE ); */ + /* proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_pdss_reserved_3, tvb, *offset, 2, ENC_BIG_ENDIAN ); */ proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_gse_pkt_id, tvb, *offset, 2, FALSE ); - proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_payload_vs_core_id, tvb, *offset, 2, FALSE ); - proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_apid, tvb, *offset, 2, FALSE ); + proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_payload_vs_core_id, tvb, *offset, 2, ENC_BIG_ENDIAN ); + proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_apid, tvb, *offset, 2, ENC_BIG_ENDIAN ); *offset += 2; - proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_virtual_channel, tvb, *offset, 2, FALSE ); + proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_virtual_channel, tvb, *offset, 2, ENC_BIG_ENDIAN ); *offset += 2; - proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_pdss_reserved_sync, tvb, *offset, 2, FALSE ); + proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_pdss_reserved_sync, tvb, *offset, 2, ENC_BIG_ENDIAN ); *offset += 2; } @@ -499,13 +499,13 @@ static void common_secondary_header_dissector ( proto_tree* ehs_secondary_header /* AOS/LOS EHS secondary header dissector */ static void aoslos_secondary_header_dissector ( proto_tree* ehs_secondary_header_tree, tvbuff_t* tvb, int* offset ) { - proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_version, tvb, *offset, 1, FALSE ); - proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_data_status_bit_5, tvb, *offset, 1, FALSE ); - proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_data_status_bit_4, tvb, *offset, 1, FALSE ); - proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_data_status_bit_3, tvb, *offset, 1, FALSE ); - proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_data_status_bit_2, tvb, *offset, 1, FALSE ); - proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_data_status_bit_1, tvb, *offset, 1, FALSE ); - proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_data_status_bit_0, tvb, *offset, 1, FALSE ); + proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_version, tvb, *offset, 1, ENC_BIG_ENDIAN ); + proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_data_status_bit_5, tvb, *offset, 1, ENC_BIG_ENDIAN ); + proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_data_status_bit_4, tvb, *offset, 1, ENC_BIG_ENDIAN ); + proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_data_status_bit_3, tvb, *offset, 1, ENC_BIG_ENDIAN ); + proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_data_status_bit_2, tvb, *offset, 1, ENC_BIG_ENDIAN ); + proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_data_status_bit_1, tvb, *offset, 1, ENC_BIG_ENDIAN ); + proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_data_status_bit_0, tvb, *offset, 1, ENC_BIG_ENDIAN ); ++(*offset); common_secondary_header_dissector ( ehs_secondary_header_tree, tvb, offset ); @@ -515,13 +515,13 @@ static void aoslos_secondary_header_dissector ( proto_tree* ehs_secondary_header /* payload ccsds secondary header dissector */ static void payload_ccsds_secondary_header_dissector ( proto_tree* ehs_secondary_header_tree, tvbuff_t* tvb, int* offset ) { - proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_version, tvb, *offset, 1, FALSE ); - proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_data_status_bit_5, tvb, *offset, 1, FALSE ); - proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_data_status_bit_4, tvb, *offset, 1, FALSE ); - proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_data_status_bit_3, tvb, *offset, 1, FALSE ); + proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_version, tvb, *offset, 1, ENC_BIG_ENDIAN ); + proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_data_status_bit_5, tvb, *offset, 1, ENC_BIG_ENDIAN ); + proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_data_status_bit_4, tvb, *offset, 1, ENC_BIG_ENDIAN ); + proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_data_status_bit_3, tvb, *offset, 1, ENC_BIG_ENDIAN ); proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_vcdu_sequence_error, tvb, *offset, 1, FALSE ); - proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_packet_sequence_error, tvb, *offset, 1, FALSE ); - proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_data_status_bit_0, tvb, *offset, 1, FALSE ); + proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_packet_sequence_error, tvb, *offset, 1, ENC_BIG_ENDIAN ); + proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_data_status_bit_0, tvb, *offset, 1, ENC_BIG_ENDIAN ); ++(*offset); common_secondary_header_dissector ( ehs_secondary_header_tree, tvb, offset ); @@ -531,13 +531,13 @@ static void payload_ccsds_secondary_header_dissector ( proto_tree* ehs_secondary /* core ccsds secondary header dissector */ static void core_ccsds_secondary_header_dissector ( proto_tree* ehs_secondary_header_tree, tvbuff_t* tvb, int* offset ) { - proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_version, tvb, *offset, 1, FALSE ); - proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_data_status_bit_5, tvb, *offset, 1, FALSE ); - proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_data_status_bit_4, tvb, *offset, 1, FALSE ); + proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_version, tvb, *offset, 1, ENC_BIG_ENDIAN ); + proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_data_status_bit_5, tvb, *offset, 1, ENC_BIG_ENDIAN ); + proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_data_status_bit_4, tvb, *offset, 1, ENC_BIG_ENDIAN ); proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_parent_stream_error, tvb, *offset, 1, FALSE ); proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_vcdu_sequence_error, tvb, *offset, 1, FALSE ); - proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_packet_sequence_error, tvb, *offset, 1, FALSE ); - proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_data_status_bit_0, tvb, *offset, 1, FALSE ); + proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_packet_sequence_error, tvb, *offset, 1, ENC_BIG_ENDIAN ); + proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_data_status_bit_0, tvb, *offset, 1, ENC_BIG_ENDIAN ); ++(*offset); common_secondary_header_dissector ( ehs_secondary_header_tree, tvb, offset ); @@ -547,13 +547,13 @@ static void core_ccsds_secondary_header_dissector ( proto_tree* ehs_secondary_he /* payload bpdu secondary header dissector */ static void payload_bpdu_secondary_header_dissector ( proto_tree* ehs_secondary_header_tree, tvbuff_t* tvb, int* offset ) { - proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_version, tvb, *offset, 1, FALSE ); - proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_data_status_bit_5, tvb, *offset, 1, FALSE ); - proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_data_status_bit_4, tvb, *offset, 1, FALSE ); - proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_data_status_bit_3, tvb, *offset, 1, FALSE ); + proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_version, tvb, *offset, 1, ENC_BIG_ENDIAN ); + proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_data_status_bit_5, tvb, *offset, 1, ENC_BIG_ENDIAN ); + proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_data_status_bit_4, tvb, *offset, 1, ENC_BIG_ENDIAN ); + proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_data_status_bit_3, tvb, *offset, 1, ENC_BIG_ENDIAN ); proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_vcdu_sequence_error, tvb, *offset, 1, FALSE ); - proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_data_status_bit_1, tvb, *offset, 1, FALSE ); - proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_data_status_bit_0, tvb, *offset, 1, FALSE ); + proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_data_status_bit_1, tvb, *offset, 1, ENC_BIG_ENDIAN ); + proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_data_status_bit_0, tvb, *offset, 1, ENC_BIG_ENDIAN ); ++(*offset); common_secondary_header_dissector ( ehs_secondary_header_tree, tvb, offset ); @@ -563,13 +563,13 @@ static void payload_bpdu_secondary_header_dissector ( proto_tree* ehs_secondary_ /* udsm secondary header dissector */ static void udsm_secondary_header_dissector ( proto_tree* ehs_secondary_header_tree, tvbuff_t* tvb, int* offset ) { - proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_version, tvb, *offset, 1, FALSE ); - proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_data_status_bit_5, tvb, *offset, 1, FALSE ); - proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_data_status_bit_4, tvb, *offset, 1, FALSE ); - proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_data_status_bit_3, tvb, *offset, 1, FALSE ); - proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_data_status_bit_2, tvb, *offset, 1, FALSE ); - proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_data_status_bit_1, tvb, *offset, 1, FALSE ); - proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_data_status_bit_0, tvb, *offset, 1, FALSE ); + proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_version, tvb, *offset, 1, ENC_BIG_ENDIAN ); + proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_data_status_bit_5, tvb, *offset, 1, ENC_BIG_ENDIAN ); + proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_data_status_bit_4, tvb, *offset, 1, ENC_BIG_ENDIAN ); + proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_data_status_bit_3, tvb, *offset, 1, ENC_BIG_ENDIAN ); + proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_data_status_bit_2, tvb, *offset, 1, ENC_BIG_ENDIAN ); + proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_data_status_bit_1, tvb, *offset, 1, ENC_BIG_ENDIAN ); + proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_data_status_bit_0, tvb, *offset, 1, ENC_BIG_ENDIAN ); ++(*offset); common_secondary_header_dissector ( ehs_secondary_header_tree, tvb, offset ); @@ -588,12 +588,12 @@ static void tdm_secondary_header_dissector ( proto_tree* ehs_secondary_header_tr int year, jday, hour, minute, second, tenths; - proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_secondary_header_length, tvb, *offset, 2, FALSE ); + proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_secondary_header_length, tvb, *offset, 2, ENC_BIG_ENDIAN ); *offset += 2; proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_extra_data_packet, tvb, *offset, 1, FALSE ); - proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_backup_stream_id_number, tvb, *offset, 1, FALSE ); - proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_end_of_data_flag, tvb, *offset, 1, FALSE ); + proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_backup_stream_id_number, tvb, *offset, 1, ENC_BIG_ENDIAN ); + proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_end_of_data_flag, tvb, *offset, 1, ENC_BIG_ENDIAN ); proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_parent_frame_error, tvb, *offset, 1, FALSE ); proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_checksum_error, tvb, *offset, 1, FALSE ); proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_fixed_value_error, tvb, *offset, 1, FALSE ); @@ -605,35 +605,35 @@ static void tdm_secondary_header_dissector ( proto_tree* ehs_secondary_header_tr proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_sync_error, tvb, *offset, 1, FALSE ); proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_aoslos_flag, tvb, *offset, 1, FALSE ); proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_override_errors_flag, tvb, *offset, 1, FALSE ); - proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_data_status, tvb, *offset, 1, FALSE ); + proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_data_status, tvb, *offset, 1, ENC_BIG_ENDIAN ); ++(*offset); - proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_idq, tvb, *offset, 2, FALSE ); + proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_idq, tvb, *offset, 2, ENC_BIG_ENDIAN ); *offset += 2; - proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_cdq, tvb, *offset, 2, FALSE ); + proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_cdq, tvb, *offset, 2, ENC_BIG_ENDIAN ); *offset += 2; - proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_adq, tvb, *offset, 2, FALSE ); + proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_adq, tvb, *offset, 2, ENC_BIG_ENDIAN ); *offset += 2; - proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_data_dq, tvb, *offset, 2, FALSE ); + proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_data_dq, tvb, *offset, 2, ENC_BIG_ENDIAN ); *offset += 2; - /* proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_unused, tvb, *offset, 2, FALSE ); */ + /* proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_unused, tvb, *offset, 2, ENC_BIG_ENDIAN ); */ *offset += 2; - proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_format_id, tvb, *offset, 2, FALSE ); + proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_format_id, tvb, *offset, 2, ENC_BIG_ENDIAN ); *offset += 2; - proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_major_frame_packet_index, tvb, *offset, 1, FALSE ); + proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_major_frame_packet_index, tvb, *offset, 1, ENC_BIG_ENDIAN ); ++(*offset); - proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_numpkts_per_major_frame, tvb, *offset, 1, FALSE ); + proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_numpkts_per_major_frame, tvb, *offset, 1, ENC_BIG_ENDIAN ); ++(*offset); num_minor_frames = 1 + tvb_get_guint8 ( tvb, *offset ); - proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_num_minor_frames_per_packet, tvb, *offset, 1, FALSE ); + proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_num_minor_frames_per_packet, tvb, *offset, 1, ENC_BIG_ENDIAN ); ++(*offset); cntmet_present = tvb_get_guint8 ( tvb, *offset ) & 0x80; @@ -642,33 +642,33 @@ static void tdm_secondary_header_dissector ( proto_tree* ehs_secondary_header_tr proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_cntmet_present, tvb, *offset, 1, FALSE ); proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_obt_present, tvb, *offset, 1, FALSE ); proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_major_frame_status_present, tvb, *offset, 1, FALSE ); - /* proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_reserved, tvb, *offset, 1, FALSE ); */ + /* proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_reserved, tvb, *offset, 1, ENC_BIG_ENDIAN ); */ ++(*offset); if ( cntmet_present ) { year = tvb_get_guint8 ( tvb, *offset ); - proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_cnt_year, tvb, *offset, 1, FALSE ); + proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_cnt_year, tvb, *offset, 1, ENC_BIG_ENDIAN ); ++(*offset); jday = tvb_get_ntohs ( tvb, *offset ); - proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_cnt_jday, tvb, *offset, 2, FALSE ); + proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_cnt_jday, tvb, *offset, 2, ENC_BIG_ENDIAN ); *offset += 2; hour = tvb_get_guint8 ( tvb, *offset ); - proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_cnt_hour, tvb, *offset, 1, FALSE ); + proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_cnt_hour, tvb, *offset, 1, ENC_BIG_ENDIAN ); ++(*offset); minute = tvb_get_guint8 ( tvb, *offset ); - proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_cnt_minute, tvb, *offset, 1, FALSE ); + proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_cnt_minute, tvb, *offset, 1, ENC_BIG_ENDIAN ); ++(*offset); second = tvb_get_guint8 ( tvb, *offset ); - proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_cnt_second, tvb, *offset, 1, FALSE ); + proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_cnt_second, tvb, *offset, 1, ENC_BIG_ENDIAN ); ++(*offset); tenths = tvb_get_guint8 ( tvb, *offset ) >> 4; - proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_cnt_tenths, tvb, *offset, 1, FALSE ); + proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_cnt_tenths, tvb, *offset, 1, ENC_BIG_ENDIAN ); ++(*offset); /* format a more readable time */ @@ -680,27 +680,27 @@ static void tdm_secondary_header_dissector ( proto_tree* ehs_secondary_header_tr if ( obt_present ) { year = tvb_get_guint8 ( tvb, *offset ); - proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_obt_year, tvb, *offset, 1, FALSE ); + proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_obt_year, tvb, *offset, 1, ENC_BIG_ENDIAN ); ++(*offset); jday = tvb_get_ntohs ( tvb, *offset ); - proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_obt_jday, tvb, *offset, 2, FALSE ); + proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_obt_jday, tvb, *offset, 2, ENC_BIG_ENDIAN ); *offset += 2; hour = tvb_get_guint8 ( tvb, *offset ); - proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_obt_hour, tvb, *offset, 1, FALSE ); + proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_obt_hour, tvb, *offset, 1, ENC_BIG_ENDIAN ); ++(*offset); minute = tvb_get_guint8 ( tvb, *offset ); - proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_obt_minute, tvb, *offset, 1, FALSE ); + proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_obt_minute, tvb, *offset, 1, ENC_BIG_ENDIAN ); ++(*offset); second = tvb_get_guint8 ( tvb, *offset ); - proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_obt_second, tvb, *offset, 1, FALSE ); + proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_obt_second, tvb, *offset, 1, ENC_BIG_ENDIAN ); ++(*offset); tenths = tvb_get_guint8 ( tvb, *offset ) >> 4; - proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_obt_tenths, tvb, *offset, 1, FALSE ); + proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_obt_tenths, tvb, *offset, 1, ENC_BIG_ENDIAN ); ++(*offset); /* format a more readable time */ @@ -711,7 +711,7 @@ static void tdm_secondary_header_dissector ( proto_tree* ehs_secondary_header_tr proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_obt_computed_flag, tvb, *offset, 1, FALSE ); proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_obt_not_retrieved_flag, tvb, *offset, 1, FALSE ); /* proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_obt_reserved, tvb, *offset, 1, FALSE ); */ - proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_obt_source_apid, tvb, *offset, 1, FALSE ); + proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_obt_source_apid, tvb, *offset, 1, ENC_BIG_ENDIAN ); } if ( mjfs_present ) @@ -719,13 +719,13 @@ static void tdm_secondary_header_dissector ( proto_tree* ehs_secondary_header_tr proto_tree_add_text ( ehs_secondary_header_tree, tvb, *offset, 0, " " ); num_major_frames = 1 + tvb_get_guint8 ( tvb, *offset ); - proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_num_major_frame_status_words, tvb, *offset, 1, FALSE ); + proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_num_major_frame_status_words, tvb, *offset, 1, ENC_BIG_ENDIAN ); ++(*offset); for ( j=0; j < num_major_frames; ++j ) { proto_tree_add_text ( ehs_secondary_header_tree, tvb, *offset, 1, "Major Frame Status Byte# %d", j ); - /* proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_mjfs_reserved, tvb, *offset, 1, FALSE ); */ + /* proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_mjfs_reserved, tvb, *offset, 1, ENC_BIG_ENDIAN ); */ proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_mjfs_parent_frame_error, tvb, *offset, 1, FALSE ); proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_mjfs_checksum_error, tvb, *offset, 1, FALSE ); proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_tdm_mjfs_fixed_value_error, tvb, *offset, 1, FALSE ); @@ -755,16 +755,16 @@ static void tdm_secondary_header_dissector ( proto_tree* ehs_secondary_header_tr /* pseudo secondary header dissector */ static void pseudo_secondary_header_dissector ( proto_tree* ehs_secondary_header_tree, tvbuff_t* tvb, int* offset ) { - /* proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_pseudo_unused, tvb, *offset, 2, FALSE ); */ + /* proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_pseudo_unused, tvb, *offset, 2, ENC_BIG_ENDIAN ); */ *offset += 2; - proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_pseudo_workstation_id, tvb, *offset, 2, FALSE ); + proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_pseudo_workstation_id, tvb, *offset, 2, ENC_BIG_ENDIAN ); *offset += 2; - proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_pseudo_user_id, tvb, *offset, 2, FALSE ); + proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_pseudo_user_id, tvb, *offset, 2, ENC_BIG_ENDIAN ); *offset += 2; - proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_pseudo_comp_id, tvb, *offset, 2, FALSE ); + proto_tree_add_item ( ehs_secondary_header_tree, hf_ehs_sh_pseudo_comp_id, tvb, *offset, 2, ENC_BIG_ENDIAN ); *offset += 2; } @@ -878,7 +878,7 @@ static void aoslos_data_zone_dissector ( proto_tree* ehs_tree, tvbuff_t* tvb, in * 2 10 - kuband LOS * 3 11 - kuband AOS */ - proto_tree_add_item ( ehs_data_zone_tree, hf_ehs_dz_aoslos_indicator, tvb, *offset, 1, FALSE ); + proto_tree_add_item ( ehs_data_zone_tree, hf_ehs_dz_aoslos_indicator, tvb, *offset, 1, ENC_BIG_ENDIAN ); ++(*offset); } @@ -895,37 +895,37 @@ static void udsm_data_zone_dissector ( proto_tree* ehs_tree, tvbuff_t* tvb, int* ehs_data_zone = proto_tree_add_text ( ehs_tree, tvb, *offset, pinfo->iplen - IP_HEADER_LENGTH - *offset, "UDSM Data Zone" ); ehs_data_zone_tree = proto_item_add_subtree ( ehs_data_zone, ett_ehs_data_zone ); - proto_tree_add_item ( ehs_data_zone_tree, hf_ehs_dz_udsm_ccsds_vs_bpdu, tvb, *offset, 1, FALSE ); - /* proto_tree_add_item ( ehs_data_zone_tree, hf_ehs_dz_udsm_unused1, tvb, *offset, 1, FALSE ); */ + proto_tree_add_item ( ehs_data_zone_tree, hf_ehs_dz_udsm_ccsds_vs_bpdu, tvb, *offset, 1, ENC_BIG_ENDIAN ); + /* proto_tree_add_item ( ehs_data_zone_tree, hf_ehs_dz_udsm_unused1, tvb, *offset, 1, ENC_BIG_ENDIAN ); */ ++(*offset); - /* proto_tree_add_item ( ehs_data_zone_tree, hf_ehs_dz_udsm_unused2, tvb, *offset, 1, FALSE ); */ + /* proto_tree_add_item ( ehs_data_zone_tree, hf_ehs_dz_udsm_unused2, tvb, *offset, 1, ENC_BIG_ENDIAN ); */ ++(*offset); - /* proto_tree_add_item ( ehs_data_zone_tree, hf_ehs_dz_udsm_unused3, tvb, *offset, 2, FALSE ); */ + /* proto_tree_add_item ( ehs_data_zone_tree, hf_ehs_dz_udsm_unused3, tvb, *offset, 2, ENC_BIG_ENDIAN ); */ proto_tree_add_item ( ehs_data_zone_tree, hf_ehs_dz_udsm_gse_pkt_id, tvb, *offset, 2, FALSE ); - proto_tree_add_item ( ehs_data_zone_tree, hf_ehs_dz_udsm_payload_vs_core, tvb, *offset, 2, FALSE ); - proto_tree_add_item ( ehs_data_zone_tree, hf_ehs_dz_udsm_apid, tvb, *offset, 2, FALSE ); + proto_tree_add_item ( ehs_data_zone_tree, hf_ehs_dz_udsm_payload_vs_core, tvb, *offset, 2, ENC_BIG_ENDIAN ); + proto_tree_add_item ( ehs_data_zone_tree, hf_ehs_dz_udsm_apid, tvb, *offset, 2, ENC_BIG_ENDIAN ); *offset += 2; year = tvb_get_guint8 ( tvb, *offset ); - proto_tree_add_item ( ehs_data_zone_tree, hf_ehs_dz_udsm_start_time_year, tvb, *offset, 1, FALSE ); + proto_tree_add_item ( ehs_data_zone_tree, hf_ehs_dz_udsm_start_time_year, tvb, *offset, 1, ENC_BIG_ENDIAN ); ++(*offset); jday = tvb_get_ntohs ( tvb, *offset ); - proto_tree_add_item ( ehs_data_zone_tree, hf_ehs_dz_udsm_start_time_jday, tvb, *offset, 2, FALSE ); + proto_tree_add_item ( ehs_data_zone_tree, hf_ehs_dz_udsm_start_time_jday, tvb, *offset, 2, ENC_BIG_ENDIAN ); *offset += 2; hour = tvb_get_guint8 ( tvb, *offset ); - proto_tree_add_item ( ehs_data_zone_tree, hf_ehs_dz_udsm_start_time_hour, tvb, *offset, 1, FALSE ); + proto_tree_add_item ( ehs_data_zone_tree, hf_ehs_dz_udsm_start_time_hour, tvb, *offset, 1, ENC_BIG_ENDIAN ); ++(*offset); minute = tvb_get_guint8 ( tvb, *offset ); - proto_tree_add_item ( ehs_data_zone_tree, hf_ehs_dz_udsm_start_time_minute, tvb, *offset, 1, FALSE ); + proto_tree_add_item ( ehs_data_zone_tree, hf_ehs_dz_udsm_start_time_minute, tvb, *offset, 1, ENC_BIG_ENDIAN ); ++(*offset); second = tvb_get_guint8 ( tvb, *offset ); - proto_tree_add_item ( ehs_data_zone_tree, hf_ehs_dz_udsm_start_time_second, tvb, *offset, 1, FALSE ); + proto_tree_add_item ( ehs_data_zone_tree, hf_ehs_dz_udsm_start_time_second, tvb, *offset, 1, ENC_BIG_ENDIAN ); ++(*offset); /* format a more readable time */ @@ -933,48 +933,48 @@ static void udsm_data_zone_dissector ( proto_tree* ehs_tree, tvbuff_t* tvb, int* "%04d/%03d:%02d:%02d:%02d = UDSM Start Time", year + 1900, jday, hour, minute, second ); year = tvb_get_guint8 ( tvb, *offset ); - proto_tree_add_item ( ehs_data_zone_tree, hf_ehs_dz_udsm_stop_time_year, tvb, *offset, 1, FALSE ); + proto_tree_add_item ( ehs_data_zone_tree, hf_ehs_dz_udsm_stop_time_year, tvb, *offset, 1, ENC_BIG_ENDIAN ); ++(*offset); jday = tvb_get_ntohs ( tvb, *offset ); - proto_tree_add_item ( ehs_data_zone_tree, hf_ehs_dz_udsm_stop_time_jday, tvb, *offset, 2, FALSE ); + proto_tree_add_item ( ehs_data_zone_tree, hf_ehs_dz_udsm_stop_time_jday, tvb, *offset, 2, ENC_BIG_ENDIAN ); *offset += 2; hour = tvb_get_guint8 ( tvb, *offset ); - proto_tree_add_item ( ehs_data_zone_tree, hf_ehs_dz_udsm_stop_time_hour, tvb, *offset, 1, FALSE ); + proto_tree_add_item ( ehs_data_zone_tree, hf_ehs_dz_udsm_stop_time_hour, tvb, *offset, 1, ENC_BIG_ENDIAN ); ++(*offset); minute = tvb_get_guint8 ( tvb, *offset ); - proto_tree_add_item ( ehs_data_zone_tree, hf_ehs_dz_udsm_stop_time_minute, tvb, *offset, 1, FALSE ); + proto_tree_add_item ( ehs_data_zone_tree, hf_ehs_dz_udsm_stop_time_minute, tvb, *offset, 1, ENC_BIG_ENDIAN ); ++(*offset); second = tvb_get_guint8 ( tvb, *offset ); - proto_tree_add_item ( ehs_data_zone_tree, hf_ehs_dz_udsm_stop_time_second, tvb, *offset, 1, FALSE ); + proto_tree_add_item ( ehs_data_zone_tree, hf_ehs_dz_udsm_stop_time_second, tvb, *offset, 1, ENC_BIG_ENDIAN ); ++(*offset); /* format a more readable time */ proto_tree_add_text ( ehs_data_zone_tree, tvb, *offset-7, 7, "%04d/%03d:%02d:%02d:%02d = UDSM Stop Time", year + 1900, jday, hour, minute, second ); - /* proto_tree_add_item ( ehs_data_zone_tree, hf_ehs_dz_udsm_unused4, tvb, *offset, 2, FALSE ); */ + /* proto_tree_add_item ( ehs_data_zone_tree, hf_ehs_dz_udsm_unused4, tvb, *offset, 2, ENC_BIG_ENDIAN ); */ *offset += 2; - proto_tree_add_item ( ehs_data_zone_tree, hf_ehs_dz_udsm_num_pkts_xmtd, tvb, *offset, 2, FALSE ); + proto_tree_add_item ( ehs_data_zone_tree, hf_ehs_dz_udsm_num_pkts_xmtd, tvb, *offset, 2, ENC_BIG_ENDIAN ); *offset += 2; - proto_tree_add_item ( ehs_data_zone_tree, hf_ehs_dz_udsm_num_vcdu_seqerrs, tvb, *offset, 2, FALSE ); + proto_tree_add_item ( ehs_data_zone_tree, hf_ehs_dz_udsm_num_vcdu_seqerrs, tvb, *offset, 2, ENC_BIG_ENDIAN ); *offset += 2; - proto_tree_add_item ( ehs_data_zone_tree, hf_ehs_dz_udsm_num_pkt_seqerrs, tvb, *offset, 2, FALSE ); + proto_tree_add_item ( ehs_data_zone_tree, hf_ehs_dz_udsm_num_pkt_seqerrs, tvb, *offset, 2, ENC_BIG_ENDIAN ); *offset += 2; - proto_tree_add_item ( ehs_data_zone_tree, hf_ehs_dz_udsm_num_pktlen_errors, tvb, *offset, 2, FALSE ); + proto_tree_add_item ( ehs_data_zone_tree, hf_ehs_dz_udsm_num_pktlen_errors, tvb, *offset, 2, ENC_BIG_ENDIAN ); *offset += 2; - proto_tree_add_item ( ehs_data_zone_tree, hf_ehs_dz_udsm_event, tvb, *offset, 1, FALSE ); + proto_tree_add_item ( ehs_data_zone_tree, hf_ehs_dz_udsm_event, tvb, *offset, 1, ENC_BIG_ENDIAN ); ++(*offset); - proto_tree_add_item ( ehs_data_zone_tree, hf_ehs_dz_udsm_num_pkts_xmtd_rollover, tvb, *offset, 1, FALSE ); + proto_tree_add_item ( ehs_data_zone_tree, hf_ehs_dz_udsm_num_pkts_xmtd_rollover, tvb, *offset, 1, ENC_BIG_ENDIAN ); ++(*offset); } @@ -1071,63 +1071,63 @@ dissect_ehs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ehs_primary_header = proto_tree_add_text ( ehs_tree, tvb, offset, EHS_PRIMARY_HEADER_SIZE, "Primary EHS Header" ); ehs_primary_header_tree = proto_item_add_subtree ( ehs_primary_header, ett_ehs_primary_header ); - proto_tree_add_item ( ehs_primary_header_tree, hf_ehs_ph_version, tvb, offset, 1, FALSE ); - proto_tree_add_item ( ehs_primary_header_tree, hf_ehs_ph_project, tvb, offset, 1, FALSE ); + proto_tree_add_item ( ehs_primary_header_tree, hf_ehs_ph_version, tvb, offset, 1, ENC_BIG_ENDIAN ); + proto_tree_add_item ( ehs_primary_header_tree, hf_ehs_ph_project, tvb, offset, 1, ENC_BIG_ENDIAN ); ++offset; - proto_tree_add_item ( ehs_primary_header_tree, hf_ehs_ph_support_mode, tvb, offset, 1, FALSE ); - proto_tree_add_item ( ehs_primary_header_tree, hf_ehs_ph_data_mode, tvb, offset, 1, FALSE ); + proto_tree_add_item ( ehs_primary_header_tree, hf_ehs_ph_support_mode, tvb, offset, 1, ENC_BIG_ENDIAN ); + proto_tree_add_item ( ehs_primary_header_tree, hf_ehs_ph_data_mode, tvb, offset, 1, ENC_BIG_ENDIAN ); ++offset; - proto_tree_add_item ( ehs_primary_header_tree, hf_ehs_ph_mission, tvb, offset, 1, FALSE ); + proto_tree_add_item ( ehs_primary_header_tree, hf_ehs_ph_mission, tvb, offset, 1, ENC_BIG_ENDIAN ); ++offset; /* save protocol for use later on */ protocol = tvb_get_guint8 ( tvb, offset ); - proto_tree_add_item ( ehs_primary_header_tree, hf_ehs_ph_protocol, tvb, offset, 1, FALSE ); + proto_tree_add_item ( ehs_primary_header_tree, hf_ehs_ph_protocol, tvb, offset, 1, ENC_BIG_ENDIAN ); ++offset; year = tvb_get_guint8 ( tvb, offset ); - proto_tree_add_item ( ehs_primary_header_tree, hf_ehs_ph_year, tvb, offset, 1, FALSE ); + proto_tree_add_item ( ehs_primary_header_tree, hf_ehs_ph_year, tvb, offset, 1, ENC_BIG_ENDIAN ); ++offset; jday = tvb_get_ntohs ( tvb, offset ); - proto_tree_add_item ( ehs_primary_header_tree, hf_ehs_ph_jday, tvb, offset, 2, FALSE ); + proto_tree_add_item ( ehs_primary_header_tree, hf_ehs_ph_jday, tvb, offset, 2, ENC_BIG_ENDIAN ); offset += 2; hour = tvb_get_guint8 ( tvb, offset ); - proto_tree_add_item ( ehs_primary_header_tree, hf_ehs_ph_hour, tvb, offset, 1, FALSE ); + proto_tree_add_item ( ehs_primary_header_tree, hf_ehs_ph_hour, tvb, offset, 1, ENC_BIG_ENDIAN ); ++offset; minute = tvb_get_guint8 ( tvb, offset ); - proto_tree_add_item ( ehs_primary_header_tree, hf_ehs_ph_minute, tvb, offset, 1, FALSE ); + proto_tree_add_item ( ehs_primary_header_tree, hf_ehs_ph_minute, tvb, offset, 1, ENC_BIG_ENDIAN ); ++offset; second = tvb_get_guint8 ( tvb, offset ); - proto_tree_add_item ( ehs_primary_header_tree, hf_ehs_ph_second, tvb, offset, 1, FALSE ); + proto_tree_add_item ( ehs_primary_header_tree, hf_ehs_ph_second, tvb, offset, 1, ENC_BIG_ENDIAN ); ++offset; tenths = tvb_get_guint8 ( tvb, offset ) >> 4; - proto_tree_add_item ( ehs_primary_header_tree, hf_ehs_ph_tenths, tvb, offset, 1, FALSE ); + proto_tree_add_item ( ehs_primary_header_tree, hf_ehs_ph_tenths, tvb, offset, 1, ENC_BIG_ENDIAN ); /* format a more readable ground receipt time string */ proto_tree_add_text ( ehs_primary_header_tree, tvb, offset-7, 7, "%04d/%03d:%02d:%02d:%02d.%1d = EHS Ground Receipt Time", year + 1900, jday, hour, minute, second, tenths ); proto_tree_add_item ( ehs_primary_header_tree, hf_ehs_ph_new_data_flag, tvb, offset, 1, FALSE ); - /* proto_tree_add_item ( ehs_primary_header_tree, hf_ehs_ph_pad1, tvb, offset, 1, FALSE ); */ + /* proto_tree_add_item ( ehs_primary_header_tree, hf_ehs_ph_pad1, tvb, offset, 1, ENC_BIG_ENDIAN ); */ proto_tree_add_item ( ehs_primary_header_tree, hf_ehs_ph_hold_flag, tvb, offset, 1, FALSE ); proto_tree_add_item ( ehs_primary_header_tree, hf_ehs_ph_sign_flag, tvb, offset, 1, FALSE ); ++offset; - /* proto_tree_add_item ( ehs_primary_header_tree, hf_ehs_ph_pad2, tvb, offset, 1, FALSE ); */ + /* proto_tree_add_item ( ehs_primary_header_tree, hf_ehs_ph_pad2, tvb, offset, 1, ENC_BIG_ENDIAN ); */ ++offset; - /* proto_tree_add_item ( ehs_primary_header_tree, hf_ehs_ph_pad3, tvb, offset, 1, FALSE ); */ + /* proto_tree_add_item ( ehs_primary_header_tree, hf_ehs_ph_pad3, tvb, offset, 1, ENC_BIG_ENDIAN ); */ ++offset; - /* proto_tree_add_item ( ehs_primary_header_tree, hf_ehs_ph_pad4, tvb, offset, 1, FALSE ); */ + /* proto_tree_add_item ( ehs_primary_header_tree, hf_ehs_ph_pad4, tvb, offset, 1, ENC_BIG_ENDIAN ); */ ++offset; - proto_tree_add_item ( ehs_primary_header_tree, hf_ehs_ph_hosc_packet_size, tvb, offset, 2, FALSE ); + proto_tree_add_item ( ehs_primary_header_tree, hf_ehs_ph_hosc_packet_size, tvb, offset, 2, ENC_BIG_ENDIAN ); offset += 2; /* build the ehs secondary header tree */ diff --git a/epan/dissectors/packet-eigrp.c b/epan/dissectors/packet-eigrp.c index f9208d7946..59989442f3 100644 --- a/epan/dissectors/packet-eigrp.c +++ b/epan/dissectors/packet-eigrp.c @@ -386,12 +386,12 @@ static void dissect_eigrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { eigrp_tree = proto_item_add_subtree(ti, ett_eigrp); - proto_tree_add_item(eigrp_tree, hf_eigrp_version, tvb, 0, 1, FALSE); - proto_tree_add_item(eigrp_tree, hf_eigrp_opcode, tvb, 1, 1, FALSE); - proto_tree_add_item(eigrp_tree, hf_eigrp_checksum, tvb, 2, 2, FALSE); + proto_tree_add_item(eigrp_tree, hf_eigrp_version, tvb, 0, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(eigrp_tree, hf_eigrp_opcode, tvb, 1, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(eigrp_tree, hf_eigrp_checksum, tvb, 2, 2, ENC_BIG_ENDIAN); /* Decode the EIGRP Flags Field */ - ti = proto_tree_add_item(eigrp_tree, hf_eigrp_flags, tvb, 4, 4, FALSE); + ti = proto_tree_add_item(eigrp_tree, hf_eigrp_flags, tvb, 4, 4, ENC_BIG_ENDIAN); eigrp_flags_tree = proto_item_add_subtree(ti, ett_eigrp_flags); proto_tree_add_item(eigrp_flags_tree, hf_eigrp_flags_init, tvb, 4, 4, FALSE); @@ -401,9 +401,9 @@ static void dissect_eigrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { /* End Decode the EIGRP Flags Field */ - proto_tree_add_item(eigrp_tree, hf_eigrp_sequence, tvb, 8, 4, FALSE); - proto_tree_add_item(eigrp_tree, hf_eigrp_acknowledge, tvb, 12, 4, FALSE); - proto_tree_add_item(eigrp_tree, hf_eigrp_as, tvb, 16, 4, FALSE); + proto_tree_add_item(eigrp_tree, hf_eigrp_sequence, tvb, 8, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(eigrp_tree, hf_eigrp_acknowledge, tvb, 12, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(eigrp_tree, hf_eigrp_as, tvb, 16, 4, ENC_BIG_ENDIAN); } if (opcode == EIGRP_SAP) { @@ -427,8 +427,8 @@ static void dissect_eigrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { "%s", val_to_str(tlv, eigrp_tlv_vals, "Unknown (0x%04x)")); tlv_tree = proto_item_add_subtree(ti, ett_tlv); - proto_tree_add_item(tlv_tree, hf_eigrp_tlv, tvb, offset, 2, FALSE); - proto_tree_add_item(tlv_tree, hf_eigrp_tlv_size, tvb, offset + 2, 2, FALSE); + proto_tree_add_item(tlv_tree, hf_eigrp_tlv, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_eigrp_tlv_size, tvb, offset + 2, 2, ENC_BIG_ENDIAN); switch (tlv) { @@ -498,23 +498,23 @@ static void dissect_eigrp_par(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre guint8 k1, k2, k3, k4, k5; k1 = tvb_get_guint8(tvb, 1); - proto_tree_add_item(tree, hf_eigrp_par_k1, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_eigrp_par_k1, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; k2 = tvb_get_guint8(tvb, 1); - proto_tree_add_item(tree, hf_eigrp_par_k2, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_eigrp_par_k2, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; k3 = tvb_get_guint8(tvb, 1); - proto_tree_add_item(tree, hf_eigrp_par_k3, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_eigrp_par_k3, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; k4 = tvb_get_guint8(tvb, 1); - proto_tree_add_item(tree, hf_eigrp_par_k4, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_eigrp_par_k4, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; k5 = tvb_get_guint8(tvb, 1); - proto_tree_add_item(tree, hf_eigrp_par_k5, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_eigrp_par_k5, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(tree, hf_eigrp_par_reserved, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_eigrp_par_reserved, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(tree, hf_eigrp_par_holdtime, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_eigrp_par_holdtime, tvb, offset, 2, ENC_BIG_ENDIAN); if (k1 == 255 && k2 == 255 && k3 == 255 && k4 == 255 && k5 == 255) { proto_item_append_text(ti, ": Goodbye Message"); @@ -530,11 +530,11 @@ static void dissect_eigrp_auth(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr keysize = tvb_get_ntohs(tvb, 2); - proto_tree_add_item(tree, hf_eigrp_auth_type, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_eigrp_auth_type, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - ti_keysize = proto_tree_add_item(tree, hf_eigrp_auth_keysize, tvb, offset, 2, FALSE); + ti_keysize = proto_tree_add_item(tree, hf_eigrp_auth_keysize, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(tree, hf_eigrp_auth_keyid, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_eigrp_auth_keyid, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; proto_tree_add_item(tree, hf_eigrp_auth_nullpad, tvb, offset, 12, FALSE); offset += 12; @@ -558,7 +558,7 @@ static void dissect_eigrp_seq(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre addr_len = tvb_get_guint8(tvb, 0); - ti_addrlen = proto_tree_add_item(tree, hf_eigrp_seq_addrlen, tvb, offset, 1, FALSE); + ti_addrlen = proto_tree_add_item(tree, hf_eigrp_seq_addrlen, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; switch (addr_len) { @@ -604,7 +604,7 @@ static void dissect_eigrp_sv(tvbuff_t *tvb, proto_tree *tree, proto_item *ti) { static void dissect_eigrp_nms(tvbuff_t *tvb, proto_tree *tree, proto_item *ti) { - proto_tree_add_item(tree, hf_eigrp_nms, tvb, 0, 4, FALSE); + proto_tree_add_item(tree, hf_eigrp_nms, tvb, 0, 4, ENC_BIG_ENDIAN); proto_item_append_text(ti, ": %u", tvb_get_ntohl(tvb, 0)); } @@ -613,7 +613,7 @@ static void dissect_eigrp_stub(tvbuff_t *tvb, proto_tree *tree) { proto_tree *eigrp_stub_flags_tree; proto_item *ti; - ti = proto_tree_add_item(tree, hf_eigrp_stub_flags, tvb, 0, 2, FALSE); + ti = proto_tree_add_item(tree, hf_eigrp_stub_flags, tvb, 0, 2, ENC_BIG_ENDIAN); eigrp_stub_flags_tree = proto_item_add_subtree(ti, ett_eigrp_stub_flags); proto_tree_add_item(eigrp_stub_flags_tree, hf_eigrp_stub_flags_connected, tvb, 0, 2, FALSE); @@ -634,19 +634,19 @@ static void dissect_eigrp_ip_int(tvbuff_t *tvb, packet_info *pinfo, proto_tree * proto_tree_add_item(tree, hf_eigrp_ip_int_nexthop, tvb, offset, 4, FALSE); offset += 4; - proto_tree_add_item(tree, hf_eigrp_ip_int_delay, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_eigrp_ip_int_delay, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(tree, hf_eigrp_ip_int_bandwidth, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_eigrp_ip_int_bandwidth, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(tree, hf_eigrp_ip_int_mtu, tvb, offset, 3, FALSE); + proto_tree_add_item(tree, hf_eigrp_ip_int_mtu, tvb, offset, 3, ENC_BIG_ENDIAN); offset += 3; - proto_tree_add_item(tree, hf_eigrp_ip_int_hopcount, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_eigrp_ip_int_hopcount, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(tree, hf_eigrp_ip_int_reliability, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_eigrp_ip_int_reliability, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(tree, hf_eigrp_ip_int_load, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_eigrp_ip_int_load, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(tree, hf_eigrp_ip_int_reserved, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_eigrp_ip_int_reserved, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; for (offset = 20; tvb_length_remaining(tvb, offset) > 0; offset += (1 + addr_len)) { @@ -654,12 +654,12 @@ static void dissect_eigrp_ip_int(tvbuff_t *tvb, packet_info *pinfo, proto_tree * addr_len = ipv4_addr_and_mask(tvb, offset + 1, ip_addr, length); if (addr_len < 0) { - ti_prefixlen = proto_tree_add_item(tree, hf_eigrp_ip_int_prefixlen, tvb, offset, 1, FALSE); + ti_prefixlen = proto_tree_add_item(tree, hf_eigrp_ip_int_prefixlen, tvb, offset, 1, ENC_BIG_ENDIAN); expert_add_info_format(pinfo, ti_prefixlen, PI_UNDECODED, PI_WARN, "Invalid prefix length %u, must be <= 32", length); addr_len = 4; /* assure we can exit the loop */ } else { - proto_tree_add_item(tree, hf_eigrp_ip_int_prefixlen, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_eigrp_ip_int_prefixlen, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; ti_dst = proto_tree_add_text(tree, tvb, offset, addr_len, "Destination: %s", ip_to_str(ip_addr)); proto_item_append_text (ti," %c %s/%u%s", offset == 21 ? '=':',', @@ -686,19 +686,19 @@ static void dissect_eigrp_ip_ext(tvbuff_t *tvb, packet_info *pinfo, proto_tree * tvb_memcpy(tvb,ip_addr, 4, 4); proto_tree_add_item(tree, hf_eigrp_ip_ext_origrouter, tvb, offset, 4, FALSE); offset += 4; - proto_tree_add_item(tree, hf_eigrp_ip_ext_as, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_eigrp_ip_ext_as, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(tree, hf_eigrp_ip_ext_tag, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_eigrp_ip_ext_tag, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(tree, hf_eigrp_ip_ext_metric, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_eigrp_ip_ext_metric, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(tree, hf_eigrp_ip_ext_reserved, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_eigrp_ip_ext_reserved, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(tree, hf_eigrp_ip_ext_proto, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_eigrp_ip_ext_proto, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; /* Decode the IP external route Flags Field */ - ti = proto_tree_add_item(tree, hf_eigrp_ip_ext_flags, tvb, offset, 1, FALSE); + ti = proto_tree_add_item(tree, hf_eigrp_ip_ext_flags, tvb, offset, 1, ENC_BIG_ENDIAN); eigrp_ip_ext_flags_tree = proto_item_add_subtree(ti, ett_eigrp_ip_ext_flags); proto_tree_add_item(eigrp_ip_ext_flags_tree, hf_eigrp_ip_ext_flags_ext, tvb, offset, 1, FALSE); @@ -706,19 +706,19 @@ static void dissect_eigrp_ip_ext(tvbuff_t *tvb, packet_info *pinfo, proto_tree * offset += 1; /* End Decode the IP external route Flags Field */ - proto_tree_add_item(tree, hf_eigrp_ip_ext_delay, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_eigrp_ip_ext_delay, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(tree, hf_eigrp_ip_ext_bandwidth, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_eigrp_ip_ext_bandwidth, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(tree, hf_eigrp_ip_ext_mtu, tvb, offset, 3, FALSE); + proto_tree_add_item(tree, hf_eigrp_ip_ext_mtu, tvb, offset, 3, ENC_BIG_ENDIAN); offset += 3; - proto_tree_add_item(tree, hf_eigrp_ip_ext_hopcount, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_eigrp_ip_ext_hopcount, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(tree, hf_eigrp_ip_ext_reliability, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_eigrp_ip_ext_reliability, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(tree, hf_eigrp_ip_ext_load, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_eigrp_ip_ext_load, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(tree, hf_eigrp_ip_ext_reserved2, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_eigrp_ip_ext_reserved2, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; for (offset = 40; tvb_length_remaining(tvb, offset) > 0; offset += (1 + addr_len)) { @@ -726,12 +726,12 @@ static void dissect_eigrp_ip_ext(tvbuff_t *tvb, packet_info *pinfo, proto_tree * addr_len = ipv4_addr_and_mask(tvb, offset + 1, ip_addr, length); if (addr_len < 0) { - ti_prefixlen = proto_tree_add_item(tree, hf_eigrp_ip_ext_prefixlen, tvb, offset, 1, FALSE); + ti_prefixlen = proto_tree_add_item(tree, hf_eigrp_ip_ext_prefixlen, tvb, offset, 1, ENC_BIG_ENDIAN); expert_add_info_format(pinfo, ti_prefixlen, PI_UNDECODED, PI_WARN, "Invalid prefix length %u, must be <= 32", length); addr_len = 4; /* assure we can exit the loop */ } else { - proto_tree_add_item(tree, hf_eigrp_ip_ext_prefixlen, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_eigrp_ip_ext_prefixlen, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; ti_dst = proto_tree_add_text(tree, tvb, offset, addr_len, "Destination = %s", ip_to_str(ip_addr)); proto_item_append_text(eigrp_ip_ext_ti, " %c %s/%u%s", offset == 41 ? '=':',', @@ -754,19 +754,19 @@ static void dissect_eigrp_ipx_int(tvbuff_t *tvb, packet_info *pinfo, proto_tree offset += 4; proto_tree_add_item(tree, hf_eigrp_ipx_int_nexthop_id, tvb, offset, 6, FALSE); offset += 6; - proto_tree_add_item(tree, hf_eigrp_ipx_int_delay, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_eigrp_ipx_int_delay, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(tree, hf_eigrp_ipx_int_bandwidth, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_eigrp_ipx_int_bandwidth, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(tree, hf_eigrp_ipx_int_mtu, tvb, offset, 3, FALSE); + proto_tree_add_item(tree, hf_eigrp_ipx_int_mtu, tvb, offset, 3, ENC_BIG_ENDIAN); offset += 3; - proto_tree_add_item(tree, hf_eigrp_ipx_int_hopcount, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_eigrp_ipx_int_hopcount, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(tree, hf_eigrp_ipx_int_reliability, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_eigrp_ipx_int_reliability, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(tree, hf_eigrp_ipx_int_load, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_eigrp_ipx_int_load, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(tree, hf_eigrp_ipx_int_reserved, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_eigrp_ipx_int_reserved, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; ti_dst = proto_tree_add_item(tree, hf_eigrp_ipx_int_dst, tvb, offset, 4, ENC_NA); proto_item_append_text(ti, " = %08x%s", tvb_get_ntohl(tvb, 26), ((tvb_get_ntohl(tvb, 10) == 0xffffffff) ? " - Destination unreachable":"")); @@ -786,32 +786,32 @@ static void dissect_eigrp_ipx_ext(tvbuff_t *tvb, packet_info *pinfo, proto_tree offset += 6; proto_tree_add_item(tree, hf_eigrp_ipx_ext_origrouter, tvb, offset, 6, FALSE); offset += 6; - proto_tree_add_item(tree, hf_eigrp_ipx_ext_as, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_eigrp_ipx_ext_as, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(tree, hf_eigrp_ipx_ext_tag, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_eigrp_ipx_ext_tag, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(tree, hf_eigrp_ipx_ext_proto, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_eigrp_ipx_ext_proto, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(tree, hf_eigrp_ipx_ext_reserved, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_eigrp_ipx_ext_reserved, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(tree, hf_eigrp_ipx_ext_metric, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_eigrp_ipx_ext_metric, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(tree, hf_eigrp_ipx_ext_extdelay, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_eigrp_ipx_ext_extdelay, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(tree, hf_eigrp_ipx_ext_delay, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_eigrp_ipx_ext_delay, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(tree, hf_eigrp_ipx_ext_bandwidth, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_eigrp_ipx_ext_bandwidth, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(tree, hf_eigrp_ipx_ext_mtu, tvb, offset, 3, FALSE); + proto_tree_add_item(tree, hf_eigrp_ipx_ext_mtu, tvb, offset, 3, ENC_BIG_ENDIAN); offset += 3; - proto_tree_add_item(tree, hf_eigrp_ipx_ext_hopcount, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_eigrp_ipx_ext_hopcount, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(tree, hf_eigrp_ipx_ext_reliability, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_eigrp_ipx_ext_reliability, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(tree, hf_eigrp_ipx_ext_load, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_eigrp_ipx_ext_load, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(tree, hf_eigrp_ipx_ext_reserved2, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_eigrp_ipx_ext_reserved2, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; ti_dst = proto_tree_add_item(tree, hf_eigrp_ipx_ext_dst, tvb, offset, 4, ENC_NA); proto_item_append_text(ti, " = %08x%s", tvb_get_ntohl(tvb, 46), ((tvb_get_ntohl(tvb, 30) == 0xffffffff) ? " - Destination unreachable":"")); @@ -825,7 +825,7 @@ static void dissect_eigrp_ipx_ext(tvbuff_t *tvb, packet_info *pinfo, proto_tree static void dissect_eigrp_at_cbl(tvbuff_t *tvb, proto_tree *tree, proto_item *ti) { proto_tree_add_text(tree, tvb, 0, 4, "AppleTalk Cable Range = %u-%u", tvb_get_ntohs(tvb, 0), tvb_get_ntohs(tvb, 2)); - proto_tree_add_item(tree, hf_eigrp_at_cbl_routerid, tvb, 4, 4, FALSE); + proto_tree_add_item(tree, hf_eigrp_at_cbl_routerid, tvb, 4, 4, ENC_BIG_ENDIAN); proto_item_append_text(ti, ": Cable range= %u-%u, Router ID= %u", tvb_get_ntohs(tvb, 0), tvb_get_ntohs(tvb, 2), tvb_get_ntohl(tvb, 4)); } @@ -837,19 +837,19 @@ static void dissect_eigrp_at_int(tvbuff_t *tvb, proto_tree *tree, proto_item *ti proto_tree_add_text(tree, tvb, offset, 4, "Next Hop Address = %u.%u", tvb_get_ntohs(tvb, 0), tvb_get_ntohs(tvb, 2)); offset += 4; - proto_tree_add_item(tree, hf_eigrp_at_int_delay, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_eigrp_at_int_delay, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(tree, hf_eigrp_at_int_bandwidth, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_eigrp_at_int_bandwidth, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(tree, hf_eigrp_at_int_mtu, tvb, offset, 3, FALSE); + proto_tree_add_item(tree, hf_eigrp_at_int_mtu, tvb, offset, 3, ENC_BIG_ENDIAN); offset += 3; - proto_tree_add_item(tree, hf_eigrp_at_int_hopcount, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_eigrp_at_int_hopcount, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(tree, hf_eigrp_at_int_reliability, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_eigrp_at_int_reliability, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(tree, hf_eigrp_at_int_load, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_eigrp_at_int_load, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(tree, hf_eigrp_at_int_reserved, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_eigrp_at_int_reserved, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_text(tree,tvb,offset,4,"Cable range = %u-%u",tvb_get_ntohs(tvb,20),tvb_get_ntohs(tvb,22)); @@ -863,17 +863,17 @@ static void dissect_eigrp_at_ext(tvbuff_t *tvb, proto_tree *tree, proto_item *ti proto_tree_add_text(tree, tvb, offset, 4, "Next Hop Address = %u.%u", tvb_get_ntohs(tvb, 0), tvb_get_ntohs(tvb, 2)); offset += 4; - proto_tree_add_item(tree, hf_eigrp_at_ext_origrouter, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_eigrp_at_ext_origrouter, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(tree, hf_eigrp_at_ext_as, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_eigrp_at_ext_as, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(tree, hf_eigrp_at_ext_tag, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_eigrp_at_ext_tag, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(tree, hf_eigrp_at_ext_proto, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_eigrp_at_ext_proto, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; /* Decode the AppleTalk external route Flags Field */ - ti = proto_tree_add_item(tree, hf_eigrp_at_ext_flags, tvb, offset, 1, FALSE); + ti = proto_tree_add_item(tree, hf_eigrp_at_ext_flags, tvb, offset, 1, ENC_BIG_ENDIAN); eigrp_at_ext_flags_tree = proto_item_add_subtree(ti, ett_eigrp_at_ext_flags); proto_tree_add_item(eigrp_at_ext_flags_tree, hf_eigrp_at_ext_flags_ext, tvb, offset, 1, FALSE); @@ -881,22 +881,22 @@ static void dissect_eigrp_at_ext(tvbuff_t *tvb, proto_tree *tree, proto_item *ti offset += 1; /* End Decode the AppleTalk external route Flags Field */ - proto_tree_add_item(tree, hf_eigrp_at_ext_metric, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_eigrp_at_ext_metric, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(tree, hf_eigrp_at_ext_delay, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_eigrp_at_ext_delay, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(tree, hf_eigrp_at_ext_bandwidth, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_eigrp_at_ext_bandwidth, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(tree, hf_eigrp_at_ext_mtu, tvb, offset, 3, FALSE); + proto_tree_add_item(tree, hf_eigrp_at_ext_mtu, tvb, offset, 3, ENC_BIG_ENDIAN); offset += 3; - proto_tree_add_item(tree, hf_eigrp_at_ext_hopcount, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_eigrp_at_ext_hopcount, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(tree, hf_eigrp_at_ext_reliability, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_eigrp_at_ext_reliability, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(tree, hf_eigrp_at_ext_load, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_eigrp_at_ext_load, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(tree, hf_eigrp_at_ext_reserved, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_eigrp_at_ext_reserved, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_text(tree, tvb, offset, 4, "Cable range = %u-%u", tvb_get_ntohs(tvb, 36), tvb_get_ntohs(tvb, 38)); @@ -912,19 +912,19 @@ static void dissect_eigrp_ip6_int(tvbuff_t *tvb, packet_info *pinfo, proto_tree proto_tree_add_item(tree, hf_eigrp_ip6_int_nexthop, tvb, offset, 16, FALSE); offset += 16; - proto_tree_add_item(tree, hf_eigrp_ip6_int_delay, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_eigrp_ip6_int_delay, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(tree, hf_eigrp_ip6_int_bandwidth, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_eigrp_ip6_int_bandwidth, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(tree, hf_eigrp_ip6_int_mtu, tvb, offset, 3, FALSE); + proto_tree_add_item(tree, hf_eigrp_ip6_int_mtu, tvb, offset, 3, ENC_BIG_ENDIAN); offset += 3; - proto_tree_add_item(tree, hf_eigrp_ip6_int_hopcount, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_eigrp_ip6_int_hopcount, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(tree, hf_eigrp_ip6_int_reliability, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_eigrp_ip6_int_reliability, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(tree, hf_eigrp_ip6_int_load, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_eigrp_ip6_int_load, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(tree, hf_eigrp_ip6_int_reserved, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_eigrp_ip6_int_reserved, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; for (offset = 32; tvb_length_remaining(tvb, offset) > 0; offset += (1 + addr_len)) { @@ -932,12 +932,12 @@ static void dissect_eigrp_ip6_int(tvbuff_t *tvb, packet_info *pinfo, proto_tree addr_len = ipv6_addr_and_mask(tvb, offset + 1, &addr, length); if (addr_len < 0) { - ti_prefixlen = proto_tree_add_item(tree, hf_eigrp_ip6_int_prefixlen, tvb, offset, 1, FALSE); + ti_prefixlen = proto_tree_add_item(tree, hf_eigrp_ip6_int_prefixlen, tvb, offset, 1, ENC_BIG_ENDIAN); expert_add_info_format(pinfo, ti_prefixlen, PI_UNDECODED, PI_WARN, "Invalid prefix length %u, must be <= 128", length); addr_len = 16; /* assure we can exit the loop */ } else { - proto_tree_add_item(tree, hf_eigrp_ip6_int_prefixlen, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_eigrp_ip6_int_prefixlen, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; if ((length < 128) && (length % 8 == 0)) { @@ -968,19 +968,19 @@ static void dissect_eigrp_ip6_ext(tvbuff_t *tvb, packet_info *pinfo, proto_tree offset += 16; proto_tree_add_item(tree, hf_eigrp_ip6_ext_origrouter, tvb, offset, 4, FALSE); offset += 4; - proto_tree_add_item(tree, hf_eigrp_ip6_ext_as, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_eigrp_ip6_ext_as, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(tree, hf_eigrp_ip6_ext_tag, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_eigrp_ip6_ext_tag, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(tree, hf_eigrp_ip6_ext_metric, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_eigrp_ip6_ext_metric, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(tree, hf_eigrp_ip6_ext_reserved, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_eigrp_ip6_ext_reserved, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(tree, hf_eigrp_ip6_ext_proto, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_eigrp_ip6_ext_proto, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; /* Decode the IPv6 external route Flags Field */ - ti = proto_tree_add_item(tree, hf_eigrp_ip6_ext_flags, tvb, offset, 1, FALSE); + ti = proto_tree_add_item(tree, hf_eigrp_ip6_ext_flags, tvb, offset, 1, ENC_BIG_ENDIAN); eigrp_ip6_ext_flags_tree = proto_item_add_subtree(ti, ett_eigrp_ip6_ext_flags); proto_tree_add_item(eigrp_ip6_ext_flags_tree, hf_eigrp_ip6_ext_flags_ext, tvb, offset, 1, FALSE); @@ -988,19 +988,19 @@ static void dissect_eigrp_ip6_ext(tvbuff_t *tvb, packet_info *pinfo, proto_tree offset += 1; /* End Decode the IPv6 external route Flags Field */ - proto_tree_add_item(tree, hf_eigrp_ip6_ext_delay, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_eigrp_ip6_ext_delay, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(tree, hf_eigrp_ip6_ext_bandwidth, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_eigrp_ip6_ext_bandwidth, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(tree, hf_eigrp_ip6_ext_mtu, tvb, offset, 3, FALSE); + proto_tree_add_item(tree, hf_eigrp_ip6_ext_mtu, tvb, offset, 3, ENC_BIG_ENDIAN); offset += 3; - proto_tree_add_item(tree, hf_eigrp_ip6_ext_hopcount, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_eigrp_ip6_ext_hopcount, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(tree, hf_eigrp_ip6_ext_reliability, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_eigrp_ip6_ext_reliability, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(tree, hf_eigrp_ip6_ext_load, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_eigrp_ip6_ext_load, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(tree, hf_eigrp_ip6_ext_reserved2, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_eigrp_ip6_ext_reserved2, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; for (offset = 52; tvb_length_remaining(tvb, offset) > 0; offset += (1 + addr_len)) @@ -1009,12 +1009,12 @@ static void dissect_eigrp_ip6_ext(tvbuff_t *tvb, packet_info *pinfo, proto_tree addr_len = ipv6_addr_and_mask(tvb, offset + 1, &addr, length); if (addr_len < 0) { - ti_prefixlen = proto_tree_add_item(tree, hf_eigrp_ip6_ext_prefixlen, tvb, offset, 1, FALSE); + ti_prefixlen = proto_tree_add_item(tree, hf_eigrp_ip6_ext_prefixlen, tvb, offset, 1, ENC_BIG_ENDIAN); expert_add_info_format(pinfo, ti_prefixlen, PI_UNDECODED, PI_WARN, "Invalid prefix length %u, must be <= 128", length); addr_len = 16; /* assure we can exit the loop */ } else { - proto_tree_add_item(tree, hf_eigrp_ip6_ext_prefixlen, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_eigrp_ip6_ext_prefixlen, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; if ((length < 128) && (length % 8 == 0)) { diff --git a/epan/dissectors/packet-enttec.c b/epan/dissectors/packet-enttec.c index 9cc014488b..499e58ef76 100644 --- a/epan/dissectors/packet-enttec.c +++ b/epan/dissectors/packet-enttec.c @@ -131,15 +131,15 @@ dissect_enttec_poll_reply(tvbuff_t *tvb, guint offset, proto_tree *tree) offset += 6; proto_tree_add_item(tree, hf_enttec_poll_reply_node_type, tvb, - offset, 2, FALSE); + offset, 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(tree, hf_enttec_poll_reply_version, tvb, - offset, 1, FALSE); + offset, 1, ENC_BIG_ENDIAN); offset += 1; proto_tree_add_item(tree, hf_enttec_poll_reply_switch, tvb, - offset, 1, FALSE); + offset, 1, ENC_BIG_ENDIAN); offset += 1; proto_tree_add_item(tree, hf_enttec_poll_reply_name, tvb, @@ -147,15 +147,15 @@ dissect_enttec_poll_reply(tvbuff_t *tvb, guint offset, proto_tree *tree) offset += 10; proto_tree_add_item(tree, hf_enttec_poll_reply_option, tvb, - offset, 1, FALSE); + offset, 1, ENC_BIG_ENDIAN); offset += 1; proto_tree_add_item(tree, hf_enttec_poll_reply_tos, tvb, - offset, 1, FALSE); + offset, 1, ENC_BIG_ENDIAN); offset += 1; proto_tree_add_item(tree, hf_enttec_poll_reply_ttl, tvb, - offset, 1, FALSE); + offset, 1, ENC_BIG_ENDIAN); offset += 1; /* data */ @@ -167,7 +167,7 @@ static gint dissect_enttec_poll(tvbuff_t *tvb, guint offset, proto_tree *tree) { proto_tree_add_item(tree, hf_enttec_poll_type, tvb, - offset, 1, FALSE); + offset, 1, ENC_BIG_ENDIAN); offset += 1; return offset; @@ -204,21 +204,21 @@ dissect_enttec_dmx_data(tvbuff_t *tvb, guint offset, proto_tree *tree) guint16 ci,ui,i,start_offset,end_offset; proto_tree_add_item(tree, hf_enttec_dmx_data_universe, tvb, - offset, 1, FALSE); + offset, 1, ENC_BIG_ENDIAN); offset += 1; proto_tree_add_item(tree, hf_enttec_dmx_data_start_code, tvb, - offset, 1, FALSE); + offset, 1, ENC_BIG_ENDIAN); offset += 1; type = tvb_get_guint8(tvb, offset); proto_tree_add_item(tree, hf_enttec_dmx_data_type, tvb, - offset, 1, FALSE); + offset, 1, ENC_BIG_ENDIAN); offset += 1; length = tvb_get_ntohs(tvb, offset); proto_tree_add_item(tree, hf_enttec_dmx_data_size, tvb, - offset, 2, FALSE); + offset, 2, ENC_BIG_ENDIAN); offset += 2; /* @@ -367,7 +367,7 @@ dissect_enttec(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (enttec_tree) { proto_tree_add_item(enttec_tree, hf_enttec_head, tvb, - offset, 4, FALSE ); + offset, 4, ENC_BIG_ENDIAN ); offset += 4; switch (head) { diff --git a/epan/dissectors/packet-epl.c b/epan/dissectors/packet-epl.c index 978b7fbc90..bade12a042 100644 --- a/epan/dissectors/packet-epl.c +++ b/epan/dissectors/packet-epl.c @@ -767,17 +767,17 @@ dissect_epl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) epl_tree = proto_item_add_subtree(ti, ett_epl); proto_tree_add_item(epl_tree, - hf_epl_mtyp, tvb, offset, 1, TRUE); + hf_epl_mtyp, tvb, offset, 1, ENC_LITTLE_ENDIAN); } offset += 1; if (tree && !udpencap) { - epl_dest_item = proto_tree_add_item(epl_tree, hf_epl_dest, tvb, offset, 1, TRUE); + epl_dest_item = proto_tree_add_item(epl_tree, hf_epl_dest, tvb, offset, 1, ENC_LITTLE_ENDIAN); proto_item_append_text (epl_dest_item, "%s", dest_str); offset += 1; - epl_src_item = proto_tree_add_item(epl_tree, hf_epl_src, tvb, offset, 1, TRUE); + epl_src_item = proto_tree_add_item(epl_tree, hf_epl_src, tvb, offset, 1, ENC_LITTLE_ENDIAN); proto_item_append_text (epl_src_item, "%s", src_str); offset += 1; } @@ -870,7 +870,7 @@ dissect_epl_soc(proto_tree *epl_tree, tvbuff_t *tvb, packet_info *pinfo, gint of nettime.nsecs = tvb_get_letohl(tvb, offset+4); proto_tree_add_time(epl_tree, hf_epl_soc_nettime, tvb, offset, 8, &nettime); - proto_tree_add_item(epl_tree, hf_epl_soc_relativetime, tvb, offset+8, 8, TRUE); + proto_tree_add_item(epl_tree, hf_epl_soc_relativetime, tvb, offset+8, 8, ENC_LITTLE_ENDIAN); } offset += 16; @@ -942,11 +942,11 @@ dissect_epl_pres(proto_tree *epl_tree, tvbuff_t *tvb, packet_info *pinfo, guint8 { if (epl_src != EPL_MN_NODEID) /* check if the sender is CN or MN */ { - proto_tree_add_item(epl_tree, hf_epl_pres_stat_cs, tvb, offset, 1, TRUE); + proto_tree_add_item(epl_tree, hf_epl_pres_stat_cs, tvb, offset, 1, ENC_LITTLE_ENDIAN); } else /* MN */ { - proto_tree_add_item(epl_tree, hf_epl_pres_stat_ms, tvb, offset, 1, TRUE); + proto_tree_add_item(epl_tree, hf_epl_pres_stat_ms, tvb, offset, 1, ENC_LITTLE_ENDIAN); } } offset += 1; @@ -962,8 +962,8 @@ dissect_epl_pres(proto_tree *epl_tree, tvbuff_t *tvb, packet_info *pinfo, guint8 if (epl_tree) { - proto_tree_add_item(epl_tree, hf_epl_pres_pr, tvb, offset, 1, TRUE); - proto_tree_add_item(epl_tree, hf_epl_pres_rs, tvb, offset, 1, TRUE); + proto_tree_add_item(epl_tree, hf_epl_pres_pr, tvb, offset, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(epl_tree, hf_epl_pres_rs, tvb, offset, 1, ENC_LITTLE_ENDIAN); } offset += 1; @@ -1010,11 +1010,11 @@ dissect_epl_soa(proto_tree *epl_tree, tvbuff_t *tvb, packet_info *pinfo, guint8 { if (epl_src != EPL_MN_NODEID) /* check if CN or MN */ { - proto_tree_add_item(epl_tree, hf_epl_soa_stat_cs, tvb, offset, 1, TRUE); + proto_tree_add_item(epl_tree, hf_epl_soa_stat_cs, tvb, offset, 1, ENC_LITTLE_ENDIAN); } else /* MN */ { - proto_tree_add_item(epl_tree, hf_epl_soa_stat_ms, tvb, offset, 1, TRUE); + proto_tree_add_item(epl_tree, hf_epl_soa_stat_ms, tvb, offset, 1, ENC_LITTLE_ENDIAN); } } offset += 1; @@ -1118,7 +1118,7 @@ dissect_epl_asnd_nmtreq(proto_tree *epl_tree, tvbuff_t *tvb, packet_info *pinfo, { proto_tree_add_uint(epl_tree, hf_epl_asnd_nmtrequest_rcid, tvb, offset, 1, rcid); - proto_tree_add_item(epl_tree, hf_epl_asnd_nmtrequest_rct, tvb, offset+1, 1, TRUE); + proto_tree_add_item(epl_tree, hf_epl_asnd_nmtrequest_rct, tvb, offset+1, 1, ENC_LITTLE_ENDIAN); proto_tree_add_item(epl_tree, hf_epl_asnd_nmtrequest_rcd, tvb, offset+2, -1, ENC_NA); } @@ -1153,7 +1153,7 @@ dissect_epl_asnd_nmtcmd(proto_tree *epl_tree, tvbuff_t *tvb, packet_info *pinfo, break; case EPL_ASND_NMTCOMMAND_NMTFLUSHARPENTRY: - proto_tree_add_item(epl_tree, hf_epl_asnd_nmtcommand_nmtflusharpentry_nid, tvb, offset, 1, TRUE); + proto_tree_add_item(epl_tree, hf_epl_asnd_nmtcommand_nmtflusharpentry_nid, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 1; break; @@ -1191,17 +1191,17 @@ dissect_epl_asnd_ires(proto_tree *epl_tree, tvbuff_t *tvb, packet_info *pinfo, g proto_tree_add_item(epl_tree, hf_epl_asnd_identresponse_ec, tvb, offset, 1, TRUE); offset += 1; - proto_tree_add_item(epl_tree, hf_epl_asnd_identresponse_pr, tvb, offset, 1, TRUE); - proto_tree_add_item(epl_tree, hf_epl_asnd_identresponse_rs, tvb, offset, 1, TRUE); + proto_tree_add_item(epl_tree, hf_epl_asnd_identresponse_pr, tvb, offset, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(epl_tree, hf_epl_asnd_identresponse_rs, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 1; if (epl_src != EPL_MN_NODEID) /* check if CN or MN */ { - proto_tree_add_item(epl_tree, hf_epl_asnd_identresponse_stat_cs, tvb, offset, 1, TRUE); + proto_tree_add_item(epl_tree, hf_epl_asnd_identresponse_stat_cs, tvb, offset, 1, ENC_LITTLE_ENDIAN); } else /* MN */ { - proto_tree_add_item(epl_tree, hf_epl_asnd_identresponse_stat_ms, tvb, offset, 1, TRUE); + proto_tree_add_item(epl_tree, hf_epl_asnd_identresponse_stat_ms, tvb, offset, 1, ENC_LITTLE_ENDIAN); } offset += 2; @@ -1230,16 +1230,16 @@ dissect_epl_asnd_ires(proto_tree *epl_tree, tvbuff_t *tvb, packet_info *pinfo, g proto_tree_add_boolean(epl_feat_tree, hf_epl_asnd_identresponse_feat_bitD, tvb, offset, 4, epl_asnd_ires_feat); offset += 4; - proto_tree_add_item(epl_tree, hf_epl_asnd_identresponse_mtu, tvb, offset, 2, TRUE); + proto_tree_add_item(epl_tree, hf_epl_asnd_identresponse_mtu, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; - proto_tree_add_item(epl_tree, hf_epl_asnd_identresponse_pis, tvb, offset, 2, TRUE); + proto_tree_add_item(epl_tree, hf_epl_asnd_identresponse_pis, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; - proto_tree_add_item(epl_tree, hf_epl_asnd_identresponse_pos, tvb, offset, 2, TRUE); + proto_tree_add_item(epl_tree, hf_epl_asnd_identresponse_pos, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; - proto_tree_add_item(epl_tree, hf_epl_asnd_identresponse_rst, tvb, offset, 4, TRUE); + proto_tree_add_item(epl_tree, hf_epl_asnd_identresponse_rst, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 6; profile = tvb_get_letohs(tvb, offset); @@ -1248,34 +1248,34 @@ dissect_epl_asnd_ires(proto_tree *epl_tree, tvbuff_t *tvb, packet_info *pinfo, g 4, "", "Device Type: Profil %d (%s), Additional Information: 0x%4.4X", profile, val_to_str(profile, epl_device_profiles, "Unknown Profile"), additional); - proto_tree_add_item(epl_tree, hf_epl_asnd_identresponse_profile, tvb, offset, 2, TRUE); + proto_tree_add_item(epl_tree, hf_epl_asnd_identresponse_profile, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 4; - proto_tree_add_item(epl_tree, hf_epl_asnd_identresponse_vid, tvb, offset, 4, TRUE); + proto_tree_add_item(epl_tree, hf_epl_asnd_identresponse_vid, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; - proto_tree_add_item(epl_tree, hf_epl_asnd_identresponse_productcode, tvb, offset, 4, TRUE); + proto_tree_add_item(epl_tree, hf_epl_asnd_identresponse_productcode, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; - proto_tree_add_item(epl_tree, hf_epl_asnd_identresponse_rno, tvb, offset, 4, TRUE); + proto_tree_add_item(epl_tree, hf_epl_asnd_identresponse_rno, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; - proto_tree_add_item(epl_tree, hf_epl_asnd_identresponse_sno, tvb, offset, 4, TRUE); + proto_tree_add_item(epl_tree, hf_epl_asnd_identresponse_sno, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; - proto_tree_add_item(epl_tree, hf_epl_asnd_identresponse_vex1, tvb, offset, 8, TRUE); + proto_tree_add_item(epl_tree, hf_epl_asnd_identresponse_vex1, tvb, offset, 8, ENC_LITTLE_ENDIAN); offset += 8; - proto_tree_add_item(epl_tree, hf_epl_asnd_identresponse_vcd, tvb, offset, 4, TRUE); + proto_tree_add_item(epl_tree, hf_epl_asnd_identresponse_vcd, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; - proto_tree_add_item(epl_tree, hf_epl_asnd_identresponse_vct, tvb, offset, 4, TRUE); + proto_tree_add_item(epl_tree, hf_epl_asnd_identresponse_vct, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; - proto_tree_add_item(epl_tree, hf_epl_asnd_identresponse_ad, tvb, offset, 4, TRUE); + proto_tree_add_item(epl_tree, hf_epl_asnd_identresponse_ad, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; - proto_tree_add_item(epl_tree, hf_epl_asnd_identresponse_at, tvb, offset, 4, TRUE); + proto_tree_add_item(epl_tree, hf_epl_asnd_identresponse_at, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; epl_asnd_identresponse_ipa = tvb_get_ntohl(tvb, offset); @@ -1320,8 +1320,8 @@ dissect_epl_asnd_sres(proto_tree *epl_tree, tvbuff_t *tvb, packet_info *pinfo, g proto_tree_add_item(epl_tree, hf_epl_asnd_statusresponse_ec, tvb, offset, 1, TRUE); offset += 1; - proto_tree_add_item(epl_tree, hf_epl_asnd_statusresponse_pr, tvb, offset, 1, TRUE); - proto_tree_add_item(epl_tree, hf_epl_asnd_statusresponse_rs, tvb, offset, 1, TRUE); + proto_tree_add_item(epl_tree, hf_epl_asnd_statusresponse_pr, tvb, offset, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(epl_tree, hf_epl_asnd_statusresponse_rs, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 1; } else @@ -1350,13 +1350,13 @@ dissect_epl_asnd_sres(proto_tree *epl_tree, tvbuff_t *tvb, packet_info *pinfo, g epl_seb_tree = proto_item_add_subtree(ti_seb, ett_epl_seb); - proto_tree_add_item(epl_seb_tree, hf_epl_asnd_statusresponse_seb_err_errorregister_u8_bit0, tvb, offset, 1, TRUE); - proto_tree_add_item(epl_seb_tree, hf_epl_asnd_statusresponse_seb_err_errorregister_u8_bit1, tvb, offset, 1, TRUE); - proto_tree_add_item(epl_seb_tree, hf_epl_asnd_statusresponse_seb_err_errorregister_u8_bit2, tvb, offset, 1, TRUE); - proto_tree_add_item(epl_seb_tree, hf_epl_asnd_statusresponse_seb_err_errorregister_u8_bit3, tvb, offset, 1, TRUE); - proto_tree_add_item(epl_seb_tree, hf_epl_asnd_statusresponse_seb_err_errorregister_u8_bit4, tvb, offset, 1, TRUE); - proto_tree_add_item(epl_seb_tree, hf_epl_asnd_statusresponse_seb_err_errorregister_u8_bit5, tvb, offset, 1, TRUE); - proto_tree_add_item(epl_seb_tree, hf_epl_asnd_statusresponse_seb_err_errorregister_u8_bit7, tvb, offset, 1, TRUE); + proto_tree_add_item(epl_seb_tree, hf_epl_asnd_statusresponse_seb_err_errorregister_u8_bit0, tvb, offset, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(epl_seb_tree, hf_epl_asnd_statusresponse_seb_err_errorregister_u8_bit1, tvb, offset, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(epl_seb_tree, hf_epl_asnd_statusresponse_seb_err_errorregister_u8_bit2, tvb, offset, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(epl_seb_tree, hf_epl_asnd_statusresponse_seb_err_errorregister_u8_bit3, tvb, offset, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(epl_seb_tree, hf_epl_asnd_statusresponse_seb_err_errorregister_u8_bit4, tvb, offset, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(epl_seb_tree, hf_epl_asnd_statusresponse_seb_err_errorregister_u8_bit5, tvb, offset, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(epl_seb_tree, hf_epl_asnd_statusresponse_seb_err_errorregister_u8_bit7, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 2; proto_tree_add_item(epl_seb_tree, hf_epl_asnd_statusresponse_seb_devicespecific_err, tvb,offset, 6, ENC_NA); @@ -1379,31 +1379,31 @@ dissect_epl_asnd_sres(proto_tree *epl_tree, tvbuff_t *tvb, packet_info *pinfo, g /*Entry Type*/ ti_el_entry_type = proto_tree_add_item(ti_el_entry, - hf_epl_asnd_statusresponse_el_entry_type, tvb, offset, 2, TRUE); + hf_epl_asnd_statusresponse_el_entry_type, tvb, offset, 2, ENC_LITTLE_ENDIAN); epl_el_entry_type_tree = proto_item_add_subtree(ti_el_entry_type, ett_epl_el_entry_type); proto_tree_add_item(epl_el_entry_type_tree, - hf_epl_asnd_statusresponse_el_entry_type_profile, tvb, offset, 2, TRUE); + hf_epl_asnd_statusresponse_el_entry_type_profile, tvb, offset, 2, ENC_LITTLE_ENDIAN); proto_tree_add_item(epl_el_entry_type_tree, - hf_epl_asnd_statusresponse_el_entry_type_mode, tvb, offset, 2, TRUE); + hf_epl_asnd_statusresponse_el_entry_type_mode, tvb, offset, 2, ENC_LITTLE_ENDIAN); proto_tree_add_item(epl_el_entry_type_tree, - hf_epl_asnd_statusresponse_el_entry_type_bit14, tvb, offset, 2, TRUE); + hf_epl_asnd_statusresponse_el_entry_type_bit14, tvb, offset, 2, ENC_LITTLE_ENDIAN); proto_tree_add_item(epl_el_entry_type_tree, - hf_epl_asnd_statusresponse_el_entry_type_bit15, tvb, offset, 2, TRUE); + hf_epl_asnd_statusresponse_el_entry_type_bit15, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; - proto_tree_add_item(epl_el_entry_tree, hf_epl_asnd_statusresponse_el_entry_code, tvb, offset, 2, TRUE); + proto_tree_add_item(epl_el_entry_tree, hf_epl_asnd_statusresponse_el_entry_code, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; - proto_tree_add_item(epl_el_entry_tree, hf_epl_asnd_statusresponse_el_entry_time, tvb, offset, 8, TRUE); + proto_tree_add_item(epl_el_entry_tree, hf_epl_asnd_statusresponse_el_entry_time, tvb, offset, 8, ENC_LITTLE_ENDIAN); offset += 8; - proto_tree_add_item(epl_el_entry_tree, hf_epl_asnd_statusresponse_el_entry_add, tvb, offset, 8, TRUE); + proto_tree_add_item(epl_el_entry_tree, hf_epl_asnd_statusresponse_el_entry_add, tvb, offset, 8, ENC_LITTLE_ENDIAN); offset += 8; } @@ -1495,19 +1495,19 @@ dissect_epl_sdo_command(proto_tree *epl_tree, tvbuff_t *tvb, packet_info *pinfo, if (epl_tree) { - proto_tree_add_item(epl_tree, hf_epl_asnd_sdo_cmd_transaction_id, tvb, offset, 1, TRUE); + proto_tree_add_item(epl_tree, hf_epl_asnd_sdo_cmd_transaction_id, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 1; - proto_tree_add_item(epl_tree, hf_epl_asnd_sdo_cmd_response, tvb, offset, 1, TRUE); - proto_tree_add_item(epl_tree, hf_epl_asnd_sdo_cmd_abort, tvb, offset, 1, TRUE); + proto_tree_add_item(epl_tree, hf_epl_asnd_sdo_cmd_response, tvb, offset, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(epl_tree, hf_epl_asnd_sdo_cmd_abort, tvb, offset, 1, ENC_LITTLE_ENDIAN); - proto_tree_add_item(epl_tree, hf_epl_asnd_sdo_cmd_segmentation, tvb, offset, 1, TRUE); + proto_tree_add_item(epl_tree, hf_epl_asnd_sdo_cmd_segmentation, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 1; - proto_tree_add_item(epl_tree, hf_epl_asnd_sdo_cmd_command_id, tvb, offset, 1, TRUE); + proto_tree_add_item(epl_tree, hf_epl_asnd_sdo_cmd_command_id, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 1; - proto_tree_add_item(epl_tree, hf_epl_asnd_sdo_cmd_segment_size, tvb, offset, 2, TRUE); + proto_tree_add_item(epl_tree, hf_epl_asnd_sdo_cmd_segment_size, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 4; } else @@ -1523,7 +1523,7 @@ dissect_epl_sdo_command(proto_tree *epl_tree, tvbuff_t *tvb, packet_info *pinfo, /* if Segmentation = Initiate then print DataSize */ if (epl_tree) { - proto_tree_add_item(epl_tree, hf_epl_asnd_sdo_cmd_data_size, tvb, offset, 4, TRUE); + proto_tree_add_item(epl_tree, hf_epl_asnd_sdo_cmd_data_size, tvb, offset, 4, ENC_LITTLE_ENDIAN); } segmented = TRUE; offset += 4; diff --git a/epan/dissectors/packet-epl_v1.c b/epan/dissectors/packet-epl_v1.c index 91604191c5..d30b7b4a8c 100644 --- a/epan/dissectors/packet-epl_v1.c +++ b/epan/dissectors/packet-epl_v1.c @@ -195,17 +195,17 @@ static gint ett_epl_v1 = -1; gint dissect_epl_v1_soc(proto_tree *epl_v1_tree, tvbuff_t *tvb, gint offset) { - proto_tree_add_item(epl_v1_tree, hf_epl_v1_soc_ms, tvb, offset, 1, TRUE); - proto_tree_add_item(epl_v1_tree, hf_epl_v1_soc_ps, tvb, offset, 1, TRUE); + proto_tree_add_item(epl_v1_tree, hf_epl_v1_soc_ms, tvb, offset, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(epl_v1_tree, hf_epl_v1_soc_ps, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 1; - proto_tree_add_item(epl_v1_tree, hf_epl_v1_soc_net_command, tvb, offset, 2, TRUE); + proto_tree_add_item(epl_v1_tree, hf_epl_v1_soc_net_command, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; - proto_tree_add_item(epl_v1_tree, hf_epl_v1_soc_net_time, tvb, offset, 4, TRUE); + proto_tree_add_item(epl_v1_tree, hf_epl_v1_soc_net_time, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; - proto_tree_add_item(epl_v1_tree, hf_epl_v1_soc_powerlink_cycle_time, tvb, offset, 4, TRUE); + proto_tree_add_item(epl_v1_tree, hf_epl_v1_soc_powerlink_cycle_time, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; proto_tree_add_item(epl_v1_tree, hf_epl_v1_soc_net_command_parameter, tvb, offset, 32, ENC_NA); @@ -220,7 +220,7 @@ dissect_epl_v1_eoc(proto_tree *epl_v1_tree, tvbuff_t *tvb, gint offset) { offset += 1; - proto_tree_add_item(epl_v1_tree, hf_epl_v1_eoc_net_command, tvb, offset, 2, TRUE); + proto_tree_add_item(epl_v1_tree, hf_epl_v1_eoc_net_command, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 8; proto_tree_add_item(epl_v1_tree, hf_epl_v1_eoc_net_command_parameter, tvb, offset, 32, ENC_NA); @@ -235,12 +235,12 @@ dissect_epl_v1_preq(proto_tree *epl_v1_tree, tvbuff_t *tvb, gint offset) { guint16 len; - proto_tree_add_item(epl_v1_tree, hf_epl_v1_preq_ms, tvb, offset, 1, TRUE); - proto_tree_add_item(epl_v1_tree, hf_epl_v1_preq_rd, tvb, offset, 1, TRUE); + proto_tree_add_item(epl_v1_tree, hf_epl_v1_preq_ms, tvb, offset, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(epl_v1_tree, hf_epl_v1_preq_rd, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 1; /* get length of data */ - proto_tree_add_item(epl_v1_tree, hf_epl_v1_preq_poll_size_out, tvb, offset, 2, TRUE); + proto_tree_add_item(epl_v1_tree, hf_epl_v1_preq_poll_size_out, tvb, offset, 2, ENC_LITTLE_ENDIAN); len = tvb_get_letohs(tvb, offset); offset += 6; @@ -259,16 +259,16 @@ dissect_epl_v1_pres(proto_tree *epl_v1_tree, tvbuff_t *tvb, gint offset) { guint16 len; - proto_tree_add_item(epl_v1_tree, hf_epl_v1_pres_ms, tvb, offset, 1, TRUE); - proto_tree_add_item(epl_v1_tree, hf_epl_v1_pres_ex, tvb, offset, 1, TRUE); - proto_tree_add_item(epl_v1_tree, hf_epl_v1_pres_rs, tvb, offset, 1, TRUE); - proto_tree_add_item(epl_v1_tree, hf_epl_v1_pres_wa, tvb, offset, 1, TRUE); - proto_tree_add_item(epl_v1_tree, hf_epl_v1_pres_er, tvb, offset, 1, TRUE); - proto_tree_add_item(epl_v1_tree, hf_epl_v1_pres_rd, tvb, offset, 1, TRUE); + proto_tree_add_item(epl_v1_tree, hf_epl_v1_pres_ms, tvb, offset, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(epl_v1_tree, hf_epl_v1_pres_ex, tvb, offset, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(epl_v1_tree, hf_epl_v1_pres_rs, tvb, offset, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(epl_v1_tree, hf_epl_v1_pres_wa, tvb, offset, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(epl_v1_tree, hf_epl_v1_pres_er, tvb, offset, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(epl_v1_tree, hf_epl_v1_pres_rd, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 1; /* get length of data */ - proto_tree_add_item(epl_v1_tree, hf_epl_v1_pres_poll_size_in, tvb, offset, 2, TRUE); + proto_tree_add_item(epl_v1_tree, hf_epl_v1_pres_poll_size_in, tvb, offset, 2, ENC_LITTLE_ENDIAN); len = tvb_get_letohs(tvb, offset); offset += 6; @@ -285,7 +285,7 @@ dissect_epl_v1_pres(proto_tree *epl_v1_tree, tvbuff_t *tvb, gint offset) gint dissect_epl_v1_ainv(proto_tree *epl_v1_tree, tvbuff_t *tvb, gint offset) { - proto_tree_add_item(epl_v1_tree, hf_epl_v1_ainv_channel, tvb, offset, 1, TRUE); + proto_tree_add_item(epl_v1_tree, hf_epl_v1_ainv_channel, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 1; return offset; @@ -300,33 +300,33 @@ dissect_epl_v1_asnd(proto_tree *epl_v1_tree, tvbuff_t *tvb, gint offset) guint16 len; /* get ASnd channel */ - proto_tree_add_item(epl_v1_tree, hf_epl_v1_asnd_channel, tvb, offset, 1, TRUE); + proto_tree_add_item(epl_v1_tree, hf_epl_v1_asnd_channel, tvb, offset, 1, ENC_LITTLE_ENDIAN); epl_v1_asnd_channel = tvb_get_guint8(tvb, offset); offset += 1; /* get length of data */ - proto_tree_add_item(epl_v1_tree, hf_epl_v1_asnd_size, tvb, offset, 2, TRUE); + proto_tree_add_item(epl_v1_tree, hf_epl_v1_asnd_size, tvb, offset, 2, ENC_LITTLE_ENDIAN); len = tvb_get_letohs(tvb, offset); offset += 2; /* "Ident" or "Generic" channel? */ if(epl_v1_asnd_channel == EPL_V1_AINV_IDENT){ /* Ident channel*/ - proto_tree_add_item(epl_v1_tree, hf_epl_v1_asnd_node_id, tvb, offset, 4, TRUE); + proto_tree_add_item(epl_v1_tree, hf_epl_v1_asnd_node_id, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; - proto_tree_add_item(epl_v1_tree, hf_epl_v1_asnd_hardware_revision, tvb, offset, 4, TRUE); + proto_tree_add_item(epl_v1_tree, hf_epl_v1_asnd_hardware_revision, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; - proto_tree_add_item(epl_v1_tree, hf_epl_v1_asnd_firmware_version, tvb, offset, 4, TRUE); + proto_tree_add_item(epl_v1_tree, hf_epl_v1_asnd_firmware_version, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; - proto_tree_add_item(epl_v1_tree, hf_epl_v1_asnd_device_variant, tvb, offset, 4, TRUE); + proto_tree_add_item(epl_v1_tree, hf_epl_v1_asnd_device_variant, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; - proto_tree_add_item(epl_v1_tree, hf_epl_v1_asnd_poll_in_size, tvb, offset, 4, TRUE); + proto_tree_add_item(epl_v1_tree, hf_epl_v1_asnd_poll_in_size, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; - proto_tree_add_item(epl_v1_tree, hf_epl_v1_asnd_poll_out_size, tvb, offset, 4, TRUE); + proto_tree_add_item(epl_v1_tree, hf_epl_v1_asnd_poll_out_size, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; } else { /* "Generic" and all other channels */ proto_tree_add_item(epl_v1_tree, hf_epl_v1_asnd_data, tvb, offset, len, ENC_NA); @@ -410,13 +410,13 @@ dissect_epl_v1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) epl_v1_tree = proto_item_add_subtree(ti, ett_epl_v1); } - proto_tree_add_item(epl_v1_tree, hf_epl_v1_service, tvb, offset, 1, TRUE); + proto_tree_add_item(epl_v1_tree, hf_epl_v1_service, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 1; - proto_tree_add_item(epl_v1_tree, hf_epl_v1_dest, tvb, offset, 1, TRUE); + proto_tree_add_item(epl_v1_tree, hf_epl_v1_dest, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 1; - proto_tree_add_item(epl_v1_tree, hf_epl_v1_src, tvb, offset, 1, TRUE); + proto_tree_add_item(epl_v1_tree, hf_epl_v1_src, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 1; /* The rest of the epl_v1 dissector depends on the message type */ diff --git a/epan/dissectors/packet-esio.c b/epan/dissectors/packet-esio.c index 13af51a842..a8ea08d914 100644 --- a/epan/dissectors/packet-esio.c +++ b/epan/dissectors/packet-esio.c @@ -182,16 +182,16 @@ dissect_esio(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* add items to the Ether-S-I/O header subtree*/ esio_tlg_type = tvb_get_ntohs(tvb,offset); proto_tree_add_item(esio_header_tree, - hf_esio_type, tvb, offset, 2, FALSE); + hf_esio_type, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(esio_header_tree, - hf_esio_version, tvb, offset, 2, FALSE); + hf_esio_version, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(esio_header_tree, - hf_esio_length, tvb, offset, 2, FALSE); + hf_esio_length, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(esio_header_tree, - hf_esio_transaction_id, tvb, offset, 2, FALSE); + hf_esio_transaction_id, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; switch (esio_tlg_type) { case ESIO_TRANSFER: @@ -199,17 +199,17 @@ dissect_esio(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) et = proto_tree_add_text(esio_tree, tvb, offset, 12, "Transfer header"); esio_transfer_header_tree = proto_item_add_subtree(et, ett_esio_transfer_header); proto_tree_add_item(esio_transfer_header_tree, - hf_esio_tlg_id, tvb, offset, 4, FALSE); + hf_esio_tlg_id, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; proto_tree_add_item(esio_transfer_header_tree, - hf_esio_src_stn_id, tvb, offset, 4, FALSE); + hf_esio_src_stn_id, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; esio_nbr_data_transfers = tvb_get_guint8(tvb,offset); proto_tree_add_item(esio_transfer_header_tree, - hf_esio_data_nbr, tvb, offset, 1, FALSE); + hf_esio_data_nbr, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; proto_tree_add_item(esio_transfer_header_tree, - hf_esio_data_flags, tvb, offset, 1, FALSE); + hf_esio_data_flags, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; for (i=((esio_nbr_data_transfers)); i>0; i--) { /*Add subtree(s) for Ether-S-I/O data transfers*/ @@ -220,13 +220,13 @@ dissect_esio(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) esio_transfer_dest_id); esio_data_tansfer_tree = proto_item_add_subtree(et, ett_esio_transfer_data); proto_tree_add_item(esio_data_tansfer_tree, - hf_esio_data_transfer_id, tvb, offset, 4, FALSE); + hf_esio_data_transfer_id, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; proto_tree_add_item(esio_data_tansfer_tree, - hf_esio_data_dest_id, tvb, offset, 4, FALSE); + hf_esio_data_dest_id, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; proto_tree_add_item(esio_data_tansfer_tree, - hf_esio_data_length, tvb, offset, 2, FALSE); + hf_esio_data_length, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; /*here comes the data*/ et = proto_tree_add_text(esio_data_tansfer_tree, tvb, offset, @@ -235,37 +235,37 @@ dissect_esio(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) for (i=((esio_transfer_length)); i>0; i--) { proto_tree_add_item(esio_data_tree, hf_esio_data, tvb, offset, - 1, FALSE); + 1, ENC_BIG_ENDIAN); offset += 1; } } break; case ESIO_STATUS: proto_tree_add_item(esio_tree, - hf_esio_sts_type, tvb, offset, 2, FALSE); + hf_esio_sts_type, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(esio_tree, - hf_esio_sts_size, tvb, offset, 2, FALSE); + hf_esio_sts_size, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(esio_tree, - hf_esio_src_stn_id, tvb, offset, 4, FALSE); + hf_esio_src_stn_id, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; proto_tree_add_item(esio_tree, hf_esio_rio_sts, tvb, offset, - 1, FALSE); + 1, ENC_BIG_ENDIAN); offset += 1; hi = proto_tree_add_item(esio_tree, hf_esio_rio_tlgs_lost, tvb, offset, - 1, FALSE); + 1, ENC_BIG_ENDIAN); expert_add_info_format(pinfo, hi, PI_SEQUENCE, PI_NOTE, "Telegram(s) lost"); offset += 1; proto_tree_add_item(esio_tree, hf_esio_rio_diag, tvb, offset, - 1, FALSE); + 1, ENC_BIG_ENDIAN); offset += 1; proto_tree_add_item(esio_tree, - hf_esio_rio_flags, tvb, offset, 1, FALSE); + hf_esio_rio_flags, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; break; default: diff --git a/epan/dissectors/packet-eth.c b/epan/dissectors/packet-eth.c index 6c28c383ce..4c502780fa 100644 --- a/epan/dissectors/packet-eth.c +++ b/epan/dissectors/packet-eth.c @@ -302,7 +302,7 @@ dissect_eth_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, proto_tree_add_item(addr_tree, hf_eth_lg, tvb, 6, 3, FALSE); proto_tree_add_item(addr_tree, hf_eth_ig, tvb, 6, 3, FALSE); - ti = proto_tree_add_item(fh_tree, hf_eth_invalid_lentype, tvb, 12, 2, FALSE); + ti = proto_tree_add_item(fh_tree, hf_eth_invalid_lentype, tvb, 12, 2, ENC_BIG_ENDIAN); expert_add_info_format(pinfo, ti, PI_PROTOCOL, PI_WARN, "Invalid length/type: 0x%04x (%d)", ehdr->type, ehdr->type); next_tvb = tvb_new_subset_remaining(tvb, 14); diff --git a/epan/dissectors/packet-evrc.c b/epan/dissectors/packet-evrc.c index b872192cdd..2966a26655 100644 --- a/epan/dissectors/packet-evrc.c +++ b/epan/dissectors/packet-evrc.c @@ -243,9 +243,9 @@ dissect_evrc_aux(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, evrc_varia evrc_tree = proto_item_add_subtree(item, ett_evrc); - proto_tree_add_item(evrc_tree, hf_evrc_reserved, tvb, offset, 1, FALSE); - proto_tree_add_item(evrc_tree, hf_evrc_interleave_length, tvb, offset, 1, FALSE); - proto_tree_add_item(evrc_tree, hf_evrc_interleave_index, tvb, offset, 1, FALSE); + proto_tree_add_item(evrc_tree, hf_evrc_reserved, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(evrc_tree, hf_evrc_interleave_length, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(evrc_tree, hf_evrc_interleave_index, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; @@ -264,8 +264,8 @@ dissect_evrc_aux(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, evrc_varia toc_tree = proto_item_add_subtree(item, ett_toc); proto_tree_add_item(toc_tree, hf_evrc_legacy_toc_fe_ind, tvb, offset, 1, FALSE); - proto_tree_add_item(toc_tree, hf_evrc_legacy_toc_reduc_rate, tvb, offset, 1, FALSE); - proto_tree_add_item(toc_tree, hf_evrc_legacy_toc_frame_type, tvb, offset, 1, FALSE); + proto_tree_add_item(toc_tree, hf_evrc_legacy_toc_reduc_rate, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(toc_tree, hf_evrc_legacy_toc_frame_type, tvb, offset, 1, ENC_BIG_ENDIAN); oct = tvb_get_guint8(tvb, offset); further_entries = (oct & 0x80) ? TRUE : FALSE; @@ -355,7 +355,7 @@ dissect_evrc_aux(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, evrc_varia if (frame_count & 0x01) { /* odd number of frames */ - proto_tree_add_item(toc_tree, hf_evrc_padding, tvb, offset-1, 1, FALSE); + proto_tree_add_item(toc_tree, hf_evrc_padding, tvb, offset-1, 1, ENC_BIG_ENDIAN); } proto_item_set_len(item, offset - saved_offset); diff --git a/epan/dissectors/packet-fc.c b/epan/dissectors/packet-fc.c index b10cbd0d8c..9f8a33a31d 100644 --- a/epan/dissectors/packet-fc.c +++ b/epan/dissectors/packet-fc.c @@ -364,16 +364,16 @@ dissect_fc_ba_acc (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ti = proto_tree_add_text (tree, tvb, 0, tvb_length (tvb), "Basic Link Svc"); acc_tree = proto_item_add_subtree (ti, ett_fcbls); - proto_tree_add_item (acc_tree, hf_fc_bls_seqid_vld, tvb, offset++, 1, FALSE); - proto_tree_add_item (acc_tree, hf_fc_bls_lastvld_seqid, tvb, offset++, 1, FALSE); + proto_tree_add_item (acc_tree, hf_fc_bls_seqid_vld, tvb, offset++, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (acc_tree, hf_fc_bls_lastvld_seqid, tvb, offset++, 1, ENC_BIG_ENDIAN); offset += 2; /* Skip reserved field */ - proto_tree_add_item (acc_tree, hf_fc_bls_oxid, tvb, offset, 2, FALSE); + proto_tree_add_item (acc_tree, hf_fc_bls_oxid, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item (acc_tree, hf_fc_bls_rxid, tvb, offset, 2, FALSE); + proto_tree_add_item (acc_tree, hf_fc_bls_rxid, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item (acc_tree, hf_fc_bls_lowseqcnt, tvb, offset, 2, FALSE); + proto_tree_add_item (acc_tree, hf_fc_bls_lowseqcnt, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item (acc_tree, hf_fc_bls_hiseqcnt, tvb, offset, 2, FALSE); + proto_tree_add_item (acc_tree, hf_fc_bls_hiseqcnt, tvb, offset, 2, ENC_BIG_ENDIAN); } } @@ -394,9 +394,9 @@ dissect_fc_ba_rjt (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ti = proto_tree_add_text (tree, tvb, 0, tvb_length (tvb), "Basic Link Svc"); rjt_tree = proto_item_add_subtree (ti, ett_fcbls); - proto_tree_add_item (rjt_tree, hf_fc_bls_rjtcode, tvb, offset+1, 1, FALSE); - proto_tree_add_item (rjt_tree, hf_fc_bls_rjtdetail, tvb, offset+2, 1, FALSE); - proto_tree_add_item (rjt_tree, hf_fc_bls_vendor, tvb, offset+3, 1, FALSE); + proto_tree_add_item (rjt_tree, hf_fc_bls_rjtcode, tvb, offset+1, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (rjt_tree, hf_fc_bls_rjtdetail, tvb, offset+2, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (rjt_tree, hf_fc_bls_vendor, tvb, offset+3, 1, ENC_BIG_ENDIAN); } } @@ -999,10 +999,10 @@ dissect_fc_helper (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean fclctl_get_typestr ((guint8) (fchdr.r_ctl & 0x0F), fchdr.type)); } else { - proto_tree_add_item (fc_tree, hf_fc_type, tvb, offset+8, 1, FALSE); + proto_tree_add_item (fc_tree, hf_fc_type, tvb, offset+8, 1, ENC_BIG_ENDIAN); } } else { - proto_tree_add_item (fc_tree, hf_fc_type, tvb, offset+8, 1, FALSE); + proto_tree_add_item (fc_tree, hf_fc_type, tvb, offset+8, 1, ENC_BIG_ENDIAN); } @@ -1010,7 +1010,7 @@ dissect_fc_helper (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean f_ctl = tvb_get_ntoh24(tvb, offset+9); - proto_tree_add_item (fc_tree, hf_fc_seqid, tvb, offset+12, 1, FALSE); + proto_tree_add_item (fc_tree, hf_fc_seqid, tvb, offset+12, 1, ENC_BIG_ENDIAN); df_ctl = tvb_get_guint8(tvb, offset+13); @@ -1032,7 +1032,7 @@ dissect_fc_helper (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean fclctl_get_paramstr ((fchdr.r_ctl & 0x0F), param)); } else { - proto_tree_add_item (fc_tree, hf_fc_param, tvb, offset+20, 4, FALSE); + proto_tree_add_item (fc_tree, hf_fc_param, tvb, offset+20, 4, ENC_BIG_ENDIAN); } } else if (ftype == FC_FTYPE_BLS) { if ((fchdr.r_ctl & 0x0F) == FC_BLS_ABTS) { @@ -1043,17 +1043,17 @@ dissect_fc_helper (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean "Abort Exchange")); } else { proto_tree_add_item (fc_tree, hf_fc_param, tvb, offset+20, - 4, FALSE); + 4, ENC_BIG_ENDIAN); } } else if (ftype == FC_FTYPE_SCSI ) { if (f_ctl&FC_FCTL_REL_OFFSET){ - proto_tree_add_item (fc_tree, hf_fc_relative_offset, tvb, offset+20, 4, FALSE); + proto_tree_add_item (fc_tree, hf_fc_relative_offset, tvb, offset+20, 4, ENC_BIG_ENDIAN); fchdr.relative_offset=tvb_get_ntohl(tvb, offset+20); } else { - proto_tree_add_item (fc_tree, hf_fc_param, tvb, offset+20, 4, FALSE); + proto_tree_add_item (fc_tree, hf_fc_param, tvb, offset+20, 4, ENC_BIG_ENDIAN); } } else { - proto_tree_add_item (fc_tree, hf_fc_param, tvb, offset+20, 4, FALSE); + proto_tree_add_item (fc_tree, hf_fc_param, tvb, offset+20, 4, ENC_BIG_ENDIAN); } /* Skip the Frame_Header */ diff --git a/epan/dissectors/packet-fcct.c b/epan/dissectors/packet-fcct.c index ba55ca693f..3943b96137 100644 --- a/epan/dissectors/packet-fcct.c +++ b/epan/dissectors/packet-fcct.c @@ -202,19 +202,19 @@ dissect_fcct (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) fcct_tree = proto_item_add_subtree (ti, ett_fcct); proto_tree_add_item (fcct_tree, hf_fcct_revision, tvb, offset++, - sizeof (guint8), 0); + sizeof (guint8), ENC_BIG_ENDIAN); proto_tree_add_string (fcct_tree, hf_fcct_inid, tvb, offset, 3, fc_to_str ((guint8 *)&in_id)); offset += 3; /* sizeof FC address */ proto_tree_add_item (fcct_tree, hf_fcct_gstype, tvb, offset++, - sizeof (guint8), 0); + sizeof (guint8), ENC_BIG_ENDIAN); proto_tree_add_item (fcct_tree, hf_fcct_gssubtype, tvb, offset, - sizeof (guint8), 0); + sizeof (guint8), ENC_BIG_ENDIAN); proto_tree_add_uint (fcct_tree, hf_fcct_server, tvb, offset++, 1, server); proto_tree_add_item (fcct_tree, hf_fcct_options, tvb, offset++, - sizeof (guint8), 0); + sizeof (guint8), ENC_BIG_ENDIAN); } /* We do not change the starting offset for the next protocol in the diff --git a/epan/dissectors/packet-fcdns.c b/epan/dissectors/packet-fcdns.c index 3e57a84137..7c14f93771 100644 --- a/epan/dissectors/packet-fcdns.c +++ b/epan/dissectors/packet-fcdns.c @@ -292,7 +292,7 @@ dissect_fc4features_and_type (proto_tree *parent_tree, tvbuff_t *tvb, int offset flags&=(~( 0x01 )); } - proto_tree_add_item (tree, hf_fcdns_req_fc4type, tvb, offset+1, 1, 0); + proto_tree_add_item (tree, hf_fcdns_req_fc4type, tvb, offset+1, 1, ENC_BIG_ENDIAN); } /* The feature routines just decode FCP's FC-4 features field @@ -444,7 +444,7 @@ dissect_fcdns_ganxt (tvbuff_t *tvb, proto_tree *req_tree, gboolean isreq) } else { proto_tree_add_item (req_tree, hf_fcdns_rply_ptype, tvb, offset, - 1, 0); + 1, ENC_BIG_ENDIAN); proto_tree_add_string (req_tree, hf_fcdns_rply_portid, tvb, offset+1, 3, tvb_fc_to_str (tvb, offset+1)); @@ -453,7 +453,7 @@ dissect_fcdns_ganxt (tvbuff_t *tvb, proto_tree *req_tree, gboolean isreq) tvb_fcwwn_to_str (tvb, offset+4)); len = tvb_get_guint8 (tvb, offset+12); proto_tree_add_item (req_tree, hf_fcdns_rply_spnamelen, tvb, - offset+12, 1, 0); + offset+12, 1, ENC_BIG_ENDIAN); if (!tvb_offset_exists (tvb, 29+len)) return; @@ -470,7 +470,7 @@ dissect_fcdns_ganxt (tvbuff_t *tvb, proto_tree *req_tree, gboolean isreq) if (tvb_offset_exists (tvb, 548)) { len = tvb_get_guint8 (tvb, offset+276); proto_tree_add_item (req_tree, hf_fcdns_rply_snamelen, tvb, - offset+276, 1, 0); + offset+276, 1, ENC_BIG_ENDIAN); if (len) { proto_tree_add_item (req_tree, hf_fcdns_rply_sname, tvb, offset+277, len, 0); @@ -584,7 +584,7 @@ dissect_fcdns_gspnid (tvbuff_t *tvb, proto_tree *req_tree, gboolean isreq) else { len = tvb_get_guint8 (tvb, offset); proto_tree_add_item (req_tree, hf_fcdns_rply_spnamelen, - tvb, offset, 1, 0); + tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item (req_tree, hf_fcdns_rply_spname, tvb, offset+1, len, ENC_NA); } @@ -602,7 +602,7 @@ dissect_fcdns_gptid (tvbuff_t *tvb, proto_tree *req_tree, gboolean isreq) } else { proto_tree_add_item (req_tree, hf_fcdns_rply_ptype, tvb, - offset, 1, 0); + offset, 1, ENC_BIG_ENDIAN); } } } @@ -787,7 +787,7 @@ dissect_fcdns_gsnnnn (tvbuff_t *tvb, proto_tree *req_tree, gboolean isreq) else { len = tvb_get_guint8 (tvb, offset); proto_tree_add_item (req_tree, hf_fcdns_rply_snamelen, tvb, - offset, 1, 0); + offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item (req_tree, hf_fcdns_rply_sname, tvb, offset+1, len, 0); } @@ -803,11 +803,11 @@ dissect_fcdns_gidft (tvbuff_t *tvb, proto_tree *req_tree, gboolean isreq) if (req_tree) { if (isreq) { proto_tree_add_item (req_tree, hf_fcdns_req_domainscope, - tvb, offset+1, 1, 0); + tvb, offset+1, 1, ENC_BIG_ENDIAN); proto_tree_add_item (req_tree, hf_fcdns_req_areascope, - tvb, offset+2, 1, 0); + tvb, offset+2, 1, ENC_BIG_ENDIAN); proto_tree_add_item (req_tree, hf_fcdns_req_fc4type, - tvb, offset+3, 1, 0); + tvb, offset+3, 1, ENC_BIG_ENDIAN); } else { do { @@ -830,11 +830,11 @@ dissect_fcdns_gpnft (tvbuff_t *tvb, proto_tree *req_tree, gboolean isreq) if (req_tree) { if (isreq) { proto_tree_add_item (req_tree, hf_fcdns_req_domainscope, - tvb, offset+1, 1, 0); + tvb, offset+1, 1, ENC_BIG_ENDIAN); proto_tree_add_item (req_tree, hf_fcdns_req_areascope, - tvb, offset+2, 1, 0); + tvb, offset+2, 1, ENC_BIG_ENDIAN); proto_tree_add_item (req_tree, hf_fcdns_req_fc4type, - tvb, offset+3, 1, 0); + tvb, offset+3, 1, ENC_BIG_ENDIAN); } else { do { @@ -860,11 +860,11 @@ dissect_fcdns_gnnft (tvbuff_t *tvb, proto_tree *req_tree, gboolean isreq) if (req_tree) { if (isreq) { proto_tree_add_item (req_tree, hf_fcdns_req_domainscope, - tvb, offset+1, 1, 0); + tvb, offset+1, 1, ENC_BIG_ENDIAN); proto_tree_add_item (req_tree, hf_fcdns_req_areascope, - tvb, offset+2, 1, 0); + tvb, offset+2, 1, ENC_BIG_ENDIAN); proto_tree_add_item (req_tree, hf_fcdns_req_fc4type, - tvb, offset+3, 1, 0); + tvb, offset+3, 1, ENC_BIG_ENDIAN); } else { do { @@ -890,11 +890,11 @@ dissect_fcdns_gidpt (tvbuff_t *tvb, proto_tree *req_tree, gboolean isreq) if (req_tree) { if (isreq) { proto_tree_add_item (req_tree, hf_fcdns_req_ptype, - tvb, offset, 1, 0); + tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item (req_tree, hf_fcdns_req_domainscope, - tvb, offset+1, 1, 0); + tvb, offset+1, 1, ENC_BIG_ENDIAN); proto_tree_add_item (req_tree, hf_fcdns_req_areascope, - tvb, offset+2, 1, 0); + tvb, offset+2, 1, ENC_BIG_ENDIAN); } else { do { @@ -940,9 +940,9 @@ dissect_fcdns_gidff (tvbuff_t *tvb, proto_tree *req_tree, gboolean isreq) if (req_tree) { if (isreq) { proto_tree_add_item (req_tree, hf_fcdns_req_domainscope, tvb, - offset+1, 1, 0); + offset+1, 1, ENC_BIG_ENDIAN); proto_tree_add_item (req_tree, hf_fcdns_req_areascope, tvb, - offset+2, 1, 0); + offset+2, 1, ENC_BIG_ENDIAN); dissect_fc4features_and_type(req_tree, tvb, offset+6); } else { @@ -1014,7 +1014,7 @@ dissect_fcdns_rptid (tvbuff_t *tvb, proto_tree *req_tree, gboolean isreq) offset+1, 3, tvb_fc_to_str (tvb, offset+1)); proto_tree_add_item (req_tree, hf_fcdns_req_ptype, tvb, - offset+4, 1, 0); + offset+4, 1, ENC_BIG_ENDIAN); } } @@ -1042,7 +1042,7 @@ dissect_fcdns_rspnid (tvbuff_t *tvb, proto_tree *req_tree, gboolean isreq) offset+1, 3, tvb_fc_to_str (tvb, offset+1)); proto_tree_add_item (req_tree, hf_fcdns_req_spnamelen, tvb, - offset+4, 1, 0); + offset+4, 1, ENC_BIG_ENDIAN); len = tvb_get_guint8 (tvb, offset+4); proto_tree_add_item (req_tree, hf_fcdns_req_spname, tvb, offset+5, @@ -1081,7 +1081,7 @@ dissect_fcdns_rfdid (tvbuff_t *tvb, proto_tree *req_tree, gboolean isreq) while (len > 0) { proto_tree_add_item (req_tree, hf_fcdns_req_fdesclen, tvb, offset, - 1, 0); + 1, ENC_BIG_ENDIAN); proto_tree_add_item (req_tree, hf_fcdns_req_fdesc, tvb, offset+1, len, 0); offset += 256; @@ -1126,7 +1126,7 @@ dissect_fcdns_rsnnnn (tvbuff_t *tvb, proto_tree *req_tree, gboolean isreq) len = tvb_get_guint8 (tvb, offset+8); proto_tree_add_item (req_tree, hf_fcdns_req_snamelen, tvb, offset+8, - 1, 0); + 1, ENC_BIG_ENDIAN); proto_tree_add_item (req_tree, hf_fcdns_req_sname, tvb, offset+9, len, 0); } @@ -1211,12 +1211,12 @@ dissect_fcdns_swils_entries (tvbuff_t *tvb, proto_tree *tree, int offset) for (i = 0; i < numrec; i++) { objfmt = tvb_get_guint8 (tvb, offset); - proto_tree_add_item (tree, hf_fcdns_sw2_objfmt, tvb, offset, 1, 0); + proto_tree_add_item (tree, hf_fcdns_sw2_objfmt, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_string (tree, hf_fcdns_rply_ownerid, tvb, offset+1, 3, fc_to_str (tvb_get_ephemeral_string (tvb, offset+1, 3))); proto_tree_add_item (tree, hf_fcdns_rply_ptype, tvb, offset+4, - 1, 0); + 1, ENC_BIG_ENDIAN); proto_tree_add_string (tree, hf_fcdns_rply_portid, tvb, offset+5, 3, tvb_fc_to_str (tvb, offset+5)); proto_tree_add_string (tree, hf_fcdns_rply_pname, tvb, offset+8, 8, @@ -1225,7 +1225,7 @@ dissect_fcdns_swils_entries (tvbuff_t *tvb, proto_tree *tree, int offset) if (!(objfmt & 0x1)) { len = tvb_get_guint8 (tvb, offset); proto_tree_add_item (tree, hf_fcdns_rply_spnamelen, tvb, - offset, 1, 0); + offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_fcdns_rply_spname, tvb, offset+1, len, 0); offset += 256; @@ -1236,7 +1236,7 @@ dissect_fcdns_swils_entries (tvbuff_t *tvb, proto_tree *tree, int offset) if (!(objfmt & 0x1)) { len = tvb_get_guint8 (tvb, offset); proto_tree_add_item (tree, hf_fcdns_rply_snamelen, tvb, - offset, 1, 0); + offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_fcdns_rply_sname, tvb, offset+1, len, 0); offset += 256; @@ -1257,18 +1257,18 @@ dissect_fcdns_swils_entries (tvbuff_t *tvb, proto_tree *tree, int offset) dissect_fc4features(tree, tvb, offset); if (tvb_get_guint8 (tvb, offset+129)) { proto_tree_add_item (tree, hf_fcdns_rply_fc4type, tvb, - offset+128, 1, 0); + offset+128, 1, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_fcdns_num_fc4desc, tvb, - offset+129, 1, 0); + offset+129, 1, ENC_BIG_ENDIAN); len = tvb_get_guint8 (tvb, offset+132); proto_tree_add_item (tree, hf_fcdns_rply_fc4desclen, tvb, - offset+132, 1, 0); + offset+132, 1, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_fcdns_rply_fc4desc, tvb, offset+133, len, ENC_NA); } else { proto_tree_add_item (tree, hf_fcdns_num_fc4desc, tvb, - offset+129, 1, 0); + offset+129, 1, ENC_BIG_ENDIAN); } offset += 388; /* FC4 desc is 260 bytes, maybe padded */ } @@ -1361,7 +1361,7 @@ dissect_fcdns_gept (tvbuff_t *tvb, proto_tree *req_tree, gboolean isreq) if (isreq) { if (req_tree) { proto_tree_add_item (req_tree, hf_fcdns_req_ptype, tvb, offset+3, - 1, 0); + 1, ENC_BIG_ENDIAN); } } else { @@ -1440,10 +1440,10 @@ dissect_fcdns_rjt (tvbuff_t *tvb, proto_tree *req_tree) int offset = 0; if (req_tree) { - proto_tree_add_item (req_tree, hf_fcdns_reason, tvb, offset+13, 1, 0); + proto_tree_add_item (req_tree, hf_fcdns_reason, tvb, offset+13, 1, ENC_BIG_ENDIAN); proto_tree_add_item (req_tree, hf_fcdns_rjtdetail, tvb, offset+14, 1, - 0); - proto_tree_add_item (req_tree, hf_fcdns_vendor, tvb, offset+15, 1, 0); + ENC_BIG_ENDIAN); + proto_tree_add_item (req_tree, hf_fcdns_vendor, tvb, offset+15, 1, ENC_BIG_ENDIAN); } } @@ -1585,9 +1585,9 @@ dissect_fcdns (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } if (tree) { - proto_tree_add_item (fcdns_tree, hf_fcdns_opcode, tvb, offset+8, 2, 0); + proto_tree_add_item (fcdns_tree, hf_fcdns_opcode, tvb, offset+8, 2, ENC_BIG_ENDIAN); proto_tree_add_item (fcdns_tree, hf_fcdns_maxres_size, tvb, offset+10, - 2, 0); + 2, ENC_BIG_ENDIAN); } switch (opcode) { diff --git a/epan/dissectors/packet-fcels.c b/epan/dissectors/packet-fcels.c index a5bd5fd027..cf8108fd6b 100644 --- a/epan/dissectors/packet-fcels.c +++ b/epan/dissectors/packet-fcels.c @@ -981,12 +981,12 @@ dissect_fcels_logi (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, if (tree) { logi_tree = proto_item_add_subtree (ti, ett_fcels_logi); - proto_tree_add_item (logi_tree, hf_fcels_opcode, tvb, offset, 1, FALSE); + proto_tree_add_item (logi_tree, hf_fcels_opcode, tvb, offset, 1, ENC_BIG_ENDIAN); subti = proto_tree_add_text (logi_tree, tvb, offset+4, 16, "Common Svc Parameters"); cmnsvc_tree = proto_item_add_subtree (subti, ett_fcels_logi_cmnsvc); - proto_tree_add_item (cmnsvc_tree, hf_fcels_b2b, tvb, offset+6, 2, FALSE); + proto_tree_add_item (cmnsvc_tree, hf_fcels_b2b, tvb, offset+6, 2, ENC_BIG_ENDIAN); flag = tvb_get_ntohs (tvb, offset+8); if (flag & 0x0001) { @@ -995,11 +995,11 @@ dissect_fcels_logi (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, dissect_cmnsvc (cmnsvc_tree, tvb, offset+8, flag, opcode); - proto_tree_add_item (cmnsvc_tree, hf_fcels_bbscnum, tvb, offset+10, 1, FALSE); - proto_tree_add_item (cmnsvc_tree, hf_fcels_rcvsize, tvb, offset+10, 2, FALSE); - proto_tree_add_item (cmnsvc_tree, hf_fcels_maxconseq, tvb, offset+12, 2, FALSE); - proto_tree_add_item (cmnsvc_tree, hf_fcels_reloffset, tvb, offset+14, 2, FALSE); - proto_tree_add_item (cmnsvc_tree, hf_fcels_edtov, tvb, offset+16, 4, FALSE); + proto_tree_add_item (cmnsvc_tree, hf_fcels_bbscnum, tvb, offset+10, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (cmnsvc_tree, hf_fcels_rcvsize, tvb, offset+10, 2, ENC_BIG_ENDIAN); + proto_tree_add_item (cmnsvc_tree, hf_fcels_maxconseq, tvb, offset+12, 2, ENC_BIG_ENDIAN); + proto_tree_add_item (cmnsvc_tree, hf_fcels_reloffset, tvb, offset+14, 2, ENC_BIG_ENDIAN); + proto_tree_add_item (cmnsvc_tree, hf_fcels_edtov, tvb, offset+16, 4, ENC_BIG_ENDIAN); proto_tree_add_string (cmnsvc_tree, hf_fcels_npname, tvb, offset+20, 8, tvb_fcwwn_to_str (tvb, offset+20)); proto_tree_add_string (cmnsvc_tree, hf_fcels_fnname, tvb, offset+28, 8, @@ -1022,13 +1022,13 @@ dissect_fcels_logi (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, dissect_rcptctl_flags (cmnsvc_tree, tvb, offset+4, flag, opcode); proto_tree_add_item (cmnsvc_tree, hf_fcels_clsrcvsize, tvb, - offset+6, 2, FALSE); + offset+6, 2, ENC_BIG_ENDIAN); proto_tree_add_item (cmnsvc_tree, hf_fcels_conseq, tvb, - offset+8, 2, FALSE); + offset+8, 2, ENC_BIG_ENDIAN); proto_tree_add_item (cmnsvc_tree, hf_fcels_e2e, tvb, - offset+10, 2, FALSE); + offset+10, 2, ENC_BIG_ENDIAN); proto_tree_add_item (cmnsvc_tree, hf_fcels_openseq, tvb, - offset+12, 2, FALSE); + offset+12, 2, ENC_BIG_ENDIAN); } offset += 16; } @@ -1064,7 +1064,7 @@ dissect_fcels_logout (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, if (tree) { logo_tree = proto_item_add_subtree (ti, ett_fcels_logo); - proto_tree_add_item (logo_tree, hf_fcels_opcode, tvb, offset-5, 1, FALSE); + proto_tree_add_item (logo_tree, hf_fcels_opcode, tvb, offset-5, 1, ENC_BIG_ENDIAN); if (!isreq) { /* Accept has no payload */ @@ -1089,7 +1089,7 @@ dissect_fcels_abtx (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, if (tree) { abtx_tree = proto_item_add_subtree (ti, ett_fcels_abtx); - proto_tree_add_item (abtx_tree, hf_fcels_opcode, tvb, offset, 1, FALSE); + proto_tree_add_item (abtx_tree, hf_fcels_opcode, tvb, offset, 1, ENC_BIG_ENDIAN); if (!isreq) { return; @@ -1100,8 +1100,8 @@ dissect_fcels_abtx (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, tvb_get_guint8 (tvb, offset+4)); proto_tree_add_string (abtx_tree, hf_fcels_nportid, tvb, offset+5, 3, tvb_fc_to_str (tvb, offset+5)); - proto_tree_add_item (abtx_tree, hf_fcels_oxid, tvb, offset+8, 2, FALSE); - proto_tree_add_item (abtx_tree, hf_fcels_rxid, tvb, offset+10, 2, FALSE); + proto_tree_add_item (abtx_tree, hf_fcels_oxid, tvb, offset+8, 2, ENC_BIG_ENDIAN); + proto_tree_add_item (abtx_tree, hf_fcels_rxid, tvb, offset+10, 2, ENC_BIG_ENDIAN); } } @@ -1116,15 +1116,15 @@ dissect_fcels_rsi (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, if (tree) { rsi_tree = proto_item_add_subtree (ti, ett_fcels_rsi); - proto_tree_add_item (rsi_tree, hf_fcels_opcode, tvb, offset-4, 1, FALSE); + proto_tree_add_item (rsi_tree, hf_fcels_opcode, tvb, offset-4, 1, ENC_BIG_ENDIAN); if (!isreq) return; - proto_tree_add_item (rsi_tree, hf_fcels_recovqual, tvb, offset, 1, FALSE); + proto_tree_add_item (rsi_tree, hf_fcels_recovqual, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_string (rsi_tree, hf_fcels_nportid, tvb, offset+1, 3, tvb_fc_to_str (tvb, offset+1)); - proto_tree_add_item (rsi_tree, hf_fcels_rxid, tvb, offset+4, 2, FALSE); - proto_tree_add_item (rsi_tree, hf_fcels_oxid, tvb, offset+6, 2, FALSE); + proto_tree_add_item (rsi_tree, hf_fcels_rxid, tvb, offset+4, 2, ENC_BIG_ENDIAN); + proto_tree_add_item (rsi_tree, hf_fcels_oxid, tvb, offset+6, 2, ENC_BIG_ENDIAN); } } @@ -1139,14 +1139,14 @@ dissect_fcels_rrq (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, if (tree) { rrq_tree = proto_item_add_subtree (ti, ett_fcels_rrq); - proto_tree_add_item (rrq_tree, hf_fcels_opcode, tvb, offset, 1, FALSE); + proto_tree_add_item (rrq_tree, hf_fcels_opcode, tvb, offset, 1, ENC_BIG_ENDIAN); if (!isreq) return; proto_tree_add_string (rrq_tree, hf_fcels_nportid, tvb, offset+5, 3, tvb_fc_to_str (tvb, offset+5)); - proto_tree_add_item (rrq_tree, hf_fcels_oxid, tvb, offset+8, 2, FALSE); - proto_tree_add_item (rrq_tree, hf_fcels_rxid, tvb, offset+10, 2, FALSE); + proto_tree_add_item (rrq_tree, hf_fcels_oxid, tvb, offset+8, 2, ENC_BIG_ENDIAN); + proto_tree_add_item (rrq_tree, hf_fcels_rxid, tvb, offset+10, 2, ENC_BIG_ENDIAN); } } @@ -1161,21 +1161,21 @@ dissect_fcels_rec (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, if (tree) { rec_tree = proto_item_add_subtree (ti, ett_fcels_rec); - proto_tree_add_item (rec_tree, hf_fcels_opcode, tvb, offset, 1, FALSE); + proto_tree_add_item (rec_tree, hf_fcels_opcode, tvb, offset, 1, ENC_BIG_ENDIAN); if (isreq) { proto_tree_add_string (rec_tree, hf_fcels_nportid, tvb, offset+5, 3, tvb_fc_to_str (tvb, offset+5)); proto_tree_add_item (rec_tree, hf_fcels_oxid, tvb, - offset+8, 2, FALSE); + offset+8, 2, ENC_BIG_ENDIAN); proto_tree_add_item (rec_tree, hf_fcels_rxid, tvb, - offset+10, 2, FALSE); + offset+10, 2, ENC_BIG_ENDIAN); } else { proto_tree_add_item (rec_tree, hf_fcels_oxid, tvb, - offset+4, 2, FALSE); + offset+4, 2, ENC_BIG_ENDIAN); proto_tree_add_item (rec_tree, hf_fcels_rxid, tvb, - offset+6, 2, FALSE); + offset+6, 2, ENC_BIG_ENDIAN); proto_tree_add_string (rec_tree, hf_fcels_nportid, tvb, offset+9, 3, tvb_fc_to_str (tvb, offset+9)); @@ -1183,7 +1183,7 @@ dissect_fcels_rec (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, offset+13, 3, tvb_fc_to_str (tvb, offset+13)); proto_tree_add_item (rec_tree, hf_fcels_rec_fc4, tvb, - offset+16, 4, FALSE); + 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); @@ -1216,7 +1216,7 @@ dissect_fcels_adisc (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, if (tree) { adisc_tree = proto_item_add_subtree (ti, ett_fcels_adisc); - proto_tree_add_item (adisc_tree, hf_fcels_opcode, tvb, offset-5, 1, FALSE); + proto_tree_add_item (adisc_tree, hf_fcels_opcode, tvb, offset-5, 1, ENC_BIG_ENDIAN); proto_tree_add_string (adisc_tree, hf_fcels_hardaddr, tvb, offset, 3, tvb_fc_to_str (tvb, offset)); @@ -1240,14 +1240,14 @@ dissect_fcels_farp (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, if (tree) { farp_tree = proto_item_add_subtree (ti, ett_fcels_farp); - proto_tree_add_item (farp_tree, hf_fcels_opcode, tvb, offset-4, 1, FALSE); + proto_tree_add_item (farp_tree, hf_fcels_opcode, tvb, offset-4, 1, ENC_BIG_ENDIAN); proto_tree_add_item (farp_tree, hf_fcels_farp_matchcodept, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_string (farp_tree, hf_fcels_nportid, tvb, offset+1, 3, tvb_fc_to_str (tvb, offset+1)); proto_tree_add_item (farp_tree, hf_fcels_farp_respaction, tvb, - offset+4, 1, FALSE); + offset+4, 1, ENC_BIG_ENDIAN); proto_tree_add_string (farp_tree, hf_fcels_resportid, tvb, offset+5, 3, tvb_fc_to_str (tvb, offset+5)); proto_tree_add_string (farp_tree, hf_fcels_npname, tvb, offset+8, @@ -1294,9 +1294,9 @@ dissect_fcels_rps (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, rps_tree = proto_item_add_subtree (ti, ett_fcels_rps); if (isreq) { - proto_tree_add_item (rps_tree, hf_fcels_rps_flag, tvb, offset, 1, FALSE); + proto_tree_add_item (rps_tree, hf_fcels_rps_flag, tvb, offset, 1, ENC_BIG_ENDIAN); - proto_tree_add_item (rps_tree, hf_fcels_opcode, tvb, offset-3, 1, FALSE); + proto_tree_add_item (rps_tree, hf_fcels_opcode, tvb, offset-3, 1, ENC_BIG_ENDIAN); if (flag & 0x2) { proto_tree_add_string (rps_tree, hf_fcels_npname, tvb, offset+1, @@ -1304,13 +1304,13 @@ dissect_fcels_rps (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, } else if (flag & 0x1) { proto_tree_add_item (rps_tree, hf_fcels_rps_portnum, tvb, - offset+5, 3, FALSE); + offset+5, 3, ENC_BIG_ENDIAN); } } else { - proto_tree_add_item (rps_tree, hf_fcels_rps_flag, tvb, offset, 1, FALSE); + proto_tree_add_item (rps_tree, hf_fcels_rps_flag, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item (rps_tree, hf_fcels_rps_portstatus, tvb, - offset+3, 2, FALSE); + offset+3, 2, ENC_BIG_ENDIAN); /* Next 6 fields are from Link Error Status Block (LESB) */ proto_tree_add_text (rps_tree, tvb, offset+5, 4, "Link Failure Count: %u", @@ -1374,7 +1374,7 @@ dissect_fcels_rpl (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, if (tree) { rpl_tree = proto_item_add_subtree (ti, ett_fcels_rpl); - proto_tree_add_item (rpl_tree, hf_fcels_opcode, tvb, offset, 1, FALSE); + proto_tree_add_item (rpl_tree, hf_fcels_opcode, tvb, offset, 1, ENC_BIG_ENDIAN); if (isreq) { proto_tree_add_text (rpl_tree, tvb, offset+6, 2, @@ -1428,7 +1428,7 @@ dissect_fcels_fan (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, if (tree) { fan_tree = proto_item_add_subtree (ti, ett_fcels_fan); - proto_tree_add_item (fan_tree, hf_fcels_opcode, tvb, offset-5, 1, FALSE); + proto_tree_add_item (fan_tree, hf_fcels_opcode, tvb, offset-5, 1, ENC_BIG_ENDIAN); proto_tree_add_string (fan_tree, hf_fcels_fabricaddr, tvb, offset, 3, tvb_fc_to_str (tvb, offset)); @@ -1452,7 +1452,7 @@ dissect_fcels_rscn (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, if (tree) { rscn_tree = proto_item_add_subtree (ti, ett_fcels_rscn); - proto_tree_add_item (rscn_tree, hf_fcels_opcode, tvb, offset-1, 1, FALSE); + proto_tree_add_item (rscn_tree, hf_fcels_opcode, tvb, offset-1, 1, ENC_BIG_ENDIAN); if (!isreq) return; @@ -1470,15 +1470,15 @@ dissect_fcels_rscn (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, rectree = proto_item_add_subtree (subti, ett_fcels_rscn_rec); proto_tree_add_item (rectree, hf_fcels_rscn_evqual, tvb, offset, - 1, FALSE); + 1, ENC_BIG_ENDIAN); proto_tree_add_item (rectree, hf_fcels_rscn_addrfmt, tvb, offset, - 1, FALSE); + 1, ENC_BIG_ENDIAN); proto_tree_add_item (rectree, hf_fcels_rscn_domain, tvb, offset+1, - 1, FALSE); + 1, ENC_BIG_ENDIAN); proto_tree_add_item (rectree, hf_fcels_rscn_area, tvb, offset+2, - 1, FALSE); + 1, ENC_BIG_ENDIAN); proto_tree_add_item (rectree, hf_fcels_rscn_port, tvb, offset+3, - 1, FALSE); + 1, ENC_BIG_ENDIAN); offset += 4; } } @@ -1494,9 +1494,9 @@ dissect_fcels_scr (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, if (tree) { scr_tree = proto_item_add_subtree (ti, ett_fcels_scr); - proto_tree_add_item (scr_tree, hf_fcels_opcode, tvb, offset-7, 1, FALSE); + proto_tree_add_item (scr_tree, hf_fcels_opcode, tvb, offset-7, 1, ENC_BIG_ENDIAN); if (isreq) - proto_tree_add_item (scr_tree, hf_fcels_scrregn, tvb, offset, 1, FALSE); + proto_tree_add_item (scr_tree, hf_fcels_scrregn, tvb, offset, 1, ENC_BIG_ENDIAN); } } @@ -1512,7 +1512,7 @@ dissect_fcels_rnft (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, if (tree) { rnft_tree = proto_item_add_subtree (ti, ett_fcels_rnft); - proto_tree_add_item (rnft_tree, hf_fcels_opcode, tvb, offset, 1, FALSE); + proto_tree_add_item (rnft_tree, hf_fcels_opcode, tvb, offset, 1, ENC_BIG_ENDIAN); if (isreq) { proto_tree_add_text (rnft_tree, tvb, offset+2, 2, @@ -1537,7 +1537,7 @@ dissect_fcels_rnft (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, fc4_tree = proto_item_add_subtree (subti, ett_fcels_rnft_fc4); proto_tree_add_item (fc4_tree, hf_fcels_rnft_fc4type, tvb, - offset, 1, FALSE); + offset, 1, ENC_BIG_ENDIAN); proto_tree_add_text (fc4_tree, tvb, offset+1, 3, "FC-4 Qualifier 0x%x", tvb_get_ntoh24 (tvb, offset+1)); @@ -1558,15 +1558,15 @@ dissect_fcels_lsts (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, if (tree) { lsts_tree = proto_item_add_subtree (ti, ett_fcels_lsts); - proto_tree_add_item (lsts_tree, hf_fcels_opcode, tvb, offset-5, 1, FALSE); + proto_tree_add_item (lsts_tree, hf_fcels_opcode, tvb, offset-5, 1, ENC_BIG_ENDIAN); if (isreq) { /* In case of LSTS, the reply has the meat */ return; } - proto_tree_add_item (lsts_tree, hf_fcels_failedrcvr, tvb, offset, 1, FALSE); + proto_tree_add_item (lsts_tree, hf_fcels_failedrcvr, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item (lsts_tree, hf_fcels_flacompliance, tvb, offset+1, - 1, FALSE); - proto_tree_add_item (lsts_tree, hf_fcels_loopstate, tvb, offset+2, 1, FALSE); + 1, ENC_BIG_ENDIAN); + proto_tree_add_item (lsts_tree, hf_fcels_loopstate, tvb, offset+2, 1, ENC_BIG_ENDIAN); proto_tree_add_item (lsts_tree, hf_fcels_publicloop_bmap, tvb, offset+3, 16, ENC_NA); proto_tree_add_item (lsts_tree, hf_fcels_pvtloop_bmap, tvb, offset+19, @@ -1595,7 +1595,7 @@ dissect_fcels_prlilo_payload (tvbuff_t *tvb, packet_info *pinfo _U_, */ prli_tree = proto_item_add_subtree (ti, ett_fcels_prli); - proto_tree_add_item (prli_tree, hf_fcels_opcode, tvb, offset, 1, FALSE); + proto_tree_add_item (prli_tree, hf_fcels_opcode, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_text (prli_tree, tvb, offset+1, 1, "Page Length: %u", @@ -1702,7 +1702,7 @@ dissect_fcels_lirr (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, if (tree) { lirr_tree = proto_item_add_subtree (ti, ett_fcels_lirr); - proto_tree_add_item (lirr_tree, hf_fcels_opcode, tvb, offset-4, 1, FALSE); + proto_tree_add_item (lirr_tree, hf_fcels_opcode, tvb, offset-4, 1, ENC_BIG_ENDIAN); proto_tree_add_text (lirr_tree, tvb, offset, 1, "Regn. Function: %s", @@ -1737,7 +1737,7 @@ dissect_fcels_srl (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, if (tree) { srl_tree = proto_item_add_subtree (ti, ett_fcels_srl); - proto_tree_add_item (srl_tree, hf_fcels_opcode, tvb, offset-4, 1, FALSE); + proto_tree_add_item (srl_tree, hf_fcels_opcode, tvb, offset-4, 1, ENC_BIG_ENDIAN); if (!isreq) return; @@ -1768,7 +1768,7 @@ dissect_fcels_rpsc (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, if (tree) { rpsc_tree = proto_item_add_subtree (ti, ett_fcels_rpsc); - proto_tree_add_item (rpsc_tree, hf_fcels_opcode, tvb, offset-2, 1, FALSE); + proto_tree_add_item (rpsc_tree, hf_fcels_opcode, tvb, offset-2, 1, ENC_BIG_ENDIAN); if (isreq) return; @@ -1800,14 +1800,14 @@ dissect_fcels_cbind (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, if (tree) { cbind_tree = proto_item_add_subtree (ti, ett_fcels_cbind); - proto_tree_add_item (cbind_tree, hf_fcels_opcode, tvb, offset, 1, FALSE); + proto_tree_add_item (cbind_tree, hf_fcels_opcode, tvb, offset, 1, ENC_BIG_ENDIAN); } col_set_str(pinfo->cinfo, COL_INFO, "CBIND "); - proto_tree_add_item (cbind_tree, hf_fcels_cbind_liveness, tvb, offset+4, 2, FALSE); - proto_tree_add_item (cbind_tree, hf_fcels_cbind_addr_mode, tvb, offset+6, 1, FALSE); - proto_tree_add_item (cbind_tree, hf_fcels_cbind_ifcp_version, tvb, offset+7, 1, FALSE); - proto_tree_add_item (cbind_tree, hf_fcels_cbind_userinfo, tvb, offset+8, 4, FALSE); + proto_tree_add_item (cbind_tree, hf_fcels_cbind_liveness, tvb, offset+4, 2, ENC_BIG_ENDIAN); + proto_tree_add_item (cbind_tree, hf_fcels_cbind_addr_mode, tvb, offset+6, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (cbind_tree, hf_fcels_cbind_ifcp_version, tvb, offset+7, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (cbind_tree, hf_fcels_cbind_userinfo, tvb, offset+8, 4, ENC_BIG_ENDIAN); proto_tree_add_string (cbind_tree, hf_fcels_cbind_snpname, tvb, offset+12, 8, tvb_fcwwn_to_str (tvb, offset+12)); @@ -1820,8 +1820,8 @@ dissect_fcels_cbind (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, break; case 40: /* 36 byte Response + 4 bytes FC CRC */ col_append_str (pinfo->cinfo, COL_INFO, "Response"); - proto_tree_add_item (cbind_tree, hf_fcels_cbind_status, tvb, offset+30, 2, FALSE); - proto_tree_add_item (cbind_tree, hf_fcels_chandle, tvb, offset+34, 2, FALSE); + proto_tree_add_item (cbind_tree, hf_fcels_cbind_status, tvb, offset+30, 2, ENC_BIG_ENDIAN); + proto_tree_add_item (cbind_tree, hf_fcels_chandle, tvb, offset+34, 2, ENC_BIG_ENDIAN); break; } @@ -1837,12 +1837,12 @@ dissect_fcels_unbind (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, if (tree) { cbind_tree = proto_item_add_subtree (ti, ett_fcels_cbind); - proto_tree_add_item (cbind_tree, hf_fcels_opcode, tvb, offset, 1, FALSE); + proto_tree_add_item (cbind_tree, hf_fcels_opcode, tvb, offset, 1, ENC_BIG_ENDIAN); } col_set_str(pinfo->cinfo, COL_INFO, "UNBIND "); - proto_tree_add_item (cbind_tree, hf_fcels_cbind_userinfo, tvb, offset+4, 4, FALSE); - proto_tree_add_item (cbind_tree, hf_fcels_chandle, tvb, offset+10, 2, FALSE); + proto_tree_add_item (cbind_tree, hf_fcels_cbind_userinfo, tvb, offset+4, 4, ENC_BIG_ENDIAN); + proto_tree_add_item (cbind_tree, hf_fcels_chandle, tvb, offset+10, 2, ENC_BIG_ENDIAN); switch(tvb_reported_length(tvb)){ @@ -1851,7 +1851,7 @@ dissect_fcels_unbind (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, break; case 28: /* 24 byte Response + 4 bytes FC CRC */ col_append_str (pinfo->cinfo, COL_INFO, "Response"); - proto_tree_add_item (cbind_tree, hf_fcels_unbind_status, tvb, offset+22, 2, FALSE); + proto_tree_add_item (cbind_tree, hf_fcels_unbind_status, tvb, offset+22, 2, ENC_BIG_ENDIAN); break; } @@ -1869,20 +1869,20 @@ dissect_fcels_rnid (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, if (tree) { rnid_tree = proto_item_add_subtree (ti, ett_fcels_rnid); - proto_tree_add_item (rnid_tree, hf_fcels_opcode, tvb, offset, 1, FALSE); + proto_tree_add_item (rnid_tree, hf_fcels_opcode, tvb, offset, 1, ENC_BIG_ENDIAN); if (isreq) { proto_tree_add_item (rnid_tree, hf_fcels_nodeidfmt, tvb, offset+4, - 1, FALSE); + 1, ENC_BIG_ENDIAN); } else { /* We only decode responses to nodeid fmt DF */ proto_tree_add_item (rnid_tree, hf_fcels_nodeidfmt, tvb, offset+4, - 1, FALSE); + 1, ENC_BIG_ENDIAN); clen = tvb_get_guint8 (tvb, offset+5); proto_tree_add_text (rnid_tree, tvb, offset+5, 1, "Common Identification Data Length: %u", clen); proto_tree_add_item (rnid_tree, hf_fcels_spidlen, tvb, offset+7, - 1, FALSE); + 1, ENC_BIG_ENDIAN); if (clen) { proto_tree_add_string (rnid_tree, hf_fcels_npname, tvb, offset+8, 8, @@ -1896,21 +1896,21 @@ dissect_fcels_rnid (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, proto_tree_add_item (rnid_tree, hf_fcels_vendoruniq, tvb, offset+24, 16, ENC_NA); proto_tree_add_item (rnid_tree, hf_fcels_asstype, tvb, - offset+40, 4, FALSE); + offset+40, 4, ENC_BIG_ENDIAN); proto_tree_add_item (rnid_tree, hf_fcels_physport, tvb, - offset+44, 4, FALSE); + offset+44, 4, ENC_BIG_ENDIAN); proto_tree_add_item (rnid_tree, hf_fcels_attnodes, tvb, - offset+48, 4, FALSE); + offset+48, 4, ENC_BIG_ENDIAN); proto_tree_add_item (rnid_tree, hf_fcels_nodemgmt, tvb, - offset+52, 1, FALSE); + offset+52, 1, ENC_BIG_ENDIAN); proto_tree_add_item (rnid_tree, hf_fcels_ipvers, tvb, - offset+53, 1, FALSE); + offset+53, 1, ENC_BIG_ENDIAN); proto_tree_add_item (rnid_tree, hf_fcels_tcpport, tvb, - offset+54, 2, FALSE); + offset+54, 2, ENC_BIG_ENDIAN); proto_tree_add_item (rnid_tree, hf_fcels_ip, tvb, offset+56, 16, FALSE); proto_tree_add_item (rnid_tree, hf_fcels_vendorsp, tvb, - offset+74, 2, FALSE); + offset+74, 2, ENC_BIG_ENDIAN); } } } @@ -1938,11 +1938,11 @@ dissect_fcels_lsrjt (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, if (tree) { lsrjt_tree = proto_item_add_subtree (ti, ett_fcels_lsrjt); - proto_tree_add_item (lsrjt_tree, hf_fcels_opcode, tvb, offset-5, 1, FALSE); + proto_tree_add_item (lsrjt_tree, hf_fcels_opcode, tvb, offset-5, 1, ENC_BIG_ENDIAN); - proto_tree_add_item (lsrjt_tree, hf_fcels_rjtcode, tvb, offset++, 1, FALSE); - proto_tree_add_item (lsrjt_tree, hf_fcels_rjtdetcode, tvb, offset++, 1, FALSE); - proto_tree_add_item (lsrjt_tree, hf_fcels_vnduniq, tvb, offset, 1, FALSE); + proto_tree_add_item (lsrjt_tree, hf_fcels_rjtcode, tvb, offset++, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (lsrjt_tree, hf_fcels_rjtdetcode, tvb, offset++, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (lsrjt_tree, hf_fcels_vnduniq, tvb, offset, 1, ENC_BIG_ENDIAN); } } diff --git a/epan/dissectors/packet-fcfcs.c b/epan/dissectors/packet-fcfcs.c index e1c60b159b..419b730d66 100644 --- a/epan/dissectors/packet-fcfcs.c +++ b/epan/dissectors/packet-fcfcs.c @@ -153,7 +153,7 @@ dissect_fcfcs_giel (tvbuff_t *tvb, proto_tree *tree, gboolean isreq) for (i = 0; i < numelem; i++) { proto_tree_add_string (tree, hf_fcs_iename, tvb, offset, 8, tvb_fcwwn_to_str (tvb, offset)); - proto_tree_add_item (tree, hf_fcs_ietype, tvb, offset+11, 1, 0); + proto_tree_add_item (tree, hf_fcs_ietype, tvb, offset+11, 1, ENC_BIG_ENDIAN); offset += 12; } } @@ -170,7 +170,7 @@ dissect_fcfcs_giet (tvbuff_t *tvb, proto_tree *tree, gboolean isreq) tvb_fcwwn_to_str (tvb, offset)); } else { - proto_tree_add_item (tree, hf_fcs_ietype, tvb, offset+3, 1, 0); + proto_tree_add_item (tree, hf_fcs_ietype, tvb, offset+3, 1, ENC_BIG_ENDIAN); } } } @@ -186,7 +186,7 @@ dissect_fcfcs_gdid (tvbuff_t *tvb, proto_tree *tree, gboolean isreq) tvb_fcwwn_to_str (tvb, offset)); } else { - proto_tree_add_item (tree, hf_fcs_iedomainid, tvb, offset+1, 1, 0); + proto_tree_add_item (tree, hf_fcs_iedomainid, tvb, offset+1, 1, ENC_BIG_ENDIAN); } } } @@ -338,11 +338,11 @@ dissect_fcfcs_gpl (tvbuff_t *tvb, proto_tree *tree, gboolean isreq) proto_tree_add_string (tree, hf_fcs_portname, tvb, offset, 8, tvb_fcwwn_to_str (tvb, offset)); proto_tree_add_item (tree, hf_fcs_portmodtype, tvb, offset+9, - 1, 0); + 1, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_fcs_porttxtype, tvb, offset+10, - 1, 0); + 1, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_fcs_porttype, tvb, offset+11, - 1, 0); + 1, ENC_BIG_ENDIAN); offset += 12; } } @@ -360,7 +360,7 @@ dissect_fcfcs_gpt (tvbuff_t *tvb, proto_tree *tree, gboolean isreq) tvb_fcwwn_to_str (tvb, offset)); } else { - proto_tree_add_item (tree, hf_fcs_porttype, tvb, offset+3, 1, 0); + proto_tree_add_item (tree, hf_fcs_porttype, tvb, offset+3, 1, ENC_BIG_ENDIAN); } } } @@ -404,7 +404,7 @@ dissect_fcfcs_gapnl (tvbuff_t *tvb, proto_tree *tree, gboolean isreq) proto_tree_add_item (tree, hf_fcs_portflags, tvb, offset+10, 1, 0); proto_tree_add_item (tree, hf_fcs_porttype, tvb, offset+11, - 1, 0); + 1, ENC_BIG_ENDIAN); offset += 12; } } @@ -422,8 +422,8 @@ dissect_fcfcs_gps (tvbuff_t *tvb, proto_tree *tree, gboolean isreq) tvb_fcwwn_to_str (tvb, offset)); } else { - proto_tree_add_item (tree, hf_fcs_porttype, tvb, offset+3, 1, 0); - proto_tree_add_item (tree, hf_fcs_portstate, tvb, offset+7, 1, 0); + proto_tree_add_item (tree, hf_fcs_porttype, tvb, offset+3, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_fcs_portstate, tvb, offset+7, 1, ENC_BIG_ENDIAN); } } } @@ -473,7 +473,7 @@ dissect_fcfcs_gplt (tvbuff_t *tvb, proto_tree *tree, gboolean isreq) } else { proto_tree_add_item (tree, hf_fcs_platformtype, tvb, offset+3, - 1, 0); + 1, ENC_BIG_ENDIAN); } } } @@ -591,7 +591,7 @@ dissect_fcfcs_rpl (tvbuff_t *tvb, proto_tree *tree, gboolean isreq) proto_tree_add_item (tree, hf_fcs_platformname, tvb, offset+1, len, ENC_NA); proto_tree_add_item (tree, hf_fcs_platformtype, tvb, offset+256, 4, - 0); + ENC_BIG_ENDIAN); numelem = tvb_get_ntohl (tvb, offset+260); proto_tree_add_text (tree, tvb, offset+260, 4, "Number of Mgmt. Addr Entries: %d", numelem); @@ -652,7 +652,7 @@ dissect_fcfcs_rplt (tvbuff_t *tvb, proto_tree *tree, gboolean isreq) proto_tree_add_item (tree, hf_fcs_platformname, tvb, offset+1, len, ENC_NA); proto_tree_add_item (tree, hf_fcs_platformtype, tvb, offset+256, - 4, 0); + 4, ENC_BIG_ENDIAN); } } } @@ -736,7 +736,7 @@ dissect_fcfcs_gcap (tvbuff_t *tvb, proto_tree *tree, gboolean isreq) if (tree) { if (!isreq) { numrec = tvb_get_ntohl (tvb, offset); - proto_tree_add_item (tree, hf_fcs_numcap, tvb, offset, 4, 0); + proto_tree_add_item (tree, hf_fcs_numcap, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; for (i = 0; i < numrec; i++) { @@ -745,14 +745,14 @@ dissect_fcfcs_gcap (tvbuff_t *tvb, proto_tree *tree, gboolean isreq) 1, subtype); proto_tree_add_item (tree, hf_fcs_vnd_capmask, tvb, offset+1, - 3, 0); + 3, ENC_BIG_ENDIAN); if (subtype == FCCT_GSSUBTYPE_FCS) { proto_tree_add_item (tree, hf_fcs_fcsmask, tvb, offset+4, - 4, 0); + 4, ENC_BIG_ENDIAN); } else if (subtype == FCCT_GSSUBTYPE_UNS) { proto_tree_add_item (tree, hf_fcs_unsmask, tvb, offset+4, - 4, 0); + 4, ENC_BIG_ENDIAN); } offset += 8; } @@ -766,10 +766,10 @@ dissect_fcfcs_rjt (tvbuff_t *tvb, proto_tree *tree) int offset = 0; if (tree) { - proto_tree_add_item (tree, hf_fcs_reason, tvb, offset+13, 1, 0); + proto_tree_add_item (tree, hf_fcs_reason, tvb, offset+13, 1, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_fcs_rjtdetail, tvb, offset+14, 1, - 0); - proto_tree_add_item (tree, hf_fcs_vendor, tvb, offset+15, 1, 0); + ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_fcs_vendor, tvb, offset+15, 1, ENC_BIG_ENDIAN); } } @@ -901,9 +901,9 @@ dissect_fcfcs (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { - proto_tree_add_item (fcfcs_tree, hf_fcs_opcode, tvb, offset+8, 2, 0); + proto_tree_add_item (fcfcs_tree, hf_fcs_opcode, tvb, offset+8, 2, ENC_BIG_ENDIAN); proto_tree_add_item (fcfcs_tree, hf_fcs_maxres_size, tvb, offset+10, - 2, 0); + 2, ENC_BIG_ENDIAN); } switch (opcode) { diff --git a/epan/dissectors/packet-fcfzs.c b/epan/dissectors/packet-fcfzs.c index 89f5b0efe5..58995d65ed 100644 --- a/epan/dissectors/packet-fcfzs.c +++ b/epan/dissectors/packet-fcfzs.c @@ -155,7 +155,7 @@ dissect_fcfzs_zoneset (tvbuff_t *tvb, proto_tree *tree, int offset) /* Zoneset Name */ len = tvb_get_guint8 (tvb, offset); proto_tree_add_item (tree, hf_fcfzs_zonesetnmlen, tvb, offset, - 1, 0); + 1, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_fcfzs_zonesetname, tvb, offset+4, len, 0); offset += 4 + len + (4-(len % 4)); @@ -163,25 +163,25 @@ dissect_fcfzs_zoneset (tvbuff_t *tvb, proto_tree *tree, int offset) /* Number of zones */ numzones = tvb_get_ntohl (tvb, offset); - proto_tree_add_item (tree, hf_fcfzs_numzones, tvb, offset, 4, 0); + proto_tree_add_item (tree, hf_fcfzs_numzones, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; /* For each zone... */ for (i = 0; i < numzones; i++) { len = tvb_get_guint8 (tvb, offset); proto_tree_add_item (tree, hf_fcfzs_zonenmlen, tvb, offset, - 1, 0); + 1, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_fcfzs_zonename, tvb, offset+4, len, 0); offset += 4 + len + (4-(len % 4)); nummbrs = tvb_get_ntohl (tvb, offset); proto_tree_add_item (tree, hf_fcfzs_nummbrentries, tvb, offset, - 4, 0); + 4, ENC_BIG_ENDIAN); offset += 4; for (j = 0; j < nummbrs; j++) { - proto_tree_add_item (tree, hf_fcfzs_mbrtype, tvb, offset, 1, 0); + proto_tree_add_item (tree, hf_fcfzs_mbrtype, tvb, offset, 1, ENC_BIG_ENDIAN); switch (tvb_get_guint8 (tvb, offset)) { case FC_FZS_ZONEMBR_PWWN: @@ -283,7 +283,7 @@ dissect_fcfzs_gzc (tvbuff_t *tvb, int offset, proto_tree *parent_tree, guint8 is } flags&=(~( 0x01 )); - proto_tree_add_item (tree, hf_fcfzs_gzc_vendor, tvb, offset+4, 4, 0); + proto_tree_add_item (tree, hf_fcfzs_gzc_vendor, tvb, offset+4, 4, ENC_BIG_ENDIAN); } } @@ -325,7 +325,7 @@ dissect_fcfzs_gest (tvbuff_t *tvb, proto_tree *parent_tree, guint8 isreq) flags&=(~( 0x40 )); - proto_tree_add_item (parent_tree, hf_fcfzs_gest_vendor, tvb, offset+4, 4, 0); + proto_tree_add_item (parent_tree, hf_fcfzs_gest_vendor, tvb, offset+4, 4, ENC_BIG_ENDIAN); } } @@ -340,18 +340,18 @@ dissect_fcfzs_gzsn (tvbuff_t *tvb, proto_tree *tree, guint8 isreq) numrec = tvb_get_ntohl (tvb, offset); proto_tree_add_item (tree, hf_fcfzs_numzonesetattrs, tvb, offset, - 4, 0); + 4, ENC_BIG_ENDIAN); offset += 4; for (i = 0; i < numrec; i++) { len = tvb_get_guint8 (tvb, offset); proto_tree_add_item (tree, hf_fcfzs_zonesetnmlen, tvb, offset, - 1, 0); + 1, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_fcfzs_zonesetname, tvb, offset+1, len, 0); offset += len + 1 + (len % 4); proto_tree_add_item (tree, hf_fcfzs_numzones, tvb, offset, - 4, 0); + 4, ENC_BIG_ENDIAN); offset += 4; } } @@ -368,7 +368,7 @@ dissect_fcfzs_gzd (tvbuff_t *tvb, proto_tree *tree, guint8 isreq) if (isreq) { len = tvb_get_guint8 (tvb, offset); proto_tree_add_item (tree, hf_fcfzs_zonesetnmlen, tvb, offset, - 1, 0); + 1, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_fcfzs_zonesetname, tvb, offset+1, len, 0); } @@ -376,18 +376,18 @@ dissect_fcfzs_gzd (tvbuff_t *tvb, proto_tree *tree, guint8 isreq) numrec = tvb_get_ntohl (tvb, offset); proto_tree_add_item (tree, hf_fcfzs_numzoneattrs, tvb, offset, - 4, 0); + 4, ENC_BIG_ENDIAN); offset += 4; for (i = 0; i < numrec; i++) { len = tvb_get_guint8 (tvb, offset); proto_tree_add_item (tree, hf_fcfzs_zonenmlen, tvb, offset, - 1, 0); + 1, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_fcfzs_zonename, tvb, offset+1, len, 0); offset += len + 1 + (len % 4); proto_tree_add_item (tree, hf_fcfzs_nummbrs, tvb, offset, - 4, 0); + 4, ENC_BIG_ENDIAN); offset += 4; } } @@ -404,7 +404,7 @@ dissect_fcfzs_gzm (tvbuff_t *tvb, proto_tree *tree, guint8 isreq) if (isreq) { len = tvb_get_guint8 (tvb, offset); proto_tree_add_item (tree, hf_fcfzs_zonenmlen, tvb, offset, - 1, 0); + 1, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_fcfzs_zonename, tvb, offset+1, len, 0); } @@ -412,10 +412,10 @@ dissect_fcfzs_gzm (tvbuff_t *tvb, proto_tree *tree, guint8 isreq) numrec = tvb_get_ntohl (tvb, offset); proto_tree_add_item (tree, hf_fcfzs_nummbrentries, tvb, offset, - 4, 0); + 4, ENC_BIG_ENDIAN); offset += 4; for (i = 0; i < numrec; i++) { - proto_tree_add_item (tree, hf_fcfzs_mbrtype, tvb, offset, 1, 0); + proto_tree_add_item (tree, hf_fcfzs_mbrtype, tvb, offset, 1, ENC_BIG_ENDIAN); switch (tvb_get_guint8 (tvb, offset)) { case FC_FZS_ZONEMBR_PWWN: case FC_FZS_ZONEMBR_NWWN: @@ -469,7 +469,7 @@ dissect_fcfzs_gzs (tvbuff_t *tvb, proto_tree *tree, guint8 isreq) if (isreq) { len = tvb_get_guint8 (tvb, offset); proto_tree_add_item (tree, hf_fcfzs_zonesetnmlen, tvb, offset, - 1, 0); + 1, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_fcfzs_zonesetname, tvb, offset+4, len, 0); } @@ -513,7 +513,7 @@ dissect_fcfzs_arzs (tvbuff_t *tvb, proto_tree *tree, guint8 isreq) if (isreq) { len = tvb_get_guint8 (tvb, offset); proto_tree_add_item (tree, hf_fcfzs_zonesetnmlen, tvb, offset, - 1, 0); + 1, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_fcfzs_zonesetname, tvb, offset+4, len, 0); } @@ -537,7 +537,7 @@ dissect_fcfzs_arzm (tvbuff_t *tvb, proto_tree *tree, guint8 isreq) if (isreq) { len = tvb_get_guint8 (tvb, offset); proto_tree_add_item (tree, hf_fcfzs_zonenmlen, tvb, offset, - 1, 0); + 1, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_fcfzs_zonename, tvb, offset+1, len, 0); @@ -548,7 +548,7 @@ dissect_fcfzs_arzm (tvbuff_t *tvb, proto_tree *tree, guint8 isreq) offset += len; for (i = 0; i < numrec; i++) { - proto_tree_add_item (tree, hf_fcfzs_mbrtype, tvb, offset, 1, 0); + proto_tree_add_item (tree, hf_fcfzs_mbrtype, tvb, offset, 1, ENC_BIG_ENDIAN); switch (tvb_get_guint8 (tvb, offset)) { case FC_FZS_ZONEMBR_PWWN: case FC_FZS_ZONEMBR_NWWN: @@ -590,14 +590,14 @@ dissect_fcfzs_arzd (tvbuff_t *tvb, proto_tree *tree, guint8 isreq) if (isreq) { len = tvb_get_guint8 (tvb, offset); proto_tree_add_item (tree, hf_fcfzs_zonesetnmlen, tvb, offset, - 1, 0); + 1, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_fcfzs_zonesetname, tvb, offset+4, len, 0); len += (len % 4); offset += len; len = tvb_get_guint8 (tvb, offset); - proto_tree_add_item (tree, hf_fcfzs_zonenmlen, tvb, offset, 1, 0); + proto_tree_add_item (tree, hf_fcfzs_zonenmlen, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_fcfzs_zonename, tvb, offset+4, len, 0); } @@ -610,9 +610,9 @@ dissect_fcfzs_rjt (tvbuff_t *tvb, proto_tree *tree) int offset = 0; if (tree) { - proto_tree_add_item (tree, hf_fcfzs_reason, tvb, offset+13, 1, 0); - proto_tree_add_item (tree, hf_fcfzs_rjtdetail, tvb, offset+14, 1, 0); - proto_tree_add_item (tree, hf_fcfzs_rjtvendor, tvb, offset+15, 1, 0); + proto_tree_add_item (tree, hf_fcfzs_reason, tvb, offset+13, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_fcfzs_rjtdetail, tvb, offset+14, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_fcfzs_rjtvendor, tvb, offset+15, 1, ENC_BIG_ENDIAN); } } @@ -648,9 +648,9 @@ dissect_fcfzs (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvb_length (tvb), "Zone Server"); fcfzs_tree = proto_item_add_subtree (ti, ett_fcfzs); - proto_tree_add_item (fcfzs_tree, hf_fcfzs_opcode, tvb, offset+8, 2, 0); + proto_tree_add_item (fcfzs_tree, hf_fcfzs_opcode, tvb, offset+8, 2, ENC_BIG_ENDIAN); proto_tree_add_item (fcfzs_tree, hf_fcfzs_maxres_size, tvb, offset+10, - 2, 0); + 2, ENC_BIG_ENDIAN); } if ((opcode != FCCT_MSG_ACC) && (opcode != FCCT_MSG_RJT)) { diff --git a/epan/dissectors/packet-fcgi.c b/epan/dissectors/packet-fcgi.c index 75dec691fd..24c63b585f 100644 --- a/epan/dissectors/packet-fcgi.c +++ b/epan/dissectors/packet-fcgi.c @@ -150,10 +150,10 @@ dissect_begin_request(tvbuff_t *tvb, proto_tree *fcgi_tree, gint offset, guint16 br = proto_tree_add_text(fcgi_tree, tvb, offset, len, "Begin Request:"); br_tree = proto_item_add_subtree(br, ett_fcgi_begin_request); - proto_tree_add_item(br_tree, hf_fcgi_begin_request_role, tvb, offset, 2, FALSE); + proto_tree_add_item(br_tree, hf_fcgi_begin_request_role, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(br_tree, hf_fcgi_begin_request_flags, tvb, offset, 1, FALSE); + proto_tree_add_item(br_tree, hf_fcgi_begin_request_flags, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(br_tree, hf_fcgi_begin_request_keep_conn, tvb, offset, 1, FALSE); offset += 1; @@ -179,10 +179,10 @@ dissect_end_request(tvbuff_t *tvb, proto_tree *fcgi_tree, gint offset, guint16 l er = proto_tree_add_text(fcgi_tree, tvb, offset, len, "End Request:"); er_tree = proto_item_add_subtree(er, ett_fcgi_end_request); - proto_tree_add_item(er_tree, hf_fcgi_end_request_app_status, tvb, offset, 4, FALSE); + proto_tree_add_item(er_tree, hf_fcgi_end_request_app_status, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(er_tree, hf_fcgi_end_request_protocol_status, tvb, offset, 1, FALSE); + proto_tree_add_item(er_tree, hf_fcgi_end_request_protocol_status, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; offset += 3; @@ -263,21 +263,21 @@ dissect_fcgi_record(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) val_to_str(type, record_types, "Unknown (%u)")); fcgi_tree = proto_item_add_subtree(ti, ett_fcgi); - proto_tree_add_item(fcgi_tree, hf_fcgi_version, tvb, offset, 1, FALSE); + proto_tree_add_item(fcgi_tree, hf_fcgi_version, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(fcgi_tree, hf_fcgi_type, tvb, offset, 1, FALSE); + proto_tree_add_item(fcgi_tree, hf_fcgi_type, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(fcgi_tree, hf_fcgi_id, tvb, offset, 2, FALSE); + proto_tree_add_item(fcgi_tree, hf_fcgi_id, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; clen = tvb_get_ntohs(tvb, offset); - proto_tree_add_item(fcgi_tree, hf_fcgi_content_length, tvb, offset, 2, FALSE); + proto_tree_add_item(fcgi_tree, hf_fcgi_content_length, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; plen = tvb_get_guint8(tvb, offset); - proto_tree_add_item(fcgi_tree, hf_fcgi_padding_length, tvb, offset, 1, FALSE); + proto_tree_add_item(fcgi_tree, hf_fcgi_padding_length, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; offset += 1; diff --git a/epan/dissectors/packet-fcip.c b/epan/dissectors/packet-fcip.c index 34e0d4610e..81798f6fbb 100644 --- a/epan/dissectors/packet-fcip.c +++ b/epan/dissectors/packet-fcip.c @@ -322,29 +322,29 @@ dissect_fcencap_header (tvbuff_t *tvb, proto_tree *tree, gint offset) if (tree) { proto_tree_add_uint (tree, hf_fcip_protocol, tvb, offset, 1, protocol); - proto_tree_add_item (tree, hf_fcip_version, tvb, offset+1, 1, 0); - proto_tree_add_item (tree, hf_fcip_protocol_c, tvb, offset+2, 1, 0); - proto_tree_add_item (tree, hf_fcip_version_c, tvb, offset+3, 1, 0); + proto_tree_add_item (tree, hf_fcip_version, tvb, offset+1, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_fcip_protocol_c, tvb, offset+2, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_fcip_version_c, tvb, offset+3, 1, ENC_BIG_ENDIAN); if (protocol == FCENCAP_PROTO_FCIP) { proto_tree_add_item (tree, hf_fcip_encap_word1, tvb, offset+4, - 4, 0); + 4, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_fcip_pflags_changed, tvb, offset+8, 1, 0); proto_tree_add_item (tree, hf_fcip_pflags_special, tvb, offset+8, 1, 0); - proto_tree_add_item (tree, hf_fcip_pflags_c, tvb, offset+10, 1, 0); + proto_tree_add_item (tree, hf_fcip_pflags_c, tvb, offset+10, 1, ENC_BIG_ENDIAN); } /* XXX - break out CRCV flag. */ - proto_tree_add_item (tree, hf_fcip_flags, tvb, offset+12, 1, 0); - proto_tree_add_item (tree, hf_fcip_framelen, tvb, offset+12, 2, 0); - proto_tree_add_item (tree, hf_fcip_flags_c, tvb, offset+14, 1, 0); - proto_tree_add_item (tree, hf_fcip_framelen_c, tvb, offset+14, 2, 0); - proto_tree_add_item (tree, hf_fcip_tsec, tvb, offset+16, 4, 0); - proto_tree_add_item (tree, hf_fcip_tusec, tvb, offset+20, 4, 0); + proto_tree_add_item (tree, hf_fcip_flags, tvb, offset+12, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_fcip_framelen, tvb, offset+12, 2, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_fcip_flags_c, tvb, offset+14, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_fcip_framelen_c, tvb, offset+14, 2, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_fcip_tsec, tvb, offset+16, 4, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_fcip_tusec, tvb, offset+20, 4, ENC_BIG_ENDIAN); /* XXX - check CRC if CRCV is set? */ - proto_tree_add_item (tree, hf_fcip_encap_crc, tvb, offset+24, 4, 0); + proto_tree_add_item (tree, hf_fcip_encap_crc, tvb, offset+24, 4, ENC_BIG_ENDIAN); } } @@ -359,11 +359,11 @@ dissect_fcip_sf (tvbuff_t *tvb, proto_tree *tree, gint offset) proto_tree_add_item (tree, hf_fcip_conn_nonce, tvb, offset+16, 8, ENC_NA); /* XXX - break out these flags */ - proto_tree_add_item (tree, hf_fcip_conn_flags, tvb, offset+24, 1, 0); - proto_tree_add_item (tree, hf_fcip_conn_code, tvb, offset+26, 2, 0); + proto_tree_add_item (tree, hf_fcip_conn_flags, tvb, offset+24, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_fcip_conn_code, tvb, offset+26, 2, ENC_BIG_ENDIAN); proto_tree_add_string (tree, hf_fcip_dst_wwn, tvb, offset+30, 8, tvb_fcwwn_to_str (tvb, offset+30)); - proto_tree_add_item (tree, hf_fcip_katov, tvb, offset+38, 4, 0); + proto_tree_add_item (tree, hf_fcip_katov, tvb, offset+38, 4, ENC_BIG_ENDIAN); } } @@ -458,14 +458,14 @@ dissect_fcip (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (!FCIP_IS_SF (pflags)) { /* print SOF */ - proto_tree_add_item (fcip_tree, hf_fcip_sof, tvb, offset, 1, 0); - proto_tree_add_item (fcip_tree, hf_fcip_sof_c, tvb, offset+2, 1, 0); + proto_tree_add_item (fcip_tree, hf_fcip_sof, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (fcip_tree, hf_fcip_sof_c, tvb, offset+2, 1, ENC_BIG_ENDIAN); /* print EOF */ offset += (frame_len-FCIP_ENCAP_HEADER_LEN-4); if (tvb_bytes_exist (tvb, offset, 4)) { - proto_tree_add_item (fcip_tree, hf_fcip_eof, tvb, offset, 1, 0); - proto_tree_add_item (fcip_tree, hf_fcip_eof_c, tvb, offset+2, 1, 0); + proto_tree_add_item (fcip_tree, hf_fcip_eof, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (fcip_tree, hf_fcip_eof_c, tvb, offset+2, 1, ENC_BIG_ENDIAN); } } } diff --git a/epan/dissectors/packet-fcoe.c b/epan/dissectors/packet-fcoe.c index 9612bbd02d..d1555b979e 100644 --- a/epan/dissectors/packet-fcoe.c +++ b/epan/dissectors/packet-fcoe.c @@ -251,7 +251,7 @@ dissect_fcoe(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) * Interpret the EOF. */ if (tvb_bytes_exist(tvb, eof_offset, 1)) { - proto_tree_add_item(fcoe_tree, hf_fcoe_eof, tvb, eof_offset, 1, 0); + proto_tree_add_item(fcoe_tree, hf_fcoe_eof, tvb, eof_offset, 1, ENC_BIG_ENDIAN); } } diff --git a/epan/dissectors/packet-fcoib.c b/epan/dissectors/packet-fcoib.c index 933f01d9a2..ba597efe46 100644 --- a/epan/dissectors/packet-fcoib.c +++ b/epan/dissectors/packet-fcoib.c @@ -316,7 +316,7 @@ dissect_fcoib(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) * Interpret the EOF. */ if (tvb_bytes_exist(tvb, eof_offset, 1)) { - proto_tree_add_item(fcoib_tree, hf_fcoib_eof, tvb, eof_offset, 1, 0); + proto_tree_add_item(fcoib_tree, hf_fcoib_eof, tvb, eof_offset, 1, ENC_BIG_ENDIAN); } } diff --git a/epan/dissectors/packet-fcp.c b/epan/dissectors/packet-fcp.c index 66db2ed914..977cbcecbd 100644 --- a/epan/dissectors/packet-fcp.c +++ b/epan/dissectors/packet-fcp.c @@ -188,7 +188,7 @@ dissect_task_mgmt_flags (packet_info *pinfo, proto_tree *parent_tree, tvbuff_t * guint8 flags; if(parent_tree) { - item = proto_tree_add_item(parent_tree, hf_fcp_taskmgmt, tvb, offset, 1, TRUE); + item = proto_tree_add_item(parent_tree, hf_fcp_taskmgmt, tvb, offset, 1, ENC_LITTLE_ENDIAN); tree = proto_item_add_subtree(item, ett_fcp_taskmgmt); } @@ -293,7 +293,7 @@ dissect_rsp_flags(proto_tree *parent_tree, tvbuff_t *tvb, int offset) guint8 flags; if(parent_tree) { - item = proto_tree_add_item(parent_tree, hf_fcp_rspflags, tvb, offset, 1, TRUE); + item = proto_tree_add_item(parent_tree, hf_fcp_rspflags, tvb, offset, 1, ENC_LITTLE_ENDIAN); tree = proto_item_add_subtree(item, ett_fcp_rsp_flags); } @@ -419,7 +419,7 @@ dissect_fcp_cmnd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, pro lun|=tvb_get_guint8(tvb, offset+1); } else { proto_tree_add_item(tree, hf_fcp_singlelun, tvb, offset+1, - 1, 0); + 1, ENC_BIG_ENDIAN); lun=tvb_get_guint8(tvb, offset+1); } @@ -434,10 +434,10 @@ dissect_fcp_cmnd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, pro se_tree_insert32(fcp_conv_data->luns, lun, itl); } - proto_tree_add_item(tree, hf_fcp_crn, tvb, offset+8, 1, 0); - proto_tree_add_item(tree, hf_fcp_taskattr, tvb, offset+9, 1, 0); + proto_tree_add_item(tree, hf_fcp_crn, tvb, offset+8, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_fcp_taskattr, tvb, offset+9, 1, ENC_BIG_ENDIAN); dissect_task_mgmt_flags(pinfo, tree, tvb, offset+10); - proto_tree_add_item(tree, hf_fcp_addlcdblen, tvb, offset+11, 1, 0); + proto_tree_add_item(tree, hf_fcp_addlcdblen, tvb, offset+11, 1, ENC_BIG_ENDIAN); rwflags=tvb_get_guint8(tvb, offset+11); if(fchdr->itlq){ if(rwflags&0x02){ @@ -460,7 +460,7 @@ dissect_fcp_cmnd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, pro dissect_scsi_cdb(cdb_tvb, pinfo, parent_tree, SCSI_DEV_UNKNOWN, fchdr->itlq, itl); proto_tree_add_item(tree, hf_fcp_dl, tvb, offset+12+16+add_len, - 4, 0); + 4, ENC_BIG_ENDIAN); if(fchdr->itlq){ fchdr->itlq->data_length=tvb_get_ntohl(tvb, offset+12+16+add_len); } @@ -468,7 +468,7 @@ dissect_fcp_cmnd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, pro if( ((rwflags&0x03)==0x03) && tvb_length_remaining(tvb, offset+12+16+add_len+4)>=4){ proto_tree_add_item(tree, hf_fcp_bidir_dl, tvb, offset+12+16+add_len+4, - 4, 0); + 4, ENC_BIG_ENDIAN); if(fchdr->itlq){ fchdr->itlq->bidir_data_length=tvb_get_ntohl(tvb, offset+12+16+add_len+4); } @@ -491,7 +491,7 @@ dissect_fcp_rspinfo(tvbuff_t *tvb, proto_tree *tree, int offset) offset+=3; /* rsp code */ - proto_tree_add_item(tree, hf_fcp_rspcode, tvb, offset, 1, 0); + proto_tree_add_item(tree, hf_fcp_rspcode, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; /* 4 reserved bytes */ @@ -522,7 +522,7 @@ dissect_fcp_rsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, prot offset+=8; /* retry delay timer */ - proto_tree_add_item(tree, hf_fcp_retry_delay_timer, tvb, offset, 2, 0); + proto_tree_add_item(tree, hf_fcp_retry_delay_timer, tvb, offset, 2, ENC_BIG_ENDIAN); offset+=2; /* flags */ @@ -531,13 +531,13 @@ dissect_fcp_rsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, prot offset++; /* scsi status code */ - proto_tree_add_item(tree, hf_fcp_scsistatus, tvb, offset, 1, 0); + proto_tree_add_item(tree, hf_fcp_scsistatus, tvb, offset, 1, ENC_BIG_ENDIAN); dissect_scsi_rsp(tvb, pinfo, parent_tree, fchdr->itlq, itl, tvb_get_guint8(tvb, offset)); offset++; /* residual count */ if(flags & 0x0e){ - proto_tree_add_item(tree, hf_fcp_resid, tvb, offset, 4, 0); + proto_tree_add_item(tree, hf_fcp_resid, tvb, offset, 4, ENC_BIG_ENDIAN); } offset+=4; @@ -582,7 +582,7 @@ dissect_fcp_rsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, prot /* bidir read resid (only present for bidirectional responses) */ if(flags&0x80){ if(flags&0x60){ - proto_tree_add_item(tree, hf_fcp_bidir_resid, tvb, offset, 4, 0); + proto_tree_add_item(tree, hf_fcp_bidir_resid, tvb, offset, 4, ENC_BIG_ENDIAN); } offset+=4; } @@ -597,8 +597,8 @@ dissect_fcp_xfer_rdy(tvbuff_t *tvb, proto_tree *tree) hidden_item = proto_tree_add_uint(tree, hf_fcp_type, tvb, offset, 0, 0); PROTO_ITEM_SET_HIDDEN(hidden_item); - proto_tree_add_item(tree, hf_fcp_data_ro, tvb, offset, 4, 0); - proto_tree_add_item(tree, hf_fcp_burstlen, tvb, offset+4, 4, 0); + proto_tree_add_item(tree, hf_fcp_data_ro, tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_fcp_burstlen, tvb, offset+4, 4, ENC_BIG_ENDIAN); } static void @@ -608,9 +608,9 @@ dissect_fcp_srr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) r_ctl = pinfo->r_ctl & 0xf; if (r_ctl == FCP_IU_UNSOL_CTL) { /* request */ - proto_tree_add_item(tree, hf_fcp_srr_ox_id, tvb, 4, 2, FALSE); - proto_tree_add_item(tree, hf_fcp_srr_rx_id, tvb, 6, 2, FALSE); - proto_tree_add_item(tree, hf_fcp_data_ro, tvb, 8, 4, FALSE); + proto_tree_add_item(tree, hf_fcp_srr_ox_id, tvb, 4, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_fcp_srr_rx_id, tvb, 6, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_fcp_data_ro, tvb, 8, 4, ENC_BIG_ENDIAN); r_ctl = tvb_get_guint8(tvb, 12); proto_tree_add_text(tree, tvb, 12, 1, "R_CTL: %s", val_to_str(r_ctl, fcp_iu_val, "0x%02x")); diff --git a/epan/dissectors/packet-fcsb3.c b/epan/dissectors/packet-fcsb3.c index bfbf967b57..ef8130db8a 100644 --- a/epan/dissectors/packet-fcsb3.c +++ b/epan/dissectors/packet-fcsb3.c @@ -297,7 +297,7 @@ dissect_iui_flags (proto_tree *parent_tree, tvbuff_t *tvb, int offset, guint16 f } flags&=(~( 0x08 )); - proto_tree_add_item (tree, hf_sbccs_iui_val, tvb, offset, 1, 0); + proto_tree_add_item (tree, hf_sbccs_iui_val, tvb, offset, 1, ENC_BIG_ENDIAN); proto_item_append_text(item, "%s", val_to_str (flags & 0x7, fc_sbccs_iu_val, "0x%x")); flags&=(~( 0x07 )); } @@ -546,7 +546,7 @@ dissect_status_flags (proto_tree *parent_tree, tvbuff_t *tvb, int offset, guint8 } - proto_tree_add_item (tree, hf_sbccs_dib_statusflags_ffc, tvb, offset, 1, 0); + proto_tree_add_item (tree, hf_sbccs_dib_statusflags_ffc, tvb, offset, 1, ENC_BIG_ENDIAN); proto_item_append_text(item, "%s", val_to_str ((flags>>5)&0x07, status_ffc_val, "Reserved:0x%x")); flags&=(~( 0xE0 )); @@ -761,9 +761,9 @@ dissect_fc_sbccs_sb3_iu_hdr (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree "SB-3 Header"); sb3hdr_tree = proto_item_add_subtree (subti, ett_fc_sbccs); - proto_tree_add_item (sb3hdr_tree, hf_sbccs_chid, tvb, offset+1, 1, 0); - proto_tree_add_item (sb3hdr_tree, hf_sbccs_cuid, tvb, offset+3, 1, 0); - proto_tree_add_item (sb3hdr_tree, hf_sbccs_devaddr, tvb, offset+4, 2, 0); + proto_tree_add_item (sb3hdr_tree, hf_sbccs_chid, tvb, offset+1, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (sb3hdr_tree, hf_sbccs_cuid, tvb, offset+3, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (sb3hdr_tree, hf_sbccs_devaddr, tvb, offset+4, 2, ENC_BIG_ENDIAN); /* Dissect IU Header */ subti = proto_tree_add_text (tree, tvb, offset + FC_SBCCS_SB3_HDR_SIZE, @@ -777,8 +777,8 @@ dissect_fc_sbccs_sb3_iu_hdr (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree dhflags = tvb_get_guint8 (tvb, offset+1); dissect_dh_flags(iuhdr_tree, tvb, offset+1, dhflags); - proto_tree_add_item (iuhdr_tree, hf_sbccs_ccw, tvb, offset+2, 2, 0); - proto_tree_add_item (iuhdr_tree, hf_sbccs_token, tvb, offset+5, 3, 0); + proto_tree_add_item (iuhdr_tree, hf_sbccs_ccw, tvb, offset+2, 2, ENC_BIG_ENDIAN); + proto_tree_add_item (iuhdr_tree, hf_sbccs_token, tvb, offset+5, 3, ENC_BIG_ENDIAN); } } @@ -787,9 +787,9 @@ static void dissect_fc_sbccs_dib_data_hdr (tvbuff_t *tvb, proto_tree *tree, guint offset) { if (tree) { - proto_tree_add_item (tree, hf_sbccs_dib_iucnt, tvb, offset+9, 1, 0); - proto_tree_add_item (tree, hf_sbccs_dib_datacnt, tvb, offset+10, 2, 0); - proto_tree_add_item (tree, hf_sbccs_lrc, tvb, offset+12, 4, 0); + proto_tree_add_item (tree, hf_sbccs_dib_iucnt, tvb, offset+9, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_sbccs_dib_datacnt, tvb, offset+10, 2, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_sbccs_lrc, tvb, offset+12, 4, ENC_BIG_ENDIAN); } } @@ -806,20 +806,20 @@ static void dissect_fc_sbccs_dib_cmd_hdr (tvbuff_t *tvb, packet_info *pinfo, } if (tree) { - proto_tree_add_item (tree, hf_sbccs_dib_ccw_cmd, tvb, offset, 1, 0); + proto_tree_add_item (tree, hf_sbccs_dib_ccw_cmd, tvb, offset, 1, ENC_BIG_ENDIAN); flags = tvb_get_guint8 (tvb, offset+1); dissect_ccw_flags(tree, tvb, offset+1, flags); - proto_tree_add_item (tree, hf_sbccs_dib_ccw_cnt, tvb, offset+2, 2, 0); - proto_tree_add_item (tree, hf_sbccs_dib_ioprio, tvb, offset+5, 1, 0); + proto_tree_add_item (tree, hf_sbccs_dib_ccw_cnt, tvb, offset+2, 2, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_sbccs_dib_ioprio, tvb, offset+5, 1, ENC_BIG_ENDIAN); flags = tvb_get_guint8 (tvb, offset+7); dissect_cmd_flags(tree, tvb, offset+7, flags); - proto_tree_add_item (tree, hf_sbccs_dib_iucnt, tvb, offset+9, 1, 0); - proto_tree_add_item (tree, hf_sbccs_dib_datacnt, tvb, offset+10, 2, 0); - proto_tree_add_item (tree, hf_sbccs_lrc, tvb, offset+12, 4, 0); + proto_tree_add_item (tree, hf_sbccs_dib_iucnt, tvb, offset+9, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_sbccs_dib_datacnt, tvb, offset+10, 2, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_sbccs_lrc, tvb, offset+12, 4, ENC_BIG_ENDIAN); } } @@ -843,25 +843,25 @@ static void dissect_fc_sbccs_dib_status_hdr (tvbuff_t *tvb, packet_info *pinfo, if (rv_valid) { proto_tree_add_item (tree, hf_sbccs_dib_residualcnt, tvb, offset+2, - 2, 0); + 2, ENC_BIG_ENDIAN); } else { proto_tree_add_item (tree, hf_sbccs_dib_iupacing, tvb, offset+3, - 1, 0); + 1, ENC_BIG_ENDIAN); } if (qparam_valid) { - proto_tree_add_item (tree, hf_sbccs_dib_qtuf, tvb, offset+4, 1, 0); - proto_tree_add_item (tree, hf_sbccs_dib_qtu, tvb, offset+4, 2, 0); + proto_tree_add_item (tree, hf_sbccs_dib_qtuf, tvb, offset+4, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_sbccs_dib_qtu, tvb, offset+4, 2, ENC_BIG_ENDIAN); } - proto_tree_add_item (tree, hf_sbccs_dib_dtuf, tvb, offset+6, 1, 0); - proto_tree_add_item (tree, hf_sbccs_dib_dtu, tvb, offset+6, 2, 0); + proto_tree_add_item (tree, hf_sbccs_dib_dtuf, tvb, offset+6, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_sbccs_dib_dtu, tvb, offset+6, 2, ENC_BIG_ENDIAN); - proto_tree_add_item (tree, hf_sbccs_dib_iucnt, tvb, offset+9, 1, 0); - proto_tree_add_item (tree, hf_sbccs_dib_datacnt, tvb, offset+10, 2, 0); + proto_tree_add_item (tree, hf_sbccs_dib_iucnt, tvb, offset+9, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_sbccs_dib_datacnt, tvb, offset+10, 2, ENC_BIG_ENDIAN); supp_status_cnt = tvb_get_ntohs (tvb, offset+10); - proto_tree_add_item (tree, hf_sbccs_lrc, tvb, offset+12, 4, 0); + proto_tree_add_item (tree, hf_sbccs_lrc, tvb, offset+12, 4, ENC_BIG_ENDIAN); if (supp_status_cnt) { next_tvb = tvb_new_subset_remaining (tvb, offset+FC_SBCCS_DIB_LRC_HDR_SIZE); @@ -884,7 +884,7 @@ static void dissect_fc_sbccs_dib_ctl_hdr (tvbuff_t *tvb, packet_info *pinfo, "0x%x")); } if (tree) { - proto_tree_add_item (tree, hf_sbccs_dib_ctlfn, tvb, offset, 1, 0); + proto_tree_add_item (tree, hf_sbccs_dib_ctlfn, tvb, offset, 1, ENC_BIG_ENDIAN); /* Control Function Parameter is to be interpreted in some cases */ switch (ctlfn) { @@ -893,26 +893,26 @@ static void dissect_fc_sbccs_dib_ctl_hdr (tvbuff_t *tvb, packet_info *pinfo, break; case FC_SBCCS_CTL_FN_DEV_XCP: proto_tree_add_item (tree, hf_sbccs_dev_xcp_code, tvb, offset+1, - 1, 0); + 1, ENC_BIG_ENDIAN); break; case FC_SBCCS_CTL_FN_PRG_PTH: proto_tree_add_item (tree, hf_sbccs_prg_pth_errcode, tvb, offset+1, - 1, 0); + 1, ENC_BIG_ENDIAN); break; default: proto_tree_add_item (tree, hf_sbccs_dib_ctlparam, tvb, offset+1, - 3, 0); + 3, ENC_BIG_ENDIAN); break; } - proto_tree_add_item (tree, hf_sbccs_dib_iucnt, tvb, offset+9, 1, 0); - proto_tree_add_item (tree, hf_sbccs_dib_datacnt, tvb, offset+10, 2, 0); - proto_tree_add_item (tree, hf_sbccs_lrc, tvb, offset+12, 4, 0); + proto_tree_add_item (tree, hf_sbccs_dib_iucnt, tvb, offset+9, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_sbccs_dib_datacnt, tvb, offset+10, 2, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_sbccs_lrc, tvb, offset+12, 4, ENC_BIG_ENDIAN); if (ctlfn == FC_SBCCS_CTL_FN_PRG_RSP) { /* Need to decode the LESBs */ proto_tree_add_item (tree, hf_sbccs_prg_rsp_errcode, tvb, offset+60, - 1, 0); + 1, ENC_BIG_ENDIAN); } } } @@ -934,7 +934,7 @@ static void dissect_fc_sbccs_dib_link_hdr (tvbuff_t *tvb, packet_info *pinfo, if (tree) { link_ctl = tvb_get_guint8 (tvb, offset+1); - proto_tree_add_item (tree, hf_sbccs_dib_linkctlfn, tvb, offset+1, 1, 0); + proto_tree_add_item (tree, hf_sbccs_dib_linkctlfn, tvb, offset+1, 1, ENC_BIG_ENDIAN); ctl_info = tvb_get_ntohs (tvb, offset+2); switch (link_ctl) { @@ -944,29 +944,29 @@ static void dissect_fc_sbccs_dib_link_hdr (tvbuff_t *tvb, packet_info *pinfo, break; case FC_SBCCS_LINK_CTL_FN_LPR: proto_tree_add_item (tree, hf_sbccs_dib_lprcode, tvb, offset+2, 1, - 0); + ENC_BIG_ENDIAN); break; case FC_SBCCS_LINK_CTL_FN_TIN: proto_tree_add_item (tree, hf_sbccs_dib_tin_imgid_cnt, tvb, - offset+3, 1, 0); + offset+3, 1, ENC_BIG_ENDIAN); break; case FC_SBCCS_LINK_CTL_FN_TIR: proto_tree_add_item (tree, hf_sbccs_dib_tin_imgid_cnt, tvb, - offset+3, 1, 0); + offset+3, 1, ENC_BIG_ENDIAN); break; case FC_SBCCS_LINK_CTL_FN_LRJ: proto_tree_add_item (tree, hf_sbccs_dib_lrjcode, tvb, offset+2, - 1, 0); + 1, ENC_BIG_ENDIAN); break; default: /* Do Nothing */ break; } - proto_tree_add_item (tree, hf_sbccs_dib_ctccntr, tvb, offset+4, 2, 0); - proto_tree_add_item (tree, hf_sbccs_dib_iucnt, tvb, offset+9, 1, 0); - proto_tree_add_item (tree, hf_sbccs_dib_datacnt, tvb, offset+10, 2, 0); - proto_tree_add_item (tree, hf_sbccs_lrc, tvb, offset+12, 4, 0); + proto_tree_add_item (tree, hf_sbccs_dib_ctccntr, tvb, offset+4, 2, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_sbccs_dib_iucnt, tvb, offset+9, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_sbccs_dib_datacnt, tvb, offset+10, 2, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_sbccs_lrc, tvb, offset+12, 4, ENC_BIG_ENDIAN); if (link_ctl == FC_SBCCS_LINK_CTL_FN_TIR) { link_payload_len = tvb_get_ntohs (tvb, offset+10); diff --git a/epan/dissectors/packet-fcsp.c b/epan/dissectors/packet-fcsp.c index 342af7c729..34a9217d4a 100644 --- a/epan/dissectors/packet-fcsp.c +++ b/epan/dissectors/packet-fcsp.c @@ -197,9 +197,9 @@ static void dissect_fcsp_dhchap_auth_param (tvbuff_t *tvb, proto_tree *tree, while (total_len > 0) { proto_tree_add_item (tree, hf_auth_dhchap_param_tag, tvb, offset, - 2, 0); + 2, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_auth_dhchap_param_len, tvb, offset+2, - 2, 0); + 2, ENC_BIG_ENDIAN); auth_param_tag = tvb_get_ntohs (tvb, offset); param_len = tvb_get_ntohs (tvb, offset+2)*4; @@ -210,7 +210,7 @@ static void dissect_fcsp_dhchap_auth_param (tvbuff_t *tvb, proto_tree *tree, total_len -= 4; for (i = 0; i < param_len; i += 4) { proto_tree_add_item (tree, hf_auth_dhchap_hash_type, tvb, - offset, 4, 0); + offset, 4, ENC_BIG_ENDIAN); offset += 4; } break; @@ -219,7 +219,7 @@ static void dissect_fcsp_dhchap_auth_param (tvbuff_t *tvb, proto_tree *tree, total_len -= 4; for (i = 0; i < param_len; i += 4) { proto_tree_add_item (tree, hf_auth_dhchap_group_type, tvb, - offset, 4, 0); + offset, 4, ENC_BIG_ENDIAN); offset += 4; } break; @@ -240,11 +240,11 @@ static void dissect_fcsp_dhchap_challenge (tvbuff_t *tvb, proto_tree *tree) if (tree) { proto_tree_add_item (tree, hf_auth_responder_name_type, tvb, offset, - 2, 0); + 2, ENC_BIG_ENDIAN); name_type = tvb_get_ntohs (tvb, offset); proto_tree_add_item (tree, hf_auth_responder_name_len, tvb, offset+2, - 2, 0); + 2, ENC_BIG_ENDIAN); name_len = tvb_get_ntohs (tvb, offset+2); @@ -259,18 +259,18 @@ static void dissect_fcsp_dhchap_challenge (tvbuff_t *tvb, proto_tree *tree) offset += (4+name_len); proto_tree_add_item (tree, hf_auth_dhchap_hash_type, tvb, offset, - 4, 0); + 4, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_auth_dhchap_group_type, tvb, offset+4, - 4, 0); + 4, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_auth_dhchap_chal_len, tvb, offset+8, - 4, 0); + 4, ENC_BIG_ENDIAN); param_len = tvb_get_ntohl (tvb, offset+8); proto_tree_add_item (tree, hf_auth_dhchap_chal_value, tvb, offset+12, param_len, ENC_NA); offset += (param_len + 12); - proto_tree_add_item (tree, hf_auth_dhchap_val_len, tvb, offset, 4, 0); + proto_tree_add_item (tree, hf_auth_dhchap_val_len, tvb, offset, 4, ENC_BIG_ENDIAN); param_len = tvb_get_ntohl (tvb, offset); proto_tree_add_item (tree, hf_auth_dhchap_dhvalue, tvb, offset+4, @@ -285,21 +285,21 @@ static void dissect_fcsp_dhchap_reply (tvbuff_t *tvb, proto_tree *tree) guint32 param_len; if (tree) { - proto_tree_add_item (tree, hf_auth_dhchap_rsp_len, tvb, offset, 4, 0); + proto_tree_add_item (tree, hf_auth_dhchap_rsp_len, tvb, offset, 4, ENC_BIG_ENDIAN); param_len = tvb_get_ntohl (tvb, offset); proto_tree_add_item (tree, hf_auth_dhchap_rsp_value, tvb, offset+4, param_len, ENC_NA); offset += (param_len + 4); - proto_tree_add_item (tree, hf_auth_dhchap_val_len, tvb, offset, 4, 0); + proto_tree_add_item (tree, hf_auth_dhchap_val_len, tvb, offset, 4, ENC_BIG_ENDIAN); param_len = tvb_get_ntohl (tvb, offset); proto_tree_add_item (tree, hf_auth_dhchap_dhvalue, tvb, offset+4, param_len, ENC_NA); offset += (param_len + 4); - proto_tree_add_item (tree, hf_auth_dhchap_chal_len, tvb, offset, 4, 0); + proto_tree_add_item (tree, hf_auth_dhchap_chal_len, tvb, offset, 4, ENC_BIG_ENDIAN); param_len = tvb_get_ntohl (tvb, offset); proto_tree_add_item (tree, hf_auth_dhchap_chal_value, tvb, offset+4, @@ -313,7 +313,7 @@ static void dissect_fcsp_dhchap_success (tvbuff_t *tvb, proto_tree *tree) guint32 param_len; if (tree) { - proto_tree_add_item (tree, hf_auth_dhchap_rsp_len, tvb, offset, 4, 0); + proto_tree_add_item (tree, hf_auth_dhchap_rsp_len, tvb, offset, 4, ENC_BIG_ENDIAN); param_len = tvb_get_ntohl (tvb, offset); proto_tree_add_item (tree, hf_auth_dhchap_rsp_value, tvb, offset+4, @@ -330,11 +330,11 @@ static void dissect_fcsp_auth_negotiate (tvbuff_t *tvb, proto_tree *tree) if (tree) { proto_tree_add_item (tree, hf_auth_initiator_name_type, tvb, offset, - 2, 0); + 2, ENC_BIG_ENDIAN); name_type = tvb_get_ntohs (tvb, offset); proto_tree_add_item (tree, hf_auth_initiator_name_len, tvb, offset+2, - 2, 0); + 2, ENC_BIG_ENDIAN); name_len = tvb_get_ntohs (tvb, offset+2); if (name_type == FC_AUTH_NAME_TYPE_WWN) { @@ -348,19 +348,19 @@ static void dissect_fcsp_auth_negotiate (tvbuff_t *tvb, proto_tree *tree) offset += (4+name_len); - proto_tree_add_item (tree, hf_auth_usable_proto, tvb, offset, 4, 0); + proto_tree_add_item (tree, hf_auth_usable_proto, tvb, offset, 4, ENC_BIG_ENDIAN); num_protos = tvb_get_ntohl (tvb, offset); offset += 4; for (i = 0; i < num_protos; i++) { - proto_tree_add_item (tree, hf_auth_proto_param_len, tvb, offset, 4, 0); + proto_tree_add_item (tree, hf_auth_proto_param_len, tvb, offset, 4, ENC_BIG_ENDIAN); param_len = tvb_get_ntohl (tvb, offset); offset += 4; if (tvb_bytes_exist (tvb, offset, param_len)) { proto_type = tvb_get_ntohl (tvb, offset); - proto_tree_add_item (tree, hf_auth_proto_type, tvb, offset, 4, 0); + proto_tree_add_item (tree, hf_auth_proto_type, tvb, offset, 4, ENC_BIG_ENDIAN); switch (proto_type) { case FC_AUTH_PROTO_TYPE_DHCHAP: dissect_fcsp_dhchap_auth_param (tvb, tree, offset+4, param_len); @@ -385,8 +385,8 @@ static void dissect_fcsp_auth_rjt (tvbuff_t *tvb, proto_tree *tree) int offset = 12; if (tree) { - proto_tree_add_item (tree, hf_auth_rjt_code, tvb, offset, 1, 0); - proto_tree_add_item (tree, hf_auth_rjt_codedet, tvb, offset+1, 1, 0); + proto_tree_add_item (tree, hf_auth_rjt_code, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_auth_rjt_codedet, tvb, offset+1, 1, ENC_BIG_ENDIAN); } } @@ -410,12 +410,12 @@ static void dissect_fcsp (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvb_length (tvb), "FC-SP"); fcsp_tree = proto_item_add_subtree (ti, ett_fcsp); - proto_tree_add_item (fcsp_tree, hf_auth_flags, tvb, offset+1, 1, 0); - proto_tree_add_item (fcsp_tree, hf_auth_msg_code, tvb, offset+2, 1, 0); + proto_tree_add_item (fcsp_tree, hf_auth_flags, tvb, offset+1, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (fcsp_tree, hf_auth_msg_code, tvb, offset+2, 1, ENC_BIG_ENDIAN); proto_tree_add_item (fcsp_tree, hf_auth_proto_ver, tvb, offset+3, 1, - 0); - proto_tree_add_item (fcsp_tree, hf_auth_len, tvb, offset+4, 4, 0); - proto_tree_add_item (fcsp_tree, hf_auth_tid, tvb, offset+8, 4, 0); + ENC_BIG_ENDIAN); + proto_tree_add_item (fcsp_tree, hf_auth_len, tvb, offset+4, 4, ENC_BIG_ENDIAN); + proto_tree_add_item (fcsp_tree, hf_auth_tid, tvb, offset+8, 4, ENC_BIG_ENDIAN); switch (opcode) { case FC_AUTH_MSG_AUTH_REJECT: diff --git a/epan/dissectors/packet-fcswils.c b/epan/dissectors/packet-fcswils.c index b0fa579a50..b4675efee8 100644 --- a/epan/dissectors/packet-fcswils.c +++ b/epan/dissectors/packet-fcswils.c @@ -530,7 +530,7 @@ dissect_swils_interconnect_element_info (tvbuff_t *tvb, proto_tree *tree, int of int len, max_len = MAX_INTERCONNECT_ELEMENT_INFO_LEN; if (tree) { - proto_tree_add_item (tree, hf_swils_interconnect_list_len, tvb, offset+3, 1, 0); + proto_tree_add_item (tree, hf_swils_interconnect_list_len, tvb, offset+3, 1, ENC_BIG_ENDIAN); len = tvb_strsize (tvb, offset+4); proto_tree_add_item (tree, hf_swils_ess_vendorname, tvb, offset+4, len, FALSE); offset += (4 + len); @@ -575,13 +575,13 @@ dissect_swils_ess_capability (tvbuff_t *tvb, proto_tree *tree, int offset, proto_tree_add_item (tree, hf_swils_ess_dns_obj0h, tvb, offset+3, 1, 0); proto_tree_add_item (tree, hf_swils_ess_dns_vendor, tvb, - offset+4, 4, 0); + offset+4, 4, ENC_BIG_ENDIAN); break; case FCCT_GSRVR_FCTLR: proto_tree_add_item (tree, hf_swils_ess_fctlr_rscn, tvb, offset+3, 1, 0); proto_tree_add_item (tree, hf_swils_ess_fctlr_vendor, tvb, - offset+4, 4, 0); + offset+4, 4, ENC_BIG_ENDIAN); break; case FCCT_GSRVR_FCS: proto_tree_add_item (tree, hf_swils_ess_fcs_basic, tvb, @@ -653,9 +653,9 @@ dissect_swils_ess_capability_obj (tvbuff_t *tvb, proto_tree *tree, int offset) capinfo_tree = proto_item_add_subtree (ti, ett_fcswils_capinfo); } - proto_tree_add_item (capinfo_tree, hf_swils_ess_cap_type, tvb, offset, 1, 0); + proto_tree_add_item (capinfo_tree, hf_swils_ess_cap_type, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item (capinfo_tree, hf_swils_ess_cap_subtype, tvb, offset+1, - 1, 0); + 1, ENC_BIG_ENDIAN); subtype = tvb_get_guint8 (tvb, offset+1); if (type != FCCT_GSTYPE_VENDOR) { @@ -663,7 +663,7 @@ dissect_swils_ess_capability_obj (tvbuff_t *tvb, proto_tree *tree, int offset) proto_tree_add_uint (capinfo_tree, hf_swils_ess_cap_svc, tvb, offset, 2, srvr_type); proto_tree_add_item (capinfo_tree, hf_swils_ess_cap_numentries, tvb, - offset+3, 1, 0); + offset+3, 1, ENC_BIG_ENDIAN); offset += 4; len += 4; @@ -678,7 +678,7 @@ dissect_swils_ess_capability_obj (tvbuff_t *tvb, proto_tree *tree, int offset) * Vendor-specific objects. */ proto_tree_add_item (capinfo_tree, hf_swils_ess_cap_len, tvb, offset+3, - 1, 0); + 1, ENC_BIG_ENDIAN); proto_tree_add_item (capinfo_tree, hf_swils_ess_cap_t10, tvb, offset+4, 8, 0); i -= 8; /* reduce length by t10 object size */ @@ -725,7 +725,7 @@ dissect_swils_elp (tvbuff_t *tvb, proto_tree *elp_tree, guint8 isreq _U_) if (elp_tree) { offset += 4; - proto_tree_add_item (elp_tree, hf_swils_elp_rev, tvb, offset++, 1, 0); + proto_tree_add_item (elp_tree, hf_swils_elp_rev, tvb, offset++, 1, ENC_BIG_ENDIAN); proto_tree_add_item (elp_tree, hf_swils_elp_flags, tvb, offset, 2, ENC_NA); offset += 3; proto_tree_add_uint_format (elp_tree, hf_swils_elp_r_a_tov, tvb, offset, 4, @@ -755,13 +755,13 @@ dissect_swils_elp (tvbuff_t *tvb, proto_tree *elp_tree, guint8 isreq _U_) &elp.clsf_svcparm[0], "Class F Svc Parameters: (%s)", flags); offset += 6; - proto_tree_add_item (elp_tree, hf_swils_elp_clsf_rcvsz, tvb, offset, 2, 0); + proto_tree_add_item (elp_tree, hf_swils_elp_clsf_rcvsz, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item (elp_tree, hf_swils_elp_clsf_conseq, tvb, offset, 2, 0); + proto_tree_add_item (elp_tree, hf_swils_elp_clsf_conseq, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item (elp_tree, hf_swils_elp_clsf_e2e, tvb, offset, 2, 0); + proto_tree_add_item (elp_tree, hf_swils_elp_clsf_e2e, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item (elp_tree, hf_swils_elp_clsf_openseq, tvb, offset, 2, 0); + proto_tree_add_item (elp_tree, hf_swils_elp_clsf_openseq, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 4; flags=""; @@ -798,7 +798,7 @@ dissect_swils_elp (tvbuff_t *tvb, proto_tree *elp_tree, guint8 isreq _U_) NULL, "Class 1 Svc Parameters: (%s)", flags); offset += 2; if (elp.cls1_svcparm[0] & 0x80) { - proto_tree_add_item (elp_tree, hf_swils_elp_cls1_rcvsz, tvb, offset, 2, 0); + proto_tree_add_item (elp_tree, hf_swils_elp_cls1_rcvsz, tvb, offset, 2, ENC_BIG_ENDIAN); } offset += 2; @@ -821,7 +821,7 @@ dissect_swils_elp (tvbuff_t *tvb, proto_tree *elp_tree, guint8 isreq _U_) offset += 2; if (elp.cls2_svcparm[0] & 0x80) { - proto_tree_add_item (elp_tree, hf_swils_elp_cls2_rcvsz, tvb, offset, 2, 0); + proto_tree_add_item (elp_tree, hf_swils_elp_cls2_rcvsz, tvb, offset, 2, ENC_BIG_ENDIAN); } offset += 2; @@ -843,24 +843,24 @@ dissect_swils_elp (tvbuff_t *tvb, proto_tree *elp_tree, guint8 isreq _U_) offset += 2; if (elp.cls3_svcparm[0] & 0x80) { - proto_tree_add_item (elp_tree, hf_swils_elp_cls3_rcvsz, tvb, offset, 2, 0); + proto_tree_add_item (elp_tree, hf_swils_elp_cls3_rcvsz, tvb, offset, 2, ENC_BIG_ENDIAN); } offset += 22; proto_tree_add_string (elp_tree, hf_swils_elp_isl_fc_mode, tvb, offset, 2, val_to_str (elp.isl_flwctrl_mode, fcswils_elp_fc_val, "Vendor Unique")); offset += 2; - proto_tree_add_item (elp_tree, hf_swils_elp_fcplen, tvb, offset, 2, 0); + proto_tree_add_item (elp_tree, hf_swils_elp_fcplen, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item (elp_tree, hf_swils_elp_b2bcredit, tvb, offset, 4, 0); + proto_tree_add_item (elp_tree, hf_swils_elp_b2bcredit, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item (elp_tree, hf_swils_elp_compat1, tvb, offset, 4, 0); + proto_tree_add_item (elp_tree, hf_swils_elp_compat1, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item (elp_tree, hf_swils_elp_compat2, tvb, offset, 4, 0); + proto_tree_add_item (elp_tree, hf_swils_elp_compat2, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item (elp_tree, hf_swils_elp_compat3, tvb, offset, 4, 0); + proto_tree_add_item (elp_tree, hf_swils_elp_compat3, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item (elp_tree, hf_swils_elp_compat4, tvb, offset, 4, 0); + proto_tree_add_item (elp_tree, hf_swils_elp_compat4, tvb, offset, 4, ENC_BIG_ENDIAN); } } @@ -892,11 +892,11 @@ dissect_swils_efp (tvbuff_t *tvb, proto_tree *efp_tree, guint8 isreq _U_) return; } if (efp_tree) - proto_tree_add_item (efp_tree, hf_swils_efp_payload_len, tvb, offset, 2, 0); + proto_tree_add_item (efp_tree, hf_swils_efp_payload_len, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 5; /* skip 3 reserved bytes, too */ if (efp_tree) proto_tree_add_item (efp_tree, hf_swils_efp_pswitch_pri, tvb, - offset, 1, FALSE); + offset, 1, ENC_BIG_ENDIAN); offset++; tvb_memcpy (tvb, efp.pswitch_name, offset, 8); if (efp_tree) @@ -924,7 +924,7 @@ dissect_swils_efp (tvbuff_t *tvb, proto_tree *efp_tree, guint8 isreq _U_) switch (rec_type) { case FC_SWILS_LRECTYPE_DOMAIN: - proto_tree_add_item (lrec_tree, hf_swils_efp_dom_id, tvb, offset+1, 1, 0); + proto_tree_add_item (lrec_tree, hf_swils_efp_dom_id, tvb, offset+1, 1, ENC_BIG_ENDIAN); proto_tree_add_string (lrec_tree, hf_swils_efp_switch_name, tvb, offset+8, 8, tvb_fcwwn_to_str (tvb, offset+8)); break; @@ -960,7 +960,7 @@ dissect_swils_rdi (tvbuff_t *tvb, proto_tree *rdi_tree, guint8 isreq) if (rdi_tree) { plen = tvb_get_ntohs (tvb, offset+2); - proto_tree_add_item (rdi_tree, hf_swils_rdi_payload_len, tvb, offset+2, 2, 0); + proto_tree_add_item (rdi_tree, hf_swils_rdi_payload_len, tvb, offset+2, 2, ENC_BIG_ENDIAN); proto_tree_add_string (rdi_tree, hf_swils_rdi_req_sname, tvb, offset+4, 8, tvb_fcwwn_to_str (tvb, offset+4)); @@ -997,13 +997,13 @@ dissect_swils_fspf_hdr (tvbuff_t *tvb, proto_tree *tree, int offset) fspfh_tree = proto_item_add_subtree (subti, ett_fcswils_fspfhdr); proto_tree_add_item (fspfh_tree, hf_swils_fspfh_rev, tvb, offset+4, - 1, 0); + 1, ENC_BIG_ENDIAN); proto_tree_add_item (fspfh_tree, hf_swils_fspfh_ar_num, tvb, - offset+5, 1, 0); + offset+5, 1, ENC_BIG_ENDIAN); proto_tree_add_item (fspfh_tree, hf_swils_fspfh_auth_type, tvb, - offset+6, 1, 0); + offset+6, 1, ENC_BIG_ENDIAN); proto_tree_add_item (fspfh_tree, hf_swils_fspfh_dom_id, tvb, offset+11, - 1, 0); + 1, ENC_BIG_ENDIAN); proto_tree_add_item (fspfh_tree, hf_swils_fspfh_auth, tvb, offset+12, 8, ENC_NA); } @@ -1012,14 +1012,14 @@ dissect_swils_fspf_hdr (tvbuff_t *tvb, proto_tree *tree, int offset) static void dissect_swils_fspf_lsrechdr (tvbuff_t *tvb, proto_tree *tree, int offset) { - proto_tree_add_item (tree, hf_swils_lsrh_lsr_type, tvb, offset, 1, 0); + proto_tree_add_item (tree, hf_swils_lsrh_lsr_type, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_text (tree, tvb, offset+2, 2, "LSR Age: %d secs", tvb_get_ntohs (tvb, offset+2)); proto_tree_add_text (tree, tvb, offset+4, 4, "Options : 0x%x", tvb_get_ntohl (tvb, offset+4)); - proto_tree_add_item (tree, hf_swils_lsrh_lsid, tvb, offset+11, 1, 0); - proto_tree_add_item (tree, hf_swils_lsrh_adv_domid, tvb, offset+15, 1, 0); - proto_tree_add_item (tree, hf_swils_lsrh_ls_incid, tvb, offset+16, 4, 0); + proto_tree_add_item (tree, hf_swils_lsrh_lsid, tvb, offset+11, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_swils_lsrh_adv_domid, tvb, offset+15, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_swils_lsrh_ls_incid, tvb, offset+16, 4, ENC_BIG_ENDIAN); proto_tree_add_text (tree, tvb, offset+20, 2, "Checksum: 0x%x", tvb_get_ntohs (tvb, offset+20)); proto_tree_add_text (tree, tvb, offset+22, 2, "LSR Length: %d", @@ -1031,10 +1031,10 @@ dissect_swils_fspf_ldrec (tvbuff_t *tvb, proto_tree *tree, int offset) { proto_tree_add_string (tree, hf_swils_ldrec_linkid, tvb, offset, 4, tvb_fc_to_str (tvb, offset+1)); - proto_tree_add_item (tree, hf_swils_ldrec_out_pidx, tvb, offset+5, 3, 0); - proto_tree_add_item (tree, hf_swils_ldrec_nbr_pidx, tvb, offset+9, 3, 0); - proto_tree_add_item (tree, hf_swils_ldrec_link_type, tvb, offset+12, 1, 0); - proto_tree_add_item (tree, hf_swils_ldrec_link_cost, tvb, offset+14, 2, 0); + proto_tree_add_item (tree, hf_swils_ldrec_out_pidx, tvb, offset+5, 3, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_swils_ldrec_nbr_pidx, tvb, offset+9, 3, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_swils_ldrec_link_type, tvb, offset+12, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_swils_ldrec_link_cost, tvb, offset+14, 2, ENC_BIG_ENDIAN); } static void @@ -1086,10 +1086,10 @@ dissect_swils_hello (tvbuff_t *tvb, proto_tree *hlo_tree, guint8 isreq _U_) dissect_swils_fspf_hdr (tvb, hlo_tree, offset); proto_tree_add_item (hlo_tree, hf_swils_hlo_options, tvb, offset+20, 4, ENC_NA); - proto_tree_add_item (hlo_tree, hf_swils_hlo_hloint, tvb, offset+24, 4, 0); - proto_tree_add_item (hlo_tree, hf_swils_hlo_deadint, tvb, offset+28, 4, 0); - proto_tree_add_item (hlo_tree, hf_swils_hlo_rcv_domid, tvb, offset+35, 1, 0); - proto_tree_add_item (hlo_tree, hf_swils_hlo_orig_pidx, tvb, offset+37, 3, 0); + proto_tree_add_item (hlo_tree, hf_swils_hlo_hloint, tvb, offset+24, 4, ENC_BIG_ENDIAN); + proto_tree_add_item (hlo_tree, hf_swils_hlo_deadint, tvb, offset+28, 4, ENC_BIG_ENDIAN); + proto_tree_add_item (hlo_tree, hf_swils_hlo_rcv_domid, tvb, offset+35, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (hlo_tree, hf_swils_hlo_orig_pidx, tvb, offset+37, 3, ENC_BIG_ENDIAN); } } @@ -1164,13 +1164,13 @@ dissect_swils_rscn (tvbuff_t *tvb, proto_tree *rscn_tree, guint8 isreq) return; proto_tree_add_item (rscn_tree, hf_swils_rscn_evtype, tvb, offset+4, - 1, 0); + 1, ENC_BIG_ENDIAN); proto_tree_add_item (rscn_tree, hf_swils_rscn_addrfmt, tvb, offset+4, - 1, 0); + 1, ENC_BIG_ENDIAN); proto_tree_add_string (rscn_tree, hf_swils_rscn_affectedport, tvb, offset+5, 3, tvb_fc_to_str (tvb, offset+5)); proto_tree_add_item (rscn_tree, hf_swils_rscn_detectfn, tvb, - offset+8, 4, 0); + offset+8, 4, ENC_BIG_ENDIAN); numrec = tvb_get_ntohl (tvb, offset+12); if (!tvb_bytes_exist (tvb, offset+16, FC_SWILS_RSCN_DEVENTRY_SIZE*numrec)) { @@ -1187,7 +1187,7 @@ dissect_swils_rscn (tvbuff_t *tvb, proto_tree *rscn_tree, guint8 isreq) "Device Entry %d", i); dev_tree = proto_item_add_subtree (subti, ett_fcswils_rscn_dev); - proto_tree_add_item (dev_tree, hf_swils_rscn_portstate, tvb, offset, 1, 0); + proto_tree_add_item (dev_tree, hf_swils_rscn_portstate, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_string (dev_tree, hf_swils_rscn_portid, tvb, offset+1, 3, tvb_fc_to_str (tvb, offset+1)); proto_tree_add_string (dev_tree, hf_swils_rscn_pwwn, tvb, offset+4, 8, @@ -1290,9 +1290,9 @@ dissect_swils_zone_obj (tvbuff_t *tvb, proto_tree *zobj_tree, int offset) objtype = tvb_get_guint8 (tvb, offset); proto_tree_add_item (zobj_tree, hf_swils_zone_objtype, tvb, offset, - 1, 0); + 1, ENC_BIG_ENDIAN); proto_tree_add_item (zobj_tree, hf_swils_zone_protocol, tvb, - offset+1, 1, 0); + offset+1, 1, ENC_BIG_ENDIAN); str = zonenm_to_str (tvb, offset+4); proto_tree_add_string (zobj_tree, hf_swils_zone_objname, tvb, offset+4, ZONENAME_LEN (tvb, offset+4), str); @@ -1478,7 +1478,7 @@ dissect_swils_sfc (tvbuff_t *tvb, proto_tree *sfc_tree, guint8 isreq) if (sfc_tree) { if (isreq) { - proto_tree_add_item (sfc_tree, hf_swils_sfc_opcode, tvb, offset+1, 1, 0); + proto_tree_add_item (sfc_tree, hf_swils_sfc_opcode, tvb, offset+1, 1, ENC_BIG_ENDIAN); zonesetlen = tvb_get_ntohs (tvb, offset+2); proto_tree_add_text (sfc_tree, tvb, offset+2, 2, @@ -1604,7 +1604,7 @@ dissect_swils_esc (tvbuff_t *tvb, proto_tree *esc_tree, guint8 isreq) proto_tree_add_item (pdesc_tree, hf_swils_esc_pdesc_vendorid, tvb, offset, 8, 0); proto_tree_add_item (pdesc_tree, hf_swils_esc_protocolid, - tvb, offset+10, 2, 0); + tvb, offset+10, 2, ENC_BIG_ENDIAN); offset += 12; } } @@ -1618,7 +1618,7 @@ dissect_swils_esc (tvbuff_t *tvb, proto_tree *esc_tree, guint8 isreq) proto_tree_add_item (pdesc_tree, hf_swils_esc_pdesc_vendorid, tvb, offset+12, 8, 0); proto_tree_add_item (pdesc_tree, hf_swils_esc_protocolid, - tvb, offset+22, 2, 0); + tvb, offset+22, 2, ENC_BIG_ENDIAN); } } } @@ -1638,10 +1638,10 @@ dissect_swils_swrjt (tvbuff_t *tvb, proto_tree *swrjt_tree, guint8 isreq _U_) int offset = 0; if (swrjt_tree) { - proto_tree_add_item (swrjt_tree, hf_swils_rjt, tvb, offset+5, 1, 0); - proto_tree_add_item (swrjt_tree, hf_swils_rjtdet, tvb, offset+6, 1, 0); + proto_tree_add_item (swrjt_tree, hf_swils_rjt, tvb, offset+5, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (swrjt_tree, hf_swils_rjtdet, tvb, offset+6, 1, ENC_BIG_ENDIAN); proto_tree_add_item (swrjt_tree, hf_swils_rjtvendor, tvb, offset+7, - 1, 0); + 1, ENC_BIG_ENDIAN); } } @@ -1659,8 +1659,8 @@ dissect_swils_ess (tvbuff_t *tvb, proto_tree *ess_tree, guint8 isreq _U_) return; } - proto_tree_add_item (ess_tree, hf_swils_ess_rev, tvb, offset+4, 4, 0); - proto_tree_add_item (ess_tree, hf_swils_ess_len, tvb, offset+8, 4, 0); + proto_tree_add_item (ess_tree, hf_swils_ess_rev, tvb, offset+4, 4, ENC_BIG_ENDIAN); + proto_tree_add_item (ess_tree, hf_swils_ess_len, tvb, offset+8, 4, ENC_BIG_ENDIAN); len = tvb_get_ntohl (tvb, offset+8); ti = proto_tree_add_text (ess_tree, tvb, offset+12, @@ -1671,7 +1671,7 @@ dissect_swils_ess (tvbuff_t *tvb, proto_tree *ess_tree, guint8 isreq _U_) len -= 256; /* the interconnect obj above is 256 bytes */ offset += 268; - proto_tree_add_item (ess_tree, hf_swils_ess_numobj, tvb, offset, 2, 0); + proto_tree_add_item (ess_tree, hf_swils_ess_numobj, tvb, offset, 2, ENC_BIG_ENDIAN); numcapobj = tvb_get_ntohs (tvb, offset); len -= 4; /* 2B numcapobj + 2B rsvd */ @@ -1696,8 +1696,8 @@ dissect_swils_mrra (tvbuff_t *tvb, proto_tree *tree, guint8 isreq) } if (isreq) { - proto_tree_add_item (tree, hf_swils_mrra_rev, tvb, offset+4, 4, 0); - proto_tree_add_item (tree, hf_swils_mrra_size, tvb, offset+8, 4, 0); + proto_tree_add_item (tree, hf_swils_mrra_rev, tvb, offset+4, 4, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_swils_mrra_size, tvb, offset+8, 4, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_swils_mrra_vendorid, tvb, offset+12, 8, 0); proto_tree_add_item (tree, hf_swils_mrra_vendorinfo, tvb, offset+20, 8, ENC_NA); @@ -1705,11 +1705,11 @@ dissect_swils_mrra (tvbuff_t *tvb, proto_tree *tree, guint8 isreq) proto_tree_add_item (tree, hf_swils_mrra_vendorid, tvb, offset+4, 8, 0); proto_tree_add_item (tree, hf_swils_mrra_reply, tvb, offset+12, - 4, 0); + 4, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_swils_mrra_reply_size, tvb, offset+16, - 4, 0); + 4, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_swils_mrra_waittime, tvb, offset+20, - 4, 0); + 4, ENC_BIG_ENDIAN); } @@ -1883,7 +1883,7 @@ dissect_fcswils (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } if (tree) { - proto_tree_add_item (swils_tree, hf_swils_opcode, tvb, offset, 1, 0); + proto_tree_add_item (swils_tree, hf_swils_opcode, tvb, offset, 1, ENC_BIG_ENDIAN); } if ((opcode < FC_SWILS_MAXCODE) && fcswils_func_table[opcode].func) { diff --git a/epan/dissectors/packet-fefd.c b/epan/dissectors/packet-fefd.c index b1d0bee953..868c734937 100644 --- a/epan/dissectors/packet-fefd.c +++ b/epan/dissectors/packet-fefd.c @@ -112,15 +112,15 @@ dissect_fefd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) fefd_tree = proto_item_add_subtree(ti, ett_fefd); /* FEFD header */ - proto_tree_add_item(fefd_tree, hf_fefd_version, tvb, offset, 1, FALSE); - proto_tree_add_item(fefd_tree, hf_fefd_opcode, tvb, offset, 1, FALSE); + proto_tree_add_item(fefd_tree, hf_fefd_version, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(fefd_tree, hf_fefd_opcode, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - flags_ti = proto_tree_add_item(fefd_tree, hf_fefd_flags, tvb, offset, 1, FALSE); + flags_ti = proto_tree_add_item(fefd_tree, hf_fefd_flags, tvb, offset, 1, ENC_BIG_ENDIAN); flags_tree = proto_item_add_subtree(flags_ti, ett_fefd_flags); proto_tree_add_item(flags_tree, hf_fefd_flags_rt, tvb, offset, 1, FALSE); proto_tree_add_item(flags_tree, hf_fefd_flags_rsy, tvb, offset, 1, FALSE); offset += 1; - proto_tree_add_item(fefd_tree, hf_fefd_checksum, tvb, offset, 2, FALSE); + proto_tree_add_item(fefd_tree, hf_fefd_checksum, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; } else { offset += 4; /* The version/opcode/flags/checksum fields from above */ diff --git a/epan/dissectors/packet-ff.c b/epan/dissectors/packet-ff.c index 5a7c2bde82..eb33348a34 100644 --- a/epan/dissectors/packet-ff.c +++ b/epan/dissectors/packet-ff.c @@ -1818,37 +1818,37 @@ dissect_ff_msg_fda_open_sess_req(tvbuff_t *tvb, gint offset, } proto_tree_add_item(sub_tree, - hf_ff_fda_open_sess_req_sess_idx, tvb, offset, 4, FALSE); + hf_ff_fda_open_sess_req_sess_idx, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; length -= 4; proto_tree_add_item(sub_tree, - hf_ff_fda_open_sess_req_max_buf_siz, tvb, offset, 4, FALSE); + hf_ff_fda_open_sess_req_max_buf_siz, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; length -= 4; proto_tree_add_item(sub_tree, - hf_ff_fda_open_sess_req_max_msg_len, tvb, offset, 4, FALSE); + hf_ff_fda_open_sess_req_max_msg_len, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; length -= 4; proto_tree_add_item(sub_tree, - hf_ff_fda_open_sess_req_reserved, tvb, offset, 1, FALSE); + hf_ff_fda_open_sess_req_reserved, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; length -= 1; proto_tree_add_item(sub_tree, - hf_ff_fda_open_sess_req_nma_conf_use, tvb, offset, 1, FALSE); + hf_ff_fda_open_sess_req_nma_conf_use, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; length -= 1; proto_tree_add_item(sub_tree, - hf_ff_fda_open_sess_req_inactivity_close_time, tvb, offset, 2, FALSE); + hf_ff_fda_open_sess_req_inactivity_close_time, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; length -= 2; proto_tree_add_item(sub_tree, - hf_ff_fda_open_sess_req_transmit_delay_time, tvb, offset, 4, FALSE); + hf_ff_fda_open_sess_req_transmit_delay_time, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; length -= 4; @@ -1892,37 +1892,37 @@ dissect_ff_msg_fda_open_sess_rsp(tvbuff_t *tvb, gint offset, } proto_tree_add_item(sub_tree, - hf_ff_fda_open_sess_rsp_sess_idx, tvb, offset, 4, FALSE); + hf_ff_fda_open_sess_rsp_sess_idx, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; length -= 4; proto_tree_add_item(sub_tree, - hf_ff_fda_open_sess_rsp_max_buf_siz, tvb, offset, 4, FALSE); + hf_ff_fda_open_sess_rsp_max_buf_siz, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; length -= 4; proto_tree_add_item(sub_tree, - hf_ff_fda_open_sess_rsp_max_msg_len, tvb, offset, 4, FALSE); + hf_ff_fda_open_sess_rsp_max_msg_len, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; length -= 4; proto_tree_add_item(sub_tree, - hf_ff_fda_open_sess_rsp_reserved, tvb, offset, 1, FALSE); + hf_ff_fda_open_sess_rsp_reserved, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; length -= 1; proto_tree_add_item(sub_tree, - hf_ff_fda_open_sess_rsp_nma_conf_use, tvb, offset, 1, FALSE); + hf_ff_fda_open_sess_rsp_nma_conf_use, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; length -= 1; proto_tree_add_item(sub_tree, - hf_ff_fda_open_sess_rsp_inactivity_close_time, tvb, offset, 2, FALSE); + hf_ff_fda_open_sess_rsp_inactivity_close_time, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; length -= 2; proto_tree_add_item(sub_tree, - hf_ff_fda_open_sess_rsp_transmit_delay_time, tvb, offset, 4, FALSE); + hf_ff_fda_open_sess_rsp_transmit_delay_time, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; length -= 4; @@ -1970,7 +1970,7 @@ dissect_ff_msg_fda_open_sess_err(tvbuff_t *tvb, gint offset, ErrorClass = tvb_get_guint8(tvb, offset); proto_tree_add_item(sub_tree, - hf_ff_fda_open_sess_err_err_class, tvb, offset, 1, FALSE); + hf_ff_fda_open_sess_err_err_class, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; length -= 1; @@ -1983,7 +1983,7 @@ dissect_ff_msg_fda_open_sess_err(tvbuff_t *tvb, gint offset, length -= 1; proto_tree_add_item(sub_tree, - hf_ff_fda_open_sess_err_additional_code, tvb, offset, 2, FALSE); + hf_ff_fda_open_sess_err_additional_code, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; length -= 2; @@ -2100,7 +2100,7 @@ dissect_ff_msg_fda_idle_err(tvbuff_t *tvb, gint offset, ErrorClass = tvb_get_guint8(tvb, offset); proto_tree_add_item(sub_tree, - hf_ff_fda_idle_err_err_class, tvb, offset, 1, FALSE); + hf_ff_fda_idle_err_err_class, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; length -= 1; @@ -2113,7 +2113,7 @@ dissect_ff_msg_fda_idle_err(tvbuff_t *tvb, gint offset, length -= 1; proto_tree_add_item(sub_tree, - hf_ff_fda_idle_err_additional_code, tvb, offset, 2, FALSE); + hf_ff_fda_idle_err_additional_code, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; length -= 2; @@ -2158,7 +2158,7 @@ dissect_ff_msg_sm_find_tag_query_req(tvbuff_t *tvb, gint offset, } proto_tree_add_item(sub_tree, - hf_ff_sm_find_tag_query_req_query_type, tvb, offset, 1, FALSE); + hf_ff_sm_find_tag_query_req_query_type, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; length -= 1; @@ -2167,7 +2167,7 @@ dissect_ff_msg_sm_find_tag_query_req(tvbuff_t *tvb, gint offset, length -= 3; proto_tree_add_item(sub_tree, - hf_ff_sm_find_tag_query_req_idx, tvb, offset, 4, FALSE); + hf_ff_sm_find_tag_query_req_idx, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; length -= 4; @@ -2270,7 +2270,7 @@ dissect_ff_msg_sm_find_tag_reply_req_list_of_fda_addr_selectors(tvbuff_t *tvb, for(d = 0; d < value; d ++) { proto_tree_add_item(sub_tree, hf_ff_sm_find_tag_reply_req_fda_addr_selector, - tvb, offset, 2, FALSE); + tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; } @@ -2304,27 +2304,27 @@ dissect_ff_msg_sm_find_tag_reply_req(tvbuff_t *tvb, gint offset, } proto_tree_add_item(sub_tree, - hf_ff_sm_find_tag_reply_req_query_type, tvb, offset, 1, FALSE); + hf_ff_sm_find_tag_reply_req_query_type, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; length -= 1; proto_tree_add_item(sub_tree, - hf_ff_sm_find_tag_reply_req_h1_node_addr, tvb, offset, 1, FALSE); + hf_ff_sm_find_tag_reply_req_h1_node_addr, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; length -= 1; proto_tree_add_item(sub_tree, - hf_ff_sm_find_tag_reply_req_fda_addr_link_id, tvb, offset, 2, FALSE); + hf_ff_sm_find_tag_reply_req_fda_addr_link_id, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; length -= 2; proto_tree_add_item(sub_tree, - hf_ff_sm_find_tag_reply_req_vfd_ref, tvb, offset, 4, FALSE); + hf_ff_sm_find_tag_reply_req_vfd_ref, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; length -= 4; proto_tree_add_item(sub_tree, - hf_ff_sm_find_tag_reply_req_od_idx, tvb, offset, 4, FALSE); + hf_ff_sm_find_tag_reply_req_od_idx, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; length -= 4; @@ -2334,7 +2334,7 @@ dissect_ff_msg_sm_find_tag_reply_req(tvbuff_t *tvb, gint offset, length -= 16; proto_tree_add_item(sub_tree, - hf_ff_sm_find_tag_reply_req_od_ver, tvb, offset, 4, FALSE); + hf_ff_sm_find_tag_reply_req_od_ver, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; length -= 4; @@ -2355,14 +2355,14 @@ dissect_ff_msg_sm_find_tag_reply_req(tvbuff_t *tvb, gint offset, length -= 1; proto_tree_add_item(sub_tree, - hf_ff_sm_find_tag_reply_req_reserved, tvb, offset, 1, FALSE); + hf_ff_sm_find_tag_reply_req_reserved, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; length -= 1; NumOfFDAAddrSelectors = tvb_get_ntohs(tvb, offset); proto_tree_add_item(sub_tree, hf_ff_sm_find_tag_reply_req_num_of_fda_addr_selectors, - tvb, offset, 2, FALSE); + tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; length -= 2; @@ -2443,11 +2443,11 @@ dissect_ff_msg_sm_id_rsp_h1_node_addr(tvbuff_t *tvb, proto_tree_add_item(sub_tree, hf_ff_sm_id_rsp_h1_node_addr_ver_num_h1_node_addr, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; proto_tree_add_item(sub_tree, - hf_ff_sm_id_rsp_h1_node_addr_ver_num_ver_num, tvb, offset, 1, FALSE); + hf_ff_sm_id_rsp_h1_node_addr_ver_num_ver_num, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; return; @@ -2507,15 +2507,15 @@ dissect_ff_msg_sm_id_rsp_h1_live_list(tvbuff_t *tvb, } proto_tree_add_item(sub_tree, - hf_ff_sm_id_rsp_h1_live_list_h1_link_id, tvb, offset, 2, FALSE); + hf_ff_sm_id_rsp_h1_live_list_h1_link_id, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(sub_tree, - hf_ff_sm_id_rsp_h1_live_list_reserved, tvb, offset, 1, FALSE); + hf_ff_sm_id_rsp_h1_live_list_reserved, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; proto_tree_add_item(sub_tree, - hf_ff_sm_id_rsp_h1_live_list_ver_num, tvb, offset, 1, FALSE); + hf_ff_sm_id_rsp_h1_live_list_ver_num, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; return; @@ -2838,12 +2838,12 @@ dissect_ff_msg_sm_id_rsp(tvbuff_t *tvb, gint offset, length -= 1; proto_tree_add_item(sub_tree, - hf_ff_sm_id_rsp_dev_idx, tvb, offset, 2, FALSE); + hf_ff_sm_id_rsp_dev_idx, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; length -= 2; proto_tree_add_item(sub_tree, - hf_ff_sm_id_rsp_max_dev_idx, tvb, offset, 2, FALSE); + hf_ff_sm_id_rsp_max_dev_idx, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; length -= 2; @@ -2863,33 +2863,33 @@ dissect_ff_msg_sm_id_rsp(tvbuff_t *tvb, gint offset, length -= 32; proto_tree_add_item(sub_tree, - hf_ff_sm_id_rsp_hse_repeat_time, tvb, offset, 4, FALSE); + hf_ff_sm_id_rsp_hse_repeat_time, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; length -= 4; proto_tree_add_item(sub_tree, - hf_ff_sm_id_rsp_lr_port, tvb, offset, 2, FALSE); + hf_ff_sm_id_rsp_lr_port, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; length -= 2; proto_tree_add_item(sub_tree, - hf_ff_sm_id_rsp_reserved, tvb, offset, 2, FALSE); + hf_ff_sm_id_rsp_reserved, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; length -= 2; proto_tree_add_item(sub_tree, - hf_ff_sm_id_rsp_annunc_ver_num, tvb, offset, 4, FALSE); + hf_ff_sm_id_rsp_annunc_ver_num, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; length -= 4; proto_tree_add_item(sub_tree, - hf_ff_sm_id_rsp_hse_dev_ver_num, tvb, offset, 4, FALSE); + hf_ff_sm_id_rsp_hse_dev_ver_num, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; length -= 4; NumOfEntriesInVerNumList = tvb_get_ntohl(tvb, offset); proto_tree_add_item(sub_tree, - hf_ff_sm_id_rsp_num_of_entries, tvb, offset, 4, FALSE); + hf_ff_sm_id_rsp_num_of_entries, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; length -= 4; @@ -2946,7 +2946,7 @@ dissect_ff_msg_sm_id_err(tvbuff_t *tvb, gint offset, ErrorClass = tvb_get_guint8(tvb, offset); proto_tree_add_item(sub_tree, - hf_ff_sm_id_err_err_class, tvb, offset, 1, FALSE); + hf_ff_sm_id_err_err_class, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; length -= 1; @@ -2959,7 +2959,7 @@ dissect_ff_msg_sm_id_err(tvbuff_t *tvb, gint offset, length -= 1; proto_tree_add_item(sub_tree, - hf_ff_sm_id_err_additional_code, tvb, offset, 2, FALSE); + hf_ff_sm_id_err_additional_code, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; length -= 2; @@ -3014,7 +3014,7 @@ dissect_ff_msg_sm_clear_addr_req(tvbuff_t *tvb, gint offset, length -= 32; proto_tree_add_item(sub_tree, - hf_ff_sm_clear_addr_req_interface_to_clear, tvb, offset, 1, FALSE); + hf_ff_sm_clear_addr_req_interface_to_clear, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; length -= 1; @@ -3095,7 +3095,7 @@ dissect_ff_msg_sm_clear_addr_err(tvbuff_t *tvb, gint offset, ErrorClass = tvb_get_guint8(tvb, offset); proto_tree_add_item(sub_tree, - hf_ff_sm_clear_addr_err_err_class, tvb, offset, 1, FALSE); + hf_ff_sm_clear_addr_err_err_class, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; length -= 1; @@ -3108,7 +3108,7 @@ dissect_ff_msg_sm_clear_addr_err(tvbuff_t *tvb, gint offset, length -= 1; proto_tree_add_item(sub_tree, - hf_ff_sm_clear_addr_err_additional_code, tvb, offset, 2, FALSE); + hf_ff_sm_clear_addr_err_additional_code, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; length -= 2; @@ -3272,7 +3272,7 @@ dissect_ff_msg_sm_set_assign_info_req(tvbuff_t *tvb, gint offset, length -= 32; proto_tree_add_item(sub_tree, - hf_ff_sm_set_assign_info_req_h1_new_addr, tvb, offset, 1, FALSE); + hf_ff_sm_set_assign_info_req_h1_new_addr, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; length -= 1; @@ -3283,22 +3283,22 @@ dissect_ff_msg_sm_set_assign_info_req(tvbuff_t *tvb, gint offset, length -= 1; proto_tree_add_item(sub_tree, - hf_ff_sm_set_assign_info_req_lr_port, tvb, offset, 2, FALSE); + hf_ff_sm_set_assign_info_req_lr_port, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; length -= 2; proto_tree_add_item(sub_tree, - hf_ff_sm_set_assign_info_req_hse_repeat_time, tvb, offset, 4, FALSE); + hf_ff_sm_set_assign_info_req_hse_repeat_time, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; length -= 4; proto_tree_add_item(sub_tree, - hf_ff_sm_set_assign_info_req_dev_idx, tvb, offset, 2, FALSE); + hf_ff_sm_set_assign_info_req_dev_idx, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; length -= 2; proto_tree_add_item(sub_tree, - hf_ff_sm_set_assign_info_req_max_dev_idx, tvb, offset, 2, FALSE); + hf_ff_sm_set_assign_info_req_max_dev_idx, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; length -= 2; @@ -3354,17 +3354,17 @@ dissect_ff_msg_sm_set_assign_info_rsp(tvbuff_t *tvb, gint offset, } proto_tree_add_item(sub_tree, - hf_ff_sm_set_assign_info_rsp_reserved, tvb, offset, 2, FALSE); + hf_ff_sm_set_assign_info_rsp_reserved, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; length -= 2; proto_tree_add_item(sub_tree, - hf_ff_sm_set_assign_info_rsp_max_dev_idx, tvb, offset, 2, FALSE); + hf_ff_sm_set_assign_info_rsp_max_dev_idx, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; length -= 2; proto_tree_add_item(sub_tree, - hf_ff_sm_set_assign_info_rsp_hse_repeat_time, tvb, offset, 4, FALSE); + hf_ff_sm_set_assign_info_rsp_hse_repeat_time, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; length -= 4; @@ -3407,7 +3407,7 @@ dissect_ff_msg_sm_set_assign_info_err(tvbuff_t *tvb, gint offset, ErrorClass = tvb_get_guint8(tvb, offset); proto_tree_add_item(sub_tree, - hf_ff_sm_set_assign_info_err_err_class, tvb, offset, 1, FALSE); + hf_ff_sm_set_assign_info_err_err_class, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; length -= 1; @@ -3421,7 +3421,7 @@ dissect_ff_msg_sm_set_assign_info_err(tvbuff_t *tvb, gint offset, length -= 1; proto_tree_add_item(sub_tree, - hf_ff_sm_set_assign_info_err_additional_code, tvb, offset, 2, FALSE); + hf_ff_sm_set_assign_info_err_additional_code, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; length -= 2; @@ -3551,7 +3551,7 @@ dissect_ff_msg_sm_clear_assign_info_err(tvbuff_t *tvb, gint offset, ErrorClass = tvb_get_guint8(tvb, offset); proto_tree_add_item(sub_tree, - hf_ff_sm_clear_assign_info_err_err_class, tvb, offset, 1, FALSE); + hf_ff_sm_clear_assign_info_err_err_class, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; length -= 1; @@ -3565,7 +3565,7 @@ dissect_ff_msg_sm_clear_assign_info_err(tvbuff_t *tvb, gint offset, length -= 1; proto_tree_add_item(sub_tree, - hf_ff_sm_clear_assign_info_err_additional_code, tvb, offset, 2, FALSE); + hf_ff_sm_clear_assign_info_err_additional_code, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; length -= 2; @@ -3610,12 +3610,12 @@ dissect_ff_msg_sm_dev_annunc_req_h1_node_addr(tvbuff_t *tvb, proto_tree_add_item(sub_tree, hf_ff_sm_dev_annunc_req_h1_node_addr_ver_num_h1_node_addr, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; proto_tree_add_item(sub_tree, hf_ff_sm_dev_annunc_req_h1_node_addr_ver_num_ver_num, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; return; @@ -3675,15 +3675,15 @@ dissect_ff_msg_sm_dev_annunc_req_h1_live_list(tvbuff_t *tvb, } proto_tree_add_item(sub_tree, - hf_ff_sm_dev_annunc_req_h1_live_list_h1_link_id, tvb, offset, 2, FALSE); + hf_ff_sm_dev_annunc_req_h1_live_list_h1_link_id, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(sub_tree, - hf_ff_sm_dev_annunc_req_h1_live_list_reserved, tvb, offset, 1, FALSE); + hf_ff_sm_dev_annunc_req_h1_live_list_reserved, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; proto_tree_add_item(sub_tree, - hf_ff_sm_dev_annunc_req_h1_live_list_ver_num, tvb, offset, 1, FALSE); + hf_ff_sm_dev_annunc_req_h1_live_list_ver_num, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; return; @@ -4008,12 +4008,12 @@ dissect_ff_msg_sm_dev_annunc_req(tvbuff_t *tvb, gint offset, length -= 1; proto_tree_add_item(sub_tree, - hf_ff_sm_dev_annunc_req_dev_idx, tvb, offset, 2, FALSE); + hf_ff_sm_dev_annunc_req_dev_idx, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; length -= 2; proto_tree_add_item(sub_tree, - hf_ff_sm_dev_annunc_req_max_dev_idx, tvb, offset, 2, FALSE); + hf_ff_sm_dev_annunc_req_max_dev_idx, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; length -= 2; @@ -4033,33 +4033,33 @@ dissect_ff_msg_sm_dev_annunc_req(tvbuff_t *tvb, gint offset, length -= 32; proto_tree_add_item(sub_tree, - hf_ff_sm_dev_annunc_req_hse_repeat_time, tvb, offset, 4, FALSE); + hf_ff_sm_dev_annunc_req_hse_repeat_time, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; length -= 4; proto_tree_add_item(sub_tree, - hf_ff_sm_dev_annunc_req_lr_port, tvb, offset, 2, FALSE); + hf_ff_sm_dev_annunc_req_lr_port, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; length -= 2; proto_tree_add_item(sub_tree, - hf_ff_sm_dev_annunc_req_reserved, tvb, offset, 2, FALSE); + hf_ff_sm_dev_annunc_req_reserved, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; length -= 2; proto_tree_add_item(sub_tree, - hf_ff_sm_dev_annunc_req_annunc_ver_num, tvb, offset, 4, FALSE); + hf_ff_sm_dev_annunc_req_annunc_ver_num, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; length -= 4; proto_tree_add_item(sub_tree, - hf_ff_sm_dev_annunc_req_hse_dev_ver_num, tvb, offset, 4, FALSE); + hf_ff_sm_dev_annunc_req_hse_dev_ver_num, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; length -= 4; NumOfEntriesInVerNumList = tvb_get_ntohl(tvb, offset); proto_tree_add_item(sub_tree, - hf_ff_sm_dev_annunc_req_num_of_entries, tvb, offset, 4, FALSE); + hf_ff_sm_dev_annunc_req_num_of_entries, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; length -= 4; @@ -4113,29 +4113,29 @@ dissect_ff_msg_fms_init_req(tvbuff_t *tvb, gint offset, } proto_tree_add_item(sub_tree, - hf_ff_fms_init_req_conn_opt, tvb, offset, 1, FALSE); + hf_ff_fms_init_req_conn_opt, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; length -= 1; proto_tree_add_item(sub_tree, hf_ff_fms_init_req_access_protection_supported_calling, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; length -= 1; proto_tree_add_item(sub_tree, hf_ff_fms_init_req_passwd_and_access_grps_calling, - tvb, offset, 2, FALSE); + tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; length -= 2; proto_tree_add_item(sub_tree, - hf_ff_fms_init_req_ver_od_calling, tvb, offset, 2, FALSE); + hf_ff_fms_init_req_ver_od_calling, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; length -= 2; proto_tree_add_item(sub_tree, - hf_ff_fms_init_req_prof_num_calling, tvb, offset, 2, FALSE); + hf_ff_fms_init_req_prof_num_calling, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; length -= 2; @@ -4179,12 +4179,12 @@ dissect_ff_msg_fms_init_rsp(tvbuff_t *tvb, gint offset, } proto_tree_add_item(sub_tree, - hf_ff_fms_init_rsp_ver_od_called, tvb, offset, 2, FALSE); + hf_ff_fms_init_rsp_ver_od_called, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; length -= 2; proto_tree_add_item(sub_tree, - hf_ff_fms_init_rsp_prof_num_called, tvb, offset, 2, FALSE); + hf_ff_fms_init_rsp_prof_num_called, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; length -= 2; @@ -4226,7 +4226,7 @@ dissect_ff_msg_fms_init_err(tvbuff_t *tvb, gint offset, ErrorClass = tvb_get_guint8(tvb, offset); proto_tree_add_item(sub_tree, - hf_ff_fms_init_err_err_class, tvb, offset, 1, FALSE); + hf_ff_fms_init_err_err_class, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; length -= 1; @@ -4239,7 +4239,7 @@ dissect_ff_msg_fms_init_err(tvbuff_t *tvb, gint offset, length -= 1; proto_tree_add_item(sub_tree, - hf_ff_fms_init_err_additional_code, tvb, offset, 2, FALSE); + hf_ff_fms_init_err_additional_code, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; length -= 2; @@ -4288,17 +4288,17 @@ dissect_ff_msg_fms_abort_req(tvbuff_t *tvb, gint offset, length -= 16; proto_tree_add_item(sub_tree, - hf_ff_fms_abort_req_abort_id, tvb, offset, 1, FALSE); + hf_ff_fms_abort_req_abort_id, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; length -= 1; proto_tree_add_item(sub_tree, - hf_ff_fms_abort_req_reason_code, tvb, offset, 1, FALSE); + hf_ff_fms_abort_req_reason_code, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; length -= 1; proto_tree_add_item(sub_tree, - hf_ff_fms_abort_req_reserved, tvb, offset, 2, FALSE); + hf_ff_fms_abort_req_reserved, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; length -= 2; @@ -4371,17 +4371,17 @@ dissect_ff_msg_fms_status_rsp(tvbuff_t *tvb, gint offset, } proto_tree_add_item(sub_tree, - hf_ff_fms_status_rsp_logical_status, tvb, offset, 1, FALSE); + hf_ff_fms_status_rsp_logical_status, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; length -= 1; proto_tree_add_item(sub_tree, - hf_ff_fms_status_rsp_physical_status, tvb, offset, 1, FALSE); + hf_ff_fms_status_rsp_physical_status, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; length -= 1; proto_tree_add_item(sub_tree, - hf_ff_fms_status_rsp_reserved, tvb, offset, 2, FALSE); + hf_ff_fms_status_rsp_reserved, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; length -= 2; @@ -4428,7 +4428,7 @@ dissect_ff_msg_fms_status_err(tvbuff_t *tvb, gint offset, ErrorClass = tvb_get_guint8(tvb, offset); proto_tree_add_item(sub_tree, - hf_ff_fms_status_err_err_class, tvb, offset, 1, FALSE); + hf_ff_fms_status_err_err_class, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; length -= 1; @@ -4441,7 +4441,7 @@ dissect_ff_msg_fms_status_err(tvbuff_t *tvb, gint offset, length -= 1; proto_tree_add_item(sub_tree, - hf_ff_fms_status_err_additional_code, tvb, offset, 2, FALSE); + hf_ff_fms_status_err_additional_code, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; length -= 2; @@ -4486,18 +4486,18 @@ dissect_ff_msg_fms_unsolicited_status_req(tvbuff_t *tvb, gint offset, } proto_tree_add_item(sub_tree, - hf_ff_fms_unsolicited_status_req_logical_status, tvb, offset, 1, FALSE); + hf_ff_fms_unsolicited_status_req_logical_status, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; length -= 1; proto_tree_add_item(sub_tree, hf_ff_fms_unsolicited_status_req_physical_status, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; length -= 1; proto_tree_add_item(sub_tree, - hf_ff_fms_unsolicited_status_req_reserved, tvb, offset, 2, FALSE); + hf_ff_fms_unsolicited_status_req_reserved, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; length -= 2; @@ -4628,7 +4628,7 @@ dissect_ff_msg_fms_id_err(tvbuff_t *tvb, gint offset, ErrorClass = tvb_get_guint8(tvb, offset); proto_tree_add_item(sub_tree, - hf_ff_fms_id_err_err_class, tvb, offset, 1, FALSE); + hf_ff_fms_id_err_err_class, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; length -= 1; @@ -4641,7 +4641,7 @@ dissect_ff_msg_fms_id_err(tvbuff_t *tvb, gint offset, length -= 1; proto_tree_add_item(sub_tree, - hf_ff_fms_id_err_additional_code, tvb, offset, 2, FALSE); + hf_ff_fms_id_err_additional_code, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; length -= 2; @@ -4685,22 +4685,22 @@ dissect_ff_msg_fms_get_od_req(tvbuff_t *tvb, gint offset, } proto_tree_add_item(sub_tree, - hf_ff_fms_get_od_req_all_attrs, tvb, offset, 1, FALSE); + hf_ff_fms_get_od_req_all_attrs, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; length -= 1; proto_tree_add_item(sub_tree, - hf_ff_fms_get_od_req_start_idx_flag, tvb, offset, 1, FALSE); + hf_ff_fms_get_od_req_start_idx_flag, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; length -= 1; proto_tree_add_item(sub_tree, - hf_ff_fms_get_od_req_reserved, tvb, offset, 2, FALSE); + hf_ff_fms_get_od_req_reserved, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; length -= 2; proto_tree_add_item(sub_tree, - hf_ff_fms_get_od_req_idx, tvb, offset, 4, FALSE); + hf_ff_fms_get_od_req_idx, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; length -= 4; @@ -4738,17 +4738,17 @@ dissect_ff_msg_fms_get_od_rsp(tvbuff_t *tvb, gint offset, } proto_tree_add_item(sub_tree, - hf_ff_fms_get_od_rsp_more_follows, tvb, offset, 1, FALSE); + hf_ff_fms_get_od_rsp_more_follows, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; length -= 1; proto_tree_add_item(sub_tree, - hf_ff_fms_get_od_rsp_num_of_obj_desc, tvb, offset, 1, FALSE); + hf_ff_fms_get_od_rsp_num_of_obj_desc, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; length -= 1; proto_tree_add_item(sub_tree, - hf_ff_fms_get_od_rsp_reserved, tvb, offset, 2, FALSE); + hf_ff_fms_get_od_rsp_reserved, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; length -= 2; @@ -4790,7 +4790,7 @@ dissect_ff_msg_fms_get_od_err(tvbuff_t *tvb, gint offset, ErrorClass = tvb_get_guint8(tvb, offset); proto_tree_add_item(sub_tree, - hf_ff_fms_get_od_err_err_class, tvb, offset, 1, FALSE); + hf_ff_fms_get_od_err_err_class, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; length -= 1; @@ -4803,7 +4803,7 @@ dissect_ff_msg_fms_get_od_err(tvbuff_t *tvb, gint offset, length -= 1; proto_tree_add_item(sub_tree, - hf_ff_fms_get_od_err_additional_code, tvb, offset, 2, FALSE); + hf_ff_fms_get_od_err_additional_code, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; length -= 2; @@ -4848,12 +4848,12 @@ dissect_ff_msg_fms_init_put_od_req(tvbuff_t *tvb, gint offset, } proto_tree_add_item(sub_tree, - hf_ff_fms_init_put_od_req_reserved, tvb, offset, 2, FALSE); + hf_ff_fms_init_put_od_req_reserved, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; length -= 2; proto_tree_add_item(sub_tree, - hf_ff_fms_init_put_od_req_consequence, tvb, offset, 2, FALSE); + hf_ff_fms_init_put_od_req_consequence, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; length -= 2; @@ -4930,7 +4930,7 @@ dissect_ff_msg_fms_init_put_od_err(tvbuff_t *tvb, gint offset, ErrorClass = tvb_get_guint8(tvb, offset); proto_tree_add_item(sub_tree, - hf_ff_fms_init_put_od_err_err_class, tvb, offset, 1, FALSE); + hf_ff_fms_init_put_od_err_err_class, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; length -= 1; @@ -4943,7 +4943,7 @@ dissect_ff_msg_fms_init_put_od_err(tvbuff_t *tvb, gint offset, length -= 1; proto_tree_add_item(sub_tree, - hf_ff_fms_init_put_od_err_additional_code, tvb, offset, 2, FALSE); + hf_ff_fms_init_put_od_err_additional_code, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; length -= 2; @@ -4987,7 +4987,7 @@ dissect_ff_msg_fms_put_od_req(tvbuff_t *tvb, gint offset, } proto_tree_add_item(sub_tree, - hf_ff_fms_put_od_req_num_of_obj_desc, tvb, offset, 1, FALSE); + hf_ff_fms_put_od_req_num_of_obj_desc, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; length -= 1; @@ -5066,7 +5066,7 @@ dissect_ff_msg_fms_put_od_err(tvbuff_t *tvb, gint offset, ErrorClass = tvb_get_guint8(tvb, offset); proto_tree_add_item(sub_tree, - hf_ff_fms_put_od_err_err_class, tvb, offset, 1, FALSE); + hf_ff_fms_put_od_err_err_class, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; length -= 1; @@ -5079,7 +5079,7 @@ dissect_ff_msg_fms_put_od_err(tvbuff_t *tvb, gint offset, length -= 1; proto_tree_add_item(sub_tree, - hf_ff_fms_put_od_err_additional_code, tvb, offset, 2, FALSE); + hf_ff_fms_put_od_err_additional_code, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; length -= 2; @@ -5195,13 +5195,13 @@ dissect_ff_msg_fms_terminate_put_od_err(tvbuff_t *tvb, gint offset, } proto_tree_add_item(sub_tree, - hf_ff_fms_terminate_put_od_err_index, tvb, offset, 4, FALSE); + hf_ff_fms_terminate_put_od_err_index, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; length -= 4; ErrorClass = tvb_get_guint8(tvb, offset); proto_tree_add_item(sub_tree, - hf_ff_fms_terminate_put_od_err_err_class, tvb, offset, 1, FALSE); + hf_ff_fms_terminate_put_od_err_err_class, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; length -= 1; @@ -5215,7 +5215,7 @@ dissect_ff_msg_fms_terminate_put_od_err(tvbuff_t *tvb, gint offset, length -= 1; proto_tree_add_item(sub_tree, - hf_ff_fms_terminate_put_od_err_additional_code, tvb, offset, 2, FALSE); + hf_ff_fms_terminate_put_od_err_additional_code, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; length -= 2; @@ -5263,7 +5263,7 @@ dissect_ff_msg_fms_generic_init_download_sequence_req( } proto_tree_add_item(sub_tree, - hf_ff_fms_gen_init_download_seq_req_idx, tvb, offset, 4, FALSE); + hf_ff_fms_gen_init_download_seq_req_idx, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; length -= 4; @@ -5343,7 +5343,7 @@ dissect_ff_msg_fms_generic_init_download_sequence_err( ErrorClass = tvb_get_guint8(tvb, offset); proto_tree_add_item(sub_tree, - hf_ff_fms_gen_init_download_seq_err_err_class, tvb, offset, 1, FALSE); + hf_ff_fms_gen_init_download_seq_err_err_class, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; length -= 1; @@ -5358,7 +5358,7 @@ dissect_ff_msg_fms_generic_init_download_sequence_err( proto_tree_add_item(sub_tree, hf_ff_fms_gen_init_download_seq_err_additional_code, - tvb, offset, 2, FALSE); + tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; length -= 2; @@ -5405,12 +5405,12 @@ dissect_ff_msg_fms_generic_download_segment_req( } proto_tree_add_item(sub_tree, - hf_ff_fms_gen_download_seg_req_idx, tvb, offset, 4, FALSE); + hf_ff_fms_gen_download_seg_req_idx, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; length -= 4; proto_tree_add_item(sub_tree, - hf_ff_fms_gen_download_seg_req_more_follows, tvb, offset, 1, FALSE); + hf_ff_fms_gen_download_seg_req_more_follows, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; length -= 1; @@ -5494,7 +5494,7 @@ dissect_ff_msg_fms_generic_download_segment_err( ErrorClass = tvb_get_guint8(tvb, offset); proto_tree_add_item(sub_tree, - hf_ff_fms_gen_download_seg_err_err_class, tvb, offset, 1, FALSE); + hf_ff_fms_gen_download_seg_err_err_class, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; length -= 1; @@ -5508,7 +5508,7 @@ dissect_ff_msg_fms_generic_download_segment_err( length -= 1; proto_tree_add_item(sub_tree, - hf_ff_fms_gen_download_seg_err_additional_code, tvb, offset, 2, FALSE); + hf_ff_fms_gen_download_seg_err_additional_code, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; length -= 2; @@ -5557,7 +5557,7 @@ dissect_ff_msg_fms_generic_terminate_download_sequence_req( } proto_tree_add_item(sub_tree, - hf_ff_fms_gen_terminate_download_seq_req_idx, tvb, offset, 4, FALSE); + hf_ff_fms_gen_terminate_download_seq_req_idx, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; length -= 4; @@ -5599,7 +5599,7 @@ dissect_ff_msg_fms_generic_terminate_download_sequence_rsp( proto_tree_add_item(sub_tree, hf_ff_fms_gen_terminate_download_seq_rsp_final_result, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; length -= 1; @@ -5649,7 +5649,7 @@ dissect_ff_msg_fms_generic_terminate_download_sequence_err( ErrorClass = tvb_get_guint8(tvb, offset); proto_tree_add_item(sub_tree, hf_ff_fms_gen_terminate_download_seq_err_err_class, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; length -= 1; @@ -5664,7 +5664,7 @@ dissect_ff_msg_fms_generic_terminate_download_sequence_err( proto_tree_add_item(sub_tree, hf_ff_fms_gen_terminate_download_seq_err_additional_code, - tvb, offset, 2, FALSE); + tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; length -= 2; @@ -5712,7 +5712,7 @@ dissect_ff_msg_fms_init_download_sequence_req( } proto_tree_add_item(sub_tree, - hf_ff_fms_init_download_seq_req_idx, tvb, offset, 4, FALSE); + hf_ff_fms_init_download_seq_req_idx, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; length -= 4; @@ -5792,7 +5792,7 @@ dissect_ff_msg_fms_init_download_sequence_err( ErrorClass = tvb_get_guint8(tvb, offset); proto_tree_add_item(sub_tree, - hf_ff_fms_init_download_seq_err_err_class, tvb, offset, 1, FALSE); + hf_ff_fms_init_download_seq_err_err_class, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; length -= 1; @@ -5806,7 +5806,7 @@ dissect_ff_msg_fms_init_download_sequence_err( length -= 1; proto_tree_add_item(sub_tree, - hf_ff_fms_init_download_seq_err_additional_code, tvb, offset, 2, FALSE); + hf_ff_fms_init_download_seq_err_additional_code, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; length -= 2; @@ -5852,7 +5852,7 @@ dissect_ff_msg_fms_download_segment_req(tvbuff_t *tvb, gint offset, } proto_tree_add_item(sub_tree, - hf_ff_fms_download_seg_req_idx, tvb, offset, 4, FALSE); + hf_ff_fms_download_seg_req_idx, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; length -= 4; @@ -5891,7 +5891,7 @@ dissect_ff_msg_fms_download_segment_rsp(tvbuff_t *tvb, gint offset, } proto_tree_add_item(sub_tree, - hf_ff_fms_download_seg_rsp_more_follows, tvb, offset, 1, FALSE); + hf_ff_fms_download_seg_rsp_more_follows, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; length -= 1; @@ -5938,7 +5938,7 @@ dissect_ff_msg_fms_download_segment_err(tvbuff_t *tvb, gint offset, ErrorClass = tvb_get_guint8(tvb, offset); proto_tree_add_item(sub_tree, - hf_ff_fms_download_seg_err_err_class, tvb, offset, 1, FALSE); + hf_ff_fms_download_seg_err_err_class, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; length -= 1; @@ -5951,7 +5951,7 @@ dissect_ff_msg_fms_download_segment_err(tvbuff_t *tvb, gint offset, length -= 1; proto_tree_add_item(sub_tree, - hf_ff_fms_download_seg_err_additional_code, tvb, offset, 2, FALSE); + hf_ff_fms_download_seg_err_additional_code, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; length -= 2; @@ -5999,7 +5999,7 @@ dissect_ff_msg_fms_terminate_download_sequence_req( } proto_tree_add_item(sub_tree, - hf_ff_fms_terminate_download_seq_req_idx, tvb, offset, 4, FALSE); + hf_ff_fms_terminate_download_seq_req_idx, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; length -= 4; @@ -6009,7 +6009,7 @@ dissect_ff_msg_fms_terminate_download_sequence_req( proto_tree_add_item(sub_tree, hf_ff_fms_terminate_download_seq_req_final_result, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; length -= 1; @@ -6090,7 +6090,7 @@ dissect_ff_msg_fms_terminate_download_sequence_err( ErrorClass = tvb_get_guint8(tvb, offset); proto_tree_add_item(sub_tree, - hf_ff_fms_terminate_download_seq_err_err_class, tvb, offset, 1, FALSE); + hf_ff_fms_terminate_download_seq_err_err_class, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; length -= 1; @@ -6105,7 +6105,7 @@ dissect_ff_msg_fms_terminate_download_sequence_err( proto_tree_add_item(sub_tree, hf_ff_fms_terminate_download_seq_err_additional_code, - tvb, offset, 2, FALSE); + tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; length -= 2; @@ -6152,7 +6152,7 @@ dissect_ff_msg_fms_init_upload_seq_req( } proto_tree_add_item(sub_tree, - hf_ff_fms_init_upload_seq_req_idx, tvb, offset, 4, FALSE); + hf_ff_fms_init_upload_seq_req_idx, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; length -= 4; @@ -6231,7 +6231,7 @@ dissect_ff_msg_fms_init_upload_seq_err( ErrorClass = tvb_get_guint8(tvb, offset); proto_tree_add_item(sub_tree, - hf_ff_fms_init_upload_seq_err_err_class, tvb, offset, 1, FALSE); + hf_ff_fms_init_upload_seq_err_err_class, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; length -= 1; @@ -6244,7 +6244,7 @@ dissect_ff_msg_fms_init_upload_seq_err( length -= 1; proto_tree_add_item(sub_tree, - hf_ff_fms_init_upload_seq_err_additional_code, tvb, offset, 2, FALSE); + hf_ff_fms_init_upload_seq_err_additional_code, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; length -= 2; @@ -6289,7 +6289,7 @@ dissect_ff_msg_fms_upload_segment_req(tvbuff_t *tvb, gint offset, } proto_tree_add_item(sub_tree, - hf_ff_fms_upload_seg_req_idx, tvb, offset, 4, FALSE); + hf_ff_fms_upload_seg_req_idx, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; length -= 4; @@ -6328,7 +6328,7 @@ dissect_ff_msg_fms_upload_segment_rsp(tvbuff_t *tvb, gint offset, } proto_tree_add_item(sub_tree, - hf_ff_fms_upload_seg_rsp_more_follows, tvb, offset, 1, FALSE); + hf_ff_fms_upload_seg_rsp_more_follows, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; length -= 1; @@ -6375,7 +6375,7 @@ dissect_ff_msg_fms_upload_segment_err(tvbuff_t *tvb, gint offset, ErrorClass = tvb_get_guint8(tvb, offset); proto_tree_add_item(sub_tree, - hf_ff_fms_upload_seg_err_err_class, tvb, offset, 1, FALSE); + hf_ff_fms_upload_seg_err_err_class, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; length -= 1; @@ -6388,7 +6388,7 @@ dissect_ff_msg_fms_upload_segment_err(tvbuff_t *tvb, gint offset, length -= 1; proto_tree_add_item(sub_tree, - hf_ff_fms_upload_seg_err_additional_code, tvb, offset, 2, FALSE); + hf_ff_fms_upload_seg_err_additional_code, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; length -= 2; @@ -6435,7 +6435,7 @@ dissect_ff_msg_fms_terminate_upload_seq_req( } proto_tree_add_item(sub_tree, - hf_ff_fms_terminate_upload_seq_req_idx, tvb, offset, 4, FALSE); + hf_ff_fms_terminate_upload_seq_req_idx, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; length -= 4; @@ -6515,7 +6515,7 @@ dissect_ff_msg_fms_terminate_upload_seq_err( ErrorClass = tvb_get_guint8(tvb, offset); proto_tree_add_item(sub_tree, - hf_ff_fms_terminate_upload_seq_err_err_class, tvb, offset, 1, FALSE); + hf_ff_fms_terminate_upload_seq_err_err_class, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; length -= 1; @@ -6530,7 +6530,7 @@ dissect_ff_msg_fms_terminate_upload_seq_err( proto_tree_add_item(sub_tree, hf_ff_fms_terminate_upload_seq_err_additional_code, - tvb, offset, 2, FALSE); + tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; length -= 2; @@ -6577,7 +6577,7 @@ dissect_ff_msg_fms_req_dom_download_req( } proto_tree_add_item(sub_tree, - hf_ff_fms_req_dom_download_req_idx, tvb, offset, 4, FALSE); + hf_ff_fms_req_dom_download_req_idx, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; length -= 4; @@ -6658,7 +6658,7 @@ dissect_ff_msg_fms_req_dom_download_err( ErrorClass = tvb_get_guint8(tvb, offset); proto_tree_add_item(sub_tree, - hf_ff_fms_req_dom_download_err_err_class, tvb, offset, 1, FALSE); + hf_ff_fms_req_dom_download_err_err_class, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; length -= 1; @@ -6672,7 +6672,7 @@ dissect_ff_msg_fms_req_dom_download_err( length -= 1; proto_tree_add_item(sub_tree, - hf_ff_fms_req_dom_download_err_additional_code, tvb, offset, 2, FALSE); + hf_ff_fms_req_dom_download_err_additional_code, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; length -= 2; @@ -6719,7 +6719,7 @@ dissect_ff_msg_fms_req_dom_upload_req( } proto_tree_add_item(sub_tree, - hf_ff_fms_req_dom_upload_req_idx, tvb, offset, 4, FALSE); + hf_ff_fms_req_dom_upload_req_idx, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; length -= 4; @@ -6800,7 +6800,7 @@ dissect_ff_msg_fms_req_dom_upload_err( ErrorClass = tvb_get_guint8(tvb, offset); proto_tree_add_item(sub_tree, - hf_ff_fms_req_dom_upload_err_err_class, tvb, offset, 1, FALSE); + hf_ff_fms_req_dom_upload_err_err_class, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; length -= 1; @@ -6813,7 +6813,7 @@ dissect_ff_msg_fms_req_dom_upload_err( length -= 1; proto_tree_add_item(sub_tree, - hf_ff_fms_req_dom_upload_err_additional_code, tvb, offset, 2, FALSE); + hf_ff_fms_req_dom_upload_err_additional_code, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; length -= 2; @@ -6860,7 +6860,7 @@ dissect_ff_msg_fms_create_pi_req_dom_idxes(tvbuff_t *tvb, for(d = 0; d < value; d ++) { proto_tree_add_item(sub_tree, - hf_ff_fms_create_pi_req_dom_idx, tvb, offset, 4, FALSE); + hf_ff_fms_create_pi_req_dom_idx, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; } @@ -6894,18 +6894,18 @@ dissect_ff_msg_fms_create_pi_req(tvbuff_t *tvb, gint offset, } proto_tree_add_item(sub_tree, - hf_ff_fms_create_pi_req_reusable, tvb, offset, 1, FALSE); + hf_ff_fms_create_pi_req_reusable, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; length -= 1; proto_tree_add_item(sub_tree, - hf_ff_fms_create_pi_req_reserved, tvb, offset, 1, FALSE); + hf_ff_fms_create_pi_req_reserved, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; length -= 1; NumOfDomIdxes = tvb_get_ntohs(tvb, offset); proto_tree_add_item(sub_tree, - hf_ff_fms_create_pi_req_num_of_dom_idxes, tvb, offset, 2, FALSE); + hf_ff_fms_create_pi_req_num_of_dom_idxes, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; length -= 2; @@ -6953,7 +6953,7 @@ dissect_ff_msg_fms_create_pi_rsp(tvbuff_t *tvb, gint offset, } proto_tree_add_item(sub_tree, - hf_ff_fms_create_pi_rsp_idx, tvb, offset, 4, FALSE); + hf_ff_fms_create_pi_rsp_idx, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; length -= 4; @@ -6997,7 +6997,7 @@ dissect_ff_msg_fms_create_pi_err(tvbuff_t *tvb, gint offset, ErrorClass = tvb_get_guint8(tvb, offset); proto_tree_add_item(sub_tree, - hf_ff_fms_create_pi_err_err_class, tvb, offset, 1, FALSE); + hf_ff_fms_create_pi_err_err_class, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; length -= 1; @@ -7010,7 +7010,7 @@ dissect_ff_msg_fms_create_pi_err(tvbuff_t *tvb, gint offset, length -= 1; proto_tree_add_item(sub_tree, - hf_ff_fms_create_pi_err_additional_code, tvb, offset, 2, FALSE); + hf_ff_fms_create_pi_err_additional_code, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; length -= 2; @@ -7057,7 +7057,7 @@ dissect_ff_msg_fms_del_pi_req(tvbuff_t *tvb, gint offset, } proto_tree_add_item(sub_tree, - hf_ff_fms_del_pi_req_idx, tvb, offset, 4, FALSE); + hf_ff_fms_del_pi_req_idx, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; length -= 4; @@ -7136,7 +7136,7 @@ dissect_ff_msg_fms_del_pi_err(tvbuff_t *tvb, gint offset, ErrorClass = tvb_get_guint8(tvb, offset); proto_tree_add_item(sub_tree, - hf_ff_fms_del_pi_err_err_class, tvb, offset, 1, FALSE); + hf_ff_fms_del_pi_err_err_class, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; length -= 1; @@ -7149,7 +7149,7 @@ dissect_ff_msg_fms_del_pi_err(tvbuff_t *tvb, gint offset, length -= 1; proto_tree_add_item(sub_tree, - hf_ff_fms_del_pi_err_additional_code, tvb, offset, 2, FALSE); + hf_ff_fms_del_pi_err_additional_code, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; length -= 2; @@ -7194,7 +7194,7 @@ dissect_ff_msg_fms_start_pi_req(tvbuff_t *tvb, gint offset, } proto_tree_add_item(sub_tree, - hf_ff_fms_start_req_idx, tvb, offset, 4, FALSE); + hf_ff_fms_start_req_idx, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; length -= 4; @@ -7269,7 +7269,7 @@ dissect_ff_msg_fms_start_pi_err(tvbuff_t *tvb, gint offset, } proto_tree_add_item(sub_tree, - hf_ff_fms_start_err_pi_state, tvb, offset, 1, FALSE); + hf_ff_fms_start_err_pi_state, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; length -= 1; @@ -7279,7 +7279,7 @@ dissect_ff_msg_fms_start_pi_err(tvbuff_t *tvb, gint offset, ErrorClass = tvb_get_guint8(tvb, offset); proto_tree_add_item(sub_tree, - hf_ff_fms_start_err_err_class, tvb, offset, 1, FALSE); + hf_ff_fms_start_err_err_class, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; length -= 1; @@ -7292,7 +7292,7 @@ dissect_ff_msg_fms_start_pi_err(tvbuff_t *tvb, gint offset, length -= 1; proto_tree_add_item(sub_tree, - hf_ff_fms_start_err_additional_code, tvb, offset, 2, FALSE); + hf_ff_fms_start_err_additional_code, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; length -= 2; @@ -7336,7 +7336,7 @@ dissect_ff_msg_fms_stop_pi_req(tvbuff_t *tvb, gint offset, } proto_tree_add_item(sub_tree, - hf_ff_fms_stop_req_idx, tvb, offset, 4, FALSE); + hf_ff_fms_stop_req_idx, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; length -= 4; @@ -7411,7 +7411,7 @@ dissect_ff_msg_fms_stop_pi_err(tvbuff_t *tvb, gint offset, } proto_tree_add_item(sub_tree, - hf_ff_fms_stop_err_pi_state, tvb, offset, 1, FALSE); + hf_ff_fms_stop_err_pi_state, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; length -= 1; @@ -7421,7 +7421,7 @@ dissect_ff_msg_fms_stop_pi_err(tvbuff_t *tvb, gint offset, ErrorClass = tvb_get_guint8(tvb, offset); proto_tree_add_item(sub_tree, - hf_ff_fms_stop_err_err_class, tvb, offset, 1, FALSE); + hf_ff_fms_stop_err_err_class, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; length -= 1; @@ -7434,7 +7434,7 @@ dissect_ff_msg_fms_stop_pi_err(tvbuff_t *tvb, gint offset, length -= 1; proto_tree_add_item(sub_tree, - hf_ff_fms_stop_err_additional_code, tvb, offset, 2, FALSE); + hf_ff_fms_stop_err_additional_code, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; length -= 2; @@ -7478,7 +7478,7 @@ dissect_ff_msg_fms_resume_pi_req(tvbuff_t *tvb, gint offset, } proto_tree_add_item(sub_tree, - hf_ff_fms_resume_req_idx, tvb, offset, 4, FALSE); + hf_ff_fms_resume_req_idx, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; length -= 4; @@ -7553,7 +7553,7 @@ dissect_ff_msg_fms_resume_pi_err(tvbuff_t *tvb, gint offset, } proto_tree_add_item(sub_tree, - hf_ff_fms_resume_err_pi_state, tvb, offset, 1, FALSE); + hf_ff_fms_resume_err_pi_state, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; length -= 1; @@ -7563,7 +7563,7 @@ dissect_ff_msg_fms_resume_pi_err(tvbuff_t *tvb, gint offset, ErrorClass = tvb_get_guint8(tvb, offset); proto_tree_add_item(sub_tree, - hf_ff_fms_resume_err_err_class, tvb, offset, 1, FALSE); + hf_ff_fms_resume_err_err_class, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; length -= 1; @@ -7576,7 +7576,7 @@ dissect_ff_msg_fms_resume_pi_err(tvbuff_t *tvb, gint offset, length -= 1; proto_tree_add_item(sub_tree, - hf_ff_fms_resume_err_additional_code, tvb, offset, 2, FALSE); + hf_ff_fms_resume_err_additional_code, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; length -= 2; @@ -7620,7 +7620,7 @@ dissect_ff_msg_fms_reset_pi_req(tvbuff_t *tvb, gint offset, } proto_tree_add_item(sub_tree, - hf_ff_fms_reset_req_idx, tvb, offset, 4, FALSE); + hf_ff_fms_reset_req_idx, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; length -= 4; @@ -7695,7 +7695,7 @@ dissect_ff_msg_fms_reset_pi_err(tvbuff_t *tvb, gint offset, } proto_tree_add_item(sub_tree, - hf_ff_fms_reset_err_pi_state, tvb, offset, 1, FALSE); + hf_ff_fms_reset_err_pi_state, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; length -= 1; @@ -7705,7 +7705,7 @@ dissect_ff_msg_fms_reset_pi_err(tvbuff_t *tvb, gint offset, ErrorClass = tvb_get_guint8(tvb, offset); proto_tree_add_item(sub_tree, - hf_ff_fms_reset_err_err_class, tvb, offset, 1, FALSE); + hf_ff_fms_reset_err_err_class, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; length -= 1; @@ -7718,7 +7718,7 @@ dissect_ff_msg_fms_reset_pi_err(tvbuff_t *tvb, gint offset, length -= 1; proto_tree_add_item(sub_tree, - hf_ff_fms_reset_err_additional_code, tvb, offset, 2, FALSE); + hf_ff_fms_reset_err_additional_code, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; length -= 2; @@ -7762,7 +7762,7 @@ dissect_ff_msg_fms_kill_pi_req(tvbuff_t *tvb, gint offset, } proto_tree_add_item(sub_tree, - hf_ff_fms_kill_req_idx, tvb, offset, 4, FALSE); + hf_ff_fms_kill_req_idx, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; length -= 4; @@ -7838,7 +7838,7 @@ dissect_ff_msg_fms_kill_pi_err(tvbuff_t *tvb, gint offset, ErrorClass = tvb_get_guint8(tvb, offset); proto_tree_add_item(sub_tree, - hf_ff_fms_kill_err_err_class, tvb, offset, 1, FALSE); + hf_ff_fms_kill_err_err_class, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; length -= 1; @@ -7851,7 +7851,7 @@ dissect_ff_msg_fms_kill_pi_err(tvbuff_t *tvb, gint offset, length -= 1; proto_tree_add_item(sub_tree, - hf_ff_fms_kill_err_additional_code, tvb, offset, 2, FALSE); + hf_ff_fms_kill_err_additional_code, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; length -= 2; @@ -7895,7 +7895,7 @@ dissect_ff_msg_fms_read_req(tvbuff_t *tvb, gint offset, } proto_tree_add_item(sub_tree, - hf_ff_fms_read_req_idx, tvb, offset, 4, FALSE); + hf_ff_fms_read_req_idx, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; length -= 4; @@ -7968,7 +7968,7 @@ dissect_ff_msg_fms_read_err(tvbuff_t *tvb, gint offset, ErrorClass = tvb_get_guint8(tvb, offset); proto_tree_add_item(sub_tree, - hf_ff_fms_read_err_err_class, tvb, offset, 1, FALSE); + hf_ff_fms_read_err_err_class, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; length -= 1; @@ -7981,7 +7981,7 @@ dissect_ff_msg_fms_read_err(tvbuff_t *tvb, gint offset, length -= 1; proto_tree_add_item(sub_tree, - hf_ff_fms_read_err_additional_code, tvb, offset, 2, FALSE); + hf_ff_fms_read_err_additional_code, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; length -= 2; @@ -8026,12 +8026,12 @@ dissect_ff_msg_fms_read_subindex_req(tvbuff_t *tvb, gint offset, } proto_tree_add_item(sub_tree, - hf_ff_fms_read_with_subidx_req_idx, tvb, offset, 4, FALSE); + hf_ff_fms_read_with_subidx_req_idx, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; length -= 4; proto_tree_add_item(sub_tree, - hf_ff_fms_read_with_subidx_req_subidx, tvb, offset, 4, FALSE); + hf_ff_fms_read_with_subidx_req_subidx, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; length -= 4; @@ -8106,7 +8106,7 @@ dissect_ff_msg_fms_read_subindex_err(tvbuff_t *tvb, gint offset, ErrorClass = tvb_get_guint8(tvb, offset); proto_tree_add_item(sub_tree, - hf_ff_fms_read_with_subidx_err_err_class, tvb, offset, 1, FALSE); + hf_ff_fms_read_with_subidx_err_err_class, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; length -= 1; @@ -8120,7 +8120,7 @@ dissect_ff_msg_fms_read_subindex_err(tvbuff_t *tvb, gint offset, length -= 1; proto_tree_add_item(sub_tree, - hf_ff_fms_read_with_subidx_err_additional_code, tvb, offset, 2, FALSE); + hf_ff_fms_read_with_subidx_err_additional_code, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; length -= 2; @@ -8165,7 +8165,7 @@ dissect_ff_msg_fms_write_req(tvbuff_t *tvb, gint offset, } proto_tree_add_item(sub_tree, - hf_ff_fms_write_req_idx, tvb, offset, 4, FALSE); + hf_ff_fms_write_req_idx, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; length -= 4; @@ -8241,7 +8241,7 @@ dissect_ff_msg_fms_write_err(tvbuff_t *tvb, gint offset, ErrorClass = tvb_get_guint8(tvb, offset); proto_tree_add_item(sub_tree, - hf_ff_fms_write_err_err_class, tvb, offset, 1, FALSE); + hf_ff_fms_write_err_err_class, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; length -= 1; @@ -8254,7 +8254,7 @@ dissect_ff_msg_fms_write_err(tvbuff_t *tvb, gint offset, length -= 1; proto_tree_add_item(sub_tree, - hf_ff_fms_write_err_additional_code, tvb, offset, 2, FALSE); + hf_ff_fms_write_err_additional_code, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; length -= 2; @@ -8299,12 +8299,12 @@ dissect_ff_msg_fms_write_subindex_req(tvbuff_t *tvb, gint offset, } proto_tree_add_item(sub_tree, - hf_ff_fms_write_with_subidx_req_idx, tvb, offset, 4, FALSE); + hf_ff_fms_write_with_subidx_req_idx, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; length -= 4; proto_tree_add_item(sub_tree, - hf_ff_fms_write_with_subidx_req_subidx, tvb, offset, 4, FALSE); + hf_ff_fms_write_with_subidx_req_subidx, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; length -= 4; @@ -8381,7 +8381,7 @@ dissect_ff_msg_fms_write_subindex_err(tvbuff_t *tvb, gint offset, ErrorClass = tvb_get_guint8(tvb, offset); proto_tree_add_item(sub_tree, - hf_ff_fms_write_with_subidx_err_err_class, tvb, offset, 1, FALSE); + hf_ff_fms_write_with_subidx_err_err_class, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; length -= 1; @@ -8395,7 +8395,7 @@ dissect_ff_msg_fms_write_subindex_err(tvbuff_t *tvb, gint offset, length -= 1; proto_tree_add_item(sub_tree, - hf_ff_fms_write_with_subidx_err_additional_code, tvb, offset, 2, FALSE); + hf_ff_fms_write_with_subidx_err_additional_code, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; length -= 2; @@ -8442,7 +8442,7 @@ dissect_ff_msg_fms_def_variable_list_req_list_of_idxes(tvbuff_t *tvb, for(d = 0; d < value; d ++) { proto_tree_add_item(sub_tree, - hf_ff_fms_def_variable_list_req_idx, tvb, offset, 4, FALSE); + hf_ff_fms_def_variable_list_req_idx, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; } @@ -8475,7 +8475,7 @@ dissect_ff_msg_fms_def_variable_list_req(tvbuff_t *tvb, gint offset, NumOfIndexes = tvb_get_ntohl(tvb, offset); proto_tree_add_item(sub_tree, - hf_ff_fms_def_variable_list_req_num_of_idxes, tvb, offset, 4, FALSE); + hf_ff_fms_def_variable_list_req_num_of_idxes, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; length -= 4; @@ -8521,7 +8521,7 @@ dissect_ff_msg_fms_def_variable_list_rsp(tvbuff_t *tvb, gint offset, } proto_tree_add_item(sub_tree, - hf_ff_fms_def_variable_list_rsp_idx, tvb, offset, 4, FALSE); + hf_ff_fms_def_variable_list_rsp_idx, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; length -= 4; @@ -8564,7 +8564,7 @@ dissect_ff_msg_fms_def_variable_list_err(tvbuff_t *tvb, gint offset, ErrorClass = tvb_get_guint8(tvb, offset); proto_tree_add_item(sub_tree, - hf_ff_fms_def_variable_list_err_err_class, tvb, offset, 1, FALSE); + hf_ff_fms_def_variable_list_err_err_class, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; length -= 1; @@ -8578,7 +8578,7 @@ dissect_ff_msg_fms_def_variable_list_err(tvbuff_t *tvb, gint offset, length -= 1; proto_tree_add_item(sub_tree, - hf_ff_fms_def_variable_list_err_additional_code, tvb, offset, 2, FALSE); + hf_ff_fms_def_variable_list_err_additional_code, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; length -= 2; @@ -8624,7 +8624,7 @@ dissect_ff_msg_fms_del_variable_list_req(tvbuff_t *tvb, gint offset, } proto_tree_add_item(sub_tree, - hf_ff_fms_del_variable_list_req_idx, tvb, offset, 4, FALSE); + hf_ff_fms_del_variable_list_req_idx, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; length -= 4; @@ -8701,7 +8701,7 @@ dissect_ff_msg_fms_del_variable_list_err(tvbuff_t *tvb, gint offset, ErrorClass = tvb_get_guint8(tvb, offset); proto_tree_add_item(sub_tree, - hf_ff_fms_del_variable_list_err_err_class, tvb, offset, 1, FALSE); + hf_ff_fms_del_variable_list_err_err_class, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; length -= 1; @@ -8715,7 +8715,7 @@ dissect_ff_msg_fms_del_variable_list_err(tvbuff_t *tvb, gint offset, length -= 1; proto_tree_add_item(sub_tree, - hf_ff_fms_del_variable_list_err_additional_code, tvb, offset, 2, FALSE); + hf_ff_fms_del_variable_list_err_additional_code, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; length -= 2; @@ -8761,7 +8761,7 @@ dissect_ff_msg_fms_info_report_req(tvbuff_t *tvb, gint offset, } proto_tree_add_item(sub_tree, - hf_ff_fms_info_report_req_idx, tvb, offset, 4, FALSE); + hf_ff_fms_info_report_req_idx, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; length -= 4; @@ -8803,12 +8803,12 @@ dissect_ff_msg_fms_info_report_subindex_req(tvbuff_t *tvb, gint offset, } proto_tree_add_item(sub_tree, - hf_ff_fms_info_report_with_subidx_req_idx, tvb, offset, 4, FALSE); + hf_ff_fms_info_report_with_subidx_req_idx, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; length -= 4; proto_tree_add_item(sub_tree, - hf_ff_fms_info_report_with_subidx_req_subidx, tvb, offset, 4, FALSE); + hf_ff_fms_info_report_with_subidx_req_subidx, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; length -= 4; @@ -8848,7 +8848,7 @@ dissect_ff_msg_fms_info_report_change_req(tvbuff_t *tvb, gint offset, } proto_tree_add_item(sub_tree, - hf_ff_fms_info_report_on_change_req_idx, tvb, offset, 4, FALSE); + hf_ff_fms_info_report_on_change_req_idx, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; length -= 4; @@ -8892,13 +8892,13 @@ dissect_ff_msg_fms_info_report_change_subindex_req( proto_tree_add_item(sub_tree, hf_ff_fms_info_report_on_change_with_subidx_req_idx, - tvb, offset, 4, FALSE); + tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; length -= 4; proto_tree_add_item(sub_tree, hf_ff_fms_info_report_on_change_with_subidx_req_subidx, - tvb, offset, 4, FALSE); + tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; length -= 4; @@ -8939,12 +8939,12 @@ dissect_ff_msg_fms_ev_notification_req( } proto_tree_add_item(sub_tree, - hf_ff_fms_ev_notification_req_idx, tvb, offset, 4, FALSE); + hf_ff_fms_ev_notification_req_idx, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; length -= 4; proto_tree_add_item(sub_tree, - hf_ff_fms_ev_notification_req_ev_num, tvb, offset, 4, FALSE); + hf_ff_fms_ev_notification_req_ev_num, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; length -= 4; @@ -8986,7 +8986,7 @@ dissect_ff_msg_fms_alter_alter_ev_condition_monitoring_req( } proto_tree_add_item(sub_tree, - hf_ff_fms_alter_ev_condition_monitoring_req_idx, tvb, offset, 4, FALSE); + hf_ff_fms_alter_ev_condition_monitoring_req_idx, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; length -= 4; @@ -8996,7 +8996,7 @@ dissect_ff_msg_fms_alter_alter_ev_condition_monitoring_req( proto_tree_add_item(sub_tree, hf_ff_fms_alter_ev_condition_monitoring_req_enabled, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; length -= 1; @@ -9078,7 +9078,7 @@ dissect_ff_msg_fms_alter_alter_ev_condition_monitoring_err( ErrorClass = tvb_get_guint8(tvb, offset); proto_tree_add_item(sub_tree, hf_ff_fms_alter_ev_condition_monitoring_err_err_class, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; length -= 1; @@ -9093,7 +9093,7 @@ dissect_ff_msg_fms_alter_alter_ev_condition_monitoring_err( proto_tree_add_item(sub_tree, hf_ff_fms_alter_ev_condition_monitoring_err_additional_code, - tvb, offset, 2, FALSE); + tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; length -= 2; @@ -9140,12 +9140,12 @@ dissect_ff_msg_fms_ack_ev_notification_req( } proto_tree_add_item(sub_tree, - hf_ff_fms_ack_ev_notification_req_idx, tvb, offset, 4, FALSE); + hf_ff_fms_ack_ev_notification_req_idx, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; length -= 4; proto_tree_add_item(sub_tree, - hf_ff_fms_ack_ev_notification_req_ev_num, tvb, offset, 4, FALSE); + hf_ff_fms_ack_ev_notification_req_ev_num, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; length -= 4; @@ -9225,7 +9225,7 @@ dissect_ff_msg_fms_ack_ev_notification_err( ErrorClass = tvb_get_guint8(tvb, offset); proto_tree_add_item(sub_tree, - hf_ff_fms_ack_ev_notification_err_err_class, tvb, offset, 1, FALSE); + hf_ff_fms_ack_ev_notification_err_err_class, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; length -= 1; @@ -9240,7 +9240,7 @@ dissect_ff_msg_fms_ack_ev_notification_err( proto_tree_add_item(sub_tree, hf_ff_fms_ack_ev_notification_err_additional_code, - tvb, offset, 2, FALSE); + tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; length -= 2; @@ -9411,7 +9411,7 @@ dissect_ff_msg_lr_get_info_rsp( } proto_tree_add_item(sub_tree, - hf_ff_lr_get_info_rsp_lr_attrs_ver, tvb, offset, 4, FALSE); + hf_ff_lr_get_info_rsp_lr_attrs_ver, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; length -= 4; @@ -9429,7 +9429,7 @@ dissect_ff_msg_lr_get_info_rsp( default: proto_tree_add_item(sub_tree, hf_ff_lr_get_info_rsp_lr_max_msg_num_diff, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); } offset += 1; length -= 1; @@ -9440,17 +9440,17 @@ dissect_ff_msg_lr_get_info_rsp( length -= 1; proto_tree_add_item(sub_tree, - hf_ff_lr_get_info_rsp_reserved, tvb, offset, 2, FALSE); + hf_ff_lr_get_info_rsp_reserved, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; length -= 2; proto_tree_add_item(sub_tree, - hf_ff_lr_get_info_rsp_diagnostic_msg_intvl, tvb, offset, 4, FALSE); + hf_ff_lr_get_info_rsp_diagnostic_msg_intvl, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; length -= 4; proto_tree_add_item(sub_tree, - hf_ff_lr_get_info_rsp_aging_time, tvb, offset, 4, FALSE); + hf_ff_lr_get_info_rsp_aging_time, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; length -= 4; @@ -9518,7 +9518,7 @@ dissect_ff_msg_lr_get_info_err( ErrorClass = tvb_get_guint8(tvb, offset); proto_tree_add_item(sub_tree, - hf_ff_lr_get_info_err_err_class, tvb, offset, 1, FALSE); + hf_ff_lr_get_info_err_err_class, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; length -= 1; @@ -9531,7 +9531,7 @@ dissect_ff_msg_lr_get_info_err( length -= 1; proto_tree_add_item(sub_tree, - hf_ff_lr_get_info_err_additional_code, tvb, offset, 2, FALSE); + hf_ff_lr_get_info_err_additional_code, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; length -= 2; @@ -9666,7 +9666,7 @@ dissect_ff_msg_lr_put_info_req( } proto_tree_add_item(sub_tree, - hf_ff_lr_put_info_req_lr_attrs_ver, tvb, offset, 4, FALSE); + hf_ff_lr_put_info_req_lr_attrs_ver, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; length -= 4; @@ -9684,7 +9684,7 @@ dissect_ff_msg_lr_put_info_req( default: proto_tree_add_item(sub_tree, hf_ff_lr_put_info_req_lr_max_msg_num_diff, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); } offset += 1; length -= 1; @@ -9695,17 +9695,17 @@ dissect_ff_msg_lr_put_info_req( length -= 1; proto_tree_add_item(sub_tree, - hf_ff_lr_put_info_req_reserved, tvb, offset, 2, FALSE); + hf_ff_lr_put_info_req_reserved, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; length -= 2; proto_tree_add_item(sub_tree, - hf_ff_lr_put_info_req_diagnostic_msg_intvl, tvb, offset, 4, FALSE); + hf_ff_lr_put_info_req_diagnostic_msg_intvl, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; length -= 4; proto_tree_add_item(sub_tree, - hf_ff_lr_put_info_req_aging_time, tvb, offset, 4, FALSE); + hf_ff_lr_put_info_req_aging_time, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; length -= 4; @@ -9857,7 +9857,7 @@ dissect_ff_msg_lr_put_info_rsp( } proto_tree_add_item(sub_tree, - hf_ff_lr_put_info_rsp_lr_attrs_ver, tvb, offset, 4, FALSE); + hf_ff_lr_put_info_rsp_lr_attrs_ver, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; length -= 4; @@ -9875,7 +9875,7 @@ dissect_ff_msg_lr_put_info_rsp( default: proto_tree_add_item(sub_tree, hf_ff_lr_put_info_rsp_lr_max_msg_num_diff, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); } offset += 1; length -= 1; @@ -9886,17 +9886,17 @@ dissect_ff_msg_lr_put_info_rsp( length -= 1; proto_tree_add_item(sub_tree, - hf_ff_lr_put_info_rsp_reserved, tvb, offset, 2, FALSE); + hf_ff_lr_put_info_rsp_reserved, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; length -= 2; proto_tree_add_item(sub_tree, - hf_ff_lr_put_info_rsp_diagnostic_msg_intvl, tvb, offset, 4, FALSE); + hf_ff_lr_put_info_rsp_diagnostic_msg_intvl, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; length -= 4; proto_tree_add_item(sub_tree, - hf_ff_lr_put_info_rsp_aging_time, tvb, offset, 4, FALSE); + hf_ff_lr_put_info_rsp_aging_time, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; length -= 4; @@ -9964,7 +9964,7 @@ dissect_ff_msg_lr_put_info_err( ErrorClass = tvb_get_guint8(tvb, offset); proto_tree_add_item(sub_tree, - hf_ff_lr_put_info_err_err_class, tvb, offset, 1, FALSE); + hf_ff_lr_put_info_err_err_class, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; length -= 1; @@ -9977,7 +9977,7 @@ dissect_ff_msg_lr_put_info_err( length -= 1; proto_tree_add_item(sub_tree, - hf_ff_lr_put_info_err_additional_code, tvb, offset, 2, FALSE); + hf_ff_lr_put_info_err_additional_code, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; length -= 2; @@ -10059,7 +10059,7 @@ dissect_ff_msg_lr_get_statistics_rsp_x_cable_stat(tvbuff_t *tvb, for(d = 0; d < value; d ++) { proto_tree_add_item(sub_tree, - hf_ff_lr_get_statistics_rsp_x_cable_stat, tvb, offset, 4, FALSE); + hf_ff_lr_get_statistics_rsp_x_cable_stat, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; } @@ -10094,43 +10094,43 @@ dissect_ff_msg_lr_get_statistics_rsp( proto_tree_add_item(sub_tree, hf_ff_lr_get_statistics_rsp_num_diag_svr_ind_recv_a, - tvb, offset, 4, FALSE); + tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; length -= 4; proto_tree_add_item(sub_tree, hf_ff_lr_get_statistics_rsp_num_diag_svr_ind_miss_a, - tvb, offset, 4, FALSE); + tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; length -= 4; proto_tree_add_item(sub_tree, hf_ff_lr_get_statistics_rsp_num_rem_dev_diag_recv_fault_a, - tvb, offset, 4, FALSE); + tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; length -= 4; proto_tree_add_item(sub_tree, hf_ff_lr_get_statistics_rsp_num_diag_svr_ind_recv_b, - tvb, offset, 4, FALSE); + tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; length -= 4; proto_tree_add_item(sub_tree, hf_ff_lr_get_statistics_rsp_num_diag_svr_ind_miss_b, - tvb, offset, 4, FALSE); + tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; length -= 4; proto_tree_add_item(sub_tree, hf_ff_lr_get_statistics_rsp_num_rem_dev_diag_recv_fault_b, - tvb, offset, 4, FALSE); + tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; length -= 4; NumXcableStat = tvb_get_ntohl(tvb, offset); proto_tree_add_item(sub_tree, - hf_ff_lr_get_statistics_rsp_num_x_cable_stat, tvb, offset, 4, FALSE); + hf_ff_lr_get_statistics_rsp_num_x_cable_stat, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; length -= 4; @@ -10182,7 +10182,7 @@ dissect_ff_msg_lr_get_statistics_err( ErrorClass = tvb_get_guint8(tvb, offset); proto_tree_add_item(sub_tree, - hf_ff_lr_get_statistics_err_err_class, tvb, offset, 1, FALSE); + hf_ff_lr_get_statistics_err_err_class, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; length -= 1; @@ -10196,7 +10196,7 @@ dissect_ff_msg_lr_get_statistics_err( length -= 1; proto_tree_add_item(sub_tree, - hf_ff_lr_get_statistics_err_additional_code, tvb, offset, 2, FALSE); + hf_ff_lr_get_statistics_err_additional_code, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; length -= 2; @@ -10295,7 +10295,7 @@ dissect_ff_msg_diagnostic_msg_req_if_a_to_a_status(tvbuff_t *tvb, for(d = 0; d < value; d ++) { proto_tree_add_item(sub_tree, hf_ff_lr_diagnostic_msg_req_if_a_to_a_status, - tvb, offset, 4, FALSE); + tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; } @@ -10329,7 +10329,7 @@ dissect_ff_msg_diagnostic_msg_req_if_b_to_a_status(tvbuff_t *tvb, for(d = 0; d < value; d ++) { proto_tree_add_item(sub_tree, hf_ff_lr_diagnostic_msg_req_if_b_to_a_status, - tvb, offset, 4, FALSE); + tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; } @@ -10363,7 +10363,7 @@ dissect_ff_msg_diagnostic_msg_req_if_a_to_b_status(tvbuff_t *tvb, for(d = 0; d < value; d ++) { proto_tree_add_item(sub_tree, hf_ff_lr_diagnostic_msg_req_if_a_to_b_status, - tvb, offset, 4, FALSE); + tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; } @@ -10397,7 +10397,7 @@ dissect_ff_msg_diagnostic_msg_req_if_b_to_b_status(tvbuff_t *tvb, for(d = 0; d < value; d ++) { proto_tree_add_item(sub_tree, hf_ff_lr_diagnostic_msg_req_if_b_to_b_status, - tvb, offset, 4, FALSE); + tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; } @@ -10435,7 +10435,7 @@ dissect_ff_msg_diagnostic_msg_req( DeviceIndex = tvb_get_ntohs(tvb, offset); if(DeviceIndex) { proto_tree_add_item(sub_tree, - hf_ff_lr_diagnostic_msg_req_dev_idx, tvb, offset, 2, FALSE); + hf_ff_lr_diagnostic_msg_req_dev_idx, tvb, offset, 2, ENC_BIG_ENDIAN); } else { proto_tree_add_uint_format(sub_tree, hf_ff_lr_diagnostic_msg_req_dev_idx, @@ -10447,18 +10447,18 @@ dissect_ff_msg_diagnostic_msg_req( proto_tree_add_item(sub_tree, hf_ff_lr_diagnostic_msg_req_num_of_network_ifs, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; length -= 1; proto_tree_add_item(sub_tree, - hf_ff_lr_diagnostic_msg_req_transmission_if, tvb, offset, 1, FALSE); + hf_ff_lr_diagnostic_msg_req_transmission_if, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; length -= 1; proto_tree_add_item(sub_tree, hf_ff_lr_diagnostic_msg_req_diagnostic_msg_intvl, - tvb, offset, 4, FALSE); + tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; length -= 4; @@ -10468,7 +10468,7 @@ dissect_ff_msg_diagnostic_msg_req( length -= 32; proto_tree_add_item(sub_tree, - hf_ff_lr_diagnostic_msg_req_reserved, tvb, offset, 1, FALSE); + hf_ff_lr_diagnostic_msg_req_reserved, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; length -= 1; @@ -10480,7 +10480,7 @@ dissect_ff_msg_diagnostic_msg_req( NumOfInterfaceStatuses = tvb_get_ntohs(tvb, offset); proto_tree_add_item(sub_tree, - hf_ff_lr_diagnostic_msg_req_num_of_if_statuses, tvb, offset, 2, FALSE); + hf_ff_lr_diagnostic_msg_req_num_of_if_statuses, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; length -= 2; @@ -12637,26 +12637,26 @@ dissect_ff_msg_trailer(tvbuff_t *tvb, if(Options & OPTION_MESSAGE_NUMBER_MASK) { proto_tree_add_item(sub_tree, - hf_ff_fda_msg_trailer_msg_num, tvb, offset, 4, FALSE); + hf_ff_fda_msg_trailer_msg_num, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; } if(Options & OPTION_INVOKE_ID_MASK) { proto_tree_add_item(sub_tree, - hf_ff_fda_msg_trailer_invoke_id, tvb, offset, 4, FALSE); + hf_ff_fda_msg_trailer_invoke_id, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; } if(Options & OPTION_TIME_STAMP_MASK) { proto_tree_add_item(sub_tree, - hf_ff_fda_msg_trailer_time_stamp, tvb, offset, 8, FALSE); + hf_ff_fda_msg_trailer_time_stamp, tvb, offset, 8, ENC_BIG_ENDIAN); offset += 8; } if(Options & OPTION_EXTENDED_CNTRL_MASK) { proto_tree_add_item(sub_tree, hf_ff_fda_msg_trailer_extended_control_field, - tvb, offset, 4, FALSE); + tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; } @@ -12909,7 +12909,7 @@ dissect_ff_msg_hdr(tvbuff_t *tvb, /* FDA Message Version */ proto_tree_add_item(sub_tree, - hf_ff_fda_msg_hdr_ver, tvb, offset, 1, FALSE); + hf_ff_fda_msg_hdr_ver, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; /* Options */ @@ -12928,12 +12928,12 @@ dissect_ff_msg_hdr(tvbuff_t *tvb, /* FDA Address */ proto_tree_add_item(sub_tree, - hf_ff_fda_msg_hdr_fda_addr, tvb, offset, 4, FALSE); + hf_ff_fda_msg_hdr_fda_addr, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; /* Message Length */ proto_tree_add_item(sub_tree, - hf_ff_fda_msg_hdr_len, tvb, offset, 4, FALSE); + hf_ff_fda_msg_hdr_len, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; return; diff --git a/epan/dissectors/packet-fip.c b/epan/dissectors/packet-fip.c index 709d2610de..48105c8143 100644 --- a/epan/dissectors/packet-fip.c +++ b/epan/dissectors/packet-fip.c @@ -277,8 +277,8 @@ static dissector_handle_t fc_handle; static void fip_desc_type_len(proto_tree *tree, tvbuff_t *tvb) { - proto_tree_add_item(tree, hf_fip_desc_type, tvb, 0, 1, FALSE); - proto_tree_add_item(tree, hf_fip_desc_len, tvb, 1, 1, FALSE); + proto_tree_add_item(tree, hf_fip_desc_type, tvb, 0, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_fip_desc_len, tvb, 1, 1, ENC_BIG_ENDIAN); } /* @@ -393,29 +393,29 @@ dissect_fip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) FIP_HEADER_LEN + rlen * FIP_BPW, "FIP %s", info); fip_tree = proto_item_add_subtree(ti, ett_fip); - proto_tree_add_item(fip_tree, hf_fip_ver, tvb, 0, 1, FALSE); - proto_tree_add_item(fip_tree, hf_fip_op, tvb, 2, 2, FALSE); + proto_tree_add_item(fip_tree, hf_fip_ver, tvb, 0, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(fip_tree, hf_fip_op, tvb, 2, 2, ENC_BIG_ENDIAN); switch (op) { case FIP_OP_DISC: - proto_tree_add_item(fip_tree, hf_fip_disc_subcode, tvb, 5, 1, FALSE); + proto_tree_add_item(fip_tree, hf_fip_disc_subcode, tvb, 5, 1, ENC_BIG_ENDIAN); break; case FIP_OP_LS: - proto_tree_add_item(fip_tree, hf_fip_ls_subcode, tvb, 5, 1, FALSE); + proto_tree_add_item(fip_tree, hf_fip_ls_subcode, tvb, 5, 1, ENC_BIG_ENDIAN); break; case FIP_OP_CTRL: - proto_tree_add_item(fip_tree, hf_fip_ctrl_subcode, tvb, 5, 1, FALSE); + proto_tree_add_item(fip_tree, hf_fip_ctrl_subcode, tvb, 5, 1, ENC_BIG_ENDIAN); break; case FIP_OP_VLAN: - proto_tree_add_item(fip_tree, hf_fip_vlan_subcode, tvb, 5, 1, FALSE); + proto_tree_add_item(fip_tree, hf_fip_vlan_subcode, tvb, 5, 1, ENC_BIG_ENDIAN); break; case FIP_OP_VN2VN: - proto_tree_add_item(fip_tree, hf_fip_vn2vn_subcode, tvb, 5, 1, FALSE); + proto_tree_add_item(fip_tree, hf_fip_vn2vn_subcode, tvb, 5, 1, ENC_BIG_ENDIAN); break; default: - proto_tree_add_item(fip_tree, hf_fip_hex_subcode, tvb, 5, 1, FALSE); + proto_tree_add_item(fip_tree, hf_fip_hex_subcode, tvb, 5, 1, ENC_BIG_ENDIAN); break; } - proto_tree_add_item(fip_tree, hf_fip_dlen, tvb, 6, 2, FALSE); + 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); @@ -447,7 +447,7 @@ dissect_fip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) subtree = proto_item_add_subtree(item, ett_fip_dt_pri); fip_desc_type_len(subtree, desc_tvb); proto_tree_add_item(subtree, hf_fip_desc_pri, desc_tvb, - 3, 1, FALSE); + 3, 1, ENC_BIG_ENDIAN); proto_item_append_text(item, "%u", tvb_get_guint8(desc_tvb, 3)); break; case FIP_DT_MAC: @@ -478,7 +478,7 @@ dissect_fip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) subtree = proto_item_add_subtree(item, ett_fip_dt_fab); fip_desc_type_len(subtree, desc_tvb); proto_tree_add_item(subtree, hf_fip_desc_fab_vfid, desc_tvb, - 2, 2, FALSE); + 2, 2, ENC_BIG_ENDIAN); text = tvb_fc_to_str(desc_tvb, 5); proto_tree_add_string(subtree, hf_fip_desc_fab_map, desc_tvb, 5, 3, text); @@ -491,7 +491,7 @@ dissect_fip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) subtree = proto_item_add_subtree(item, ett_fip_dt_mdl); fip_desc_type_len(subtree, desc_tvb); proto_tree_add_item(subtree, hf_fip_desc_fcoe_size, desc_tvb, - 2, 2, FALSE); + 2, 2, ENC_BIG_ENDIAN); proto_item_append_text(item, "%u", tvb_get_ntohs(desc_tvb, 2)); break; case FIP_DT_FLOGI: @@ -510,7 +510,7 @@ dissect_fip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(subtree, hf_fip_desc_vn_mac, desc_tvb, 2, 6, FALSE); proto_tree_add_item(subtree, hf_fip_desc_vn_fid, desc_tvb, - 9, 3, FALSE); + 9, 3, ENC_BIG_ENDIAN); text = tvb_fcwwn_to_str(desc_tvb, 12); proto_tree_add_string(subtree, hf_fip_desc_vn_wwpn, desc_tvb, 12, 8, text); @@ -540,7 +540,7 @@ dissect_fip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) subtree = proto_item_add_subtree(item, ett_fip_dt_vlan); fip_desc_type_len(subtree, desc_tvb); proto_tree_add_item(subtree, hf_fip_desc_vlan, desc_tvb, - 2, 2, FALSE); + 2, 2, ENC_BIG_ENDIAN); proto_item_append_text(item, "%u", tvb_get_ntohs(desc_tvb, 2)); break; case FIP_DT_FC4F: diff --git a/epan/dissectors/packet-flip.c b/epan/dissectors/packet-flip.c index 89a734af93..c086bd86db 100644 --- a/epan/dissectors/packet-flip.c +++ b/epan/dissectors/packet-flip.c @@ -470,7 +470,7 @@ dissect_flip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) "%d", basic_hdr_reserved); /* Flow ID: 28 bits. */ proto_tree_add_item(basic_hdr_tree, hf_flip_basic_flowid, - flip_tvb, offset + 0, 4, FALSE); + flip_tvb, offset + 0, 4, ENC_BIG_ENDIAN); /* Sequence number: 16 bits. */ proto_tree_add_uint_format_value(basic_hdr_tree, hf_flip_basic_seqnum, diff --git a/epan/dissectors/packet-fp_hint.c b/epan/dissectors/packet-fp_hint.c index 9c36656b42..e7b6d27c6c 100644 --- a/epan/dissectors/packet-fp_hint.c +++ b/epan/dissectors/packet-fp_hint.c @@ -217,7 +217,7 @@ static guint16 assign_rb_info(tvbuff_t *tvb, packet_info *pinfo, guint16 offset, 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_item(subtree, hf_fph_rbid, tvb, (offset+4), 2, TRUE); + 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); proto_tree_add_boolean(subtree, hf_fph_deciphered, tvb, offset+5, 1, deciphered); diff --git a/epan/dissectors/packet-fractalgeneratorprotocol.c b/epan/dissectors/packet-fractalgeneratorprotocol.c index 63cd17de0d..9638fc0565 100644 --- a/epan/dissectors/packet-fractalgeneratorprotocol.c +++ b/epan/dissectors/packet-fractalgeneratorprotocol.c @@ -121,15 +121,15 @@ static const value_string message_type_values[] = { static void dissect_fractalgeneratorprotocol_parameter_message(tvbuff_t *message_tvb, proto_tree *message_tree) { - proto_tree_add_item(message_tree, hf_parameter_width, message_tvb, PARAMETER_WIDTH_OFFSET, PARAMETER_WIDTH_LENGTH, FALSE); - proto_tree_add_item(message_tree, hf_parameter_height, message_tvb, PARAMETER_HEIGHT_OFFSET, PARAMETER_HEIGHT_LENGTH, FALSE); - proto_tree_add_item(message_tree, hf_parameter_maxiterations, message_tvb, PARAMETER_MAXITERATIONS_OFFSET, PARAMETER_MAXITERATIONS_LENGTH, FALSE); - proto_tree_add_item(message_tree, hf_parameter_algorithmid, message_tvb, PARAMETER_ALGORITHMID_OFFSET, PARAMETER_ALGORITHMID_LENGTH, FALSE); - proto_tree_add_item(message_tree, hf_parameter_c1real, message_tvb, PARAMETER_C1REAL_OFFSET, PARAMETER_C1REAL_LENGTH, FALSE); - proto_tree_add_item(message_tree, hf_parameter_c1imag, message_tvb, PARAMETER_C1IMAG_OFFSET, PARAMETER_C1IMAG_LENGTH, FALSE); - proto_tree_add_item(message_tree, hf_parameter_c2real, message_tvb, PARAMETER_C2REAL_OFFSET, PARAMETER_C2REAL_LENGTH, FALSE); - proto_tree_add_item(message_tree, hf_parameter_c2imag, message_tvb, PARAMETER_C2IMAG_OFFSET, PARAMETER_C2IMAG_LENGTH, FALSE); - proto_tree_add_item(message_tree, hf_parameter_n, message_tvb, PARAMETER_N_OFFSET, PARAMETER_N_LENGTH, FALSE); + proto_tree_add_item(message_tree, hf_parameter_width, message_tvb, PARAMETER_WIDTH_OFFSET, PARAMETER_WIDTH_LENGTH, ENC_BIG_ENDIAN); + proto_tree_add_item(message_tree, hf_parameter_height, message_tvb, PARAMETER_HEIGHT_OFFSET, PARAMETER_HEIGHT_LENGTH, ENC_BIG_ENDIAN); + proto_tree_add_item(message_tree, hf_parameter_maxiterations, message_tvb, PARAMETER_MAXITERATIONS_OFFSET, PARAMETER_MAXITERATIONS_LENGTH, ENC_BIG_ENDIAN); + proto_tree_add_item(message_tree, hf_parameter_algorithmid, message_tvb, PARAMETER_ALGORITHMID_OFFSET, PARAMETER_ALGORITHMID_LENGTH, ENC_BIG_ENDIAN); + proto_tree_add_item(message_tree, hf_parameter_c1real, message_tvb, PARAMETER_C1REAL_OFFSET, PARAMETER_C1REAL_LENGTH, ENC_BIG_ENDIAN); + proto_tree_add_item(message_tree, hf_parameter_c1imag, message_tvb, PARAMETER_C1IMAG_OFFSET, PARAMETER_C1IMAG_LENGTH, ENC_BIG_ENDIAN); + proto_tree_add_item(message_tree, hf_parameter_c2real, message_tvb, PARAMETER_C2REAL_OFFSET, PARAMETER_C2REAL_LENGTH, ENC_BIG_ENDIAN); + proto_tree_add_item(message_tree, hf_parameter_c2imag, message_tvb, PARAMETER_C2IMAG_OFFSET, PARAMETER_C2IMAG_LENGTH, ENC_BIG_ENDIAN); + proto_tree_add_item(message_tree, hf_parameter_n, message_tvb, PARAMETER_N_OFFSET, PARAMETER_N_LENGTH, ENC_BIG_ENDIAN); } @@ -138,9 +138,9 @@ dissect_fractalgeneratorprotocol_data_message(tvbuff_t *message_tvb, proto_tree { guint16 buffer_length; - proto_tree_add_item(message_tree, hf_data_start_x, message_tvb, DATA_STARTX_OFFSET, DATA_STARTX_LENGTH, FALSE); - proto_tree_add_item(message_tree, hf_data_start_y, message_tvb, DATA_STARTY_OFFSET, DATA_STARTY_LENGTH, FALSE); - proto_tree_add_item(message_tree, hf_data_points, message_tvb, DATA_POINTS_OFFSET, DATA_POINTS_LENGTH, FALSE); + proto_tree_add_item(message_tree, hf_data_start_x, message_tvb, DATA_STARTX_OFFSET, DATA_STARTX_LENGTH, ENC_BIG_ENDIAN); + proto_tree_add_item(message_tree, hf_data_start_y, message_tvb, DATA_STARTY_OFFSET, DATA_STARTY_LENGTH, ENC_BIG_ENDIAN); + proto_tree_add_item(message_tree, hf_data_points, message_tvb, DATA_POINTS_OFFSET, DATA_POINTS_LENGTH, ENC_BIG_ENDIAN); buffer_length = tvb_get_ntohl(message_tvb, DATA_POINTS_OFFSET)*4; if (buffer_length > 0) { @@ -158,9 +158,9 @@ dissect_fractalgeneratorprotocol_message(tvbuff_t *message_tvb, packet_info *pin if (pinfo && (check_col(pinfo->cinfo, COL_INFO))) { col_add_fstr(pinfo->cinfo, COL_INFO, "%s ", val_to_str(type, message_type_values, "Unknown FractalGeneratorProtocol type")); } - proto_tree_add_item(fractalgeneratorprotocol_tree, hf_message_type, message_tvb, MESSAGE_TYPE_OFFSET, MESSAGE_TYPE_LENGTH, FALSE); - proto_tree_add_item(fractalgeneratorprotocol_tree, hf_message_flags, message_tvb, MESSAGE_FLAGS_OFFSET, MESSAGE_FLAGS_LENGTH, FALSE); - proto_tree_add_item(fractalgeneratorprotocol_tree, hf_message_length, message_tvb, MESSAGE_LENGTH_OFFSET, MESSAGE_LENGTH_LENGTH, FALSE); + proto_tree_add_item(fractalgeneratorprotocol_tree, hf_message_type, message_tvb, MESSAGE_TYPE_OFFSET, MESSAGE_TYPE_LENGTH, ENC_BIG_ENDIAN); + proto_tree_add_item(fractalgeneratorprotocol_tree, hf_message_flags, message_tvb, MESSAGE_FLAGS_OFFSET, MESSAGE_FLAGS_LENGTH, ENC_BIG_ENDIAN); + proto_tree_add_item(fractalgeneratorprotocol_tree, hf_message_length, message_tvb, MESSAGE_LENGTH_OFFSET, MESSAGE_LENGTH_LENGTH, ENC_BIG_ENDIAN); switch (type) { case FRACTALGENERATOR_PARAMETER_MESSAGE_TYPE: dissect_fractalgeneratorprotocol_parameter_message(message_tvb, fractalgeneratorprotocol_tree); diff --git a/epan/dissectors/packet-fw1.c b/epan/dissectors/packet-fw1.c index 07b1362d91..2a820f1be3 100644 --- a/epan/dissectors/packet-fw1.c +++ b/epan/dissectors/packet-fw1.c @@ -216,7 +216,7 @@ dissect_fw1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(fh_tree, hf_fw1_interface, tvb, 2, iface_len, FALSE); if (fw1_with_uuid) - proto_tree_add_item(fh_tree, hf_fw1_uuid, tvb, 8, 4, FALSE); + proto_tree_add_item(fh_tree, hf_fw1_uuid, tvb, 8, 4, ENC_BIG_ENDIAN); } etype = tvb_get_ntohs(tvb, 12); diff --git a/epan/dissectors/packet-g723.c b/epan/dissectors/packet-g723.c index ea18378bbf..578265507e 100644 --- a/epan/dissectors/packet-g723.c +++ b/epan/dissectors/packet-g723.c @@ -84,8 +84,8 @@ dissect_g723(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) g723_tree = proto_item_add_subtree(ti, ett_g723); octet = tvb_get_guint8(tvb,offset); - proto_tree_add_item(g723_tree, hf_g723_frame_size_and_codec, tvb, offset, 1, FALSE); - proto_tree_add_item(g723_tree, hf_g723_lpc_B5_B0, tvb, offset, 1, FALSE); + proto_tree_add_item(g723_tree, hf_g723_frame_size_and_codec, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(g723_tree, hf_g723_lpc_B5_B0, tvb, offset, 1, ENC_BIG_ENDIAN); if ((octet & 0x1) == 1 ) /* Low rate */ return; diff --git a/epan/dissectors/packet-gdsdb.c b/epan/dissectors/packet-gdsdb.c index fbfe2daa5f..47231ea9a4 100644 --- a/epan/dissectors/packet-gdsdb.c +++ b/epan/dissectors/packet-gdsdb.c @@ -430,20 +430,20 @@ gdsdb_connect(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { offset = 4; proto_tree_add_item(tree, hf_gdsdb_connect_operation, tvb, - offset, 4, FALSE); + offset, 4, ENC_BIG_ENDIAN); offset += 4; proto_tree_add_item(tree, hf_gdsdb_connect_version, tvb, - offset, 4, FALSE); + offset, 4, ENC_BIG_ENDIAN); offset += 4; proto_tree_add_item(tree, hf_gdsdb_connect_client, tvb, - offset, 4, FALSE); + offset, 4, ENC_BIG_ENDIAN); offset += 4; proto_tree_add_item(tree, hf_gdsdb_connect_filename, tvb, offset, 4, FALSE); length = tvb_get_ntohl(tvb, offset); offset += length + 6; proto_tree_add_item(tree, hf_gdsdb_connect_count, tvb, - offset, 4, FALSE); + offset, 4, ENC_BIG_ENDIAN); count = tvb_get_ntohl(tvb, offset); offset += 4; proto_tree_add_item(tree, hf_gdsdb_connect_userid, tvb, @@ -457,23 +457,23 @@ gdsdb_connect(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ett_gdsdb_connect_pref); proto_tree_add_item(pref_tree, hf_gdsdb_connect_pref_version, - tvb, offset, 4, FALSE); + tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; proto_tree_add_item(pref_tree, hf_gdsdb_connect_pref_architecture, - tvb, offset, 4, FALSE); + tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; proto_tree_add_item(pref_tree, hf_gdsdb_connect_pref_mintype, - tvb, offset, 4, FALSE); + tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; proto_tree_add_item(pref_tree, hf_gdsdb_connect_pref_maxtype, - tvb, offset, 4, FALSE); + tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; proto_tree_add_item(pref_tree, hf_gdsdb_connect_pref_weight, - tvb, offset, 4, FALSE); + tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; } } @@ -492,10 +492,10 @@ gdsdb_accept(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) if (tree) { offset = 4; proto_tree_add_item(tree, hf_gdsdb_accept_version, tvb, - offset, 4, FALSE); + offset, 4, ENC_BIG_ENDIAN); offset += 4; proto_tree_add_item(tree, hf_gdsdb_accept_architecture, tvb, - offset, 4, FALSE); + offset, 4, ENC_BIG_ENDIAN); offset += 4; } @@ -513,13 +513,13 @@ gdsdb_request(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) if (tree) { offset = 4; proto_tree_add_item(tree, hf_gdsdb_request_type, tvb, - offset, 4, FALSE); + offset, 4, ENC_BIG_ENDIAN); offset += 4; proto_tree_add_item(tree, hf_gdsdb_request_object, tvb, - offset, 4, FALSE); + offset, 4, ENC_BIG_ENDIAN); offset += 4; proto_tree_add_item(tree, hf_gdsdb_request_partner, tvb, - offset, 8, FALSE); + offset, 8, ENC_BIG_ENDIAN); } return tvb_length(tvb); @@ -543,7 +543,7 @@ gdsdb_attach(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) if (tree) { offset = 4; proto_tree_add_item(tree, hf_gdsdb_attach_database, tvb, - offset, 4, FALSE); + offset, 4, ENC_BIG_ENDIAN); offset += 4; proto_tree_add_item(tree, hf_gdsdb_attach_filename, tvb, offset, 4, FALSE); @@ -568,7 +568,7 @@ gdsdb_compile(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) if (tree) { offset = 4; proto_tree_add_item(tree, hf_gdsdb_compile_database, tvb, - offset, 4, FALSE); + offset, 4, ENC_BIG_ENDIAN); offset += 4; proto_tree_add_item(tree, hf_gdsdb_compile_blr, tvb, offset, 4, FALSE); @@ -588,26 +588,26 @@ gdsdb_receive(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) if (tree) { offset = 4; proto_tree_add_item(tree, hf_gdsdb_receive_request, tvb, - offset, 4, FALSE); + offset, 4, ENC_BIG_ENDIAN); offset += 4; proto_tree_add_item(tree, hf_gdsdb_receive_incarnation, tvb, - offset, 4, FALSE); + offset, 4, ENC_BIG_ENDIAN); offset += 4; proto_tree_add_item(tree, hf_gdsdb_receive_transaction, tvb, - offset, 4, FALSE); + offset, 4, ENC_BIG_ENDIAN); offset += 4; proto_tree_add_item(tree, hf_gdsdb_receive_msgnr, tvb, - offset, 4, FALSE); + offset, 4, ENC_BIG_ENDIAN); offset += 4; proto_tree_add_item(tree, hf_gdsdb_receive_messages, tvb, - offset, 4, FALSE); + offset, 4, ENC_BIG_ENDIAN); offset += 4; while(tvb_bytes_exist(tvb, offset, 12)) { proto_tree_add_item(tree, hf_gdsdb_receive_direction, - tvb, offset, 4, FALSE); + tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; proto_tree_add_item(tree, hf_gdsdb_receive_offset, - tvb, offset, 8, FALSE); + tvb, offset, 8, ENC_BIG_ENDIAN); offset += 8; } } @@ -626,19 +626,19 @@ gdsdb_send(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) if (tree) { offset = 4; proto_tree_add_item(tree, hf_gdsdb_send_request, tvb, - offset, 4, FALSE); + offset, 4, ENC_BIG_ENDIAN); offset += 4; proto_tree_add_item(tree, hf_gdsdb_send_incarnation, tvb, - offset, 4, FALSE); + offset, 4, ENC_BIG_ENDIAN); offset += 4; proto_tree_add_item(tree, hf_gdsdb_send_transaction, tvb, - offset, 4, FALSE); + offset, 4, ENC_BIG_ENDIAN); offset += 4; proto_tree_add_item(tree, hf_gdsdb_send_msgnr, tvb, - offset, 4, FALSE); + offset, 4, ENC_BIG_ENDIAN); offset += 4; proto_tree_add_item(tree, hf_gdsdb_send_messages, tvb, - offset, 4, FALSE); + offset, 4, ENC_BIG_ENDIAN); } return tvb_length(tvb); @@ -656,10 +656,10 @@ gdsdb_response(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) if (tree) { offset = 4; proto_tree_add_item(tree, hf_gdsdb_response_object, tvb, - offset, 4, FALSE); + offset, 4, ENC_BIG_ENDIAN); offset += 4; proto_tree_add_item(tree, hf_gdsdb_response_blobid, tvb, - offset, 8, FALSE); + offset, 8, ENC_BIG_ENDIAN); offset += 8; proto_tree_add_item(tree, hf_gdsdb_response_data, tvb, offset, 4, FALSE); @@ -684,10 +684,10 @@ gdsdb_transact(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) if (tree) { offset = 4; proto_tree_add_item(tree, hf_gdsdb_transact_database, tvb, - offset, 4, FALSE); + offset, 4, ENC_BIG_ENDIAN); offset += 4; proto_tree_add_item(tree, hf_gdsdb_transact_transaction, tvb, - offset, 4, FALSE); + offset, 4, ENC_BIG_ENDIAN); } return tvb_length(tvb); @@ -705,7 +705,7 @@ gdsdb_transact_response(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) if (tree) { offset = 4; proto_tree_add_item(tree, hf_gdsdb_transactresponse_messages, - tvb, offset, 4, FALSE); + tvb, offset, 4, ENC_BIG_ENDIAN); } return tvb_length(tvb); @@ -727,10 +727,10 @@ gdsdb_open_blob2(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) length = tvb_get_ntohl(tvb, offset); offset += length + 6; proto_tree_add_item(tree, hf_gdsdb_openblob_transaction, tvb, - offset, 4, FALSE); + offset, 4, ENC_BIG_ENDIAN); offset += 4; proto_tree_add_item(tree, hf_gdsdb_openblob_id, tvb, offset, - 8, FALSE); + 8, ENC_BIG_ENDIAN); } return tvb_length(tvb); @@ -747,10 +747,10 @@ gdsdb_open_blob(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) if (tree) { offset = 4; proto_tree_add_item(tree, hf_gdsdb_openblob_transaction, tvb, - offset, 4, FALSE); + offset, 4, ENC_BIG_ENDIAN); offset += 4; proto_tree_add_item(tree, hf_gdsdb_openblob_id, tvb, offset, - 8, FALSE); + 8, ENC_BIG_ENDIAN); } return tvb_length(tvb); @@ -820,10 +820,10 @@ gdsdb_info(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) if (tree) { offset = 4; proto_tree_add_item(tree, hf_gdsdb_info_object, tvb, offset, - 4, FALSE); + 4, ENC_BIG_ENDIAN); offset += 4; proto_tree_add_item(tree, hf_gdsdb_info_incarnation, tvb, - offset, 4, FALSE); + offset, 4, ENC_BIG_ENDIAN); offset += 4; if(opcode == op_service_info) { proto_tree_add_item(tree, hf_gdsdb_info_items, tvb, @@ -832,7 +832,7 @@ gdsdb_info(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) offset += length + 6; } proto_tree_add_item(tree, hf_gdsdb_info_buffer_length, tvb, - offset, 4, FALSE); + offset, 4, ENC_BIG_ENDIAN); } return tvb_length(tvb); @@ -1267,7 +1267,7 @@ dissect_gdsdb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) FALSE); gdsdb_tree = proto_item_add_subtree(ti, ett_gdsdb); proto_tree_add_item(gdsdb_tree, hf_gdsdb_opcode, tvb, - 0, 4, FALSE); + 0, 4, ENC_BIG_ENDIAN); } /* opcode < op_max */ diff --git a/epan/dissectors/packet-gmhdr.c b/epan/dissectors/packet-gmhdr.c index bc9017ca3d..c2d1f0d20c 100644 --- a/epan/dissectors/packet-gmhdr.c +++ b/epan/dissectors/packet-gmhdr.c @@ -109,12 +109,12 @@ dissect_gmtlv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *gmhdr_tree, gui expert_add_info_format(pinfo, gmhdr_tree, PI_MALFORMED, PI_ERROR, "Field length %u invalid", fl); break; } - ti = proto_tree_add_item(gmhdr_tree, hf_gmhdr_srcport, tvb, offset, fl, FALSE); + ti = proto_tree_add_item(gmhdr_tree, hf_gmhdr_srcport, tvb, offset, fl, ENC_BIG_ENDIAN); srcport_tree = proto_item_add_subtree(ti, ett_srcport); - proto_tree_add_item(srcport_tree, hf_gmhdr_srcport_plfm, tvb, offset, fl, FALSE); - proto_tree_add_item(srcport_tree, hf_gmhdr_srcport_gid, tvb, offset, fl, FALSE); - proto_tree_add_item(srcport_tree, hf_gmhdr_srcport_bid, tvb, offset, fl, FALSE); - ti = proto_tree_add_item(srcport_tree, hf_gmhdr_srcport_pid, tvb, offset, fl, FALSE); + proto_tree_add_item(srcport_tree, hf_gmhdr_srcport_plfm, tvb, offset, fl, ENC_BIG_ENDIAN); + proto_tree_add_item(srcport_tree, hf_gmhdr_srcport_gid, tvb, offset, fl, ENC_BIG_ENDIAN); + proto_tree_add_item(srcport_tree, hf_gmhdr_srcport_bid, tvb, offset, fl, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(srcport_tree, hf_gmhdr_srcport_pid, tvb, offset, fl, ENC_BIG_ENDIAN); /* If not GV-2404, we need different formula here */ pid = ((tv & GMHDR_SRCPORT_PID_MASK) >> GMHDR_SRCPORT_PID_SHFT) - 24; if (pid >= 1 && pid <= 4) { @@ -127,7 +127,7 @@ dissect_gmtlv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *gmhdr_tree, gui expert_add_info_format(pinfo, gmhdr_tree, PI_MALFORMED, PI_ERROR, "Field length %u invalid", fl); break; } - proto_tree_add_item(gmhdr_tree, hf_gmhdr_pktsize, tvb, offset, fl, FALSE); + proto_tree_add_item(gmhdr_tree, hf_gmhdr_pktsize, tvb, offset, fl, ENC_BIG_ENDIAN); break; case GMHDR_FTYPE_TIMESTAMP_LOCAL: case GMHDR_FTYPE_TIMESTAMP_NTP: diff --git a/epan/dissectors/packet-gmrp.c b/epan/dissectors/packet-gmrp.c index f1f011f70c..fff530a2ab 100644 --- a/epan/dissectors/packet-gmrp.c +++ b/epan/dissectors/packet-gmrp.c @@ -300,7 +300,7 @@ dissect_gmrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { /* Service Requirement */ proto_tree_add_item(gmrp_tree, hf_gmrp_attribute_value_service_requirement, - tvb, offset, sizeof(guint8), FALSE); + tvb, offset, sizeof(guint8), ENC_BIG_ENDIAN); offset += sizeof(guint8); length -= sizeof(guint8); diff --git a/epan/dissectors/packet-gnutella.c b/epan/dissectors/packet-gnutella.c index 2240828988..119fc5227c 100644 --- a/epan/dissectors/packet-gnutella.c +++ b/epan/dissectors/packet-gnutella.c @@ -92,7 +92,7 @@ static void dissect_gnutella_pong(tvbuff_t *tvb, guint offset, proto_tree *tree) tvb, offset + GNUTELLA_PONG_PORT_OFFSET, GNUTELLA_PORT_LENGTH, - TRUE); + ENC_LITTLE_ENDIAN); proto_tree_add_item(tree, hf_gnutella_pong_ip, @@ -106,14 +106,14 @@ static void dissect_gnutella_pong(tvbuff_t *tvb, guint offset, proto_tree *tree) tvb, offset + GNUTELLA_PONG_FILES_OFFSET, GNUTELLA_LONG_LENGTH, - TRUE); + ENC_LITTLE_ENDIAN); proto_tree_add_item(tree, hf_gnutella_pong_kbytes, tvb, offset + GNUTELLA_PONG_KBYTES_OFFSET, GNUTELLA_LONG_LENGTH, - TRUE); + ENC_LITTLE_ENDIAN); } @@ -124,7 +124,7 @@ static void dissect_gnutella_query(tvbuff_t *tvb, guint offset, proto_tree *tree tvb, offset + GNUTELLA_QUERY_SPEED_OFFSET, GNUTELLA_SHORT_LENGTH, - TRUE); + ENC_LITTLE_ENDIAN); if (size > GNUTELLA_SHORT_LENGTH) { proto_tree_add_item(tree, @@ -168,7 +168,7 @@ static void dissect_gnutella_queryhit(tvbuff_t *tvb, guint offset, proto_tree *t tvb, offset + GNUTELLA_QUERYHIT_PORT_OFFSET, GNUTELLA_PORT_LENGTH, - TRUE); + ENC_LITTLE_ENDIAN); proto_tree_add_item(tree, hf_gnutella_queryhit_ip, @@ -182,7 +182,7 @@ static void dissect_gnutella_queryhit(tvbuff_t *tvb, guint offset, proto_tree *t tvb, offset + GNUTELLA_QUERYHIT_SPEED_OFFSET, GNUTELLA_LONG_LENGTH, - TRUE); + ENC_LITTLE_ENDIAN); hit_offset = offset + GNUTELLA_QUERYHIT_FIRST_HIT_OFFSET; @@ -237,14 +237,14 @@ static void dissect_gnutella_queryhit(tvbuff_t *tvb, guint offset, proto_tree *t tvb, idx_at_offset, GNUTELLA_LONG_LENGTH, - TRUE); + ENC_LITTLE_ENDIAN); proto_tree_add_item(hit_tree, hf_gnutella_queryhit_hit_size, tvb, size_at_offset, GNUTELLA_LONG_LENGTH, - TRUE); + ENC_LITTLE_ENDIAN); proto_tree_add_item(hit_tree, hf_gnutella_queryhit_hit_name, @@ -303,7 +303,7 @@ static void dissect_gnutella_push(tvbuff_t *tvb, guint offset, proto_tree *tree) tvb, offset + GNUTELLA_PUSH_INDEX_OFFSET, GNUTELLA_LONG_LENGTH, - TRUE); + ENC_LITTLE_ENDIAN); proto_tree_add_item(tree, hf_gnutella_push_ip, @@ -317,7 +317,7 @@ static void dissect_gnutella_push(tvbuff_t *tvb, guint offset, proto_tree *tree) tvb, offset + GNUTELLA_PUSH_PORT_OFFSET, GNUTELLA_PORT_LENGTH, - TRUE); + ENC_LITTLE_ENDIAN); } @@ -425,14 +425,14 @@ static void dissect_gnutella_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree * tvb, GNUTELLA_HEADER_TTL_OFFSET, GNUTELLA_BYTE_LENGTH, - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item(gnutella_header_tree, hf_gnutella_header_hops, tvb, GNUTELLA_HEADER_HOPS_OFFSET, GNUTELLA_BYTE_LENGTH, - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_uint(gnutella_header_tree, hf_gnutella_header_size, diff --git a/epan/dissectors/packet-gopher.c b/epan/dissectors/packet-gopher.c index d01eaee2bb..7c5333a526 100644 --- a/epan/dissectors/packet-gopher.c +++ b/epan/dissectors/packet-gopher.c @@ -180,7 +180,7 @@ dissect_gopher(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { ti = proto_tree_add_string(gopher_tree, hf_gopher_dir_item, tvb, offset, line_len + 1, name); dir_tree = proto_item_add_subtree(ti, ett_dir_item); - proto_tree_add_item(dir_tree, hf_gopher_di_type, tvb, offset, 1, FALSE); + proto_tree_add_item(dir_tree, hf_gopher_di_type, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(dir_tree, hf_gopher_di_name, tvb, offset + 1, sel_start - offset - 2, FALSE); proto_tree_add_item(dir_tree, hf_gopher_di_selector, tvb, sel_start, diff --git a/epan/dissectors/packet-gpef.c b/epan/dissectors/packet-gpef.c index 0dab34afac..054b765978 100644 --- a/epan/dissectors/packet-gpef.c +++ b/epan/dissectors/packet-gpef.c @@ -69,16 +69,16 @@ dissect_gpef_efskey(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *p /* length 1 */ length1 = tvb_get_letohl(tvb, offset); - proto_tree_add_item(tree, hf_gpef_efskey_length1, tvb, offset, 4, TRUE); + proto_tree_add_item(tree, hf_gpef_efskey_length1, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; /* length 2 */ - proto_tree_add_item(tree, hf_gpef_efskey_length2, tvb, offset, 4, TRUE); + proto_tree_add_item(tree, hf_gpef_efskey_length2, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; /* sid offset */ sid_offset = tvb_get_letohl(tvb, offset); - proto_tree_add_item(tree, hf_gpef_efskey_sid_offset, tvb, offset, 4, TRUE); + proto_tree_add_item(tree, hf_gpef_efskey_sid_offset, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; /* reserved */ @@ -86,12 +86,12 @@ dissect_gpef_efskey(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *p /* cert length */ cert_length = tvb_get_letohl(tvb, offset); - proto_tree_add_item(tree, hf_gpef_efskey_cert_length, tvb, offset, 4, TRUE); + proto_tree_add_item(tree, hf_gpef_efskey_cert_length, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; /* cert offset */ cert_offset = tvb_get_letohl(tvb, offset); - proto_tree_add_item(tree, hf_gpef_efskey_cert_offset, tvb, offset, 4, TRUE); + proto_tree_add_item(tree, hf_gpef_efskey_cert_offset, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; /* reserved, must be 0x20 0x00 0x00 0x00 */ @@ -129,7 +129,7 @@ dissect_gpef_efsblob(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *parent_t /* key count */ count = tvb_get_letohl(tvb, offset); - proto_tree_add_item(tree, hf_gpef_keycount, tvb, offset, 4, TRUE); + proto_tree_add_item(tree, hf_gpef_keycount, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; while (count--) { diff --git a/epan/dissectors/packet-gre.c b/epan/dissectors/packet-gre.c index 5ea46d6c2d..daffd7c1e3 100644 --- a/epan/dissectors/packet-gre.c +++ b/epan/dissectors/packet-gre.c @@ -229,8 +229,8 @@ dissect_gre_3gpp2_attribs(tvbuff_t *tvb, int offset, proto_tree *tree) val_to_str((attrib_id&0x7f), gre_3ggp2_attrib_id_vals, "%u (Unknown)")); attr_tree = proto_item_add_subtree(attr_item, ett_3gpp2_attr); - proto_tree_add_item(attr_tree, hf_gre_3ggp2_attrib_id, tvb, offset, 1, FALSE); - proto_tree_add_item(attr_tree, hf_gre_3ggp2_attrib_length, tvb, offset+1, 1, FALSE); + proto_tree_add_item(attr_tree, hf_gre_3ggp2_attrib_id, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(attr_tree, hf_gre_3ggp2_attrib_length, tvb, offset+1, 1, ENC_BIG_ENDIAN); offset += 2; last_attrib = (attrib_id & 0x80)?TRUE:FALSE; @@ -257,7 +257,7 @@ dissect_gre_3gpp2_attribs(tvbuff_t *tvb, int offset, proto_tree *tree) case ID_3GPP2_SEG: { value = tvb_get_guint8(tvb,offset) >>6; - proto_tree_add_item(attr_tree, hf_gre_3ggp2_seg, tvb, offset, attrib_length, FALSE); + proto_tree_add_item(attr_tree, hf_gre_3ggp2_seg, tvb, offset, attrib_length, ENC_BIG_ENDIAN); proto_item_append_text(attr_item," - %s",val_to_str(value, gre_3ggp2_seg_vals, "0x%02X - Unknown")); } break; @@ -294,11 +294,11 @@ dissect_gre_wccp2_redirect_header(tvbuff_t *tvb, int offset, proto_tree *tree) proto_tree_add_item(rh_tree, hf_gre_wccp_alternative_bucket_used, tvb, offset, 1, FALSE); - proto_tree_add_item(rh_tree, hf_gre_wccp_service_id, tvb, offset +1, 1, FALSE); + proto_tree_add_item(rh_tree, hf_gre_wccp_service_id, tvb, offset +1, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(rh_tree, hf_gre_wccp_alternative_bucket, tvb, offset +2, 1, FALSE); + proto_tree_add_item(rh_tree, hf_gre_wccp_alternative_bucket, tvb, offset +2, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(rh_tree, hf_gre_wccp_primary_bucket, tvb, offset +3, 1, FALSE); + proto_tree_add_item(rh_tree, hf_gre_wccp_primary_bucket, tvb, offset +3, 1, ENC_BIG_ENDIAN); } static void @@ -356,7 +356,7 @@ dissect_gre(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) gre_tree = proto_item_add_subtree(ti, ett_gre); - it_flags = proto_tree_add_item(gre_tree, hf_gre_flags_and_version, tvb, offset, 2, FALSE); + it_flags = proto_tree_add_item(gre_tree, hf_gre_flags_and_version, tvb, offset, 2, ENC_BIG_ENDIAN); fv_tree = proto_item_add_subtree(it_flags, ett_gre_flags); proto_tree_add_item(fv_tree, hf_gre_flags_checksum, tvb, offset, 2, FALSE); @@ -369,23 +369,23 @@ dissect_gre(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(fv_tree, hf_gre_flags_strict_source_route, tvb, offset, 2, FALSE); - proto_tree_add_item(fv_tree, hf_gre_flags_recursion_control, tvb, offset, 2, FALSE); + proto_tree_add_item(fv_tree, hf_gre_flags_recursion_control, tvb, offset, 2, ENC_BIG_ENDIAN); /* RFC2637 Section 4.1 : Enhanced GRE Header */ if (is_ppp) { proto_tree_add_item(fv_tree, hf_gre_flags_ack, tvb, offset, 2, FALSE); - proto_tree_add_item(fv_tree, hf_gre_flags_reserved_ppp, tvb, offset, 2, FALSE); + proto_tree_add_item(fv_tree, hf_gre_flags_reserved_ppp, tvb, offset, 2, ENC_BIG_ENDIAN); } else { - proto_tree_add_item(fv_tree, hf_gre_flags_reserved, tvb, offset, 2, FALSE); + proto_tree_add_item(fv_tree, hf_gre_flags_reserved, tvb, offset, 2, ENC_BIG_ENDIAN); } - proto_tree_add_item(fv_tree, hf_gre_flags_version, tvb, offset, 2, FALSE); + proto_tree_add_item(fv_tree, hf_gre_flags_version, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(gre_tree, hf_gre_proto, tvb, offset, 2, FALSE); + proto_tree_add_item(gre_tree, hf_gre_proto, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; if (flags_and_ver & GRE_CHECKSUM || flags_and_ver & GRE_ROUTING) { @@ -394,7 +394,7 @@ dissect_gre(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) vec_t cksum_vec[1]; guint16 cksum, computed_cksum; - it_checksum = proto_tree_add_item(gre_tree, hf_gre_checksum, tvb, offset, 2, FALSE); + it_checksum = proto_tree_add_item(gre_tree, hf_gre_checksum, tvb, offset, 2, ENC_BIG_ENDIAN); /* Checksum check !... */ cksum = tvb_get_ntohs(tvb, offset); length = tvb_length(tvb); @@ -416,7 +416,7 @@ dissect_gre(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset += 2; - proto_tree_add_item(gre_tree, hf_gre_offset, tvb, offset, 2, FALSE); + proto_tree_add_item(gre_tree, hf_gre_offset, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; } @@ -427,22 +427,22 @@ dissect_gre(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(gre_tree, hf_gre_key_payload_length, tvb, offset, 2, FALSE); offset += 2; - proto_tree_add_item(gre_tree, hf_gre_key_call_id, tvb, offset, 2, FALSE); + proto_tree_add_item(gre_tree, hf_gre_key_call_id, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; } else { - proto_tree_add_item(gre_tree, hf_gre_key, tvb, offset, 4, FALSE); + proto_tree_add_item(gre_tree, hf_gre_key, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; } } if (flags_and_ver & GRE_SEQUENCE) { - proto_tree_add_item(gre_tree, hf_gre_sequence_number , tvb, offset, 4, FALSE); + proto_tree_add_item(gre_tree, hf_gre_sequence_number , tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; } if (is_ppp && (flags_and_ver & GRE_ACK)) { - proto_tree_add_item(gre_tree, hf_gre_ack_number , tvb, offset, 4, FALSE); + proto_tree_add_item(gre_tree, hf_gre_ack_number , tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; } if (flags_and_ver & GRE_ROUTING) { @@ -454,14 +454,14 @@ dissect_gre(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) r_tree = proto_item_add_subtree(ti, ett_gre_routing); sre_af = tvb_get_ntohs(tvb, offset); - proto_tree_add_item(r_tree, hf_gre_routing_address_family , tvb, offset, 2, FALSE); + proto_tree_add_item(r_tree, hf_gre_routing_address_family , tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(r_tree, hf_gre_routing_sre_offset , tvb, offset, 1, FALSE); + proto_tree_add_item(r_tree, hf_gre_routing_sre_offset , tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; sre_length = tvb_get_guint8(tvb, offset); - proto_tree_add_item(r_tree, hf_gre_routing_sre_length , tvb, offset, 1, FALSE); + proto_tree_add_item(r_tree, hf_gre_routing_sre_length , tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; proto_item_set_len(it_routing, 2 + 1 +1 + sre_length); diff --git a/epan/dissectors/packet-gsm_a_bssmap.c b/epan/dissectors/packet-gsm_a_bssmap.c index 22d3f96bb1..2fdd1ca337 100644 --- a/epan/dissectors/packet-gsm_a_bssmap.c +++ b/epan/dissectors/packet-gsm_a_bssmap.c @@ -3895,7 +3895,7 @@ be_call_id(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offs * Call Identifier octet 4 * Call Identifier (most significant bits) octet 5 */ - proto_tree_add_item(tree, hf_gsm_a_bssmap_call_id, tvb, curr_offset, 4, TRUE); + proto_tree_add_item(tree, hf_gsm_a_bssmap_call_id, tvb, curr_offset, 4, ENC_LITTLE_ENDIAN); curr_offset+=4; return(curr_offset - offset); @@ -3913,7 +3913,7 @@ be_call_id_lst(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 proto_tree_add_text(tree, tvb, curr_offset, len, "all resources and references associated to all Call Identifiers in use between the BSC and the MSC need to be released"); } while (curr_offset-offset < len){ - proto_tree_add_item(tree, hf_gsm_a_bssmap_call_id, tvb, curr_offset, 4, TRUE); + proto_tree_add_item(tree, hf_gsm_a_bssmap_call_id, tvb, curr_offset, 4, ENC_LITTLE_ENDIAN); curr_offset+=4; } diff --git a/epan/dissectors/packet-gsm_bsslap.c b/epan/dissectors/packet-gsm_bsslap.c index 4fe5d36179..61451eaef6 100644 --- a/epan/dissectors/packet-gsm_bsslap.c +++ b/epan/dissectors/packet-gsm_bsslap.c @@ -174,7 +174,7 @@ de_ta(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, g guint32 curr_offset; curr_offset = offset; - proto_tree_add_item(tree, hf_gsm_bsslap_ta, tvb, curr_offset, 1, FALSE); + proto_tree_add_item(tree, hf_gsm_bsslap_ta, tvb, curr_offset, 1, ENC_BIG_ENDIAN); curr_offset++; return(curr_offset - offset); @@ -218,7 +218,7 @@ de_bsslap_cause(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 guint32 curr_offset; curr_offset = offset; - proto_tree_add_item(tree, hf_gsm_bsslap_cause, tvb, curr_offset, 1, FALSE); + proto_tree_add_item(tree, hf_gsm_bsslap_cause, tvb, curr_offset, 1, ENC_BIG_ENDIAN); curr_offset++; return(curr_offset - offset); @@ -236,7 +236,7 @@ de_rrlp_flg(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 off guint32 curr_offset; curr_offset = offset; - proto_tree_add_item(tree, hf_gsm_bsslap_rrlp_flg, tvb, curr_offset, 1, FALSE); + proto_tree_add_item(tree, hf_gsm_bsslap_rrlp_flg, tvb, curr_offset, 1, ENC_BIG_ENDIAN); curr_offset++; return(curr_offset - offset); @@ -299,7 +299,7 @@ de_cell_id_list(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 off if (add_string) add_string[0] = '\0'; - proto_tree_add_item(subtree, hf_gsm_bsslap_cell_id_disc, tvb, curr_offset, 1, FALSE); + proto_tree_add_item(subtree, hf_gsm_bsslap_cell_id_disc, tvb, curr_offset, 1, ENC_BIG_ENDIAN); curr_offset++; len--; switch(cell_id_disc){ @@ -357,7 +357,7 @@ de_lac(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint32 curr_offset; curr_offset = offset; - proto_tree_add_item(tree, hf_gsm_bsslap_lac, tvb, curr_offset, 1, FALSE); + proto_tree_add_item(tree, hf_gsm_bsslap_lac, tvb, curr_offset, 1, ENC_BIG_ENDIAN); curr_offset++; return(curr_offset - offset); @@ -371,7 +371,7 @@ de_ms_pow(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offse guint32 curr_offset; curr_offset = offset; - proto_tree_add_item(tree, hf_gsm_bsslap_ms_pow, tvb, curr_offset, 1, FALSE); + proto_tree_add_item(tree, hf_gsm_bsslap_ms_pow, tvb, curr_offset, 1, ENC_BIG_ENDIAN); curr_offset++; return(curr_offset - offset); @@ -386,7 +386,7 @@ de_delta_time(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 o guint32 curr_offset; curr_offset = offset; - proto_tree_add_item(tree, hf_gsm_bsslap_timer_value, tvb, curr_offset, 1, FALSE); + proto_tree_add_item(tree, hf_gsm_bsslap_timer_value, tvb, curr_offset, 1, ENC_BIG_ENDIAN); curr_offset++; return(curr_offset - offset); @@ -430,7 +430,7 @@ de_poll_rep(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 off guint32 curr_offset; curr_offset = offset; - proto_tree_add_item(tree, hf_gsm_bsslap_poll_rep, tvb, curr_offset, 1, FALSE); + proto_tree_add_item(tree, hf_gsm_bsslap_poll_rep, tvb, curr_offset, 1, ENC_BIG_ENDIAN); curr_offset++; return(curr_offset - offset); @@ -466,7 +466,7 @@ de_tfi(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint32 curr_offset; curr_offset = offset; - proto_tree_add_item(tree, hf_gsm_bsslap_tfi, tvb, curr_offset, 1, FALSE); + proto_tree_add_item(tree, hf_gsm_bsslap_tfi, tvb, curr_offset, 1, ENC_BIG_ENDIAN); curr_offset++; return(curr_offset - offset); @@ -811,7 +811,7 @@ dissect_gsm_bsslap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) sub_tree = proto_item_add_subtree(item, ett_gsm_bsslap); /* Message Type IE / 5.1 M V 1 */ - proto_tree_add_item(sub_tree, hf_gsm_bsslap_msg_type, tvb, offset, 1, FALSE); + proto_tree_add_item(sub_tree, hf_gsm_bsslap_msg_type, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; switch (octet){ diff --git a/epan/dissectors/packet-gsmtap.c b/epan/dissectors/packet-gsmtap.c index f1b41130e1..cc2bb5569f 100644 --- a/epan/dissectors/packet-gsmtap.c +++ b/epan/dissectors/packet-gsmtap.c @@ -276,11 +276,11 @@ dissect_sacch_l1h(tvbuff_t *tvb, proto_tree *tree) tvb_get_guint8(tvb, 1)); l1h_tree = proto_item_add_subtree(ti, ett_gsmtap); /* Power Level */ - proto_tree_add_item(l1h_tree, hf_sacch_l1h_power_lev, tvb, 0, 1, FALSE); + proto_tree_add_item(l1h_tree, hf_sacch_l1h_power_lev, tvb, 0, 1, ENC_BIG_ENDIAN); /* Fast Power Control */ proto_tree_add_item(l1h_tree, hf_sacch_l1h_fpc, tvb, 0, 1, FALSE); /* Acutal Timing Advance */ - proto_tree_add_item(l1h_tree, hf_sacch_l1h_ta, tvb, 1, 1, FALSE); + proto_tree_add_item(l1h_tree, hf_sacch_l1h_ta, tvb, 1, 1, ENC_BIG_ENDIAN); } @@ -374,40 +374,40 @@ dissect_gsmtap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvb_get_guint8(tvb, offset+14)); gsmtap_tree = proto_item_add_subtree(ti, ett_gsmtap); proto_tree_add_item(gsmtap_tree, hf_gsmtap_version, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_uint_format(gsmtap_tree, hf_gsmtap_hdrlen, tvb, offset+1, 1, hdr_len, "Header length: %u bytes", hdr_len); proto_tree_add_item(gsmtap_tree, hf_gsmtap_type, - tvb, offset+2, 1, FALSE); + tvb, offset+2, 1, ENC_BIG_ENDIAN); proto_tree_add_item(gsmtap_tree, hf_gsmtap_timeslot, - tvb, offset+3, 1, FALSE); + tvb, offset+3, 1, ENC_BIG_ENDIAN); proto_tree_add_item(gsmtap_tree, hf_gsmtap_arfcn, - tvb, offset+4, 2, FALSE); + tvb, offset+4, 2, ENC_BIG_ENDIAN); proto_tree_add_item(gsmtap_tree, hf_gsmtap_uplink, - tvb, offset+4, 2, FALSE); + tvb, offset+4, 2, ENC_BIG_ENDIAN); proto_tree_add_item(gsmtap_tree, hf_gsmtap_noise_dbm, - tvb, offset+6, 1, FALSE); + tvb, offset+6, 1, ENC_BIG_ENDIAN); proto_tree_add_item(gsmtap_tree, hf_gsmtap_signal_dbm, - tvb, offset+7, 1, FALSE); + tvb, offset+7, 1, ENC_BIG_ENDIAN); proto_tree_add_item(gsmtap_tree, hf_gsmtap_frame_nr, - tvb, offset+8, 4, FALSE); + tvb, offset+8, 4, ENC_BIG_ENDIAN); if (type == GSMTAP_TYPE_UM_BURST) proto_tree_add_item(gsmtap_tree, hf_gsmtap_burst_type, - tvb, offset+12, 1, FALSE); + tvb, offset+12, 1, ENC_BIG_ENDIAN); else if (type == GSMTAP_TYPE_UM) proto_tree_add_item(gsmtap_tree, hf_gsmtap_channel_type, - tvb, offset+12, 1, FALSE); + tvb, offset+12, 1, ENC_BIG_ENDIAN); else if (type == GSMTAP_TYPE_TETRA_I1) proto_tree_add_item(gsmtap_tree, hf_gsmtap_tetra_channel_type, - tvb, offset+12, 1, FALSE); + tvb, offset+12, 1, ENC_BIG_ENDIAN); else if (type == GSMTAP_TYPE_WMX_BURST) proto_tree_add_item(gsmtap_tree, hf_gsmtap_burst_type, - tvb, offset+12, 1, FALSE); + tvb, offset+12, 1, ENC_BIG_ENDIAN); proto_tree_add_item(gsmtap_tree, hf_gsmtap_antenna, - tvb, offset+13, 1, FALSE); + tvb, offset+13, 1, ENC_BIG_ENDIAN); proto_tree_add_item(gsmtap_tree, hf_gsmtap_subslot, - tvb, offset+14, 1, FALSE); + tvb, offset+14, 1, ENC_BIG_ENDIAN); } switch (type) { diff --git a/epan/dissectors/packet-gvcp.c b/epan/dissectors/packet-gvcp.c index ccc55df91f..6884676b0c 100644 --- a/epan/dissectors/packet-gvcp.c +++ b/epan/dissectors/packet-gvcp.c @@ -258,10 +258,10 @@ dissect_gvcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ti = proto_tree_add_item(tree, proto_gvcp, tvb, 0, -1, FALSE); gvcp_tree = proto_item_add_subtree(ti, ett_gvcp); - proto_tree_add_item(gvcp_tree, hf_gvcp_type, tvb, 0, 2, FALSE); - proto_tree_add_item(gvcp_tree, hf_gvcp_opcode, tvb, 2, 2, FALSE); - proto_tree_add_item(gvcp_tree, hf_gvcp_payloadsize, tvb, 4, 2, FALSE); - proto_tree_add_item(gvcp_tree, hf_gvcp_sequenceno, tvb, 6, 2, FALSE); + proto_tree_add_item(gvcp_tree, hf_gvcp_type, tvb, 0, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(gvcp_tree, hf_gvcp_opcode, tvb, 2, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(gvcp_tree, hf_gvcp_payloadsize, tvb, 4, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(gvcp_tree, hf_gvcp_sequenceno, tvb, 6, 2, ENC_BIG_ENDIAN); /* opcode specific fields */ switch (packet_opcode) { @@ -274,9 +274,9 @@ dissect_gvcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; case 0x80: /* Register Read Request */ if (packet_plsize >= 4) { - proto_tree_add_item(gvcp_tree, hf_gvcp_address, tvb, 8, 4, FALSE); + proto_tree_add_item(gvcp_tree, hf_gvcp_address, tvb, 8, 4, ENC_BIG_ENDIAN); if (packet_plsize >= 8) { - proto_tree_add_item(gvcp_tree, hf_gvcp_address2, tvb, 12, 4, FALSE); + proto_tree_add_item(gvcp_tree, hf_gvcp_address2, tvb, 12, 4, ENC_BIG_ENDIAN); if (packet_plsize >= 12) proto_tree_add_item(gvcp_tree, hf_gvcp_remainder, tvb, 16, -1, ENC_NA); } @@ -284,9 +284,9 @@ dissect_gvcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; case 0x81: /* Register Read Answer */ if (packet_plsize >= 4) { - proto_tree_add_item(gvcp_tree, hf_gvcp_value, tvb, 8, 4, FALSE); + proto_tree_add_item(gvcp_tree, hf_gvcp_value, tvb, 8, 4, ENC_BIG_ENDIAN); if (packet_plsize >= 8) { - proto_tree_add_item(gvcp_tree, hf_gvcp_value2, tvb, 12, 4, FALSE); + proto_tree_add_item(gvcp_tree, hf_gvcp_value2, tvb, 12, 4, ENC_BIG_ENDIAN); if (packet_plsize >= 12) proto_tree_add_item(gvcp_tree, hf_gvcp_remainder, tvb, 16, -1, ENC_NA); } @@ -294,11 +294,11 @@ dissect_gvcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; case 0x82: /* Register Write Request */ if (packet_plsize >= 8) { - proto_tree_add_item(gvcp_tree, hf_gvcp_address, tvb, 8, 4, FALSE); - proto_tree_add_item(gvcp_tree, hf_gvcp_value, tvb, 12, 4, FALSE); + proto_tree_add_item(gvcp_tree, hf_gvcp_address, tvb, 8, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(gvcp_tree, hf_gvcp_value, tvb, 12, 4, ENC_BIG_ENDIAN); if (packet_plsize >= 16) { - proto_tree_add_item(gvcp_tree, hf_gvcp_address2, tvb, 16, 4, FALSE); - proto_tree_add_item(gvcp_tree, hf_gvcp_value2, tvb, 20, 4, FALSE); + proto_tree_add_item(gvcp_tree, hf_gvcp_address2, tvb, 16, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(gvcp_tree, hf_gvcp_value2, tvb, 20, 4, ENC_BIG_ENDIAN); if (packet_plsize >= 24) proto_tree_add_item(gvcp_tree, hf_gvcp_remainder, tvb, 24, -1, ENC_NA); } @@ -306,25 +306,25 @@ dissect_gvcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; case 0x83: /* Register Write Answer */ if (packet_plsize >= 4) - proto_tree_add_item(gvcp_tree, hf_gvcp_nwritten, tvb, 8, 4, FALSE); + proto_tree_add_item(gvcp_tree, hf_gvcp_nwritten, tvb, 8, 4, ENC_BIG_ENDIAN); break; case 0x84: /* Block Read Request */ if (packet_plsize >= 8) { - proto_tree_add_item(gvcp_tree, hf_gvcp_address, tvb, 8, 4, FALSE); - proto_tree_add_item(gvcp_tree, hf_gvcp_unknown16, tvb, 12, 2, FALSE); - proto_tree_add_item(gvcp_tree, hf_gvcp_nbytes, tvb, 14, 2, FALSE); + proto_tree_add_item(gvcp_tree, hf_gvcp_address, tvb, 8, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(gvcp_tree, hf_gvcp_unknown16, tvb, 12, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(gvcp_tree, hf_gvcp_nbytes, tvb, 14, 2, ENC_BIG_ENDIAN); } break; case 0x85: /* Block Read Answer */ case 0x86: /* Block Write Request */ if (packet_plsize >= 8) { - proto_tree_add_item(gvcp_tree, hf_gvcp_address, tvb, 8, 4, FALSE); + proto_tree_add_item(gvcp_tree, hf_gvcp_address, tvb, 8, 4, ENC_BIG_ENDIAN); proto_tree_add_item(gvcp_tree, hf_gvcp_data, tvb, 12, -1, ENC_NA); } break; case 0x87: /* Block Write Answer */ if (packet_plsize >= 4) - proto_tree_add_item(gvcp_tree, hf_gvcp_nbytes, tvb, 10, 2, FALSE); + proto_tree_add_item(gvcp_tree, hf_gvcp_nbytes, tvb, 10, 2, ENC_BIG_ENDIAN); break; default: if (packet_plsize > 0) diff --git a/epan/dissectors/packet-gvrp.c b/epan/dissectors/packet-gvrp.c index 6b7f8a630a..905d5d39d1 100644 --- a/epan/dissectors/packet-gvrp.c +++ b/epan/dissectors/packet-gvrp.c @@ -267,7 +267,7 @@ dissect_gvrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Show attribute value */ proto_tree_add_item(gvrp_tree, hf_gvrp_attribute_value, - tvb, offset, sizeof(guint16), FALSE); + tvb, offset, sizeof(guint16), ENC_BIG_ENDIAN); offset += sizeof(guint16); length -= sizeof(guint16); diff --git a/epan/dissectors/packet-h223.c b/epan/dissectors/packet-h223.c index 24c655a167..859315e416 100644 --- a/epan/dissectors/packet-h223.c +++ b/epan/dissectors/packet-h223.c @@ -684,7 +684,7 @@ dissect_mux_al_pdu( tvbuff_t *tvb, packet_info *pinfo, proto_tree *vc_tree, data_start = 0; if( al2_sequenced ) { - proto_tree_add_item(al_tree, hf_h223_al2_seqno, tvb, 0, 1, TRUE); + proto_tree_add_item(al_tree, hf_h223_al2_seqno, tvb, 0, 1, ENC_LITTLE_ENDIAN); data_start++; } @@ -1085,7 +1085,7 @@ dissect_mux_pdu( tvbuff_t *tvb, packet_info *pinfo, guint32 pkt_offset, /* add the closing HDLC flag */ if( pdu_tree ) - proto_tree_add_item(pdu_tree,hf_h223_mux_hdlc2,tvb,offset,2,FALSE); + proto_tree_add_item(pdu_tree,hf_h223_mux_hdlc2,tvb,offset,2,ENC_BIG_ENDIAN); } diff --git a/epan/dissectors/packet-h248_annex_c.c b/epan/dissectors/packet-h248_annex_c.c index a69f2c9426..8896f80a13 100644 --- a/epan/dissectors/packet-h248_annex_c.c +++ b/epan/dissectors/packet-h248_annex_c.c @@ -790,8 +790,8 @@ static void dissect_h248_annexc_NSAP(proto_tree* tree, static void dissect_h248_annexc_vpvc(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo _U_, int hfid, h248_curr_info_t* h248_info _U_, void* unused _U_) { proto_item* pi = proto_tree_add_item(tree,hfid,tvb,0,2,FALSE); proto_tree* pt = proto_item_add_subtree(pi,ett_vpvc); - proto_tree_add_item(pt,hf_h248_pkg_annexc_vp,tvb,0,2,FALSE); - proto_tree_add_item(pt,hf_h248_pkg_annexc_vc,tvb,2,2,FALSE); + proto_tree_add_item(pt,hf_h248_pkg_annexc_vp,tvb,0,2,ENC_BIG_ENDIAN); + proto_tree_add_item(pt,hf_h248_pkg_annexc_vc,tvb,2,2,ENC_BIG_ENDIAN); } static void dissect_h248_annexc_USI(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, int hfid, h248_curr_info_t* h248_info _U_, void* implicit_p) { diff --git a/epan/dissectors/packet-h263p.c b/epan/dissectors/packet-h263p.c index 9800b55e4a..04af1a00c7 100644 --- a/epan/dissectors/packet-h263p.c +++ b/epan/dissectors/packet-h263p.c @@ -92,11 +92,11 @@ dissect_h263P( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) h263P_tree = proto_item_add_subtree( ti, ett_h263P ); data16 = tvb_get_ntohs(tvb,offset); - proto_tree_add_item( h263P_tree, hf_h263P_rr, tvb, offset, 2, FALSE ); + proto_tree_add_item( h263P_tree, hf_h263P_rr, tvb, offset, 2, ENC_BIG_ENDIAN ); proto_tree_add_item( h263P_tree, hf_h263P_pbit, tvb, offset, 2, FALSE ); proto_tree_add_item( h263P_tree, hf_h263P_vbit, tvb, offset, 2, FALSE ); proto_tree_add_item( h263P_tree, hf_h263P_plen, tvb, offset, 2, FALSE ); - proto_tree_add_item( h263P_tree, hf_h263P_pebit, tvb, offset, 2, FALSE ); + proto_tree_add_item( h263P_tree, hf_h263P_pebit, tvb, offset, 2, ENC_BIG_ENDIAN ); offset = offset +2; /* * V: 1 bit @@ -139,9 +139,9 @@ dissect_h263P( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) * A bit that indicates that the packet content is for a sync frame. * : */ - proto_tree_add_item( h263P_tree, hf_h263P_tid, tvb, offset, 1, FALSE ); - proto_tree_add_item( h263P_tree, hf_h263P_trun, tvb, offset, 1, FALSE ); - proto_tree_add_item( h263P_tree, hf_h263P_s, tvb, offset, 1, FALSE ); + proto_tree_add_item( h263P_tree, hf_h263P_tid, tvb, offset, 1, ENC_BIG_ENDIAN ); + proto_tree_add_item( h263P_tree, hf_h263P_trun, tvb, offset, 1, ENC_BIG_ENDIAN ); + proto_tree_add_item( h263P_tree, hf_h263P_s, tvb, offset, 1, ENC_BIG_ENDIAN ); offset++; } diff --git a/epan/dissectors/packet-hci_h4.c b/epan/dissectors/packet-hci_h4.c index 7b1f225950..4802574422 100644 --- a/epan/dissectors/packet-hci_h4.c +++ b/epan/dissectors/packet-hci_h4.c @@ -100,7 +100,7 @@ dissect_hci_h4(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) PROTO_ITEM_SET_GENERATED(ti); proto_tree_add_item(hci_h4_tree, hf_hci_h4_type, - tvb, 0, 1, TRUE); + tvb, 0, 1, ENC_LITTLE_ENDIAN); col_append_fstr(pinfo->cinfo, COL_INFO, "%s", val_to_str(type, hci_h4_type_vals, "Unknown HCI packet type 0x%02x")); diff --git a/epan/dissectors/packet-hilscher.c b/epan/dissectors/packet-hilscher.c index 6ae793c3bd..a5aeef146a 100644 --- a/epan/dissectors/packet-hilscher.c +++ b/epan/dissectors/packet-hilscher.c @@ -97,18 +97,18 @@ dissect_hilscher_netanalyzer(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree col_set_str(pinfo->cinfo, COL_PROTOCOL, "netANALYZER"); if (tree) - proto_tree_add_item(tree, hf_information_type, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_information_type, tvb, offset, 1, ENC_BIG_ENDIAN); /* GPIO NUMBER */ offset++; if (tree) - proto_tree_add_item (tree, hf_gpio_number, tvb, offset, 1, FALSE); + proto_tree_add_item (tree, hf_gpio_number, tvb, offset, 1, ENC_BIG_ENDIAN); gpio_num = (tvb_get_guint8(tvb, offset) & 0x03); /* GPIO EDGE */ offset++; if (tree) - proto_tree_add_item (tree, hf_gpio_edge, tvb, offset, 1, FALSE); + proto_tree_add_item (tree, hf_gpio_edge, tvb, offset, 1, ENC_BIG_ENDIAN); gpio_edgex = (tvb_get_guint8(tvb, offset) & 0x01); if (gpio_edgex == 0x00) diff --git a/epan/dissectors/packet-hip.c b/epan/dissectors/packet-hip.c index e21881f099..5cdfa967d4 100644 --- a/epan/dissectors/packet-hip.c +++ b/epan/dissectors/packet-hip.c @@ -439,8 +439,8 @@ dissect_hip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ti = proto_tree_add_item(tree, proto_hip, tvb, 0, -1, FALSE); hip_tree = proto_item_add_subtree(ti, ett_hip); - proto_tree_add_item(hip_tree, hf_hip_proto, tvb, offset, 1, FALSE); - proto_tree_add_item(hip_tree, hf_hip_hdr_len, tvb, offset+1, 1, FALSE); + proto_tree_add_item(hip_tree, hf_hip_proto, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(hip_tree, hf_hip_hdr_len, tvb, offset+1, 1, ENC_BIG_ENDIAN); proto_tree_add_uint_format(hip_tree, hf_hip_shim6_fixed_bit_p, tvb, offset+2, 1, hiph_shim6_fixed_bit_p, "Fixed P-bit: %u (Always zero)", @@ -507,7 +507,7 @@ dissect_hip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) checksum_h); } - ti = proto_tree_add_item(hip_tree, hf_hip_controls, tvb, offset+6, 2, FALSE); + ti = proto_tree_add_item(hip_tree, hf_hip_controls, tvb, offset+6, 2, ENC_BIG_ENDIAN); if (ti) { /* HIP Controls subtree */ ti = proto_item_add_subtree(ti, ett_hip_controls); @@ -582,21 +582,21 @@ dissect_hip_tlv(tvbuff_t *tvb, int offset, proto_item *ti, int type, int tlv_len case PARAM_ESP_INFO: t = proto_item_add_subtree(ti, ett_hip_tlv_data); /* Reserved */ - proto_tree_add_item(t, hf_hip_tlv_ei_res, tvb, newoffset, 2, FALSE); + proto_tree_add_item(t, hf_hip_tlv_ei_res, tvb, newoffset, 2, ENC_BIG_ENDIAN); /* KEYMAT index */ newoffset += 2; - proto_tree_add_item(t, hf_hip_tlv_ei_keyidx, tvb, newoffset, 2, FALSE); + proto_tree_add_item(t, hf_hip_tlv_ei_keyidx, tvb, newoffset, 2, ENC_BIG_ENDIAN); /* OLD SPI */ newoffset += 2; - proto_tree_add_item(t, hf_hip_tlv_ei_oldspi, tvb, newoffset, 4, FALSE); + proto_tree_add_item(t, hf_hip_tlv_ei_oldspi, tvb, newoffset, 4, ENC_BIG_ENDIAN); /* NEW SPI */ newoffset += 4; - proto_tree_add_item(t, hf_hip_tlv_ei_newspi, tvb, newoffset, 4, FALSE); + proto_tree_add_item(t, hf_hip_tlv_ei_newspi, tvb, newoffset, 4, ENC_BIG_ENDIAN); break; case PARAM_R1_COUNTER: t = proto_item_add_subtree(ti, ett_hip_tlv_data); /* Reserved */ - proto_tree_add_item(t, hf_hip_tlv_r1_res, tvb, newoffset, 4, FALSE); + proto_tree_add_item(t, hf_hip_tlv_r1_res, tvb, newoffset, 4, ENC_BIG_ENDIAN); /* R1 generation counter */ newoffset += 4; proto_tree_add_item(t, hf_hip_tlv_r1count, tvb, newoffset, 8, ENC_NA); @@ -633,16 +633,16 @@ dissect_hip_tlv(tvbuff_t *tvb, int offset, proto_item *ti, int type, int tlv_len ti_loc = proto_item_add_subtree(ti_loc, ett_hip_locator_data); /* Traffic type */ proto_tree_add_item(ti_loc, hf_hip_tlv_locator_traffic_type, tvb, - newoffset, 1, FALSE); + newoffset, 1, ENC_BIG_ENDIAN); newoffset++; /* Locator type */ #if 0 locator_type = tvb_get_guint8(tvb, newoffset); #endif - proto_tree_add_item(ti_loc, hf_hip_tlv_locator_type, tvb, newoffset, 1, FALSE); + proto_tree_add_item(ti_loc, hf_hip_tlv_locator_type, tvb, newoffset, 1, ENC_BIG_ENDIAN); newoffset++; /* Locator length */ - proto_tree_add_item(ti_loc, hf_hip_tlv_locator_len, tvb, newoffset, 1, FALSE); + proto_tree_add_item(ti_loc, hf_hip_tlv_locator_len, tvb, newoffset, 1, ENC_BIG_ENDIAN); newoffset++; /* Reserved includes the Preferred bit */ reserved = tvb_get_guint8(tvb, newoffset); @@ -653,7 +653,7 @@ dissect_hip_tlv(tvbuff_t *tvb, int offset, proto_item *ti, int type, int tlv_len newoffset++; /* Locator lifetime */ proto_tree_add_item(ti_loc, hf_hip_tlv_locator_lifetime, tvb, - newoffset, 4, FALSE); + newoffset, 4, ENC_BIG_ENDIAN); newoffset += 4; if (locator_type == 0) { /* Locator types 1 and 0 RFC 5206 section 4.2.*/ @@ -666,7 +666,7 @@ dissect_hip_tlv(tvbuff_t *tvb, int offset, proto_item *ti, int type, int tlv_len /* Locator types 1 and 0 RFC 5206 section 4.2.*/ /* SPI */ proto_tree_add_item(ti_loc, hf_hip_tlv_locator_spi, tvb, - newoffset, 4, FALSE); + newoffset, 4, ENC_BIG_ENDIAN); newoffset += 4; /* Locator */ proto_tree_add_item(ti_loc, hf_hip_tlv_locator_address, @@ -677,7 +677,7 @@ dissect_hip_tlv(tvbuff_t *tvb, int offset, proto_item *ti, int type, int tlv_len /* Locator type 2 RFC 5770 section 5.7. */ /* Tansport port */ proto_tree_add_item(ti_loc, hf_hip_tlv_locator_port, tvb, - newoffset, 2, FALSE); + newoffset, 2, ENC_BIG_ENDIAN); newoffset += 2; /* Transport protocol */ transport_proto = tvb_get_guint8(tvb, newoffset); @@ -691,15 +691,15 @@ dissect_hip_tlv(tvbuff_t *tvb, int offset, proto_item *ti, int type, int tlv_len newoffset++; /* Kind */ proto_tree_add_item(ti_loc, hf_hip_tlv_locator_kind, tvb, - newoffset, 1, FALSE); + newoffset, 1, ENC_BIG_ENDIAN); newoffset++; /* Priority */ proto_tree_add_item(ti_loc, hf_hip_tlv_locator_priority, tvb, - newoffset, 4, FALSE); + newoffset, 4, ENC_BIG_ENDIAN); newoffset += 4; /* SPI */ proto_tree_add_item(ti_loc, hf_hip_tlv_locator_spi, tvb, - newoffset, 4, FALSE); + newoffset, 4, ENC_BIG_ENDIAN); newoffset += 4; /* Locator */ proto_tree_add_item(ti_loc, hf_hip_tlv_locator_address, @@ -713,13 +713,13 @@ dissect_hip_tlv(tvbuff_t *tvb, int offset, proto_item *ti, int type, int tlv_len case PARAM_PUZZLE: t = proto_item_add_subtree(ti, ett_hip_tlv_data); /* K number of verified bits */ - proto_tree_add_item(t, hf_hip_tlv_puzzle_k, tvb, newoffset, 1, FALSE); + proto_tree_add_item(t, hf_hip_tlv_puzzle_k, tvb, newoffset, 1, ENC_BIG_ENDIAN); /* Puzzle lifetime */ newoffset++; - proto_tree_add_item(t, hf_hip_tlv_puzzle_life, tvb, newoffset, 1, FALSE); + proto_tree_add_item(t, hf_hip_tlv_puzzle_life, tvb, newoffset, 1, ENC_BIG_ENDIAN); /* Puzzle O*/ newoffset++; - proto_tree_add_item(t, hf_hip_tlv_puzzle_o, tvb, newoffset, 2, FALSE); + proto_tree_add_item(t, hf_hip_tlv_puzzle_o, tvb, newoffset, 2, ENC_BIG_ENDIAN); /* Puzzle I */ newoffset += 2; proto_tree_add_item(t, hf_hip_tlv_puzzle_i, tvb,newoffset, 8, ENC_NA); @@ -727,13 +727,13 @@ dissect_hip_tlv(tvbuff_t *tvb, int offset, proto_item *ti, int type, int tlv_len case PARAM_SOLUTION: t = proto_item_add_subtree(ti, ett_hip_tlv_data); /* K number of verified bits */ - proto_tree_add_item(t, hf_hip_tlv_solution_k, tvb, newoffset, 1, FALSE); + proto_tree_add_item(t, hf_hip_tlv_solution_k, tvb, newoffset, 1, ENC_BIG_ENDIAN); /* Solution Reserved */ newoffset++; - proto_tree_add_item(t, hf_hip_tlv_solution_reserved, tvb, newoffset, 1, FALSE); + proto_tree_add_item(t, hf_hip_tlv_solution_reserved, tvb, newoffset, 1, ENC_BIG_ENDIAN); /* Solution Opaque */ newoffset++; - proto_tree_add_item(t, hf_hip_tlv_solution_o, tvb,newoffset, 2, FALSE); + proto_tree_add_item(t, hf_hip_tlv_solution_o, tvb,newoffset, 2, ENC_BIG_ENDIAN); /* Solution I */ newoffset += 2; proto_tree_add_item(t, hf_hip_tlv_solution_i, tvb, newoffset, 8, ENC_NA); @@ -744,14 +744,14 @@ dissect_hip_tlv(tvbuff_t *tvb, int offset, proto_item *ti, int type, int tlv_len case PARAM_SEQ: t = proto_item_add_subtree(ti, ett_hip_tlv_data); /* Update ID */ - proto_tree_add_item(t, hf_hip_tlv_seq_updid, tvb, newoffset, 4, FALSE); + proto_tree_add_item(t, hf_hip_tlv_seq_updid, tvb, newoffset, 4, ENC_BIG_ENDIAN); break; case PARAM_ACK: t = proto_item_add_subtree(ti, ett_hip_tlv_data); /* Can contain multiple Update IDs from peer */ while (tlv_len > 0) { /* peer Update ID */ - proto_tree_add_item(t, hf_hip_tlv_ack_updid, tvb, newoffset, 4, FALSE); + proto_tree_add_item(t, hf_hip_tlv_ack_updid, tvb, newoffset, 4, ENC_BIG_ENDIAN); newoffset += 4; tlv_len -= 4; } @@ -766,7 +766,7 @@ dissect_hip_tlv(tvbuff_t *tvb, int offset, proto_item *ti, int type, int tlv_len /* First Public value len */ newoffset++; pv_len = tvb_get_ntohs(tvb, newoffset); - proto_tree_add_item(t, hf_hip_tlv_dh_pv_length, tvb, newoffset, 2, FALSE); + proto_tree_add_item(t, hf_hip_tlv_dh_pv_length, tvb, newoffset, 2, ENC_BIG_ENDIAN); /* First Public value */ newoffset += 2; @@ -781,7 +781,7 @@ dissect_hip_tlv(tvbuff_t *tvb, int offset, proto_item *ti, int type, int tlv_len /* Second Public value len */ newoffset += 1; pv_len = tvb_get_ntohs(tvb, newoffset); - proto_tree_add_item(t, hf_hip_tlv_dh_pv_length, tvb, newoffset, 2, FALSE); + proto_tree_add_item(t, hf_hip_tlv_dh_pv_length, tvb, newoffset, 2, ENC_BIG_ENDIAN); /* Second Public Value */ newoffset += 2; proto_tree_add_item(t, hf_hip_tlv_dh_pub, tvb, newoffset, @@ -791,7 +791,7 @@ dissect_hip_tlv(tvbuff_t *tvb, int offset, proto_item *ti, int type, int tlv_len case PARAM_ESP_TRANSFORM: t = proto_item_add_subtree(ti, ett_hip_tlv_data); /* Reserved */ - proto_tree_add_item(t, hf_hip_tlv_esp_reserved, tvb, newoffset, 2, FALSE); + proto_tree_add_item(t, hf_hip_tlv_esp_reserved, tvb, newoffset, 2, ENC_BIG_ENDIAN); newoffset +=2; tlv_len -= 2; while (tlv_len > 0) { @@ -822,7 +822,7 @@ dissect_hip_tlv(tvbuff_t *tvb, int offset, proto_item *ti, int type, int tlv_len case PARAM_NAT_TRAVERSAL_MODE: t = proto_item_add_subtree(ti, ett_hip_tlv_data); /* Reserved */ - proto_tree_add_item(t, hf_hip_tlv_esp_reserved, tvb, newoffset, 2, FALSE); + proto_tree_add_item(t, hf_hip_tlv_esp_reserved, tvb, newoffset, 2, ENC_BIG_ENDIAN); newoffset += 2; tlv_len -= 2; while (tlv_len > 0) { @@ -839,12 +839,12 @@ dissect_hip_tlv(tvbuff_t *tvb, int offset, proto_item *ti, int type, int tlv_len case PARAM_TRANSACTION_PACING: t = proto_item_add_subtree(ti, ett_hip_tlv_data); /* Min Ta */ - proto_tree_add_item(t, hf_hip_tlv_transaction_minta, tvb, newoffset, 4, FALSE); + proto_tree_add_item(t, hf_hip_tlv_transaction_minta, tvb, newoffset, 4, ENC_BIG_ENDIAN); break; case PARAM_ENCRYPTED: t = proto_item_add_subtree(ti, ett_hip_tlv_data); /* Reserved */ - proto_tree_add_item(t, hf_hip_tlv_enc_reserved, tvb, newoffset, 4, FALSE); + proto_tree_add_item(t, hf_hip_tlv_enc_reserved, tvb, newoffset, 4, ENC_BIG_ENDIAN); newoffset += 4; /* IV * 16 bytes IV for AES CBC RFC 3602 @@ -859,15 +859,15 @@ dissect_hip_tlv(tvbuff_t *tvb, int offset, proto_item *ti, int type, int tlv_len case PARAM_HOST_ID: t = proto_item_add_subtree(ti, ett_hip_tlv_data); hi_len = tvb_get_ntohs(tvb, newoffset); - proto_tree_add_item(t, hf_hip_tlv_host_id_len, tvb, newoffset, 2, FALSE); + proto_tree_add_item(t, hf_hip_tlv_host_id_len, tvb, newoffset, 2, ENC_BIG_ENDIAN); newoffset += 2; di_len = tvb_get_ntohs(tvb, newoffset); di_type = (di_len >> 12) & 0x000F; /* get 4 bits for DI type */ di_len = di_len & 0x0FFF; /* 12 bits for DI length */ /* DI type */ - proto_tree_add_item(t, hf_hip_tlv_host_di_type, tvb, newoffset, 1, FALSE); + proto_tree_add_item(t, hf_hip_tlv_host_di_type, tvb, newoffset, 1, ENC_BIG_ENDIAN); /* DI len */ - proto_tree_add_item(t, hf_hip_tlv_host_di_len, tvb, newoffset, 2, FALSE); + proto_tree_add_item(t, hf_hip_tlv_host_di_len, tvb, newoffset, 2, ENC_BIG_ENDIAN); newoffset += 2; /* hi_hdr - first 4 bytes are 0200ff03 (KEY RR in RFC 2535) * flags 2 octets @@ -877,7 +877,7 @@ dissect_hip_tlv(tvbuff_t *tvb, int offset, proto_item *ti, int type, int tlv_len */ hi_hdr = tvb_get_ntohl(tvb, newoffset); ti_tlv = proto_tree_add_item(t, hf_hip_tlv_host_id_hdr, - tvb, newoffset, 4, FALSE); + tvb, newoffset, 4, ENC_BIG_ENDIAN); if (ti_tlv) { ti_tlv = proto_item_add_subtree(ti_tlv, ett_hip_tlv_host_id_hdr); /* HDR Flags*/ @@ -904,7 +904,7 @@ dissect_hip_tlv(tvbuff_t *tvb, int offset, proto_item *ti, int type, int tlv_len */ newoffset++; /* 12 + offset */ /* T */ - proto_tree_add_item(t, hf_hip_tlv_host_id_t, tvb, newoffset, 1, FALSE); + proto_tree_add_item(t, hf_hip_tlv_host_id_t, tvb, newoffset, 1, ENC_BIG_ENDIAN); hi_t = tvb_get_guint8(tvb, newoffset); newoffset++; /* Q */ @@ -936,7 +936,7 @@ dissect_hip_tlv(tvbuff_t *tvb, int offset, proto_item *ti, int type, int tlv_len /* E len */ e_len = tvb_get_guint8(tvb, newoffset); proto_tree_add_item(t, hf_hip_tlv_host_id_e_len, tvb, newoffset, - (e_len > 255) ? 3 : 1, FALSE); + (e_len > 255) ? 3 : 1, ENC_BIG_ENDIAN); newoffset++; hi_len -= 5; /* subtract RDATA + e_len */ if (e_len == 0) { /* e_len is 0 followed by 16-bit value */ @@ -987,16 +987,16 @@ dissect_hip_tlv(tvbuff_t *tvb, int offset, proto_item *ti, int type, int tlv_len case PARAM_CERT: /* CERT */ t = proto_item_add_subtree(ti, ett_hip_tlv_data); /* Cert Group */ - proto_tree_add_item(t, hf_hip_tlv_cert_group, tvb, newoffset, 1, FALSE); + proto_tree_add_item(t, hf_hip_tlv_cert_group, tvb, newoffset, 1, ENC_BIG_ENDIAN); newoffset++; /* Cert Count */ - proto_tree_add_item(t, hf_hip_tlv_cert_count, tvb, newoffset, 1, FALSE); + proto_tree_add_item(t, hf_hip_tlv_cert_count, tvb, newoffset, 1, ENC_BIG_ENDIAN); newoffset++; /* Cert ID */ - proto_tree_add_item(t, hf_hip_tlv_cert_id, tvb, newoffset, 1, FALSE); + proto_tree_add_item(t, hf_hip_tlv_cert_id, tvb, newoffset, 1, ENC_BIG_ENDIAN); newoffset++; /* Cert Type */ - proto_tree_add_item(t, hf_hip_tlv_cert_type, tvb, newoffset, 1, FALSE); + proto_tree_add_item(t, hf_hip_tlv_cert_type, tvb, newoffset, 1, ENC_BIG_ENDIAN); newoffset++; /* Certificate */ proto_tree_add_item(t, hf_hip_tlv_certificate, tvb, newoffset, @@ -1005,10 +1005,10 @@ dissect_hip_tlv(tvbuff_t *tvb, int offset, proto_item *ti, int type, int tlv_len case PARAM_NOTIFICATION: t = proto_item_add_subtree(ti, ett_hip_tlv_data); /* Reserved */ - proto_tree_add_item(t, hf_hip_tlv_notification_res, tvb, newoffset, 2, FALSE); + proto_tree_add_item(t, hf_hip_tlv_notification_res, tvb, newoffset, 2, ENC_BIG_ENDIAN); newoffset += 2; /* Notification Message Type */ - proto_tree_add_item(t, hf_hip_tlv_notification_type, tvb, newoffset, 2, FALSE); + proto_tree_add_item(t, hf_hip_tlv_notification_type, tvb, newoffset, 2, ENC_BIG_ENDIAN); newoffset += 2; /* Notification Data */ proto_tree_add_item(t, hf_hip_tlv_notification_data, tvb, newoffset, @@ -1030,20 +1030,20 @@ dissect_hip_tlv(tvbuff_t *tvb, int offset, proto_item *ti, int type, int tlv_len t = proto_item_add_subtree(ti, ett_hip_tlv_data); if (type == PARAM_REG_INFO) { /* Min Lifetime */ - proto_tree_add_item(t, hf_hip_tlv_reg_ltmin, tvb, newoffset, 1, FALSE); + proto_tree_add_item(t, hf_hip_tlv_reg_ltmin, tvb, newoffset, 1, ENC_BIG_ENDIAN); newoffset++; /* Max Lifetime */ - proto_tree_add_item(t, hf_hip_tlv_reg_ltmax, tvb, newoffset, 1, FALSE); + proto_tree_add_item(t, hf_hip_tlv_reg_ltmax, tvb, newoffset, 1, ENC_BIG_ENDIAN); newoffset++; tlv_len -= 2; } else if (type == PARAM_REG_FAILED) { /* Failure Type */ - proto_tree_add_item(t, hf_hip_tlv_reg_failtype, tvb, newoffset, 1, FALSE); + proto_tree_add_item(t, hf_hip_tlv_reg_failtype, tvb, newoffset, 1, ENC_BIG_ENDIAN); newoffset++;; tlv_len--; } else { /* Lifetime */ - proto_tree_add_item(t, hf_hip_tlv_reg_lt, tvb, newoffset, 1, FALSE); + proto_tree_add_item(t, hf_hip_tlv_reg_lt, tvb, newoffset, 1, ENC_BIG_ENDIAN); newoffset++; tlv_len--; } @@ -1097,13 +1097,13 @@ dissect_hip_tlv(tvbuff_t *tvb, int offset, proto_item *ti, int type, int tlv_len case PARAM_RELAY_FROM: t = proto_item_add_subtree(ti, ett_hip_tlv_data); /* Port */ - proto_tree_add_item(t, hf_hip_tlv_relay_from_port, tvb, newoffset, 2, FALSE); + proto_tree_add_item(t, hf_hip_tlv_relay_from_port, tvb, newoffset, 2, ENC_BIG_ENDIAN); newoffset += 2; /* Protocol */ - proto_tree_add_item(t, hf_hip_tlv_relay_from_protocol, tvb, newoffset, 1, FALSE); + proto_tree_add_item(t, hf_hip_tlv_relay_from_protocol, tvb, newoffset, 1, ENC_BIG_ENDIAN); newoffset += 1; /* Reserved */ - proto_tree_add_item(t, hf_hip_tlv_relay_from_reserved, tvb, newoffset, 1, FALSE); + proto_tree_add_item(t, hf_hip_tlv_relay_from_reserved, tvb, newoffset, 1, ENC_BIG_ENDIAN); newoffset += 1; /* Address */ proto_tree_add_item(t, hf_hip_tlv_relay_to_address, tvb, newoffset, 16, FALSE); @@ -1111,13 +1111,13 @@ dissect_hip_tlv(tvbuff_t *tvb, int offset, proto_item *ti, int type, int tlv_len case PARAM_RELAY_TO: t = proto_item_add_subtree(ti, ett_hip_tlv_data); /* Port */ - proto_tree_add_item(t, hf_hip_tlv_relay_to_port, tvb, newoffset, 2, FALSE); + proto_tree_add_item(t, hf_hip_tlv_relay_to_port, tvb, newoffset, 2, ENC_BIG_ENDIAN); newoffset += 2; /* Protocol */ - proto_tree_add_item(t, hf_hip_tlv_relay_to_protocol, tvb, newoffset, 1, FALSE); + proto_tree_add_item(t, hf_hip_tlv_relay_to_protocol, tvb, newoffset, 1, ENC_BIG_ENDIAN); newoffset += 1; /* Reserved */ - proto_tree_add_item(t, hf_hip_tlv_relay_to_reserved, tvb, newoffset, 1, FALSE); + proto_tree_add_item(t, hf_hip_tlv_relay_to_reserved, tvb, newoffset, 1, ENC_BIG_ENDIAN); newoffset += 1; /* Address */ proto_tree_add_item(t, hf_hip_tlv_relay_to_address, tvb, newoffset, 16, FALSE); @@ -1125,13 +1125,13 @@ dissect_hip_tlv(tvbuff_t *tvb, int offset, proto_item *ti, int type, int tlv_len case PARAM_REG_FROM: t = proto_item_add_subtree(ti, ett_hip_tlv_data); /* Port */ - proto_tree_add_item(t, hf_hip_tlv_reg_from_port, tvb, newoffset, 2, FALSE); + proto_tree_add_item(t, hf_hip_tlv_reg_from_port, tvb, newoffset, 2, ENC_BIG_ENDIAN); newoffset += 2; /* Protocol */ - proto_tree_add_item(t, hf_hip_tlv_reg_from_protocol, tvb, newoffset, 1, FALSE); + proto_tree_add_item(t, hf_hip_tlv_reg_from_protocol, tvb, newoffset, 1, ENC_BIG_ENDIAN); newoffset += 1; /* Reserved */ - proto_tree_add_item(t, hf_hip_tlv_reg_from_reserved, tvb, newoffset, 1, FALSE); + proto_tree_add_item(t, hf_hip_tlv_reg_from_reserved, tvb, newoffset, 1, ENC_BIG_ENDIAN); newoffset += 1; /* Address */ proto_tree_add_item(t, hf_hip_tlv_reg_from_address, tvb, newoffset, 16, FALSE); diff --git a/epan/dissectors/packet-hpsw.c b/epan/dissectors/packet-hpsw.c index 9f24c3168a..d8d0468e26 100644 --- a/epan/dissectors/packet-hpsw.c +++ b/epan/dissectors/packet-hpsw.c @@ -99,7 +99,7 @@ dissect_hpsw(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_uint(hp_tree, hf_hpsw_version, tvb, 0, 1, version); offset++; - proto_tree_add_item(hp_tree, hf_hpsw_type, tvb, 1, 1, FALSE); + proto_tree_add_item(hp_tree, hf_hpsw_type, tvb, 1, 1, ENC_BIG_ENDIAN); offset++; while ( tvb_reported_length_remaining(tvb, offset) > 0 ) diff --git a/epan/dissectors/packet-hsrp.c b/epan/dissectors/packet-hsrp.c index f32062768e..7049e581ac 100644 --- a/epan/dissectors/packet-hsrp.c +++ b/epan/dissectors/packet-hsrp.c @@ -378,7 +378,7 @@ dissect_hsrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ti = proto_tree_add_item(tree, proto_hsrp, tvb, offset, -1, FALSE); hsrp_tree = proto_item_add_subtree(ti, ett_hsrp); - proto_tree_add_item(hsrp_tree, hf_hsrp_version, tvb, offset, 1, FALSE); + proto_tree_add_item(hsrp_tree, hf_hsrp_version, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; proto_tree_add_uint(hsrp_tree, hf_hsrp_opcode, tvb, offset, 1, opcode); offset++; @@ -397,11 +397,11 @@ dissect_hsrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) (holdtime == HSRP_DEFAULT_HOLDTIME) ? "" : "Non-", holdtime); offset++; - proto_tree_add_item(hsrp_tree, hf_hsrp_priority, tvb, offset, 1, FALSE); + proto_tree_add_item(hsrp_tree, hf_hsrp_priority, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; - proto_tree_add_item(hsrp_tree, hf_hsrp_group, tvb, offset, 1, FALSE); + proto_tree_add_item(hsrp_tree, hf_hsrp_group, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; - proto_tree_add_item(hsrp_tree, hf_hsrp_reserved, tvb, offset, 1, FALSE); + proto_tree_add_item(hsrp_tree, hf_hsrp_reserved, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; tvb_memcpy(tvb, auth_buf, offset, 8); auth_buf[sizeof auth_buf - 1] = '\0'; @@ -413,19 +413,19 @@ dissect_hsrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(hsrp_tree, hf_hsrp_virt_ip_addr, tvb, offset, 4, FALSE); offset += 4; } else if (opcode == 3) { - proto_tree_add_item(hsrp_tree, hf_hsrp_adv_type, tvb, offset, 2, FALSE); + proto_tree_add_item(hsrp_tree, hf_hsrp_adv_type, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(hsrp_tree, hf_hsrp_adv_length, tvb, offset, 2, FALSE); + proto_tree_add_item(hsrp_tree, hf_hsrp_adv_length, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(hsrp_tree, hf_hsrp_adv_state, tvb, offset, 1, FALSE); + proto_tree_add_item(hsrp_tree, hf_hsrp_adv_state, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(hsrp_tree, hf_hsrp_adv_reserved1, tvb, offset, 1, FALSE); + proto_tree_add_item(hsrp_tree, hf_hsrp_adv_reserved1, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(hsrp_tree, hf_hsrp_adv_activegrp, tvb, offset, 2, FALSE); + proto_tree_add_item(hsrp_tree, hf_hsrp_adv_activegrp, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(hsrp_tree, hf_hsrp_adv_passivegrp, tvb, offset, 2, FALSE); + proto_tree_add_item(hsrp_tree, hf_hsrp_adv_passivegrp, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(hsrp_tree, hf_hsrp_adv_reserved2, tvb, offset, 4, FALSE); + proto_tree_add_item(hsrp_tree, hf_hsrp_adv_reserved2, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; } else { next_tvb = tvb_new_subset_remaining(tvb, offset); @@ -479,7 +479,7 @@ dissect_hsrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { /* Making Group State TLV subtree. */ group_state_tlv = proto_item_add_subtree(ti, ett_hsrp2_group_state_tlv); - proto_tree_add_item(group_state_tlv, hf_hsrp2_version, tvb, offset, 1, FALSE); + proto_tree_add_item(group_state_tlv, hf_hsrp2_version, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; proto_tree_add_uint(group_state_tlv, hf_hsrp2_opcode, tvb, offset, 1, opcode); offset++; @@ -488,11 +488,11 @@ dissect_hsrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ipver = tvb_get_guint8(tvb, offset); proto_tree_add_uint(group_state_tlv, hf_hsrp2_ipversion, tvb, offset, 1, ipver); offset++; - proto_tree_add_item(group_state_tlv, hf_hsrp2_group, tvb, offset, 2, FALSE); + proto_tree_add_item(group_state_tlv, hf_hsrp2_group, tvb, offset, 2, ENC_BIG_ENDIAN); offset+=2; proto_tree_add_item(group_state_tlv, hf_hsrp2_identifier, tvb, offset, 6, FALSE); offset+=6; - proto_tree_add_item(group_state_tlv, hf_hsrp2_priority, tvb, offset, 4, FALSE); + proto_tree_add_item(group_state_tlv, hf_hsrp2_priority, tvb, offset, 4, ENC_BIG_ENDIAN); offset+=4; hellotime = tvb_get_ntohl(tvb, offset); @@ -539,9 +539,9 @@ dissect_hsrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Making Interface State TLV subtree */ interface_state_tlv = proto_item_add_subtree(ti, ett_hsrp2_interface_state_tlv); - proto_tree_add_item(interface_state_tlv, hf_hsrp2_active_group, tvb, offset, 2, FALSE); + proto_tree_add_item(interface_state_tlv, hf_hsrp2_active_group, tvb, offset, 2, ENC_BIG_ENDIAN); offset+=2; - proto_tree_add_item(interface_state_tlv, hf_hsrp2_passive_group, tvb, offset, 2, FALSE); + proto_tree_add_item(interface_state_tlv, hf_hsrp2_passive_group, tvb, offset, 2, ENC_BIG_ENDIAN); offset+=2; } } else if (type == 3 && len == 8) { @@ -576,17 +576,17 @@ dissect_hsrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Making MD5 Authentication TLV subtree */ md5_auth_tlv = proto_item_add_subtree(ti, ett_hsrp2_md5_auth_tlv); - proto_tree_add_item(md5_auth_tlv, hf_hsrp2_md5_algorithm, tvb, offset, 1, FALSE); + proto_tree_add_item(md5_auth_tlv, hf_hsrp2_md5_algorithm, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; /* Skip padding field */ offset++; - proto_tree_add_item(md5_auth_tlv, hf_hsrp2_md5_flags, tvb, offset, 2, FALSE); + proto_tree_add_item(md5_auth_tlv, hf_hsrp2_md5_flags, tvb, offset, 2, ENC_BIG_ENDIAN); offset+=2; proto_tree_add_item(md5_auth_tlv, hf_hsrp2_md5_ip_address, tvb, offset, 4, FALSE); offset+=4; - proto_tree_add_item(md5_auth_tlv, hf_hsrp2_md5_key_id, tvb, offset, 4, FALSE); + proto_tree_add_item(md5_auth_tlv, hf_hsrp2_md5_key_id, tvb, offset, 4, ENC_BIG_ENDIAN); offset+=4; - proto_tree_add_item(md5_auth_tlv, hf_hsrp2_md5_auth_data, tvb, offset, 16, FALSE); + proto_tree_add_item(md5_auth_tlv, hf_hsrp2_md5_auth_data, tvb, offset, 16, ENC_BIG_ENDIAN); offset += 16; } } else { diff --git a/epan/dissectors/packet-iax2.c b/epan/dissectors/packet-iax2.c index 4875c6e480..d38daf2484 100644 --- a/epan/dissectors/packet-iax2.c +++ b/epan/dissectors/packet-iax2.c @@ -1075,7 +1075,7 @@ dissect_iax2 (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) full_mini_subtree = proto_item_add_subtree(full_mini_base, ett_iax2_full_mini_subtree); if( scallno != 0 ) - proto_tree_add_item (full_mini_subtree, hf_iax2_scallno, tvb, offset-2, 2, FALSE); + proto_tree_add_item (full_mini_subtree, hf_iax2_scallno, tvb, offset-2, 2, ENC_BIG_ENDIAN); } iax2_info->ptype = type; @@ -1543,7 +1543,7 @@ dissect_fullpacket (tvbuff_t * tvb, guint32 offset, if( iax2_tree ) { proto_item *packet_type_base; - proto_tree_add_item (iax2_tree, hf_iax2_dcallno, tvb, offset, 2, FALSE ); + proto_tree_add_item (iax2_tree, hf_iax2_dcallno, tvb, offset, 2, ENC_BIG_ENDIAN ); proto_tree_add_item(iax2_tree, hf_iax2_retransmission, tvb, offset, 2, FALSE ); @@ -1561,7 +1561,7 @@ dissect_fullpacket (tvbuff_t * tvb, guint32 offset, FALSE); proto_tree_add_item (iax2_tree, hf_iax2_iseqno, tvb, offset+7, 1, - FALSE); + ENC_BIG_ENDIAN); packet_type_base = proto_tree_add_uint (iax2_tree, hf_iax2_type, tvb, offset+8, 1, type); @@ -1615,7 +1615,7 @@ dissect_fullpacket (tvbuff_t * tvb, guint32 offset, if( packet_type_tree ) { proto_item *item; - proto_tree_add_item (packet_type_tree, hf_iax2_voice_csub, tvb, offset+9, 1, FALSE); + proto_tree_add_item (packet_type_tree, hf_iax2_voice_csub, tvb, offset+9, 1, ENC_BIG_ENDIAN); item = proto_tree_add_uint (packet_type_tree, hf_iax2_voice_codec, tvb, offset+9, 1, codec); PROTO_ITEM_SET_GENERATED(item); } @@ -1640,7 +1640,7 @@ dissect_fullpacket (tvbuff_t * tvb, guint32 offset, if( packet_type_tree ) { proto_item *item; - proto_tree_add_item (packet_type_tree, hf_iax2_video_csub, tvb, offset+9, 1, FALSE); + proto_tree_add_item (packet_type_tree, hf_iax2_video_csub, tvb, offset+9, 1, ENC_BIG_ENDIAN); proto_tree_add_item (packet_type_tree, hf_iax2_marker, tvb, offset+9, 1, FALSE); item = proto_tree_add_uint (packet_type_tree, hf_iax2_video_codec, tvb, offset+9, 1, codec); PROTO_ITEM_SET_GENERATED(item); @@ -1664,7 +1664,7 @@ dissect_fullpacket (tvbuff_t * tvb, guint32 offset, break; case AST_FRAME_MODEM: - proto_tree_add_item (packet_type_tree, hf_iax2_modem_csub, tvb, offset+9, 1, FALSE); + proto_tree_add_item (packet_type_tree, hf_iax2_modem_csub, tvb, offset+9, 1, ENC_BIG_ENDIAN); offset += 10; if (check_col (pinfo->cinfo, COL_INFO)) @@ -1749,7 +1749,7 @@ static guint32 dissect_minivideopacket (tvbuff_t * tvb, guint32 offset, proto_tree_add_item (iax2_tree, hf_iax2_minividts, tvb, offset, 2, FALSE); iax2_add_ts_fields(pinfo, iax2_tree, iax_packet, (guint16)ts); - proto_tree_add_item (iax2_tree, hf_iax2_minividmarker, tvb, offset, 2, FALSE); + proto_tree_add_item (iax2_tree, hf_iax2_minividmarker, tvb, offset, 2, ENC_BIG_ENDIAN); } else { iax2_add_ts_fields(pinfo, iax2_tree, iax_packet, (guint16)ts); } @@ -1843,8 +1843,8 @@ static guint32 dissect_trunkcall_ts (tvbuff_t * tvb, guint32 offset, proto_tree call_item = proto_tree_add_text(iax2_tree, tvb, offset, rlen + 6, "Trunk call from %u, ts: %u", scallno, ts); call_tree = proto_item_add_subtree(call_item, ett_iax2_trunk_call); - proto_tree_add_item(call_tree, hf_iax2_trunk_call_len, tvb, offset, 2, FALSE); - proto_tree_add_item(call_tree, hf_iax2_trunk_call_scallno, tvb, offset + 2, 2, FALSE); + proto_tree_add_item(call_tree, hf_iax2_trunk_call_len, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(call_tree, hf_iax2_trunk_call_scallno, tvb, offset + 2, 2, ENC_BIG_ENDIAN); proto_tree_add_item(call_tree, hf_iax2_trunk_call_ts, tvb, offset + 4, 2, FALSE); proto_tree_add_item(call_tree, hf_iax2_trunk_call_data, tvb, offset + 6, rlen, ENC_NA); } @@ -1876,8 +1876,8 @@ static guint32 dissect_trunkcall_nots (tvbuff_t * tvb, guint32 offset, proto_tre call_item = proto_tree_add_text(iax2_tree, tvb, offset, rlen + 6, "Trunk call from %u", scallno); call_tree = proto_item_add_subtree(call_item, ett_iax2_trunk_call); - proto_tree_add_item(call_tree, hf_iax2_trunk_call_scallno, tvb, offset, 2, FALSE); - proto_tree_add_item(call_tree, hf_iax2_trunk_call_len, tvb, offset + 2, 2, FALSE); + proto_tree_add_item(call_tree, hf_iax2_trunk_call_scallno, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(call_tree, hf_iax2_trunk_call_len, tvb, offset + 2, 2, ENC_BIG_ENDIAN); proto_tree_add_item(call_tree, hf_iax2_trunk_call_data, tvb, offset + 4, rlen, ENC_NA); } offset += 4 + rlen; @@ -1908,7 +1908,7 @@ static guint32 dissect_trunkpacket (tvbuff_t * tvb, guint32 offset, if( iax2_tree ) { /* Meta Command */ - proto_tree_add_item(iax2_tree, hf_iax2_trunk_metacmd, tvb, offset, 1, FALSE); + proto_tree_add_item(iax2_tree, hf_iax2_trunk_metacmd, tvb, offset, 1, ENC_BIG_ENDIAN); /* Command data */ cd = proto_tree_add_uint(iax2_tree, hf_iax2_trunk_cmddata, tvb, offset + 1, 1, cmddata); diff --git a/epan/dissectors/packet-icep.c b/epan/dissectors/packet-icep.c index c364587c09..32e7cd2518 100644 --- a/epan/dissectors/packet-icep.c +++ b/epan/dissectors/packet-icep.c @@ -539,15 +539,15 @@ static void dissect_ice_params(proto_tree *tree, tvbuff_t *tvb, if ( tree ) { - proto_tree_add_item(tree, hf_icep_params_size, tvb, offset, 4, TRUE); + proto_tree_add_item(tree, hf_icep_params_size, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; (*consumed) += 4; - proto_tree_add_item(tree, hf_icep_params_major, tvb, offset, 1, TRUE); + proto_tree_add_item(tree, hf_icep_params_major, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 1; (*consumed)++; - proto_tree_add_item(tree, hf_icep_params_minor, tvb, offset, 1, TRUE); + proto_tree_add_item(tree, hf_icep_params_minor, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 1; (*consumed)++; @@ -710,7 +710,7 @@ static void dissect_icep_request_common(tvbuff_t *tvb, guint32 offset, } if (icep_sub_tree) - proto_tree_add_item(icep_sub_tree, hf_icep_mode, tvb, offset, 1, TRUE); + proto_tree_add_item(icep_sub_tree, hf_icep_mode, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; DBG0("consumed --> 1\n"); (*total_consumed)++; @@ -796,7 +796,7 @@ static void dissect_icep_request(tvbuff_t *tvb, guint32 offset, proto_tree *icep icep_sub_tree = proto_item_add_subtree(ti, ett_icep_msg); proto_tree_add_item(icep_sub_tree, hf_icep_request_id, tvb, offset, 4, - TRUE); + ENC_LITTLE_ENDIAN); } @@ -983,7 +983,7 @@ static void dissect_icep_reply(tvbuff_t *tvb, guint32 offset, proto_tree *icep_t icep_sub_tree = proto_item_add_subtree(ti, ett_icep_msg); proto_tree_add_item(icep_sub_tree, hf_icep_request_id, tvb, offset, 4, - TRUE); + ENC_LITTLE_ENDIAN); } if ( check_col(mypinfo->cinfo, COL_INFO) ) { @@ -995,7 +995,7 @@ static void dissect_icep_reply(tvbuff_t *tvb, guint32 offset, proto_tree *icep_t if (icep_tree) proto_tree_add_item(icep_sub_tree, hf_icep_reply_status, tvb, offset, 1, - TRUE); + ENC_LITTLE_ENDIAN); if ( check_col(mypinfo->cinfo, COL_INFO) ) { col_append_fstr(mypinfo->cinfo, COL_INFO, " %s", @@ -1109,27 +1109,27 @@ static void dissect_icep_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree offset += 4; proto_tree_add_item(icep_tree, hf_icep_protocol_major, - tvb, offset, 1, TRUE); + tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; proto_tree_add_item(icep_tree, hf_icep_protocol_minor, - tvb, offset, 1, TRUE); + tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; proto_tree_add_item(icep_tree, hf_icep_encoding_major, - tvb, offset, 1, TRUE); + tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; proto_tree_add_item(icep_tree, hf_icep_encoding_minor, - tvb, offset, 1, TRUE); + tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; proto_tree_add_item(icep_tree, hf_icep_message_type, - tvb, offset, 1, TRUE); + tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; proto_tree_add_item(icep_tree, hf_icep_compression_status, - tvb, offset, 1, TRUE); + tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; proto_tree_add_item(icep_tree, hf_icep_message_size, diff --git a/epan/dissectors/packet-icmp.c b/epan/dissectors/packet-icmp.c index 313a77c3b2..1b1d3eccb7 100644 --- a/epan/dissectors/packet-icmp.c +++ b/epan/dissectors/packet-icmp.c @@ -338,7 +338,7 @@ dissect_mip_extensions(tvbuff_t *tvb, int offset, proto_tree *tree) /* Add our fields */ /* type */ proto_tree_add_item(mip_tree, hf_icmp_mip_type, tvb, offset, - 1, FALSE); + 1, ENC_BIG_ENDIAN); offset++; break; case ICMP_MIP_MOB_AGENT_ADV: @@ -346,19 +346,19 @@ dissect_mip_extensions(tvbuff_t *tvb, int offset, proto_tree *tree) /* Add our fields */ /* type */ proto_tree_add_item(mip_tree, hf_icmp_mip_type, tvb, offset, - 1, FALSE); + 1, ENC_BIG_ENDIAN); offset++; /* length */ proto_tree_add_item(mip_tree, hf_icmp_mip_length, tvb, offset, - 1, FALSE); + 1, ENC_BIG_ENDIAN); offset++; /* sequence number */ proto_tree_add_item(mip_tree, hf_icmp_mip_seq, tvb, offset, - 2, FALSE); + 2, ENC_BIG_ENDIAN); offset+=2; /* Registration Lifetime */ proto_tree_add_item(mip_tree, hf_icmp_mip_life, tvb, offset, - 2, FALSE); + 2, ENC_BIG_ENDIAN); offset+=2; /* flags */ flags = tvb_get_ntohs(tvb, offset); @@ -392,17 +392,17 @@ dissect_mip_extensions(tvbuff_t *tvb, int offset, proto_tree *tree) /* Add our fields */ /* type */ proto_tree_add_item(mip_tree, hf_icmp_mip_type, tvb, offset, - 1, FALSE); + 1, ENC_BIG_ENDIAN); offset++; /* length */ proto_tree_add_item(mip_tree, hf_icmp_mip_length, tvb, offset, - 1, FALSE); + 1, ENC_BIG_ENDIAN); offset++; /* prefix lengths */ for(i=0; i<length; i++) { proto_tree_add_item(mip_tree, hf_icmp_mip_prefix_length, tvb, offset, - 1, FALSE); + 1, ENC_BIG_ENDIAN); offset++; } break; @@ -410,11 +410,11 @@ dissect_mip_extensions(tvbuff_t *tvb, int offset, proto_tree *tree) /* Challenge Extension (RFC 3012)*/ /* type */ proto_tree_add_item(mip_tree, hf_icmp_mip_type, tvb, offset, - 1, FALSE); + 1, ENC_BIG_ENDIAN); offset++; /* length */ proto_tree_add_item(mip_tree, hf_icmp_mip_length, tvb, offset, - 1, FALSE); + 1, ENC_BIG_ENDIAN); offset++; /* challenge */ proto_tree_add_item(mip_tree, hf_icmp_mip_challenge, tvb, offset, @@ -425,11 +425,11 @@ dissect_mip_extensions(tvbuff_t *tvb, int offset, proto_tree *tree) default: /* type */ proto_tree_add_item(mip_tree, hf_icmp_mip_type, tvb, offset, - 1, FALSE); + 1, ENC_BIG_ENDIAN); offset++; /* length */ proto_tree_add_item(mip_tree, hf_icmp_mip_length, tvb, offset, - 1, FALSE); + 1, ENC_BIG_ENDIAN); offset++; /* data, if any */ if (length != 0) { @@ -632,7 +632,7 @@ dissect_mpls_extensions(tvbuff_t *tvb, gint offset, proto_tree *tree) tvb, offset + 3, 1, - FALSE); + ENC_BIG_ENDIAN); proto_item_append_text(tf_entry, ", TTL: %u", ttl); @@ -933,10 +933,10 @@ dissect_icmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ti = proto_tree_add_item(tree, proto_icmp, tvb, 0, length, FALSE); icmp_tree = proto_item_add_subtree(ti, ett_icmp); - ti = proto_tree_add_item(icmp_tree, hf_icmp_type, tvb, 0, 1, FALSE); + ti = proto_tree_add_item(icmp_tree, hf_icmp_type, tvb, 0, 1, ENC_BIG_ENDIAN); proto_item_append_text (ti, " (%s)", type_str); - ti = proto_tree_add_item(icmp_tree, hf_icmp_code, tvb, 1, 1, FALSE); + ti = proto_tree_add_item(icmp_tree, hf_icmp_code, tvb, 1, 1, ENC_BIG_ENDIAN); if (code_str) proto_item_append_text (ti, " (%s)", code_str); @@ -990,7 +990,7 @@ dissect_icmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case ICMP_UNREACH: switch (icmp_code) { case ICMP_FRAG_NEEDED: - proto_tree_add_item(icmp_tree, hf_icmp_mtu, tvb, 6, 2, FALSE); + proto_tree_add_item(icmp_tree, hf_icmp_mtu, tvb, 6, 2, ENC_BIG_ENDIAN); break; } break; diff --git a/epan/dissectors/packet-icmpv6.c b/epan/dissectors/packet-icmpv6.c index d03836da55..698426fa74 100644 --- a/epan/dissectors/packet-icmpv6.c +++ b/epan/dissectors/packet-icmpv6.c @@ -3024,7 +3024,7 @@ dissect_mldrv2( tvbuff_t *tvb, guint32 offset, packet_info *pinfo _U_, proto_tre mldr_offset += 2; /* Nr of Mcast Address Records (M) */ - proto_tree_add_item(tree, hf_icmpv6_mldr_nb_mcast_records, tvb, mldr_offset, 2, FALSE ); + proto_tree_add_item(tree, hf_icmpv6_mldr_nb_mcast_records, tvb, mldr_offset, 2, ENC_BIG_ENDIAN ); mldr_offset += 2; /* Multicast Address Record */ diff --git a/epan/dissectors/packet-icp.c b/epan/dissectors/packet-icp.c index 8ee58571d4..8fc3042fd9 100644 --- a/epan/dissectors/packet-icp.c +++ b/epan/dissectors/packet-icp.c @@ -172,7 +172,7 @@ static void dissect_icp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_uint(icp_tree,hf_icp_opcode, tvb, 0, 1, opcode); - proto_tree_add_item(icp_tree,hf_icp_version, tvb, 1, 1, FALSE); + proto_tree_add_item(icp_tree,hf_icp_version, tvb, 1, 1, ENC_BIG_ENDIAN); proto_tree_add_uint(icp_tree,hf_icp_length, tvb, 2, 2, message_length); diff --git a/epan/dissectors/packet-icq.c b/epan/dissectors/packet-icq.c index 9616be606a..2df6a5f34f 100644 --- a/epan/dissectors/packet-icq.c +++ b/epan/dissectors/packet-icq.c @@ -1378,7 +1378,7 @@ icqv5_srv_recv_message(proto_tree* tree, /* Tree to put the data in */ ti = proto_tree_add_text(tree, tvb, offset, 4, "Body"); subtree = proto_item_add_subtree(ti, ett_icq_body); proto_tree_add_item(subtree, hf_icq_uin, tvb, offset + SRV_RECV_MSG_UIN, - sizeof(guint32), TRUE); + sizeof(guint32), ENC_LITTLE_ENDIAN); year = tvb_get_letohs(tvb, offset + SRV_RECV_MSG_YEAR); month = tvb_get_guint8(tvb, offset + SRV_RECV_MSG_MONTH); day = tvb_get_guint8(tvb, offset + SRV_RECV_MSG_DAY); @@ -1510,9 +1510,9 @@ dissect_icqv5Client(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_text(icq_header_tree, tvb, ICQ_VERSION, 2, "Version: %u", tvb_get_letohs(tvb, ICQ_VERSION)); proto_tree_add_item(icq_header_tree, hf_icq_uin, tvb, ICQ5_CL_UIN, 4, - TRUE); + ENC_LITTLE_ENDIAN); proto_tree_add_item(icq_header_tree, hf_icq_sessionid, decr_tvb, - ICQ5_CL_SESSIONID, 4, TRUE); + ICQ5_CL_SESSIONID, 4, ENC_LITTLE_ENDIAN); proto_tree_add_uint_format(icq_header_tree, hf_icq_client_cmd, decr_tvb, ICQ5_CL_CMD, 2, cmd, "Command: %s (%u)", @@ -1613,7 +1613,7 @@ dissect_icqv5Server(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree_add_text(icq_header_tree, tvb, offset + ICQ_VERSION, 2, "Version: %u", tvb_get_letohs(tvb, ICQ_VERSION)); proto_tree_add_item(icq_header_tree, hf_icq_sessionid, tvb, - offset + ICQ5_SRV_SESSIONID, 4, TRUE); + offset + ICQ5_SRV_SESSIONID, 4, ENC_LITTLE_ENDIAN); proto_tree_add_uint_format(icq_header_tree, hf_icq_server_cmd, tvb, offset + ICQ5_SRV_CMD, 2, cmd, "Command: %s (%u)", val_to_str(cmd, serverCmdCode, "Unknown"), cmd); @@ -1624,9 +1624,9 @@ dissect_icqv5Server(tvbuff_t *tvb, int offset, packet_info *pinfo, "Seq Number 2: 0x%04x", tvb_get_letohs(tvb, offset + ICQ5_SRV_SEQNUM2)); proto_tree_add_item(icq_header_tree, hf_icq_uin, tvb, - offset + ICQ5_SRV_UIN, 4, TRUE); + offset + ICQ5_SRV_UIN, 4, ENC_LITTLE_ENDIAN); proto_tree_add_item(icq_header_tree, hf_icq_checkcode, tvb, - offset + ICQ5_SRV_CHECKCODE, 4, TRUE); + offset + ICQ5_SRV_CHECKCODE, 4, ENC_LITTLE_ENDIAN); switch (cmd) { case SRV_RAND_USER: icqv5_srv_rand_user(icq_tree, tvb, offset + ICQ5_SRV_HDRSIZE); diff --git a/epan/dissectors/packet-idp.c b/epan/dissectors/packet-idp.c index cad8837b40..5691752eb4 100644 --- a/epan/dissectors/packet-idp.c +++ b/epan/dissectors/packet-idp.c @@ -94,27 +94,27 @@ dissect_idp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) idp_tree = proto_item_add_subtree(ti, ett_idp); } - proto_tree_add_item(idp_tree, hf_idp_checksum, tvb, 0, 2, FALSE); + proto_tree_add_item(idp_tree, hf_idp_checksum, tvb, 0, 2, ENC_BIG_ENDIAN); length = tvb_get_ntohs(tvb, 2); proto_tree_add_uint_format(idp_tree, hf_idp_len, tvb, 2, 2, length, "Length: %u bytes", length); /* Adjust the tvbuff length to include only the IDP datagram. */ set_actual_length(tvb, length); - proto_tree_add_item(idp_tree, hf_idp_hops, tvb, 4, 1, FALSE); + proto_tree_add_item(idp_tree, hf_idp_hops, tvb, 4, 1, ENC_BIG_ENDIAN); type = tvb_get_guint8(tvb, 5); proto_tree_add_uint(idp_tree, hf_idp_packet_type, tvb, 5, 1, type); pinfo->ptype = PT_IDP; /* Destination */ - proto_tree_add_item(idp_tree, hf_idp_dnet, tvb, 6, 4, FALSE); + proto_tree_add_item(idp_tree, hf_idp_dnet, tvb, 6, 4, ENC_BIG_ENDIAN); proto_tree_add_item(idp_tree, hf_idp_dnode, tvb, 10, 6, FALSE); pinfo->destport = tvb_get_ntohs(tvb, 16); proto_tree_add_uint(idp_tree, hf_idp_dsocket, tvb, 16, 2, pinfo->destport); /* Source */ - proto_tree_add_item(idp_tree, hf_idp_snet, tvb, 18, 4, FALSE); + proto_tree_add_item(idp_tree, hf_idp_snet, tvb, 18, 4, ENC_BIG_ENDIAN); proto_tree_add_item(idp_tree, hf_idp_snode, tvb, 22, 6, FALSE); pinfo->srcport = tvb_get_ntohs(tvb, 28); proto_tree_add_uint(idp_tree, hf_idp_ssocket, tvb, 28, 2, diff --git a/epan/dissectors/packet-ieee1722.c b/epan/dissectors/packet-ieee1722.c index cfbbfa050b..3346f18819 100644 --- a/epan/dissectors/packet-ieee1722.c +++ b/epan/dissectors/packet-ieee1722.c @@ -141,67 +141,67 @@ static void dissect_1722(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) * Subtype field is 7 bits */ proto_tree_add_item(ieee1722_tree, hf_1722_cdfield, tvb, IEEE_1722_CD_OFFSET, 1, FALSE); - proto_tree_add_item(ieee1722_tree, hf_1722_subtype, tvb, IEEE_1722_CD_OFFSET, 1, FALSE); + proto_tree_add_item(ieee1722_tree, hf_1722_subtype, tvb, IEEE_1722_CD_OFFSET, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ieee1722_tree, hf_1722_svfield, tvb, IEEE_1722_VERSION_OFFSET, 1, FALSE); - proto_tree_add_item(ieee1722_tree, hf_1722_verfield, tvb, IEEE_1722_VERSION_OFFSET, 1, FALSE); - proto_tree_add_item(ieee1722_tree, hf_1722_mrfield, tvb, IEEE_1722_VERSION_OFFSET, 1, FALSE); + proto_tree_add_item(ieee1722_tree, hf_1722_verfield, tvb, IEEE_1722_VERSION_OFFSET, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ieee1722_tree, hf_1722_mrfield, tvb, IEEE_1722_VERSION_OFFSET, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ieee1722_tree, hf_1722_gvfield, tvb, IEEE_1722_VERSION_OFFSET, 1, FALSE); proto_tree_add_item(ieee1722_tree, hf_1722_tvfield, tvb, IEEE_1722_VERSION_OFFSET, 1, FALSE); /* Add the rest of the packet fields */ proto_tree_add_item(ieee1722_tree, hf_1722_seqnum, tvb, - IEEE_1722_SEQ_NUM_OFFSET, 1, FALSE); + IEEE_1722_SEQ_NUM_OFFSET, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ieee1722_tree, hf_1722_tufield, tvb, IEEE_1722_TU_FIELD_OFFSET, 1, FALSE); proto_tree_add_item(ieee1722_tree, hf_1722_stream_id, tvb, - IEEE_1722_STREAM_ID_OFFSET, 8, FALSE); + IEEE_1722_STREAM_ID_OFFSET, 8, ENC_BIG_ENDIAN); proto_tree_add_item(ieee1722_tree, hf_1722_avbtp_timestamp, tvb, - IEEE_1722_TIMESTAMP_OFFSET, 4, FALSE); + IEEE_1722_TIMESTAMP_OFFSET, 4, ENC_BIG_ENDIAN); proto_tree_add_item(ieee1722_tree, hf_1722_gateway_info, tvb, - IEEE_1722_GW_INFO_OFFSET, 4, FALSE); + IEEE_1722_GW_INFO_OFFSET, 4, ENC_BIG_ENDIAN); proto_tree_add_item(ieee1722_tree, hf_1722_packet_data_length, tvb, - IEEE_1722_PKT_DATA_LENGTH_OFFSET, 2, FALSE); + IEEE_1722_PKT_DATA_LENGTH_OFFSET, 2, ENC_BIG_ENDIAN); proto_tree_add_item(ieee1722_tree, hf_1722_tag, tvb, - IEEE_1722_TAG_OFFSET, 1, FALSE); + IEEE_1722_TAG_OFFSET, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ieee1722_tree, hf_1722_channel, tvb, - IEEE_1722_TAG_OFFSET, 1, FALSE); + IEEE_1722_TAG_OFFSET, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ieee1722_tree, hf_1722_tcode, tvb, - IEEE_1722_TCODE_OFFSET, 1, FALSE); + IEEE_1722_TCODE_OFFSET, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ieee1722_tree, hf_1722_sy, tvb, - IEEE_1722_TCODE_OFFSET, 1, FALSE); + IEEE_1722_TCODE_OFFSET, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ieee1722_tree, hf_1722_sid, tvb, - IEEE_1722_SID_OFFSET, 1, FALSE); + IEEE_1722_SID_OFFSET, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ieee1722_tree, hf_1722_dbs, tvb, - IEEE_1722_DBS_OFFSET, 1, FALSE); + IEEE_1722_DBS_OFFSET, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ieee1722_tree, hf_1722_fn, tvb, - IEEE_1722_FN_OFFSET, 1, FALSE); + IEEE_1722_FN_OFFSET, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ieee1722_tree, hf_1722_qpc, tvb, - IEEE_1722_FN_OFFSET, 1, FALSE); + IEEE_1722_FN_OFFSET, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ieee1722_tree, hf_1722_sph, tvb, IEEE_1722_FN_OFFSET, 1, FALSE); proto_tree_add_item(ieee1722_tree, hf_1722_dbc, tvb, - IEEE_1722_DBC_OFFSET, 1, FALSE); + IEEE_1722_DBC_OFFSET, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ieee1722_tree, hf_1722_fmt, tvb, - IEEE_1722_FMT_OFFSET, 1, FALSE); + IEEE_1722_FMT_OFFSET, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ieee1722_tree, hf_1722_fdf, tvb, - IEEE_1722_FDF_OFFSET, 1, FALSE); + IEEE_1722_FDF_OFFSET, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ieee1722_tree, hf_1722_syt, tvb, - IEEE_1722_SYT_OFFSET, 2, FALSE); + IEEE_1722_SYT_OFFSET, 2, ENC_BIG_ENDIAN); /* Calculate the remaining size by subtracting the CIP header size from the value in the packet data length field */ @@ -228,7 +228,7 @@ static void dissect_1722(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ti = proto_tree_add_text(audio_tree, tvb, offset, 1, "Sample %d", j+1); sample_tree = proto_item_add_subtree(ti, ett_1722_sample); for (i = 0; i < dbs; i++) { - proto_tree_add_item(sample_tree, hf_1722_label, tvb, offset, 1, FALSE); + proto_tree_add_item(sample_tree, hf_1722_label, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; proto_tree_add_item(sample_tree, hf_1722_sample, tvb, offset, 3, ENC_NA); diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c index 10643adec8..e65265d27e 100644 --- a/epan/dissectors/packet-ieee80211.c +++ b/epan/dissectors/packet-ieee80211.c @@ -5690,15 +5690,15 @@ dissect_vendor_ie_marvell(proto_item * item _U_, proto_tree * ietree, switch (type) { case MARVELL_IE_MESH: proto_tree_add_item (ietree, hf_ieee80211_marvell_ie_mesh_subtype, tvb, - offset++, 1, TRUE ); + offset++, 1, ENC_LITTLE_ENDIAN ); proto_tree_add_item (ietree, hf_ieee80211_marvell_ie_mesh_version, tvb, - offset++, 1, TRUE ); + offset++, 1, ENC_LITTLE_ENDIAN ); proto_tree_add_item (ietree, hf_ieee80211_marvell_ie_mesh_active_proto_id, tvb, - offset++, 1, TRUE ); + offset++, 1, ENC_LITTLE_ENDIAN ); proto_tree_add_item (ietree, hf_ieee80211_marvell_ie_mesh_active_metric_id, tvb, - offset++, 1, TRUE ); + offset++, 1, ENC_LITTLE_ENDIAN ); proto_tree_add_item (ietree, hf_ieee80211_marvell_ie_mesh_cap, tvb, - offset++, 1, TRUE ); + offset++, 1, ENC_LITTLE_ENDIAN ); break; default: diff --git a/epan/dissectors/packet-ifcp.c b/epan/dissectors/packet-ifcp.c index 072c5930c9..dcdc14d07b 100644 --- a/epan/dissectors/packet-ifcp.c +++ b/epan/dissectors/packet-ifcp.c @@ -251,7 +251,7 @@ dissect_ifcpflags(tvbuff_t *tvb, int offset, proto_tree *parent_tree) guint8 flags; if(parent_tree){ - item=proto_tree_add_item(parent_tree, hf_ifcp_flags, tvb, offset, 1, 0); + item=proto_tree_add_item(parent_tree, hf_ifcp_flags, tvb, offset, 1, ENC_BIG_ENDIAN); tree=proto_item_add_subtree (item, ett_ifcp_flags); } @@ -299,7 +299,7 @@ dissect_commonflags(tvbuff_t *tvb, int offset, proto_tree *parent_tree) guint8 flags; if(parent_tree){ - item=proto_tree_add_item(parent_tree, hf_ifcp_common_flags, tvb, offset, 1, 0); + item=proto_tree_add_item(parent_tree, hf_ifcp_common_flags, tvb, offset, 1, ENC_BIG_ENDIAN); tree=proto_item_add_subtree (item, ett_ifcp_common_flags); } @@ -368,25 +368,25 @@ dissect_ifcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) /* The Common FC Encap header */ /* protocol */ protocol = tvb_get_guint8 (tvb, offset); - ti=proto_tree_add_item(tree, hf_ifcp_protocol, tvb, offset, 1, 0); + ti=proto_tree_add_item(tree, hf_ifcp_protocol, tvb, offset, 1, ENC_BIG_ENDIAN); if(ti){ protocol_tree=proto_item_add_subtree(ti, ett_ifcp_protocol); } offset++; /* version */ - ti=proto_tree_add_item(tree, hf_ifcp_version, tvb, offset, 1, 0); + ti=proto_tree_add_item(tree, hf_ifcp_version, tvb, offset, 1, ENC_BIG_ENDIAN); if(ti){ version_tree=proto_item_add_subtree(ti, ett_ifcp_version); } offset++; /* protocol complement */ - proto_tree_add_item(protocol_tree, hf_ifcp_protocol_c, tvb, offset, 1, 0); + proto_tree_add_item(protocol_tree, hf_ifcp_protocol_c, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; /* version complement */ - proto_tree_add_item(version_tree, hf_ifcp_version_c, tvb, offset, 1, 0); + proto_tree_add_item(version_tree, hf_ifcp_version_c, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; /* 4 reserved bytes */ @@ -395,21 +395,21 @@ dissect_ifcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) /* iFCP specific fields */ if(protocol==FCENCAP_PROTO_iFCP){ /* LS_COMMAND_ACC */ - proto_tree_add_item(tree, hf_ifcp_ls_command_acc, tvb, offset, 1, 0); + proto_tree_add_item(tree, hf_ifcp_ls_command_acc, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; /* iFCP Flags */ offset=dissect_ifcpflags(tvb, offset, tree); /* SOF */ - ti=proto_tree_add_item(tree, hf_ifcp_sof, tvb, offset, 1, 0); + ti=proto_tree_add_item(tree, hf_ifcp_sof, tvb, offset, 1, ENC_BIG_ENDIAN); if(ti){ sof_tree=proto_item_add_subtree(ti, ett_ifcp_sof); } offset++; /* EOF */ - ti=proto_tree_add_item(tree, hf_ifcp_eof, tvb, offset, 1, 0); + ti=proto_tree_add_item(tree, hf_ifcp_eof, tvb, offset, 1, ENC_BIG_ENDIAN); if(ti){ eof_tree=proto_item_add_subtree(ti, ett_ifcp_eof); } @@ -424,46 +424,46 @@ dissect_ifcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) dissect_commonflags(tvb, offset, tree); /* frame len */ - ti=proto_tree_add_item(tree, hf_ifcp_framelen, tvb, offset, 2, 0); + ti=proto_tree_add_item(tree, hf_ifcp_framelen, tvb, offset, 2, ENC_BIG_ENDIAN); if(ti){ frame_len_tree=proto_item_add_subtree(ti, ett_ifcp_frame_len); } offset+=2; /* complement of flags and frame len */ - proto_tree_add_item(frame_len_tree, hf_ifcp_encap_flags_c, tvb, offset, 1, 0); - proto_tree_add_item(frame_len_tree, hf_ifcp_framelen_c, tvb, offset, 2, 0); + proto_tree_add_item(frame_len_tree, hf_ifcp_encap_flags_c, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(frame_len_tree, hf_ifcp_framelen_c, tvb, offset, 2, ENC_BIG_ENDIAN); offset+=2; /* timestamp seconds */ - proto_tree_add_item(tree, hf_ifcp_tsec, tvb, offset, 4, 0); + proto_tree_add_item(tree, hf_ifcp_tsec, tvb, offset, 4, ENC_BIG_ENDIAN); offset+=4; /* timestamp fractions */ - proto_tree_add_item(tree, hf_ifcp_tusec, tvb, offset, 4, 0); + proto_tree_add_item(tree, hf_ifcp_tusec, tvb, offset, 4, ENC_BIG_ENDIAN); offset+=4; /* crc */ - proto_tree_add_item(tree, hf_ifcp_encap_crc, tvb, offset, 4, 0); + proto_tree_add_item(tree, hf_ifcp_encap_crc, tvb, offset, 4, ENC_BIG_ENDIAN); offset+=4; /* FC SOF/-SOF */ - proto_tree_add_item(sof_tree, hf_ifcp_sof, tvb, offset, 1, 0); + proto_tree_add_item(sof_tree, hf_ifcp_sof, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; - proto_tree_add_item(sof_tree, hf_ifcp_sof, tvb, offset, 1, 0); + proto_tree_add_item(sof_tree, hf_ifcp_sof, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; - proto_tree_add_item(sof_tree, hf_ifcp_sof_c, tvb, offset, 1, 0); + proto_tree_add_item(sof_tree, hf_ifcp_sof_c, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; - proto_tree_add_item(sof_tree, hf_ifcp_sof_c, tvb, offset, 1, 0); + proto_tree_add_item(sof_tree, hf_ifcp_sof_c, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; /* FC EOF/-EOF */ if(tvb_bytes_exist(tvb, frame_len-4, 4)) { - proto_tree_add_item(eof_tree, hf_ifcp_eof, tvb, frame_len-4, 1, 0); - proto_tree_add_item(eof_tree, hf_ifcp_eof, tvb, frame_len-3, 1, 0); - proto_tree_add_item(eof_tree, hf_ifcp_eof_c, tvb, frame_len-2, 1, 0); - proto_tree_add_item(eof_tree, hf_ifcp_eof_c, tvb, frame_len-1, 1, 0); + proto_tree_add_item(eof_tree, hf_ifcp_eof, tvb, frame_len-4, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(eof_tree, hf_ifcp_eof, tvb, frame_len-3, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(eof_tree, hf_ifcp_eof_c, tvb, frame_len-2, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(eof_tree, hf_ifcp_eof_c, tvb, frame_len-1, 1, ENC_BIG_ENDIAN); } diff --git a/epan/dissectors/packet-igrp.c b/epan/dissectors/packet-igrp.c index b4f35f3e75..df483228bb 100644 --- a/epan/dissectors/packet-igrp.c +++ b/epan/dissectors/packet-igrp.c @@ -96,8 +96,8 @@ static void dissect_igrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_text(igrp_tree, tvb, 0,1,"IGRP Version : %d %s",version,(version==1?" ":" - Unknown Version, The dissection may be inaccurate")); proto_tree_add_text(igrp_tree, tvb, 0,1,"Command : %d %s",opcode,(opcode==1?"(Response)":"(Request)")); - proto_tree_add_item(igrp_tree, hf_igrp_update, tvb, 1,1, FALSE); - proto_tree_add_item(igrp_tree, hf_igrp_as, tvb, 2,2, FALSE); + proto_tree_add_item(igrp_tree, hf_igrp_update, tvb, 1,1, ENC_BIG_ENDIAN); + proto_tree_add_item(igrp_tree, hf_igrp_as, tvb, 2,2, ENC_BIG_ENDIAN); ninterior = tvb_get_ntohs(tvb,4); nsystem = tvb_get_ntohs(tvb,6); diff --git a/epan/dissectors/packet-image-png.c b/epan/dissectors/packet-image-png.c index cce9b794f0..b060d7298c 100644 --- a/epan/dissectors/packet-image-png.c +++ b/epan/dissectors/packet-image-png.c @@ -100,25 +100,25 @@ dissect_png_ihdr(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { int offset=0; - proto_tree_add_item(tree, hf_png_ihdr_width, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_png_ihdr_width, tvb, offset, 4, ENC_BIG_ENDIAN); offset+=4; - proto_tree_add_item(tree, hf_png_ihdr_height, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_png_ihdr_height, tvb, offset, 4, ENC_BIG_ENDIAN); offset+=4; - proto_tree_add_item(tree, hf_png_ihdr_bitdepth, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_png_ihdr_bitdepth, tvb, offset, 1, ENC_BIG_ENDIAN); offset+=1; - proto_tree_add_item(tree, hf_png_ihdr_colour_type, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_png_ihdr_colour_type, tvb, offset, 1, ENC_BIG_ENDIAN); offset+=1; - proto_tree_add_item(tree, hf_png_ihdr_compression_method, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_png_ihdr_compression_method, tvb, offset, 1, ENC_BIG_ENDIAN); offset+=1; - proto_tree_add_item(tree, hf_png_ihdr_filter_method, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_png_ihdr_filter_method, tvb, offset, 1, ENC_BIG_ENDIAN); offset+=1; - proto_tree_add_item(tree, hf_png_ihdr_interlace_method, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_png_ihdr_interlace_method, tvb, offset, 1, ENC_BIG_ENDIAN); offset+=1; return; @@ -147,12 +147,12 @@ dissect_png_text(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) static void dissect_png_time(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item(tree, hf_png_time_year, tvb, 0, 2, FALSE); - proto_tree_add_item(tree, hf_png_time_month, tvb, 2, 1, FALSE); - proto_tree_add_item(tree, hf_png_time_day, tvb, 3, 1, FALSE); - proto_tree_add_item(tree, hf_png_time_hour, tvb, 4, 1, FALSE); - proto_tree_add_item(tree, hf_png_time_minute, tvb, 5, 1, FALSE); - proto_tree_add_item(tree, hf_png_time_second, tvb, 6, 1, FALSE); + proto_tree_add_item(tree, hf_png_time_year, tvb, 0, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_png_time_month, tvb, 2, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_png_time_day, tvb, 3, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_png_time_hour, tvb, 4, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_png_time_minute, tvb, 5, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_png_time_second, tvb, 6, 1, ENC_BIG_ENDIAN); } static const value_string phys_unit_vals[] = { @@ -163,9 +163,9 @@ static const value_string phys_unit_vals[] = { static void dissect_png_phys(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item(tree, hf_png_phys_horiz, tvb, 0, 4, FALSE); - proto_tree_add_item(tree, hf_png_phys_vert, tvb, 4, 4, FALSE); - proto_tree_add_item(tree, hf_png_phys_unit, tvb, 8, 1, FALSE); + proto_tree_add_item(tree, hf_png_phys_horiz, tvb, 0, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_png_phys_vert, tvb, 4, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_png_phys_unit, tvb, 8, 1, ENC_BIG_ENDIAN); } static void @@ -173,15 +173,15 @@ dissect_png_bkgd(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { switch(tvb_reported_length(tvb)){ case 1: /* colour type 3 */ - proto_tree_add_item(tree, hf_png_bkgd_palette_index, tvb, 0, 1, FALSE); + proto_tree_add_item(tree, hf_png_bkgd_palette_index, tvb, 0, 1, ENC_BIG_ENDIAN); break; case 2: /* colour type 0, 4 */ - proto_tree_add_item(tree, hf_png_bkgd_greyscale, tvb, 0, 2, FALSE); + proto_tree_add_item(tree, hf_png_bkgd_greyscale, tvb, 0, 2, ENC_BIG_ENDIAN); break; case 6: /* colour type 2, 6 */ - proto_tree_add_item(tree, hf_png_bkgd_red, tvb, 0, 2, FALSE); - proto_tree_add_item(tree, hf_png_bkgd_green, tvb, 2, 2, FALSE); - proto_tree_add_item(tree, hf_png_bkgd_blue, tvb, 4, 2, FALSE); + proto_tree_add_item(tree, hf_png_bkgd_red, tvb, 0, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_png_bkgd_green, tvb, 2, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_png_bkgd_blue, tvb, 4, 2, ENC_BIG_ENDIAN); break; } } @@ -263,7 +263,7 @@ dissect_png(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) chunk_tree=proto_item_add_subtree(it, ett_png_chunk); } - proto_tree_add_item(chunk_tree, hf_png_chunk_len, tvb, offset, 4, FALSE); + proto_tree_add_item(chunk_tree, hf_png_chunk_len, tvb, offset, 4, ENC_BIG_ENDIAN); offset+=4; @@ -306,7 +306,7 @@ dissect_png(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) } offset+=len; - proto_tree_add_item(chunk_tree, hf_png_chunk_crc, tvb, offset, 4, FALSE); + proto_tree_add_item(chunk_tree, hf_png_chunk_crc, tvb, offset, 4, ENC_BIG_ENDIAN); offset+=4; } return offset; diff --git a/epan/dissectors/packet-infiniband.c b/epan/dissectors/packet-infiniband.c index 04ff57a3f7..d64bee17dd 100644 --- a/epan/dissectors/packet-infiniband.c +++ b/epan/dissectors/packet-infiniband.c @@ -1682,7 +1682,7 @@ dissect_infiniband_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, g proto_item_set_text(local_route_header_item, "%s", "Local Route Header"); local_route_header_tree = proto_item_add_subtree(local_route_header_item, ett_lrh); - proto_tree_add_item(local_route_header_tree, hf_infiniband_virtual_lane, tvb, offset, 1, FALSE); + proto_tree_add_item(local_route_header_tree, hf_infiniband_virtual_lane, tvb, offset, 1, ENC_BIG_ENDIAN); /* Get the Virtual Lane. We'll use this to identify Subnet Management and Subnet Administration Packets. */ @@ -1690,11 +1690,11 @@ dissect_infiniband_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, g virtualLane = virtualLane & 0xF0; - proto_tree_add_item(local_route_header_tree, hf_infiniband_link_version, tvb, offset, 1, FALSE); offset+=1; - proto_tree_add_item(local_route_header_tree, hf_infiniband_service_level, tvb, offset, 1, FALSE); + proto_tree_add_item(local_route_header_tree, hf_infiniband_link_version, tvb, offset, 1, ENC_BIG_ENDIAN); offset+=1; + proto_tree_add_item(local_route_header_tree, hf_infiniband_service_level, tvb, offset, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(local_route_header_tree, hf_infiniband_reserved2, tvb, offset, 1, FALSE); - proto_tree_add_item(local_route_header_tree, hf_infiniband_link_next_header, tvb, offset, 1, FALSE); + proto_tree_add_item(local_route_header_tree, hf_infiniband_reserved2, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(local_route_header_tree, hf_infiniband_link_next_header, tvb, offset, 1, ENC_BIG_ENDIAN); /* Save Link Next Header... This tells us what the next header is. */ @@ -1703,7 +1703,7 @@ dissect_infiniband_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, g offset+=1; - proto_tree_add_item(local_route_header_tree, hf_infiniband_destination_local_id, tvb, offset, 2, FALSE); + proto_tree_add_item(local_route_header_tree, hf_infiniband_destination_local_id, tvb, offset, 2, ENC_BIG_ENDIAN); /* Set destination in packet view. */ @@ -1712,15 +1712,15 @@ dissect_infiniband_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, g offset+=2; - proto_tree_add_item(local_route_header_tree, hf_infiniband_reserved5, tvb, offset, 2, FALSE); + proto_tree_add_item(local_route_header_tree, hf_infiniband_reserved5, tvb, offset, 2, ENC_BIG_ENDIAN); packetLength = tvb_get_ntohs(tvb, offset); /* Get the Packet Length. This will determine payload size later on. */ packetLength = packetLength & 0x07FF; /* Mask off top 5 bits, they are reserved */ packetLength = packetLength * 4; /* Multiply by 4 to get true byte length. This is by specification. */ /* PktLen is size in 4 byte words (byteSize /4). */ - proto_tree_add_item(local_route_header_tree, hf_infiniband_packet_length, tvb, offset, 2, FALSE); offset+=2; - proto_tree_add_item(local_route_header_tree, hf_infiniband_source_local_id, tvb, offset, 2, FALSE); + proto_tree_add_item(local_route_header_tree, hf_infiniband_packet_length, tvb, offset, 2, ENC_BIG_ENDIAN); offset+=2; + proto_tree_add_item(local_route_header_tree, hf_infiniband_source_local_id, tvb, offset, 2, ENC_BIG_ENDIAN); /* Set Source in packet view. */ *((guint16*) src_addr) = tvb_get_ntohs(tvb, offset); @@ -1739,16 +1739,16 @@ skip_lrh: proto_item_set_text(global_route_header_item, "%s", "Global Route Header"); global_route_header_tree = proto_item_add_subtree(global_route_header_item, ett_grh); - proto_tree_add_item(global_route_header_tree, hf_infiniband_ip_version, tvb, offset, 1, FALSE); - proto_tree_add_item(global_route_header_tree, hf_infiniband_traffic_class, tvb, offset, 2, FALSE); - proto_tree_add_item(global_route_header_tree, hf_infiniband_flow_label, tvb, offset, 4, FALSE); offset += 4; + proto_tree_add_item(global_route_header_tree, hf_infiniband_ip_version, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(global_route_header_tree, hf_infiniband_traffic_class, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(global_route_header_tree, hf_infiniband_flow_label, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(global_route_header_tree, hf_infiniband_payload_length, tvb, offset, 2, FALSE); offset += 2; + proto_tree_add_item(global_route_header_tree, hf_infiniband_payload_length, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; nxtHdr = tvb_get_guint8(tvb, offset); - proto_tree_add_item(global_route_header_tree, hf_infiniband_next_header, tvb, offset, 1, FALSE); offset +=1; - proto_tree_add_item(global_route_header_tree, hf_infiniband_hop_limit, tvb, offset, 1, FALSE); offset +=1; + proto_tree_add_item(global_route_header_tree, hf_infiniband_next_header, tvb, offset, 1, ENC_BIG_ENDIAN); offset +=1; + proto_tree_add_item(global_route_header_tree, hf_infiniband_hop_limit, tvb, offset, 1, ENC_BIG_ENDIAN); offset +=1; proto_tree_add_item(global_route_header_tree, hf_infiniband_source_gid, tvb, offset, 16, FALSE); tvb_get_ipv6(tvb, offset, &SRCgid); @@ -1781,7 +1781,7 @@ skip_lrh: base_transport_header_item = proto_tree_add_item(all_headers_tree, hf_infiniband_BTH, tvb, offset, 12, ENC_NA); proto_item_set_text(base_transport_header_item, "%s", "Base Transport Header"); base_transport_header_tree = proto_item_add_subtree(base_transport_header_item, ett_bth); - proto_tree_add_item(base_transport_header_tree, hf_infiniband_opcode, tvb, offset, 1, FALSE); + proto_tree_add_item(base_transport_header_tree, hf_infiniband_opcode, tvb, offset, 1, ENC_BIG_ENDIAN); /* Get the OpCode - this tells us what headers are following */ opCode = tvb_get_guint8(tvb, offset); @@ -1790,15 +1790,15 @@ skip_lrh: proto_tree_add_item(base_transport_header_tree, hf_infiniband_solicited_event, tvb, offset, 1, FALSE); proto_tree_add_item(base_transport_header_tree, hf_infiniband_migreq, tvb, offset, 1, FALSE); - proto_tree_add_item(base_transport_header_tree, hf_infiniband_pad_count, tvb, offset, 1, FALSE); - proto_tree_add_item(base_transport_header_tree, hf_infiniband_transport_header_version, tvb, offset, 1, FALSE); offset +=1; - proto_tree_add_item(base_transport_header_tree, hf_infiniband_partition_key, tvb, offset, 2, FALSE); offset +=2; - proto_tree_add_item(base_transport_header_tree, hf_infiniband_reserved8, tvb, offset, 1, FALSE); offset +=1; - proto_tree_add_item(base_transport_header_tree, hf_infiniband_destination_qp, tvb, offset, 3, FALSE); + proto_tree_add_item(base_transport_header_tree, hf_infiniband_pad_count, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(base_transport_header_tree, hf_infiniband_transport_header_version, tvb, offset, 1, ENC_BIG_ENDIAN); offset +=1; + proto_tree_add_item(base_transport_header_tree, hf_infiniband_partition_key, tvb, offset, 2, ENC_BIG_ENDIAN); offset +=2; + proto_tree_add_item(base_transport_header_tree, hf_infiniband_reserved8, tvb, offset, 1, ENC_BIG_ENDIAN); offset +=1; + proto_tree_add_item(base_transport_header_tree, hf_infiniband_destination_qp, tvb, offset, 3, ENC_BIG_ENDIAN); pinfo->destport = tvb_get_ntoh24(tvb, offset); offset +=3; proto_tree_add_item(base_transport_header_tree, hf_infiniband_acknowledge_request, tvb, offset, 1, FALSE); - proto_tree_add_item(base_transport_header_tree, hf_infiniband_reserved7, tvb, offset, 1, FALSE); offset +=1; - proto_tree_add_item(base_transport_header_tree, hf_infiniband_packet_sequence_number, tvb, offset, 3, FALSE); offset +=3; + proto_tree_add_item(base_transport_header_tree, hf_infiniband_reserved7, tvb, offset, 1, ENC_BIG_ENDIAN); offset +=1; + proto_tree_add_item(base_transport_header_tree, hf_infiniband_packet_sequence_number, tvb, offset, 3, ENC_BIG_ENDIAN); offset +=3; packetLength -= 12; /* Shave 12 for Base Transport Header */ @@ -2031,16 +2031,16 @@ skip_lrh: crc_length = tvb_reported_length_remaining(tvb, offset); if(crc_length == 6) { - proto_tree_add_item(all_headers_tree, hf_infiniband_invariant_crc, tvb, offset, 4, FALSE); offset +=4; - proto_tree_add_item(all_headers_tree, hf_infiniband_variant_crc, tvb, offset, 2, FALSE); offset+=2; + proto_tree_add_item(all_headers_tree, hf_infiniband_invariant_crc, tvb, offset, 4, ENC_BIG_ENDIAN); offset +=4; + proto_tree_add_item(all_headers_tree, hf_infiniband_variant_crc, tvb, offset, 2, ENC_BIG_ENDIAN); offset+=2; } else if(crc_length == 4) { - proto_tree_add_item(all_headers_tree, hf_infiniband_invariant_crc, tvb, offset, 4, FALSE); offset +=4; + proto_tree_add_item(all_headers_tree, hf_infiniband_invariant_crc, tvb, offset, 4, ENC_BIG_ENDIAN); offset +=4; } else if(crc_length == 2) { - proto_tree_add_item(all_headers_tree, hf_infiniband_variant_crc, tvb, offset, 2, FALSE); offset+=2; + proto_tree_add_item(all_headers_tree, hf_infiniband_variant_crc, tvb, offset, 2, ENC_BIG_ENDIAN); offset+=2; } } @@ -2091,20 +2091,20 @@ dissect_infiniband_link(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Headers Level Tree */ link_tree = proto_item_add_subtree(infiniband_link_packet, ett_link); - operand_item = proto_tree_add_item(link_tree, hf_infiniband_link_op, tvb, offset, 2, FALSE); + operand_item = proto_tree_add_item(link_tree, hf_infiniband_link_op, tvb, offset, 2, ENC_BIG_ENDIAN); if (operand > 1) { proto_item_set_text(operand_item, "%s", "Reserved"); call_dissector(data_handle, tvb, pinfo, link_tree); } else { - proto_tree_add_item(link_tree, hf_infiniband_link_fctbs, tvb, offset, 2, FALSE); + proto_tree_add_item(link_tree, hf_infiniband_link_fctbs, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(link_tree, hf_infiniband_link_vl, tvb, offset, 2, FALSE); - proto_tree_add_item(link_tree, hf_infiniband_link_fccl, tvb, offset, 2, FALSE); + proto_tree_add_item(link_tree, hf_infiniband_link_vl, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(link_tree, hf_infiniband_link_fccl, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(link_tree, hf_infiniband_link_lpcrc, tvb, offset, 2, FALSE); + proto_tree_add_item(link_tree, hf_infiniband_link_lpcrc, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; } @@ -2226,8 +2226,8 @@ parse_RDETH(proto_tree * parentTree, tvbuff_t *tvb, gint *offset) proto_item_set_text(RDETH_header_item, "%s", "RDETH - Reliable Datagram Extended Transport Header"); RDETH_header_tree = proto_item_add_subtree(RDETH_header_item, ett_rdeth); - proto_tree_add_item(RDETH_header_tree, hf_infiniband_reserved8_RDETH, tvb, local_offset, 1, FALSE); local_offset+=1; - proto_tree_add_item(RDETH_header_tree, hf_infiniband_ee_context, tvb, local_offset, 3, FALSE); local_offset+=3; + proto_tree_add_item(RDETH_header_tree, hf_infiniband_reserved8_RDETH, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset+=1; + proto_tree_add_item(RDETH_header_tree, hf_infiniband_ee_context, tvb, local_offset, 3, ENC_BIG_ENDIAN); local_offset+=3; *offset = local_offset; } @@ -2247,9 +2247,9 @@ parse_DETH(proto_tree *parentTree, packet_info *pinfo, tvbuff_t *tvb, gint *offs proto_item_set_text(DETH_header_item, "%s", "DETH - Datagram Extended Transport Header"); DETH_header_tree = proto_item_add_subtree(DETH_header_item, ett_deth); - proto_tree_add_item(DETH_header_tree, hf_infiniband_queue_key, tvb, local_offset, 4, FALSE); local_offset+=4; - proto_tree_add_item(DETH_header_tree, hf_infiniband_reserved8_DETH, tvb, local_offset, 1, FALSE); local_offset+=1; - proto_tree_add_item(DETH_header_tree, hf_infiniband_source_qp, tvb, local_offset, 3, FALSE); + proto_tree_add_item(DETH_header_tree, hf_infiniband_queue_key, tvb, local_offset, 4, ENC_BIG_ENDIAN); local_offset+=4; + proto_tree_add_item(DETH_header_tree, hf_infiniband_reserved8_DETH, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset+=1; + proto_tree_add_item(DETH_header_tree, hf_infiniband_source_qp, tvb, local_offset, 3, ENC_BIG_ENDIAN); pinfo->srcport = tvb_get_ntoh24(tvb, local_offset); local_offset+=3; *offset = local_offset; @@ -2271,9 +2271,9 @@ parse_RETH(proto_tree * parentTree, tvbuff_t *tvb, gint *offset) proto_item_set_text(RETH_header_item, "%s", "RETH - RDMA Extended Transport Header"); RETH_header_tree = proto_item_add_subtree(RETH_header_item, ett_reth); - proto_tree_add_item(RETH_header_tree, hf_infiniband_virtual_address, tvb, local_offset, 8, FALSE); local_offset+=8; - proto_tree_add_item(RETH_header_tree, hf_infiniband_remote_key, tvb, local_offset, 4, FALSE); local_offset+=4; - proto_tree_add_item(RETH_header_tree, hf_infiniband_dma_length, tvb, local_offset, 4, FALSE); local_offset+=4; + proto_tree_add_item(RETH_header_tree, hf_infiniband_virtual_address, tvb, local_offset, 8, ENC_BIG_ENDIAN); local_offset+=8; + proto_tree_add_item(RETH_header_tree, hf_infiniband_remote_key, tvb, local_offset, 4, ENC_BIG_ENDIAN); local_offset+=4; + proto_tree_add_item(RETH_header_tree, hf_infiniband_dma_length, tvb, local_offset, 4, ENC_BIG_ENDIAN); local_offset+=4; *offset = local_offset; } @@ -2294,10 +2294,10 @@ parse_ATOMICETH(proto_tree * parentTree, tvbuff_t *tvb, gint *offset) proto_item_set_text(ATOMICETH_header_item, "%s", "AtomicETH - Atomic Extended Transport Header"); ATOMICETH_header_tree = proto_item_add_subtree(ATOMICETH_header_item, ett_atomiceth); - proto_tree_add_item(ATOMICETH_header_tree, hf_infiniband_virtual_address, tvb, local_offset, 8, FALSE); local_offset+=8; - proto_tree_add_item(ATOMICETH_header_tree, hf_infiniband_remote_key, tvb, local_offset, 4, FALSE); local_offset+=4; - proto_tree_add_item(ATOMICETH_header_tree, hf_infiniband_swap_or_add_data, tvb, local_offset, 8, FALSE); local_offset+=8; - proto_tree_add_item(ATOMICETH_header_tree, hf_infiniband_compare_data, tvb, local_offset, 8, FALSE); local_offset+=8; + proto_tree_add_item(ATOMICETH_header_tree, hf_infiniband_virtual_address, tvb, local_offset, 8, ENC_BIG_ENDIAN); local_offset+=8; + proto_tree_add_item(ATOMICETH_header_tree, hf_infiniband_remote_key, tvb, local_offset, 4, ENC_BIG_ENDIAN); local_offset+=4; + proto_tree_add_item(ATOMICETH_header_tree, hf_infiniband_swap_or_add_data, tvb, local_offset, 8, ENC_BIG_ENDIAN); local_offset+=8; + proto_tree_add_item(ATOMICETH_header_tree, hf_infiniband_compare_data, tvb, local_offset, 8, ENC_BIG_ENDIAN); local_offset+=8; *offset = local_offset; } @@ -2317,8 +2317,8 @@ parse_AETH(proto_tree * parentTree, tvbuff_t *tvb, gint *offset) proto_item_set_text(AETH_header_item, "%s", "AETH - ACK Extended Transport Header"); AETH_header_tree = proto_item_add_subtree(AETH_header_item, ett_aeth); - proto_tree_add_item(AETH_header_tree, hf_infiniband_syndrome, tvb, local_offset, 1, FALSE); local_offset+=1; - proto_tree_add_item(AETH_header_tree, hf_infiniband_message_sequence_number, tvb, local_offset, 3, FALSE); local_offset+=3; + proto_tree_add_item(AETH_header_tree, hf_infiniband_syndrome, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset+=1; + proto_tree_add_item(AETH_header_tree, hf_infiniband_message_sequence_number, tvb, local_offset, 3, ENC_BIG_ENDIAN); local_offset+=3; *offset = local_offset; } @@ -2338,7 +2338,7 @@ parse_ATOMICACKETH(proto_tree * parentTree, tvbuff_t *tvb, gint *offset) ATOMICACKETH_header_item = proto_tree_add_item(parentTree, hf_infiniband_AtomicAckETH, tvb, local_offset, 8, ENC_NA); proto_item_set_text(ATOMICACKETH_header_item, "%s", "ATOMICACKETH - Atomic ACK Extended Transport Header"); ATOMICACKETH_header_tree = proto_item_add_subtree(ATOMICACKETH_header_item, ett_atomicacketh); - proto_tree_add_item(ATOMICACKETH_header_tree, hf_infiniband_original_remote_data, tvb, local_offset, 8, FALSE); local_offset+=8; + proto_tree_add_item(ATOMICACKETH_header_tree, hf_infiniband_original_remote_data, tvb, local_offset, 8, ENC_BIG_ENDIAN); local_offset+=8; *offset = local_offset; } @@ -2654,7 +2654,7 @@ static void parse_IPvSix(proto_tree *parentTree, tvbuff_t *tvb, gint *offset, pa *offset = tvb_reported_length(tvb) - 2; /* Display the VCRC */ - proto_tree_add_item(parentTree, hf_infiniband_variant_crc, tvb, *offset, 2, FALSE); + proto_tree_add_item(parentTree, hf_infiniband_variant_crc, tvb, *offset, 2, ENC_BIG_ENDIAN); } /* Parse EtherType - Parse a generic IP packaet with an EtherType of IP or ARP @@ -2678,7 +2678,7 @@ static void parse_RWH(proto_tree *ah_tree, tvbuff_t *tvb, gint *offset, packet_i RWH_header_tree = proto_item_add_subtree(RWH_header_item, ett_rwh); proto_tree_add_item(RWH_header_tree, hf_infiniband_reserved16_RWH, tvb, - *offset, 2, FALSE); + *offset, 2, ENC_BIG_ENDIAN); *offset += 2; @@ -2708,7 +2708,7 @@ static void parse_RWH(proto_tree *ah_tree, tvbuff_t *tvb, gint *offset, packet_i *offset = tvb_reported_length(tvb) - 2; /* Display the VCRC */ - proto_tree_add_item(ah_tree, hf_infiniband_variant_crc, tvb, *offset, 2, FALSE); + proto_tree_add_item(ah_tree, hf_infiniband_variant_crc, tvb, *offset, 2, ENC_BIG_ENDIAN); } @@ -2737,17 +2737,17 @@ static gboolean parse_EoIB(proto_tree *tree, tvbuff_t *tvb, gint offset, packet_ header_item = proto_tree_add_item(tree, hf_infiniband_EOIB, tvb, offset, 4, ENC_NA); header_subtree = proto_item_add_subtree(header_item, ett_eoib); - proto_tree_add_item(header_subtree, hf_infiniband_ver, tvb, offset, 2, FALSE); - proto_tree_add_item(header_subtree, hf_infiniband_tcp_chk, tvb, offset, 2, FALSE); - proto_tree_add_item(header_subtree, hf_infiniband_ip_chk, tvb, offset, 2, FALSE); + proto_tree_add_item(header_subtree, hf_infiniband_ver, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(header_subtree, hf_infiniband_tcp_chk, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(header_subtree, hf_infiniband_ip_chk, tvb, offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(header_subtree, hf_infiniband_fcs, tvb, offset, 2, FALSE); ms = tvb_get_bits8(tvb, (offset + 1)*8 + 2, 1); seg_offset = tvb_get_bits8(tvb, (offset + 1)*8 + 3, 5); proto_tree_add_item(header_subtree, hf_infiniband_ms, tvb, offset, 2, FALSE); - proto_tree_add_item(header_subtree, hf_infiniband_seg_off, tvb, offset, 2, FALSE); offset += 2; - proto_tree_add_item(header_subtree, hf_infiniband_seg_id, tvb, offset, 2, FALSE); offset += 2; + proto_tree_add_item(header_subtree, hf_infiniband_seg_off, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; + proto_tree_add_item(header_subtree, hf_infiniband_seg_id, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; if (seg_offset || ms) { /* this is a fragment of an encapsulated Ethernet jumbo frame, parse as data */ @@ -2786,7 +2786,7 @@ static void parse_SUBN_LID_ROUTED(proto_tree *parentTree, packet_info *pinfo, tv SUBN_LID_ROUTED_header_item = proto_tree_add_item(parentTree, hf_infiniband_SMP_LID, tvb, local_offset - 24, 256, ENC_NA); proto_item_set_text(SUBN_LID_ROUTED_header_item, "%s", "SMP (LID Routed) "); SUBN_LID_ROUTED_header_tree = proto_item_add_subtree(SUBN_LID_ROUTED_header_item, ett_subn_lid_routed); - proto_tree_add_item(SUBN_LID_ROUTED_header_tree, hf_infiniband_m_key, tvb, local_offset, 8, FALSE); local_offset +=8; + proto_tree_add_item(SUBN_LID_ROUTED_header_tree, hf_infiniband_m_key, tvb, local_offset, 8, ENC_BIG_ENDIAN); local_offset +=8; proto_tree_add_item(SUBN_LID_ROUTED_header_tree, hf_infiniband_reserved256, tvb, local_offset, 32, ENC_NA); local_offset +=32; label_SUBM_Method(SUBN_LID_ROUTED_header_item, &MadData, pinfo); @@ -2833,14 +2833,14 @@ static void parse_SUBN_DIRECTED_ROUTE(proto_tree *parentTree, packet_info *pinfo /* Place us at offset 4, the "D" Bit (Direction bit for Directed Route SMPs) */ local_offset -= 20; - proto_tree_add_item(SUBN_DIRECTED_ROUTE_header_tree, hf_infiniband_d, tvb, local_offset, 1, FALSE); - proto_tree_add_item(SUBN_DIRECTED_ROUTE_header_tree, hf_infiniband_smp_status, tvb, local_offset, 2, FALSE); local_offset +=2; - proto_tree_add_item(SUBN_DIRECTED_ROUTE_header_tree, hf_infiniband_hop_pointer, tvb, local_offset, 1, FALSE); local_offset +=1; - proto_tree_add_item(SUBN_DIRECTED_ROUTE_header_tree, hf_infiniband_hop_count, tvb, local_offset, 1, FALSE); local_offset +=1; + proto_tree_add_item(SUBN_DIRECTED_ROUTE_header_tree, hf_infiniband_d, tvb, local_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(SUBN_DIRECTED_ROUTE_header_tree, hf_infiniband_smp_status, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset +=2; + proto_tree_add_item(SUBN_DIRECTED_ROUTE_header_tree, hf_infiniband_hop_pointer, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset +=1; + proto_tree_add_item(SUBN_DIRECTED_ROUTE_header_tree, hf_infiniband_hop_count, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset +=1; local_offset += 16; /* Skip over the rest of the Common MAD Header... It's already dissected by parse_MAD_Common */ - proto_tree_add_item(SUBN_DIRECTED_ROUTE_header_tree, hf_infiniband_m_key, tvb, local_offset, 8, FALSE); local_offset +=8; - proto_tree_add_item(SUBN_DIRECTED_ROUTE_header_tree, hf_infiniband_dr_slid, tvb, local_offset, 2, FALSE); local_offset +=2; - proto_tree_add_item(SUBN_DIRECTED_ROUTE_header_tree, hf_infiniband_dr_dlid, tvb, local_offset, 2, FALSE); local_offset +=2; + proto_tree_add_item(SUBN_DIRECTED_ROUTE_header_tree, hf_infiniband_m_key, tvb, local_offset, 8, ENC_BIG_ENDIAN); local_offset +=8; + proto_tree_add_item(SUBN_DIRECTED_ROUTE_header_tree, hf_infiniband_dr_slid, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset +=2; + proto_tree_add_item(SUBN_DIRECTED_ROUTE_header_tree, hf_infiniband_dr_dlid, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset +=2; proto_tree_add_item(SUBN_DIRECTED_ROUTE_header_tree, hf_infiniband_reserved28, tvb, local_offset, 28, ENC_NA); local_offset +=28; /* Try to do the detail parse of the attribute. If there is an error, or the attribute is unknown, we'll just highlight the generic data. */ @@ -2883,10 +2883,10 @@ static void parse_SUBNADMN(proto_tree *parentTree, packet_info *pinfo, tvbuff_t proto_item_set_text(SUBNADMN_header_item, "%s", "SMA"); SUBNADMN_header_tree = proto_item_add_subtree(SUBNADMN_header_item, ett_subnadmin); - proto_tree_add_item(SUBNADMN_header_tree, hf_infiniband_sm_key, tvb, local_offset, 8, FALSE); local_offset+=8; - proto_tree_add_item(SUBNADMN_header_tree, hf_infiniband_attribute_offset, tvb, local_offset, 2, FALSE); local_offset+=4; - proto_tree_add_item(SUBNADMN_header_tree, hf_infiniband_reserved16, tvb, local_offset, 2, FALSE); local_offset+=4; - proto_tree_add_item(SUBNADMN_header_tree, hf_infiniband_component_mask, tvb, local_offset, 8, FALSE); local_offset+=8; + proto_tree_add_item(SUBNADMN_header_tree, hf_infiniband_sm_key, tvb, local_offset, 8, ENC_BIG_ENDIAN); local_offset+=8; + proto_tree_add_item(SUBNADMN_header_tree, hf_infiniband_attribute_offset, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset+=4; + proto_tree_add_item(SUBNADMN_header_tree, hf_infiniband_reserved16, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset+=4; + proto_tree_add_item(SUBNADMN_header_tree, hf_infiniband_component_mask, tvb, local_offset, 8, ENC_BIG_ENDIAN); local_offset+=8; label_SUBA_Method(SUBNADMN_header_item, &MadData, pinfo); label_SUBA_Attribute(SUBNADMN_header_item, &MadData, pinfo); @@ -3019,63 +3019,63 @@ static void parse_COM_MGT(proto_tree *parentTree, packet_info *pinfo, tvbuff_t * switch (MadData.attributeID) { case ATTR_CM_REQ: - proto_tree_add_item(CM_header_tree, hf_cm_req_local_comm_id, tvb, local_offset, 4, FALSE); local_offset += 4; + proto_tree_add_item(CM_header_tree, hf_cm_req_local_comm_id, tvb, local_offset, 4, ENC_BIG_ENDIAN); local_offset += 4; local_offset += 4; /* skip reserved */ - proto_tree_add_item(CM_header_tree, hf_cm_req_service_id, tvb, local_offset, 8, FALSE); + proto_tree_add_item(CM_header_tree, hf_cm_req_service_id, tvb, local_offset, 8, ENC_BIG_ENDIAN); serviceid = tvb_get_ntoh64(tvb, local_offset); local_offset += 8; - proto_tree_add_item(CM_header_tree, hf_cm_req_local_ca_guid, tvb, local_offset, 8, FALSE); local_offset += 8; + proto_tree_add_item(CM_header_tree, hf_cm_req_local_ca_guid, tvb, local_offset, 8, ENC_BIG_ENDIAN); local_offset += 8; local_offset += 4; /* skip reserved */ - proto_tree_add_item(CM_header_tree, hf_cm_req_local_qkey, tvb, local_offset, 4, FALSE); local_offset += 4; - proto_tree_add_item(CM_header_tree, hf_cm_req_local_qpn, tvb, local_offset, 3, FALSE); + proto_tree_add_item(CM_header_tree, hf_cm_req_local_qkey, tvb, local_offset, 4, ENC_BIG_ENDIAN); local_offset += 4; + proto_tree_add_item(CM_header_tree, hf_cm_req_local_qpn, tvb, local_offset, 3, ENC_BIG_ENDIAN); local_qpn = tvb_get_ntoh24(tvb, local_offset); local_offset += 3; - proto_tree_add_item(CM_header_tree, hf_cm_req_respo_res, tvb, local_offset, 1, FALSE); local_offset += 1; - proto_tree_add_item(CM_header_tree, hf_cm_req_local_eecn, tvb, local_offset, 3, FALSE); local_offset += 3; - proto_tree_add_item(CM_header_tree, hf_cm_req_init_depth, tvb, local_offset, 1, FALSE); local_offset += 1; - proto_tree_add_item(CM_header_tree, hf_cm_req_remote_eecn, tvb, local_offset, 3, FALSE); local_offset += 3; - proto_tree_add_item(CM_header_tree, hf_cm_req_remote_cm_resp_to, tvb, local_offset, 1, FALSE); - proto_tree_add_item(CM_header_tree, hf_cm_req_transp_serv_type, tvb, local_offset, 1, FALSE); - proto_tree_add_item(CM_header_tree, hf_cm_req_e2e_flow_ctrl, tvb, local_offset, 1, FALSE); local_offset += 1; - proto_tree_add_item(CM_header_tree, hf_cm_req_start_psn, tvb, local_offset, 3, FALSE); local_offset += 3; - proto_tree_add_item(CM_header_tree, hf_cm_req_local_cm_resp_to, tvb, local_offset, 1, FALSE); - proto_tree_add_item(CM_header_tree, hf_cm_req_retry_count, tvb, local_offset, 1, FALSE); local_offset += 1; - proto_tree_add_item(CM_header_tree, hf_cm_req_pkey, tvb, local_offset, 2, FALSE); local_offset += 2; - proto_tree_add_item(CM_header_tree, hf_cm_req_path_pp_mtu, tvb, local_offset, 1, FALSE); - proto_tree_add_item(CM_header_tree, hf_cm_req_rdc_exists, tvb, local_offset, 1, FALSE); - proto_tree_add_item(CM_header_tree, hf_cm_req_rnr_retry_count, tvb, local_offset, 1, FALSE); local_offset += 1; - proto_tree_add_item(CM_header_tree, hf_cm_req_max_cm_retries, tvb, local_offset, 1, FALSE); - proto_tree_add_item(CM_header_tree, hf_cm_req_srq, tvb, local_offset, 1, FALSE); + proto_tree_add_item(CM_header_tree, hf_cm_req_respo_res, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset += 1; + proto_tree_add_item(CM_header_tree, hf_cm_req_local_eecn, tvb, local_offset, 3, ENC_BIG_ENDIAN); local_offset += 3; + proto_tree_add_item(CM_header_tree, hf_cm_req_init_depth, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset += 1; + proto_tree_add_item(CM_header_tree, hf_cm_req_remote_eecn, tvb, local_offset, 3, ENC_BIG_ENDIAN); local_offset += 3; + proto_tree_add_item(CM_header_tree, hf_cm_req_remote_cm_resp_to, tvb, local_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(CM_header_tree, hf_cm_req_transp_serv_type, tvb, local_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(CM_header_tree, hf_cm_req_e2e_flow_ctrl, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset += 1; + proto_tree_add_item(CM_header_tree, hf_cm_req_start_psn, tvb, local_offset, 3, ENC_BIG_ENDIAN); local_offset += 3; + proto_tree_add_item(CM_header_tree, hf_cm_req_local_cm_resp_to, tvb, local_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(CM_header_tree, hf_cm_req_retry_count, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset += 1; + proto_tree_add_item(CM_header_tree, hf_cm_req_pkey, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset += 2; + proto_tree_add_item(CM_header_tree, hf_cm_req_path_pp_mtu, tvb, local_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(CM_header_tree, hf_cm_req_rdc_exists, tvb, local_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(CM_header_tree, hf_cm_req_rnr_retry_count, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset += 1; + proto_tree_add_item(CM_header_tree, hf_cm_req_max_cm_retries, tvb, local_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(CM_header_tree, hf_cm_req_srq, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset += 1; /* skip reserved */ - proto_tree_add_item(CM_header_tree, hf_cm_req_primary_local_lid, tvb, local_offset, 2, FALSE); + proto_tree_add_item(CM_header_tree, hf_cm_req_primary_local_lid, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_lid = tvb_get_ntohs(tvb, local_offset); local_offset += 2; - proto_tree_add_item(CM_header_tree, hf_cm_req_primary_remote_lid, tvb, local_offset, 2, FALSE); + proto_tree_add_item(CM_header_tree, hf_cm_req_primary_remote_lid, tvb, local_offset, 2, ENC_BIG_ENDIAN); remote_lid = tvb_get_ntohs(tvb, local_offset); local_offset += 2; proto_tree_add_item(CM_header_tree, hf_cm_req_primary_local_gid, tvb, local_offset, 16, FALSE); tvb_get_ipv6(tvb, local_offset, (struct e_in6_addr*)local_gid); local_offset += 16; proto_tree_add_item(CM_header_tree, hf_cm_req_primary_remote_gid, tvb, local_offset, 16, FALSE); tvb_get_ipv6(tvb, local_offset, (struct e_in6_addr*)remote_gid); local_offset += 16; - proto_tree_add_item(CM_header_tree, hf_cm_req_primary_flow_label, tvb, local_offset, 2, FALSE); local_offset += 2; + proto_tree_add_item(CM_header_tree, hf_cm_req_primary_flow_label, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset += 2; local_offset += 1; /* skip reserved */ - proto_tree_add_item(CM_header_tree, hf_cm_req_primary_packet_rate, tvb, local_offset, 1, FALSE); local_offset += 1; - proto_tree_add_item(CM_header_tree, hf_cm_req_primary_traffic_class, tvb, local_offset, 1, FALSE); local_offset += 1; - proto_tree_add_item(CM_header_tree, hf_cm_req_primary_hop_limit, tvb, local_offset, 1, FALSE); local_offset += 1; - proto_tree_add_item(CM_header_tree, hf_cm_req_primary_sl, tvb, local_offset, 1, FALSE); - proto_tree_add_item(CM_header_tree, hf_cm_req_primary_subnet_local, tvb, local_offset, 1, FALSE); + proto_tree_add_item(CM_header_tree, hf_cm_req_primary_packet_rate, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset += 1; + proto_tree_add_item(CM_header_tree, hf_cm_req_primary_traffic_class, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset += 1; + proto_tree_add_item(CM_header_tree, hf_cm_req_primary_hop_limit, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset += 1; + proto_tree_add_item(CM_header_tree, hf_cm_req_primary_sl, tvb, local_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(CM_header_tree, hf_cm_req_primary_subnet_local, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset += 1; /* skip reserved */ - proto_tree_add_item(CM_header_tree, hf_cm_req_primary_local_ack_to, tvb, local_offset, 1, FALSE); + proto_tree_add_item(CM_header_tree, hf_cm_req_primary_local_ack_to, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset += 1; /* skip reserved */ - proto_tree_add_item(CM_header_tree, hf_cm_req_alt_local_lid, tvb, local_offset, 2, FALSE); local_offset += 2; - proto_tree_add_item(CM_header_tree, hf_cm_req_alt_remote_lid, tvb, local_offset, 2, FALSE); local_offset += 2; + proto_tree_add_item(CM_header_tree, hf_cm_req_alt_local_lid, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset += 2; + proto_tree_add_item(CM_header_tree, hf_cm_req_alt_remote_lid, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset += 2; proto_tree_add_item(CM_header_tree, hf_cm_req_alt_local_gid, tvb, local_offset, 16, ENC_NA); local_offset += 16; proto_tree_add_item(CM_header_tree, hf_cm_req_alt_remote_gid, tvb, local_offset, 16, ENC_NA); local_offset += 16; - proto_tree_add_item(CM_header_tree, hf_cm_req_flow_label, tvb, local_offset, 2, FALSE); local_offset += 2; + proto_tree_add_item(CM_header_tree, hf_cm_req_flow_label, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset += 2; local_offset += 1; /* skip reserved */ - proto_tree_add_item(CM_header_tree, hf_cm_req_packet_rate, tvb, local_offset, 1, FALSE); local_offset += 1; - proto_tree_add_item(CM_header_tree, hf_cm_req_alt_traffic_class, tvb, local_offset, 1, FALSE); local_offset += 1; - proto_tree_add_item(CM_header_tree, hf_cm_req_alt_hop_limit, tvb, local_offset, 1, FALSE); local_offset += 1; - proto_tree_add_item(CM_header_tree, hf_cm_req_SL, tvb, local_offset, 1, FALSE); - proto_tree_add_item(CM_header_tree, hf_cm_req_subnet_local, tvb, local_offset, 1, FALSE); + proto_tree_add_item(CM_header_tree, hf_cm_req_packet_rate, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset += 1; + proto_tree_add_item(CM_header_tree, hf_cm_req_alt_traffic_class, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset += 1; + proto_tree_add_item(CM_header_tree, hf_cm_req_alt_hop_limit, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset += 1; + proto_tree_add_item(CM_header_tree, hf_cm_req_SL, tvb, local_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(CM_header_tree, hf_cm_req_subnet_local, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset += 1; /* skip reserved */ - proto_tree_add_item(CM_header_tree, hf_cm_req_local_ACK_timeout, tvb, local_offset, 1, FALSE); + proto_tree_add_item(CM_header_tree, hf_cm_req_local_ACK_timeout, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset += 1; /* skip reserved */ /* the following saves information about the conversation this packet defines, @@ -3122,25 +3122,25 @@ static void parse_COM_MGT(proto_tree *parentTree, packet_info *pinfo, tvbuff_t * local_offset += 92; break; case ATTR_CM_REP: - proto_tree_add_item(CM_header_tree, hf_cm_rep_localcommid, tvb, local_offset, 4, FALSE); local_offset += 4; - proto_tree_add_item(CM_header_tree, hf_cm_rep_remotecommid, tvb, local_offset, 4, FALSE); local_offset += 4; - proto_tree_add_item(CM_header_tree, hf_cm_rep_localqkey, tvb, local_offset, 4, FALSE); local_offset += 4; - proto_tree_add_item(CM_header_tree, hf_cm_rep_localqpn, tvb, local_offset, 3, FALSE); + proto_tree_add_item(CM_header_tree, hf_cm_rep_localcommid, tvb, local_offset, 4, ENC_BIG_ENDIAN); local_offset += 4; + proto_tree_add_item(CM_header_tree, hf_cm_rep_remotecommid, tvb, local_offset, 4, ENC_BIG_ENDIAN); local_offset += 4; + proto_tree_add_item(CM_header_tree, hf_cm_rep_localqkey, tvb, local_offset, 4, ENC_BIG_ENDIAN); local_offset += 4; + proto_tree_add_item(CM_header_tree, hf_cm_rep_localqpn, tvb, local_offset, 3, ENC_BIG_ENDIAN); remote_qpn = tvb_get_ntoh24(tvb, local_offset); local_offset += 3; local_offset += 1; /* skip reserved */ - proto_tree_add_item(CM_header_tree, hf_cm_rep_localeecontnum, tvb, local_offset, 3, FALSE); local_offset += 3; + proto_tree_add_item(CM_header_tree, hf_cm_rep_localeecontnum, tvb, local_offset, 3, ENC_BIG_ENDIAN); local_offset += 3; local_offset += 1; /* skip reserved */ - proto_tree_add_item(CM_header_tree, hf_cm_rep_startingpsn, tvb, local_offset, 3, FALSE); local_offset += 3; + proto_tree_add_item(CM_header_tree, hf_cm_rep_startingpsn, tvb, local_offset, 3, ENC_BIG_ENDIAN); local_offset += 3; local_offset += 1; /* skip reserved */ - proto_tree_add_item(CM_header_tree, hf_cm_rep_responderres, tvb, local_offset, 1, FALSE); local_offset += 1; - proto_tree_add_item(CM_header_tree, hf_cm_rep_initiatordepth, tvb, local_offset, 1, FALSE); local_offset += 1; - proto_tree_add_item(CM_header_tree, hf_cm_rep_tgtackdelay, tvb, local_offset, 1, FALSE); - proto_tree_add_item(CM_header_tree, hf_cm_rep_failoveracc, tvb, local_offset, 1, FALSE); - proto_tree_add_item(CM_header_tree, hf_cm_rep_e2eflowctl, tvb, local_offset, 1, FALSE); local_offset += 1; - proto_tree_add_item(CM_header_tree, hf_cm_rep_rnrretrycount, tvb, local_offset, 1, FALSE); - proto_tree_add_item(CM_header_tree, hf_cm_rep_srq, tvb, local_offset, 1, FALSE); + proto_tree_add_item(CM_header_tree, hf_cm_rep_responderres, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset += 1; + proto_tree_add_item(CM_header_tree, hf_cm_rep_initiatordepth, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset += 1; + proto_tree_add_item(CM_header_tree, hf_cm_rep_tgtackdelay, tvb, local_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(CM_header_tree, hf_cm_rep_failoveracc, tvb, local_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(CM_header_tree, hf_cm_rep_e2eflowctl, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset += 1; + proto_tree_add_item(CM_header_tree, hf_cm_rep_rnrretrycount, tvb, local_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(CM_header_tree, hf_cm_rep_srq, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset += 1; /* skip reserved */ - proto_tree_add_item(CM_header_tree, hf_cm_rep_localcaguid, tvb, local_offset, 8, FALSE); local_offset += 8; + proto_tree_add_item(CM_header_tree, hf_cm_rep_localcaguid, tvb, local_offset, 8, ENC_BIG_ENDIAN); local_offset += 8; /* the following saves information about the conversation this packet defines, so there's no point in doing it more than once per packet */ @@ -3208,19 +3208,19 @@ static void parse_COM_MGT(proto_tree *parentTree, packet_info *pinfo, tvbuff_t * local_offset += 196; break; case ATTR_CM_RTU: - proto_tree_add_item(CM_header_tree, hf_cm_rtu_localcommid, tvb, local_offset, 4, FALSE); local_offset += 4; - proto_tree_add_item(CM_header_tree, hf_cm_rtu_remotecommid, tvb, local_offset, 4, FALSE); local_offset += 4; + proto_tree_add_item(CM_header_tree, hf_cm_rtu_localcommid, tvb, local_offset, 4, ENC_BIG_ENDIAN); local_offset += 4; + proto_tree_add_item(CM_header_tree, hf_cm_rtu_remotecommid, tvb, local_offset, 4, ENC_BIG_ENDIAN); local_offset += 4; /* currently only REQ/REP call subdissectors for the private data */ proto_tree_add_item(CM_header_tree, hf_cm_rtu_privatedata, tvb, local_offset, 224, ENC_NA); local_offset += 224; break; case ATTR_CM_REJ: - proto_tree_add_item(CM_header_tree, hf_cm_rej_local_commid, tvb, local_offset, 4, FALSE); local_offset += 4; - proto_tree_add_item(CM_header_tree, hf_cm_rej_remote_commid, tvb, local_offset, 4, FALSE); local_offset += 4; - proto_tree_add_item(CM_header_tree, hf_cm_rej_msg_rej, tvb, local_offset, 1, FALSE); + proto_tree_add_item(CM_header_tree, hf_cm_rej_local_commid, tvb, local_offset, 4, ENC_BIG_ENDIAN); local_offset += 4; + proto_tree_add_item(CM_header_tree, hf_cm_rej_remote_commid, tvb, local_offset, 4, ENC_BIG_ENDIAN); local_offset += 4; + proto_tree_add_item(CM_header_tree, hf_cm_rej_msg_rej, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset += 1; /* skip reserved */ - proto_tree_add_item(CM_header_tree, hf_cm_rej_rej_info_len, tvb, local_offset, 1, FALSE); + proto_tree_add_item(CM_header_tree, hf_cm_rej_rej_info_len, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset += 1; /* skip reserved */ - proto_tree_add_item(CM_header_tree, hf_cm_rej_reason, tvb, local_offset, 2, FALSE); local_offset += 2; + proto_tree_add_item(CM_header_tree, hf_cm_rej_reason, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset += 2; proto_tree_add_item(CM_header_tree, hf_cm_rej_add_rej_info, tvb, local_offset, 72, ENC_NA); local_offset += 72; /* currently only REQ/REP call subdissectors for the private data */ proto_tree_add_item(CM_header_tree, hf_cm_rej_private_data, tvb, local_offset, 148, ENC_NA); local_offset += 148; @@ -3361,16 +3361,16 @@ static gboolean parse_MAD_Common(proto_tree *parentTree, tvbuff_t *tvb, gint *of proto_item_set_text(MAD_header_item, "%s", "MAD Header - Common Management Datagram"); MAD_header_tree = proto_item_add_subtree(MAD_header_item, ett_mad); - proto_tree_add_item(MAD_header_tree, hf_infiniband_base_version, tvb, local_offset, 1, FALSE); local_offset+=1; - proto_tree_add_item(MAD_header_tree, hf_infiniband_mgmt_class, tvb, local_offset, 1, FALSE); local_offset+=1; - proto_tree_add_item(MAD_header_tree, hf_infiniband_class_version, tvb, local_offset, 1, FALSE); local_offset+=1; - proto_tree_add_item(MAD_header_tree, hf_infiniband_method, tvb, local_offset, 1, FALSE); local_offset+=1; - proto_tree_add_item(MAD_header_tree, hf_infiniband_status, tvb, local_offset, 2, FALSE); local_offset+=2; - proto_tree_add_item(MAD_header_tree, hf_infiniband_class_specific, tvb, local_offset, 2, FALSE); local_offset+=2; - proto_tree_add_item(MAD_header_tree, hf_infiniband_transaction_id, tvb, local_offset, 8, FALSE); local_offset+=8; - proto_tree_add_item(MAD_header_tree, hf_infiniband_attribute_id, tvb, local_offset, 2, FALSE); local_offset+=2; - proto_tree_add_item(MAD_header_tree, hf_infiniband_reserved16, tvb, local_offset, 2, FALSE); local_offset+=2; - proto_tree_add_item(MAD_header_tree, hf_infiniband_attribute_modifier, tvb, local_offset, 4, FALSE); local_offset+=4; + proto_tree_add_item(MAD_header_tree, hf_infiniband_base_version, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset+=1; + proto_tree_add_item(MAD_header_tree, hf_infiniband_mgmt_class, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset+=1; + proto_tree_add_item(MAD_header_tree, hf_infiniband_class_version, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset+=1; + proto_tree_add_item(MAD_header_tree, hf_infiniband_method, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset+=1; + proto_tree_add_item(MAD_header_tree, hf_infiniband_status, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset+=2; + proto_tree_add_item(MAD_header_tree, hf_infiniband_class_specific, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset+=2; + proto_tree_add_item(MAD_header_tree, hf_infiniband_transaction_id, tvb, local_offset, 8, ENC_BIG_ENDIAN); local_offset+=8; + proto_tree_add_item(MAD_header_tree, hf_infiniband_attribute_id, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset+=2; + proto_tree_add_item(MAD_header_tree, hf_infiniband_reserved16, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset+=2; + proto_tree_add_item(MAD_header_tree, hf_infiniband_attribute_modifier, tvb, local_offset, 4, ENC_BIG_ENDIAN); local_offset+=4; proto_tree_add_item(MAD_header_tree, hf_infiniband_data, tvb, local_offset, MAD_DATA_SIZE, ENC_NA); *offset = local_offset; /* Move the offset to the start of the Data field - this will be where the other parsers start. */ @@ -3392,25 +3392,25 @@ static gboolean parse_RMPP(proto_tree *parentTree, tvbuff_t *tvb, gint *offset) proto_item_set_text(RMPP_header_item, "%s", val_to_str(RMPP_Type, RMPP_Packet_Types, "Reserved RMPP Type! (0x%02x)")); RMPP_header_tree = proto_item_add_subtree(RMPP_header_item, ett_rmpp); - proto_tree_add_item(RMPP_header_tree, hf_infiniband_rmpp_version, tvb, local_offset, 1, FALSE); local_offset+=1; - proto_tree_add_item(RMPP_header_tree, hf_infiniband_rmpp_type, tvb, local_offset, 1, FALSE); local_offset+=1; - proto_tree_add_item(RMPP_header_tree, hf_infiniband_r_resp_time, tvb, local_offset, 1, FALSE); - proto_tree_add_item(RMPP_header_tree, hf_infiniband_rmpp_flags, tvb, local_offset, 1, FALSE); local_offset+=1; - proto_tree_add_item(RMPP_header_tree, hf_infiniband_rmpp_status, tvb, local_offset, 1, FALSE); local_offset+=1; + proto_tree_add_item(RMPP_header_tree, hf_infiniband_rmpp_version, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset+=1; + proto_tree_add_item(RMPP_header_tree, hf_infiniband_rmpp_type, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset+=1; + proto_tree_add_item(RMPP_header_tree, hf_infiniband_r_resp_time, tvb, local_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(RMPP_header_tree, hf_infiniband_rmpp_flags, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset+=1; + proto_tree_add_item(RMPP_header_tree, hf_infiniband_rmpp_status, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset+=1; switch(RMPP_Type) { case RMPP_ILLEGAL: - proto_tree_add_item(RMPP_header_tree, hf_infiniband_rmpp_data1, tvb, local_offset, 4, FALSE); local_offset+=4; - proto_tree_add_item(RMPP_header_tree, hf_infiniband_rmpp_data2, tvb, local_offset, 4, FALSE); local_offset+=4; + proto_tree_add_item(RMPP_header_tree, hf_infiniband_rmpp_data1, tvb, local_offset, 4, ENC_BIG_ENDIAN); local_offset+=4; + proto_tree_add_item(RMPP_header_tree, hf_infiniband_rmpp_data2, tvb, local_offset, 4, ENC_BIG_ENDIAN); local_offset+=4; break; case RMPP_DATA: - proto_tree_add_item(RMPP_header_tree, hf_infiniband_segment_number, tvb, local_offset, 4, FALSE); local_offset+=4; - proto_tree_add_item(RMPP_header_tree, hf_infiniband_payload_length32, tvb, local_offset, 4, FALSE); local_offset+=4; + proto_tree_add_item(RMPP_header_tree, hf_infiniband_segment_number, tvb, local_offset, 4, ENC_BIG_ENDIAN); local_offset+=4; + proto_tree_add_item(RMPP_header_tree, hf_infiniband_payload_length32, tvb, local_offset, 4, ENC_BIG_ENDIAN); local_offset+=4; proto_tree_add_item(RMPP_header_tree, hf_infiniband_transferred_data, tvb, local_offset, 220, ENC_NA); break; case RMPP_ACK: - proto_tree_add_item(RMPP_header_tree, hf_infiniband_segment_number, tvb, local_offset, 4, FALSE); local_offset+=4; - proto_tree_add_item(RMPP_header_tree, hf_infiniband_new_window_last, tvb, local_offset, 4, FALSE); local_offset+=4; + proto_tree_add_item(RMPP_header_tree, hf_infiniband_segment_number, tvb, local_offset, 4, ENC_BIG_ENDIAN); local_offset+=4; + proto_tree_add_item(RMPP_header_tree, hf_infiniband_new_window_last, tvb, local_offset, 4, ENC_BIG_ENDIAN); local_offset+=4; proto_tree_add_item(RMPP_header_tree, hf_infiniband_reserved220, tvb, local_offset, 220, ENC_NA); break; case RMPP_STOP: @@ -3701,111 +3701,111 @@ static void parse_NoticeDataDetails(proto_tree* parentTree, tvbuff_t* tvb, gint break; case 68: proto_item_set_text(DataDetails_header_item, "%s", "Trap 68 DataDetails"); - proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_COMP_MASK, tvb, local_offset, 8, FALSE); local_offset+=8; - proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_WAIT_FOR_REPATH, tvb, local_offset, 1, FALSE); + proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_COMP_MASK, tvb, local_offset, 8, ENC_BIG_ENDIAN); local_offset+=8; + proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_WAIT_FOR_REPATH, tvb, local_offset, 1, ENC_BIG_ENDIAN); break; case 69: proto_item_set_text(DataDetails_header_item, "%s", "Trap 69 DataDetails"); - proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_COMP_MASK, tvb, local_offset, 8, FALSE); local_offset+=8; - proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_WAIT_FOR_REPATH, tvb, local_offset, 1, FALSE); + proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_COMP_MASK, tvb, local_offset, 8, ENC_BIG_ENDIAN); local_offset+=8; + proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_WAIT_FOR_REPATH, tvb, local_offset, 1, ENC_BIG_ENDIAN); break; case 128: proto_item_set_text(DataDetails_header_item, "%s", "Trap 128 DataDetails"); - proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_LIDADDR, tvb, local_offset, 2, FALSE); local_offset+=2; + proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_LIDADDR, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset+=2; break; case 129: proto_item_set_text(DataDetails_header_item, "%s", "Trap 129 DataDetails"); local_offset += 2; - proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_LIDADDR, tvb, local_offset, 2, FALSE); local_offset+=2; - proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_PORTNO, tvb, local_offset, 1, FALSE); local_offset+=1; + proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_LIDADDR, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset+=2; + proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_PORTNO, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset+=1; break; case 130: proto_item_set_text(DataDetails_header_item, "%s", "Trap 130 DataDetails"); local_offset += 2; - proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_LIDADDR, tvb, local_offset, 2, FALSE); local_offset+=2; - proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_PORTNO, tvb, local_offset, 1, FALSE); local_offset+=1; + proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_LIDADDR, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset+=2; + proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_PORTNO, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset+=1; break; case 131: proto_item_set_text(DataDetails_header_item, "%s", "Trap 131 DataDetails"); local_offset += 2; - proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_LIDADDR, tvb, local_offset, 2, FALSE); local_offset+=2; - proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_PORTNO, tvb, local_offset, 1, FALSE); local_offset+=1; + proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_LIDADDR, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset+=2; + proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_PORTNO, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset+=1; break; case 144: proto_item_set_text(DataDetails_header_item, "%s", "Trap 144 DataDetails"); local_offset +=2; - proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_LIDADDR, tvb, local_offset, 2, FALSE); local_offset+=2; + proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_LIDADDR, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset+=2; local_offset +=1; - proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_OtherLocalChanges, tvb, local_offset, 1, FALSE); local_offset+=1; - proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_CAPABILITYMASK, tvb, local_offset, 4, FALSE); local_offset+=4; + proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_OtherLocalChanges, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset+=1; + proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_CAPABILITYMASK, tvb, local_offset, 4, ENC_BIG_ENDIAN); local_offset+=4; local_offset +=1; - proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_LinkSpeecEnabledChange, tvb, local_offset, 1, FALSE); - proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_LinkWidthEnabledChange, tvb, local_offset, 1, FALSE); - proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_NodeDescriptionChange, tvb, local_offset, 1, FALSE); + proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_LinkSpeecEnabledChange, tvb, local_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_LinkWidthEnabledChange, tvb, local_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_NodeDescriptionChange, tvb, local_offset, 1, ENC_BIG_ENDIAN); break; case 145: proto_item_set_text(DataDetails_header_item, "%s", "Trap 145 DataDetails"); local_offset +=2; - proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_LIDADDR, tvb, local_offset, 2, FALSE); local_offset+=2; + proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_LIDADDR, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset+=2; local_offset +=2; - proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_SYSTEMIMAGEGUID, tvb, local_offset, 8, FALSE); local_offset+=8; + proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_SYSTEMIMAGEGUID, tvb, local_offset, 8, ENC_BIG_ENDIAN); local_offset+=8; break; case 256: proto_item_set_text(DataDetails_header_item, "%s", "Trap 256 DataDetails"); local_offset +=2; - proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_LIDADDR, tvb, local_offset, 2, FALSE); local_offset+=2; - proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_DRSLID, tvb, local_offset, 2, FALSE); local_offset+=2; - proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_METHOD, tvb, local_offset, 1, FALSE); local_offset+=1; + proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_LIDADDR, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset+=2; + proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_DRSLID, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset+=2; + proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_METHOD, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset+=1; local_offset +=1; - proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_ATTRIBUTEID, tvb, local_offset, 2, FALSE); local_offset+=2; - proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_ATTRIBUTEMODIFIER, tvb, local_offset, 4, FALSE); local_offset+=4; - proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_MKEY, tvb, local_offset, 8, FALSE); local_offset+=8; + proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_ATTRIBUTEID, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset+=2; + proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_ATTRIBUTEMODIFIER, tvb, local_offset, 4, ENC_BIG_ENDIAN); local_offset+=4; + proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_MKEY, tvb, local_offset, 8, ENC_BIG_ENDIAN); local_offset+=8; local_offset +=1; - proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_DRNotice, tvb, local_offset, 1, FALSE); - proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_DRPathTruncated, tvb, local_offset, 1, FALSE); - proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_DRHopCount, tvb, local_offset, 1, FALSE); local_offset+=1; + proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_DRNotice, tvb, local_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_DRPathTruncated, tvb, local_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_DRHopCount, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset+=1; proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_DRNoticeReturnPath, tvb, local_offset, 30, ENC_NA); local_offset+=30; break; case 257: proto_item_set_text(DataDetails_header_item, "%s", "Trap 257 DataDetails"); local_offset+=2; - proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_LIDADDR1, tvb, local_offset, 2, FALSE); local_offset+=2; - proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_LIDADDR2, tvb, local_offset, 2, FALSE); local_offset+=2; - proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_KEY, tvb, local_offset, 4, FALSE); local_offset+=4; - proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_SL, tvb, local_offset, 1, FALSE); local_offset+=1; - proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_QP1, tvb, local_offset, 3, FALSE); local_offset+=3; + proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_LIDADDR1, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset+=2; + proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_LIDADDR2, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset+=2; + proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_KEY, tvb, local_offset, 4, ENC_BIG_ENDIAN); local_offset+=4; + proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_SL, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset+=1; + proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_QP1, tvb, local_offset, 3, ENC_BIG_ENDIAN); local_offset+=3; local_offset +=1; - proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_QP2, tvb, local_offset, 3, FALSE); local_offset+=3; + proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_QP2, tvb, local_offset, 3, ENC_BIG_ENDIAN); local_offset+=3; proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_GIDADDR1, tvb, local_offset, 16, FALSE); local_offset+=16; proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_GIDADDR2, tvb, local_offset, 16, FALSE); local_offset+=16; break; case 258: proto_item_set_text(DataDetails_header_item, "%s", "Trap 258 DataDetails"); local_offset+=2; - proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_LIDADDR1, tvb, local_offset, 2, FALSE); local_offset+=2; - proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_LIDADDR2, tvb, local_offset, 2, FALSE); local_offset+=2; - proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_KEY, tvb, local_offset, 4, FALSE); local_offset+=4; - proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_SL, tvb, local_offset, 1, FALSE); local_offset +=1; - proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_QP1, tvb, local_offset, 3, FALSE); local_offset+=3; + proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_LIDADDR1, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset+=2; + proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_LIDADDR2, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset+=2; + proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_KEY, tvb, local_offset, 4, ENC_BIG_ENDIAN); local_offset+=4; + proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_SL, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset +=1; + proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_QP1, tvb, local_offset, 3, ENC_BIG_ENDIAN); local_offset+=3; local_offset +=1; - proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_QP2, tvb, local_offset, 3, FALSE); local_offset+=3; + proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_QP2, tvb, local_offset, 3, ENC_BIG_ENDIAN); local_offset+=3; proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_GIDADDR1, tvb, local_offset, 16, FALSE); local_offset+=16; proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_GIDADDR2, tvb, local_offset, 16, FALSE); local_offset+=16; break; case 259: proto_item_set_text(DataDetails_header_item, "%s", "Trap 259 DataDetails"); proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_DataValid, tvb, local_offset, 2, FALSE); local_offset+=2; - proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_LIDADDR1, tvb, local_offset, 2, FALSE); local_offset+=2; - proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_LIDADDR2, tvb, local_offset, 2, FALSE); local_offset+=2; - proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_PKEY, tvb, local_offset, 2, FALSE); local_offset+=2; - proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_SL, tvb, local_offset, 1, FALSE); local_offset+=1; - proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_QP1, tvb, local_offset, 3, FALSE); local_offset+=3; + proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_LIDADDR1, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset+=2; + proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_LIDADDR2, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset+=2; + proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_PKEY, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset+=2; + proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_SL, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset+=1; + proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_QP1, tvb, local_offset, 3, ENC_BIG_ENDIAN); local_offset+=3; local_offset +=1; - proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_QP2, tvb, local_offset, 3, FALSE); local_offset+=3; + proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_QP2, tvb, local_offset, 3, ENC_BIG_ENDIAN); local_offset+=3; proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_GIDADDR1, tvb, local_offset, 16, FALSE); local_offset+=16; proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_GIDADDR2, tvb, local_offset, 16, FALSE); local_offset+=16; proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_SWLIDADDR, tvb, local_offset, 2, FALSE); local_offset+=2; - proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_PORTNO, tvb, local_offset, 1, FALSE); local_offset+=1; + proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_PORTNO, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset+=1; break; default: proto_item_set_text(DataDetails_header_item, "%s", "Vendor Specific Subnet Management Trap"); local_offset +=54; @@ -3833,13 +3833,13 @@ static void parse_NoticesAndTraps(proto_tree* parentTree, tvbuff_t* tvb, gint *o proto_item_set_text(NoticesAndTraps_header_item, "%s", val_to_str(trapNumber, Trap_Description, "Unknown or Vendor Specific Trap Number! (0x%02x)")); NoticesAndTraps_header_tree = proto_item_add_subtree(NoticesAndTraps_header_item, ett_noticestraps); - proto_tree_add_item(NoticesAndTraps_header_tree, hf_infiniband_Notice_IsGeneric, tvb, local_offset, 1, FALSE); - proto_tree_add_item(NoticesAndTraps_header_tree, hf_infiniband_Notice_Type, tvb, local_offset, 1, FALSE); local_offset+=1; - proto_tree_add_item(NoticesAndTraps_header_tree, hf_infiniband_Notice_ProducerTypeVendorID, tvb, local_offset, 3, FALSE); local_offset+=3; - proto_tree_add_item(NoticesAndTraps_header_tree, hf_infiniband_Notice_TrapNumberDeviceID, tvb, local_offset, 2, FALSE); local_offset+=2; - proto_tree_add_item(NoticesAndTraps_header_tree, hf_infiniband_Notice_IssuerLID, tvb, local_offset, 2, FALSE); local_offset+=2; - proto_tree_add_item(NoticesAndTraps_header_tree, hf_infiniband_Notice_NoticeToggle, tvb, local_offset, 1, FALSE); - proto_tree_add_item(NoticesAndTraps_header_tree, hf_infiniband_Notice_NoticeCount, tvb, local_offset, 2, FALSE); local_offset+=2; + proto_tree_add_item(NoticesAndTraps_header_tree, hf_infiniband_Notice_IsGeneric, tvb, local_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(NoticesAndTraps_header_tree, hf_infiniband_Notice_Type, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset+=1; + proto_tree_add_item(NoticesAndTraps_header_tree, hf_infiniband_Notice_ProducerTypeVendorID, tvb, local_offset, 3, ENC_BIG_ENDIAN); local_offset+=3; + proto_tree_add_item(NoticesAndTraps_header_tree, hf_infiniband_Notice_TrapNumberDeviceID, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset+=2; + proto_tree_add_item(NoticesAndTraps_header_tree, hf_infiniband_Notice_IssuerLID, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset+=2; + proto_tree_add_item(NoticesAndTraps_header_tree, hf_infiniband_Notice_NoticeToggle, tvb, local_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(NoticesAndTraps_header_tree, hf_infiniband_Notice_NoticeCount, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset+=2; parse_NoticeDataDetails(NoticesAndTraps_header_tree, tvb, &local_offset, trapNumber); proto_tree_add_item(NoticesAndTraps_header_tree, hf_infiniband_Notice_DataDetails, tvb, local_offset, 54, ENC_NA); local_offset+=54; @@ -3882,18 +3882,18 @@ static void parse_NodeInfo(proto_tree* parentTree, tvbuff_t* tvb, gint *offset) NodeInfo_header_tree = parentTree; - proto_tree_add_item(NodeInfo_header_tree, hf_infiniband_NodeInfo_BaseVersion, tvb, local_offset, 1, FALSE); local_offset +=1; - proto_tree_add_item(NodeInfo_header_tree, hf_infiniband_NodeInfo_ClassVersion, tvb, local_offset, 1, FALSE); local_offset +=1; - proto_tree_add_item(NodeInfo_header_tree, hf_infiniband_NodeInfo_NodeType, tvb, local_offset, 1, FALSE); local_offset +=1; - proto_tree_add_item(NodeInfo_header_tree, hf_infiniband_NodeInfo_NumPorts, tvb, local_offset, 1, FALSE); local_offset +=1; - proto_tree_add_item(NodeInfo_header_tree, hf_infiniband_NodeInfo_SystemImageGUID, tvb, local_offset, 8, FALSE); local_offset +=8; - proto_tree_add_item(NodeInfo_header_tree, hf_infiniband_NodeInfo_NodeGUID, tvb, local_offset, 8, FALSE); local_offset +=8; - proto_tree_add_item(NodeInfo_header_tree, hf_infiniband_NodeInfo_PortGUID, tvb, local_offset, 8, FALSE); local_offset +=8; - proto_tree_add_item(NodeInfo_header_tree, hf_infiniband_NodeInfo_PartitionCap, tvb, local_offset, 2, FALSE); local_offset +=2; - proto_tree_add_item(NodeInfo_header_tree, hf_infiniband_NodeInfo_DeviceID, tvb, local_offset, 2, FALSE); local_offset +=2; - proto_tree_add_item(NodeInfo_header_tree, hf_infiniband_NodeInfo_Revision, tvb, local_offset, 4, FALSE); local_offset +=4; - proto_tree_add_item(NodeInfo_header_tree, hf_infiniband_NodeInfo_LocalPortNum, tvb, local_offset, 1, FALSE); local_offset +=1; - proto_tree_add_item(NodeInfo_header_tree, hf_infiniband_NodeInfo_VendorID, tvb, local_offset, 3, FALSE); local_offset +=3; + proto_tree_add_item(NodeInfo_header_tree, hf_infiniband_NodeInfo_BaseVersion, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset +=1; + proto_tree_add_item(NodeInfo_header_tree, hf_infiniband_NodeInfo_ClassVersion, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset +=1; + proto_tree_add_item(NodeInfo_header_tree, hf_infiniband_NodeInfo_NodeType, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset +=1; + proto_tree_add_item(NodeInfo_header_tree, hf_infiniband_NodeInfo_NumPorts, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset +=1; + proto_tree_add_item(NodeInfo_header_tree, hf_infiniband_NodeInfo_SystemImageGUID, tvb, local_offset, 8, ENC_BIG_ENDIAN); local_offset +=8; + proto_tree_add_item(NodeInfo_header_tree, hf_infiniband_NodeInfo_NodeGUID, tvb, local_offset, 8, ENC_BIG_ENDIAN); local_offset +=8; + proto_tree_add_item(NodeInfo_header_tree, hf_infiniband_NodeInfo_PortGUID, tvb, local_offset, 8, ENC_BIG_ENDIAN); local_offset +=8; + proto_tree_add_item(NodeInfo_header_tree, hf_infiniband_NodeInfo_PartitionCap, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset +=2; + proto_tree_add_item(NodeInfo_header_tree, hf_infiniband_NodeInfo_DeviceID, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset +=2; + proto_tree_add_item(NodeInfo_header_tree, hf_infiniband_NodeInfo_Revision, tvb, local_offset, 4, ENC_BIG_ENDIAN); local_offset +=4; + proto_tree_add_item(NodeInfo_header_tree, hf_infiniband_NodeInfo_LocalPortNum, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset +=1; + proto_tree_add_item(NodeInfo_header_tree, hf_infiniband_NodeInfo_VendorID, tvb, local_offset, 3, ENC_BIG_ENDIAN); local_offset +=3; } @@ -3912,23 +3912,23 @@ static void parse_SwitchInfo(proto_tree* parentTree, tvbuff_t* tvb, gint *offset SwitchInfo_header_tree = parentTree; - proto_tree_add_item(SwitchInfo_header_tree, hf_infiniband_SwitchInfo_LinearFDBCap, tvb, local_offset, 2, FALSE); local_offset +=2; - proto_tree_add_item(SwitchInfo_header_tree, hf_infiniband_SwitchInfo_RandomFDBCap, tvb, local_offset, 2, FALSE); local_offset +=2; - proto_tree_add_item(SwitchInfo_header_tree, hf_infiniband_SwitchInfo_MulticastFDBCap, tvb, local_offset, 2, FALSE); local_offset +=2; - proto_tree_add_item(SwitchInfo_header_tree, hf_infiniband_SwitchInfo_LinearFDBTop, tvb, local_offset, 2, FALSE); local_offset +=2; - proto_tree_add_item(SwitchInfo_header_tree, hf_infiniband_SwitchInfo_DefaultPort, tvb, local_offset, 1, FALSE); local_offset +=1; - proto_tree_add_item(SwitchInfo_header_tree, hf_infiniband_SwitchInfo_DefaultMulticastPrimaryPort, tvb, local_offset, 1, FALSE); local_offset +=1; - proto_tree_add_item(SwitchInfo_header_tree, hf_infiniband_SwitchInfo_DefaultMulticastNotPrimaryPort, tvb, local_offset, 1, FALSE); local_offset +=1; - proto_tree_add_item(SwitchInfo_header_tree, hf_infiniband_SwitchInfo_LifeTimeValue, tvb, local_offset, 1, FALSE); - proto_tree_add_item(SwitchInfo_header_tree, hf_infiniband_SwitchInfo_PortStateChange, tvb, local_offset, 1, FALSE); - proto_tree_add_item(SwitchInfo_header_tree, hf_infiniband_SwitchInfo_OptimizedSLtoVLMappingProgramming, tvb, local_offset, 1, FALSE); local_offset +=1; - proto_tree_add_item(SwitchInfo_header_tree, hf_infiniband_SwitchInfo_LIDsPerPort, tvb, local_offset, 2, FALSE); local_offset +=2; - proto_tree_add_item(SwitchInfo_header_tree, hf_infiniband_SwitchInfo_PartitionEnforcementCap, tvb, local_offset, 2, FALSE); local_offset +=2; - proto_tree_add_item(SwitchInfo_header_tree, hf_infiniband_SwitchInfo_InboundEnforcementCap, tvb, local_offset, 1, FALSE); - proto_tree_add_item(SwitchInfo_header_tree, hf_infiniband_SwitchInfo_OutboundEnforcementCap, tvb, local_offset, 1, FALSE); - proto_tree_add_item(SwitchInfo_header_tree, hf_infiniband_SwitchInfo_FilterRawInboundCap, tvb, local_offset, 1, FALSE); - proto_tree_add_item(SwitchInfo_header_tree, hf_infiniband_SwitchInfo_FilterRawOutboundCap, tvb, local_offset, 1, FALSE); - proto_tree_add_item(SwitchInfo_header_tree, hf_infiniband_SwitchInfo_EnhancedPortZero, tvb, local_offset, 1, FALSE); local_offset +=1; + proto_tree_add_item(SwitchInfo_header_tree, hf_infiniband_SwitchInfo_LinearFDBCap, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset +=2; + proto_tree_add_item(SwitchInfo_header_tree, hf_infiniband_SwitchInfo_RandomFDBCap, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset +=2; + proto_tree_add_item(SwitchInfo_header_tree, hf_infiniband_SwitchInfo_MulticastFDBCap, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset +=2; + proto_tree_add_item(SwitchInfo_header_tree, hf_infiniband_SwitchInfo_LinearFDBTop, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset +=2; + proto_tree_add_item(SwitchInfo_header_tree, hf_infiniband_SwitchInfo_DefaultPort, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset +=1; + proto_tree_add_item(SwitchInfo_header_tree, hf_infiniband_SwitchInfo_DefaultMulticastPrimaryPort, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset +=1; + proto_tree_add_item(SwitchInfo_header_tree, hf_infiniband_SwitchInfo_DefaultMulticastNotPrimaryPort, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset +=1; + proto_tree_add_item(SwitchInfo_header_tree, hf_infiniband_SwitchInfo_LifeTimeValue, tvb, local_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(SwitchInfo_header_tree, hf_infiniband_SwitchInfo_PortStateChange, tvb, local_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(SwitchInfo_header_tree, hf_infiniband_SwitchInfo_OptimizedSLtoVLMappingProgramming, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset +=1; + proto_tree_add_item(SwitchInfo_header_tree, hf_infiniband_SwitchInfo_LIDsPerPort, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset +=2; + proto_tree_add_item(SwitchInfo_header_tree, hf_infiniband_SwitchInfo_PartitionEnforcementCap, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset +=2; + proto_tree_add_item(SwitchInfo_header_tree, hf_infiniband_SwitchInfo_InboundEnforcementCap, tvb, local_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(SwitchInfo_header_tree, hf_infiniband_SwitchInfo_OutboundEnforcementCap, tvb, local_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(SwitchInfo_header_tree, hf_infiniband_SwitchInfo_FilterRawInboundCap, tvb, local_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(SwitchInfo_header_tree, hf_infiniband_SwitchInfo_FilterRawOutboundCap, tvb, local_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(SwitchInfo_header_tree, hf_infiniband_SwitchInfo_EnhancedPortZero, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset +=1; } /* Parse GUIDInfo Attribute @@ -3950,7 +3950,7 @@ static void parse_GUIDInfo(proto_tree* parentTree, tvbuff_t* tvb, gint *offset) for(i = 0; i < 8; i++) { - proto_tree_add_item(GUIDInfo_header_tree, hf_infiniband_GUIDInfo_GUID, tvb, local_offset, 8, FALSE); local_offset +=8; + proto_tree_add_item(GUIDInfo_header_tree, hf_infiniband_GUIDInfo_GUID, tvb, local_offset, 8, ENC_BIG_ENDIAN); local_offset +=8; proto_item_append_text(tempItemLow, "(%u)", i); } @@ -3975,55 +3975,55 @@ static void parse_PortInfo(proto_tree* parentTree, tvbuff_t* tvb, gint *offset) PortInfo_header_tree = parentTree; - proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_M_Key, tvb, local_offset, 8, FALSE); local_offset +=8; - proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_GidPrefix, tvb, local_offset, 8, FALSE); local_offset +=8; - proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_LID, tvb, local_offset, 2, FALSE); local_offset +=2; - proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_MasterSMLID, tvb, local_offset, 2, FALSE); local_offset +=2; + proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_M_Key, tvb, local_offset, 8, ENC_BIG_ENDIAN); local_offset +=8; + proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_GidPrefix, tvb, local_offset, 8, ENC_BIG_ENDIAN); local_offset +=8; + proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_LID, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset +=2; + proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_MasterSMLID, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset +=2; /* Capability Mask Flags */ - PortInfo_CapabilityMask_item = proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_CapabilityMask, tvb, local_offset, 4, FALSE); + PortInfo_CapabilityMask_item = proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_CapabilityMask, tvb, local_offset, 4, ENC_BIG_ENDIAN); PortInfo_CapabilityMask_tree = proto_item_add_subtree(PortInfo_CapabilityMask_item, ett_portinfo_capmask); - proto_tree_add_item(PortInfo_CapabilityMask_tree, hf_infiniband_PortInfo_CapabilityMask_SM, tvb, local_offset, 4, FALSE); - proto_tree_add_item(PortInfo_CapabilityMask_tree, hf_infiniband_PortInfo_CapabilityMask_NoticeSupported, tvb, local_offset, 4, FALSE); - proto_tree_add_item(PortInfo_CapabilityMask_tree, hf_infiniband_PortInfo_CapabilityMask_TrapSupported, tvb, local_offset, 4, FALSE); - proto_tree_add_item(PortInfo_CapabilityMask_tree, hf_infiniband_PortInfo_CapabilityMask_OptionalPDSupported, tvb, local_offset, 4, FALSE); - proto_tree_add_item(PortInfo_CapabilityMask_tree, hf_infiniband_PortInfo_CapabilityMask_AutomaticMigrationSupported, tvb, local_offset, 4, FALSE); - proto_tree_add_item(PortInfo_CapabilityMask_tree, hf_infiniband_PortInfo_CapabilityMask_SLMappingSupported, tvb, local_offset, 4, FALSE); - proto_tree_add_item(PortInfo_CapabilityMask_tree, hf_infiniband_PortInfo_CapabilityMask_MKeyNVRAM, tvb, local_offset, 4, FALSE); - proto_tree_add_item(PortInfo_CapabilityMask_tree, hf_infiniband_PortInfo_CapabilityMask_PKeyNVRAM, tvb, local_offset, 4, FALSE); - proto_tree_add_item(PortInfo_CapabilityMask_tree, hf_infiniband_PortInfo_CapabilityMask_LEDInfoSupported, tvb, local_offset, 4, FALSE); - proto_tree_add_item(PortInfo_CapabilityMask_tree, hf_infiniband_PortInfo_CapabilityMask_SMdisabled, tvb, local_offset, 4, FALSE); - proto_tree_add_item(PortInfo_CapabilityMask_tree, hf_infiniband_PortInfo_CapabilityMask_SystemImageGUIDSupported, tvb, local_offset, 4, FALSE); - proto_tree_add_item(PortInfo_CapabilityMask_tree, hf_infiniband_PortInfo_CapabilityMask_PKeySwitchExternalPortTrapSupported, tvb, local_offset, 4, FALSE); - proto_tree_add_item(PortInfo_CapabilityMask_tree, hf_infiniband_PortInfo_CapabilityMask_CommunicationsManagementSupported, tvb, local_offset, 4, FALSE); - proto_tree_add_item(PortInfo_CapabilityMask_tree, hf_infiniband_PortInfo_CapabilityMask_SNMPTunnelingSupported, tvb, local_offset, 4, FALSE); - proto_tree_add_item(PortInfo_CapabilityMask_tree, hf_infiniband_PortInfo_CapabilityMask_ReinitSupported, tvb, local_offset, 4, FALSE); - proto_tree_add_item(PortInfo_CapabilityMask_tree, hf_infiniband_PortInfo_CapabilityMask_DeviceManagementSupported, tvb, local_offset, 4, FALSE); - proto_tree_add_item(PortInfo_CapabilityMask_tree, hf_infiniband_PortInfo_CapabilityMask_VendorClassSupported, tvb, local_offset, 4, FALSE); - proto_tree_add_item(PortInfo_CapabilityMask_tree, hf_infiniband_PortInfo_CapabilityMask_DRNoticeSupported, tvb, local_offset, 4, FALSE); - proto_tree_add_item(PortInfo_CapabilityMask_tree, hf_infiniband_PortInfo_CapabilityMask_CapabilityMaskNoticeSupported, tvb, local_offset, 4, FALSE); - proto_tree_add_item(PortInfo_CapabilityMask_tree, hf_infiniband_PortInfo_CapabilityMask_BootManagementSupported, tvb, local_offset, 4, FALSE); - proto_tree_add_item(PortInfo_CapabilityMask_tree, hf_infiniband_PortInfo_CapabilityMask_LinkRoundTripLatencySupported, tvb, local_offset, 4, FALSE); - proto_tree_add_item(PortInfo_CapabilityMask_tree, hf_infiniband_PortInfo_CapabilityMask_ClientRegistrationSupported, tvb, local_offset, 4, FALSE); - proto_tree_add_item(PortInfo_CapabilityMask_tree, hf_infiniband_PortInfo_CapabilityMask_OtherLocalChangesNoticeSupported, tvb, local_offset, 4, FALSE); - proto_tree_add_item(PortInfo_CapabilityMask_tree, hf_infiniband_PortInfo_CapabilityMask_LinkSpeedWIdthPairsTableSupported, tvb, local_offset, 4, FALSE); + proto_tree_add_item(PortInfo_CapabilityMask_tree, hf_infiniband_PortInfo_CapabilityMask_SM, tvb, local_offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(PortInfo_CapabilityMask_tree, hf_infiniband_PortInfo_CapabilityMask_NoticeSupported, tvb, local_offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(PortInfo_CapabilityMask_tree, hf_infiniband_PortInfo_CapabilityMask_TrapSupported, tvb, local_offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(PortInfo_CapabilityMask_tree, hf_infiniband_PortInfo_CapabilityMask_OptionalPDSupported, tvb, local_offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(PortInfo_CapabilityMask_tree, hf_infiniband_PortInfo_CapabilityMask_AutomaticMigrationSupported, tvb, local_offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(PortInfo_CapabilityMask_tree, hf_infiniband_PortInfo_CapabilityMask_SLMappingSupported, tvb, local_offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(PortInfo_CapabilityMask_tree, hf_infiniband_PortInfo_CapabilityMask_MKeyNVRAM, tvb, local_offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(PortInfo_CapabilityMask_tree, hf_infiniband_PortInfo_CapabilityMask_PKeyNVRAM, tvb, local_offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(PortInfo_CapabilityMask_tree, hf_infiniband_PortInfo_CapabilityMask_LEDInfoSupported, tvb, local_offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(PortInfo_CapabilityMask_tree, hf_infiniband_PortInfo_CapabilityMask_SMdisabled, tvb, local_offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(PortInfo_CapabilityMask_tree, hf_infiniband_PortInfo_CapabilityMask_SystemImageGUIDSupported, tvb, local_offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(PortInfo_CapabilityMask_tree, hf_infiniband_PortInfo_CapabilityMask_PKeySwitchExternalPortTrapSupported, tvb, local_offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(PortInfo_CapabilityMask_tree, hf_infiniband_PortInfo_CapabilityMask_CommunicationsManagementSupported, tvb, local_offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(PortInfo_CapabilityMask_tree, hf_infiniband_PortInfo_CapabilityMask_SNMPTunnelingSupported, tvb, local_offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(PortInfo_CapabilityMask_tree, hf_infiniband_PortInfo_CapabilityMask_ReinitSupported, tvb, local_offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(PortInfo_CapabilityMask_tree, hf_infiniband_PortInfo_CapabilityMask_DeviceManagementSupported, tvb, local_offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(PortInfo_CapabilityMask_tree, hf_infiniband_PortInfo_CapabilityMask_VendorClassSupported, tvb, local_offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(PortInfo_CapabilityMask_tree, hf_infiniband_PortInfo_CapabilityMask_DRNoticeSupported, tvb, local_offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(PortInfo_CapabilityMask_tree, hf_infiniband_PortInfo_CapabilityMask_CapabilityMaskNoticeSupported, tvb, local_offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(PortInfo_CapabilityMask_tree, hf_infiniband_PortInfo_CapabilityMask_BootManagementSupported, tvb, local_offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(PortInfo_CapabilityMask_tree, hf_infiniband_PortInfo_CapabilityMask_LinkRoundTripLatencySupported, tvb, local_offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(PortInfo_CapabilityMask_tree, hf_infiniband_PortInfo_CapabilityMask_ClientRegistrationSupported, tvb, local_offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(PortInfo_CapabilityMask_tree, hf_infiniband_PortInfo_CapabilityMask_OtherLocalChangesNoticeSupported, tvb, local_offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(PortInfo_CapabilityMask_tree, hf_infiniband_PortInfo_CapabilityMask_LinkSpeedWIdthPairsTableSupported, tvb, local_offset, 4, ENC_BIG_ENDIAN); local_offset+=4; /* End Capability Mask Flags */ /* Diag Code */ - temp_item = proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_DiagCode, tvb, local_offset, 2, FALSE); + temp_item = proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_DiagCode, tvb, local_offset, 2, ENC_BIG_ENDIAN); temp_val = tvb_get_ntohs(tvb, local_offset); proto_item_append_text(temp_item, ", %s", val_to_str(temp_val, DiagCode, "Reserved DiagCode! Possible Error")); local_offset +=2; /* End Diag Code */ - proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_M_KeyLeasePeriod, tvb, local_offset, 2, FALSE); local_offset +=2; - proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_LocalPortNum, tvb, local_offset, 1, FALSE); local_offset +=1; + proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_M_KeyLeasePeriod, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset +=2; + proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_LocalPortNum, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset +=1; /* LinkWidthEnabled */ - temp_item = proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_LinkWidthEnabled, tvb, local_offset, 1, FALSE); + temp_item = proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_LinkWidthEnabled, tvb, local_offset, 1, ENC_BIG_ENDIAN); temp_val = (guint16)tvb_get_guint8(tvb, local_offset); proto_item_append_text(temp_item, ", %s", val_to_str(temp_val, LinkWidthEnabled, "Reserved LinkWidthEnabled Value! Possible Error")); @@ -4031,7 +4031,7 @@ static void parse_PortInfo(proto_tree* parentTree, tvbuff_t* tvb, gint *offset) /* End LinkWidthEnabled */ /* LinkWidthSupported */ - temp_item = proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_LinkWidthSupported, tvb, local_offset, 1, FALSE); + temp_item = proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_LinkWidthSupported, tvb, local_offset, 1, ENC_BIG_ENDIAN); temp_val = (guint16)tvb_get_guint8(tvb, local_offset); proto_item_append_text(temp_item, ", %s", val_to_str(temp_val, LinkWidthSupported, "Reserved LinkWidthSupported Value! Possible Error")); @@ -4039,7 +4039,7 @@ static void parse_PortInfo(proto_tree* parentTree, tvbuff_t* tvb, gint *offset) /* End LinkWidthSupported */ /* LinkWidthActive */ - temp_item = proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_LinkWidthActive, tvb, local_offset, 1, FALSE); + temp_item = proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_LinkWidthActive, tvb, local_offset, 1, ENC_BIG_ENDIAN); temp_val = (guint16)tvb_get_guint8(tvb, local_offset); proto_item_append_text(temp_item, ", %s", val_to_str(temp_val, LinkWidthActive, "Reserved LinkWidthActive Value! Possible Error")); @@ -4047,7 +4047,7 @@ static void parse_PortInfo(proto_tree* parentTree, tvbuff_t* tvb, gint *offset) /* End LinkWidthActive */ /* LinkSpeedSupported */ - temp_item = proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_LinkSpeedSupported, tvb, local_offset, 1, FALSE); + temp_item = proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_LinkSpeedSupported, tvb, local_offset, 1, ENC_BIG_ENDIAN); temp_val = (guint16)tvb_get_guint8(tvb, local_offset); /* 4 bit values = mask and shift */ @@ -4058,7 +4058,7 @@ static void parse_PortInfo(proto_tree* parentTree, tvbuff_t* tvb, gint *offset) /* End LinkSpeedSupported */ /* PortState */ - temp_item = proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_PortState, tvb, local_offset, 1, FALSE); + temp_item = proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_PortState, tvb, local_offset, 1, ENC_BIG_ENDIAN); temp_val = (guint16)tvb_get_guint8(tvb, local_offset); /* 4 bit values = mask and shift */ @@ -4070,7 +4070,7 @@ static void parse_PortInfo(proto_tree* parentTree, tvbuff_t* tvb, gint *offset) /* End PortState */ /* PortPhysicalState */ - temp_item = proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_PortPhysicalState, tvb, local_offset, 1, FALSE); + temp_item = proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_PortPhysicalState, tvb, local_offset, 1, ENC_BIG_ENDIAN); temp_val = (guint16)tvb_get_guint8(tvb, local_offset); /* 4 bit values = mask and shift */ @@ -4081,7 +4081,7 @@ static void parse_PortInfo(proto_tree* parentTree, tvbuff_t* tvb, gint *offset) /* End PortPhysicalState */ /* LinkDownDefaultState */ - temp_item = proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_LinkDownDefaultState, tvb, local_offset, 1, FALSE); + temp_item = proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_LinkDownDefaultState, tvb, local_offset, 1, ENC_BIG_ENDIAN); temp_val = (guint16)tvb_get_guint8(tvb, local_offset); /* 4 bit values = mask and shift */ @@ -4092,11 +4092,11 @@ static void parse_PortInfo(proto_tree* parentTree, tvbuff_t* tvb, gint *offset) local_offset +=1; /* End LinkDownDefaultState */ - proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_M_KeyProtectBits, tvb, local_offset, 1, FALSE); - proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_LMC, tvb, local_offset, 1, FALSE); local_offset +=1; + proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_M_KeyProtectBits, tvb, local_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_LMC, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset +=1; /* LinkSpeedActive */ - temp_item = proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_LinkSpeedActive, tvb, local_offset, 1, FALSE); + temp_item = proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_LinkSpeedActive, tvb, local_offset, 1, ENC_BIG_ENDIAN); temp_val = (guint16)tvb_get_guint8(tvb, local_offset); /* 4 bit values = mask and shift */ @@ -4107,7 +4107,7 @@ static void parse_PortInfo(proto_tree* parentTree, tvbuff_t* tvb, gint *offset) /* End LinkSpeedActive */ /* LinkSpeedEnabled */ - temp_item = proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_LinkSpeedEnabled, tvb, local_offset, 1, FALSE); + temp_item = proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_LinkSpeedEnabled, tvb, local_offset, 1, ENC_BIG_ENDIAN); temp_val = (guint16)tvb_get_guint8(tvb, local_offset); /* 4 bit values = mask and shift */ @@ -4119,7 +4119,7 @@ static void parse_PortInfo(proto_tree* parentTree, tvbuff_t* tvb, gint *offset) /* End LinkSpeedEnabled */ /* NeighborMTU */ - temp_item = proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_NeighborMTU, tvb, local_offset, 1, FALSE); + temp_item = proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_NeighborMTU, tvb, local_offset, 1, ENC_BIG_ENDIAN); temp_val = (guint16)tvb_get_guint8(tvb, local_offset); /* 4 bit values = mask and shift */ @@ -4130,10 +4130,10 @@ static void parse_PortInfo(proto_tree* parentTree, tvbuff_t* tvb, gint *offset) /* End NeighborMTU */ - proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_MasterSMSL, tvb, local_offset, 1, FALSE); local_offset +=1; + proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_MasterSMSL, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset +=1; /* VLCap */ - temp_item = proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_VLCap, tvb, local_offset, 1, FALSE); + temp_item = proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_VLCap, tvb, local_offset, 1, ENC_BIG_ENDIAN); temp_val = (guint16)tvb_get_guint8(tvb, local_offset); /* 4 bit values = mask and shift */ @@ -4144,14 +4144,14 @@ static void parse_PortInfo(proto_tree* parentTree, tvbuff_t* tvb, gint *offset) /* End VLCap */ - proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_InitType, tvb, local_offset, 1, FALSE); local_offset +=1; - proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_VLHighLimit, tvb, local_offset, 1, FALSE); local_offset +=1; - proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_VLArbitrationHighCap, tvb, local_offset, 1, FALSE); local_offset +=1; - proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_VLArbitrationLowCap, tvb, local_offset, 1, FALSE); local_offset +=1; - proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_InitTypeReply, tvb, local_offset, 1, FALSE); + proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_InitType, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset +=1; + proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_VLHighLimit, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset +=1; + proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_VLArbitrationHighCap, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset +=1; + proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_VLArbitrationLowCap, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset +=1; + proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_InitTypeReply, tvb, local_offset, 1, ENC_BIG_ENDIAN); /* MTUCap */ - temp_item = proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_MTUCap, tvb, local_offset, 1, FALSE); + temp_item = proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_MTUCap, tvb, local_offset, 1, ENC_BIG_ENDIAN); temp_val = (guint16)tvb_get_guint8(tvb, local_offset); /* 4 bit values = mask and shift */ @@ -4162,11 +4162,11 @@ static void parse_PortInfo(proto_tree* parentTree, tvbuff_t* tvb, gint *offset) local_offset +=1; /* End MTUCap */ - proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_VLStallCount, tvb, local_offset, 1, FALSE); - proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_HOQLife, tvb, local_offset, 1, FALSE); local_offset +=1; + proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_VLStallCount, tvb, local_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_HOQLife, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset +=1; /* OperationalVLs */ - temp_item = proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_OperationalVLs, tvb, local_offset, 1, FALSE); + temp_item = proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_OperationalVLs, tvb, local_offset, 1, ENC_BIG_ENDIAN); temp_val = (guint16)tvb_get_guint8(tvb, local_offset); /* 4 bit values = mask and shift */ @@ -4176,21 +4176,21 @@ static void parse_PortInfo(proto_tree* parentTree, tvbuff_t* tvb, gint *offset) proto_item_append_text(temp_item, ", %s", val_to_str(temp_val, OperationalVLs, "Reserved OperationalVLs Value! Possible Error")); /* End OperationalVLs */ - proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_PartitionEnforcementInbound, tvb, local_offset, 1, FALSE); - proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_PartitionEnforcementOutbound, tvb, local_offset, 1, FALSE); - proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_FilterRawInbound, tvb, local_offset, 1, FALSE); - proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_FilterRawOutbound, tvb, local_offset, 1, FALSE); local_offset +=1; - proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_M_KeyViolations, tvb, local_offset, 2, FALSE); local_offset +=2; - proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_P_KeyViolations, tvb, local_offset, 2, FALSE); local_offset +=2; - proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_Q_KeyViolations, tvb, local_offset, 2, FALSE); local_offset +=2; - proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_GUIDCap, tvb, local_offset, 1, FALSE); local_offset +=1; - proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_ClientReregister, tvb, local_offset, 1, FALSE); - proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_SubnetTimeOut, tvb, local_offset, 1, FALSE); local_offset +=1; - proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_RespTimeValue, tvb, local_offset, 1, FALSE); local_offset +=1; - proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_LocalPhyErrors, tvb, local_offset, 1, FALSE); - proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_OverrunErrors, tvb, local_offset, 1, FALSE); local_offset +=1; - proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_MaxCreditHint, tvb, local_offset, 2, FALSE); local_offset +=3; /* 2 + 1 Reserved */ - proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_LinkRoundTripLatency, tvb, local_offset, 3, FALSE); local_offset +=3; + proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_PartitionEnforcementInbound, tvb, local_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_PartitionEnforcementOutbound, tvb, local_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_FilterRawInbound, tvb, local_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_FilterRawOutbound, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset +=1; + proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_M_KeyViolations, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset +=2; + proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_P_KeyViolations, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset +=2; + proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_Q_KeyViolations, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset +=2; + proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_GUIDCap, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset +=1; + proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_ClientReregister, tvb, local_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_SubnetTimeOut, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset +=1; + proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_RespTimeValue, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset +=1; + proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_LocalPhyErrors, tvb, local_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_OverrunErrors, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset +=1; + proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_MaxCreditHint, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset +=3; /* 2 + 1 Reserved */ + proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_LinkRoundTripLatency, tvb, local_offset, 3, ENC_BIG_ENDIAN); local_offset +=3; } /* Parse P_KeyTable Attribute @@ -4216,8 +4216,8 @@ static void parse_P_KeyTable(proto_tree* parentTree, tvbuff_t* tvb, gint *offset for(i = 0; i < 32; i++) { - tempItemLow = proto_tree_add_item(P_KeyTable_header_tree, hf_infiniband_P_KeyTable_MembershipType, tvb, local_offset, 1, FALSE); - tempItemHigh = proto_tree_add_item(P_KeyTable_header_tree, hf_infiniband_P_KeyTable_P_KeyBase, tvb, local_offset, 2, FALSE); local_offset +=2; + tempItemLow = proto_tree_add_item(P_KeyTable_header_tree, hf_infiniband_P_KeyTable_MembershipType, tvb, local_offset, 1, ENC_BIG_ENDIAN); + tempItemHigh = proto_tree_add_item(P_KeyTable_header_tree, hf_infiniband_P_KeyTable_P_KeyBase, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset +=2; proto_item_append_text(tempItemLow, "(%u)", i); proto_item_append_text(tempItemHigh,"(%u)", i+1); } @@ -4246,8 +4246,8 @@ static void parse_SLtoVLMappingTable(proto_tree* parentTree, tvbuff_t* tvb, gint for(i = 0; i < 8; i++) { - tempItemLow = proto_tree_add_item(SLtoVLMappingTable_header_tree, hf_infiniband_SLtoVLMappingTable_SLtoVL_HighBits, tvb, local_offset, 1, FALSE); - tempItemHigh = proto_tree_add_item(SLtoVLMappingTable_header_tree, hf_infiniband_SLtoVLMappingTable_SLtoVL_LowBits, tvb, local_offset, 1, FALSE); local_offset +=1; + tempItemLow = proto_tree_add_item(SLtoVLMappingTable_header_tree, hf_infiniband_SLtoVLMappingTable_SLtoVL_HighBits, tvb, local_offset, 1, ENC_BIG_ENDIAN); + tempItemHigh = proto_tree_add_item(SLtoVLMappingTable_header_tree, hf_infiniband_SLtoVLMappingTable_SLtoVL_LowBits, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset +=1; proto_item_append_text(tempItemLow, "(%u)", i); proto_item_append_text(tempItemHigh,"(%u)", i+1); } @@ -4276,8 +4276,8 @@ static void parse_VLArbitrationTable(proto_tree* parentTree, tvbuff_t* tvb, gint for(i = 0; i < 32; i++) { - tempItemLow = proto_tree_add_item(VLArbitrationTable_header_tree, hf_infiniband_VLArbitrationTable_VL, tvb, local_offset, 1, FALSE); local_offset +=1; - tempItemHigh = proto_tree_add_item(VLArbitrationTable_header_tree, hf_infiniband_VLArbitrationTable_Weight, tvb, local_offset, 1, FALSE); local_offset +=1; + tempItemLow = proto_tree_add_item(VLArbitrationTable_header_tree, hf_infiniband_VLArbitrationTable_VL, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset +=1; + tempItemHigh = proto_tree_add_item(VLArbitrationTable_header_tree, hf_infiniband_VLArbitrationTable_Weight, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset +=1; proto_item_append_text(tempItemLow, "(%u)", i); proto_item_append_text(tempItemHigh,"(%u)", i); } @@ -4305,7 +4305,7 @@ static void parse_LinearForwardingTable(proto_tree* parentTree, tvbuff_t* tvb, g for(i = 0; i < 64; i++) { - tempItemLow = proto_tree_add_item(LinearForwardingTable_header_tree, hf_infiniband_LinearForwardingTable_Port, tvb, local_offset, 1, FALSE); local_offset +=1; + tempItemLow = proto_tree_add_item(LinearForwardingTable_header_tree, hf_infiniband_LinearForwardingTable_Port, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset +=1; proto_item_append_text(tempItemLow, "(%u)", i); } } @@ -4332,13 +4332,13 @@ static void parse_RandomForwardingTable(proto_tree* parentTree, tvbuff_t* tvb, g for(i = 0; i < 16; i++) { - tempItemLow = proto_tree_add_item(RandomForwardingTable_header_tree, hf_infiniband_RandomForwardingTable_LID, tvb, local_offset, 2, FALSE); local_offset +=2; + tempItemLow = proto_tree_add_item(RandomForwardingTable_header_tree, hf_infiniband_RandomForwardingTable_LID, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset +=2; proto_item_append_text(tempItemLow, "(%u)", i); - tempItemLow = proto_tree_add_item(RandomForwardingTable_header_tree, hf_infiniband_RandomForwardingTable_Valid, tvb, local_offset, 1, FALSE); + tempItemLow = proto_tree_add_item(RandomForwardingTable_header_tree, hf_infiniband_RandomForwardingTable_Valid, tvb, local_offset, 1, ENC_BIG_ENDIAN); proto_item_append_text(tempItemLow, "(%u)", i); - tempItemLow = proto_tree_add_item(RandomForwardingTable_header_tree, hf_infiniband_RandomForwardingTable_LMC, tvb, local_offset, 1, FALSE); local_offset +=1; + tempItemLow = proto_tree_add_item(RandomForwardingTable_header_tree, hf_infiniband_RandomForwardingTable_LMC, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset +=1; proto_item_append_text(tempItemLow, "(%u)", i); - tempItemLow = proto_tree_add_item(RandomForwardingTable_header_tree, hf_infiniband_RandomForwardingTable_Port, tvb, local_offset, 1, FALSE); local_offset +=1; + tempItemLow = proto_tree_add_item(RandomForwardingTable_header_tree, hf_infiniband_RandomForwardingTable_Port, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset +=1; proto_item_append_text(tempItemLow, "(%u)", i); } } @@ -4365,7 +4365,7 @@ static void parse_MulticastForwardingTable(proto_tree* parentTree, tvbuff_t* tvb for(i = 0; i < 16; i++) { - tempItemLow = proto_tree_add_item(MulticastForwardingTable_header_tree, hf_infiniband_MulticastForwardingTable_PortMask, tvb, local_offset, 2, FALSE); local_offset +=2; + tempItemLow = proto_tree_add_item(MulticastForwardingTable_header_tree, hf_infiniband_MulticastForwardingTable_PortMask, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset +=2; proto_item_append_text(tempItemLow, "(%u)", i); } @@ -4389,11 +4389,11 @@ static void parse_SMInfo(proto_tree* parentTree, tvbuff_t* tvb, gint *offset) proto_item_set_text(SMInfo_header_item, "%s", "SMInfo"); SMInfo_header_tree = proto_item_add_subtree(SMInfo_header_item, ett_sminfo); - proto_tree_add_item(SMInfo_header_tree, hf_infiniband_SMInfo_GUID, tvb, local_offset, 8, FALSE); local_offset +=8; - proto_tree_add_item(SMInfo_header_tree, hf_infiniband_SMInfo_SM_Key, tvb, local_offset, 8, FALSE); local_offset +=8; - proto_tree_add_item(SMInfo_header_tree, hf_infiniband_SMInfo_ActCount, tvb, local_offset, 4, FALSE); local_offset +=4; - proto_tree_add_item(SMInfo_header_tree, hf_infiniband_SMInfo_Priority, tvb, local_offset, 1, FALSE); - proto_tree_add_item(SMInfo_header_tree, hf_infiniband_SMInfo_SMState, tvb, local_offset, 1, FALSE); local_offset +=1; + proto_tree_add_item(SMInfo_header_tree, hf_infiniband_SMInfo_GUID, tvb, local_offset, 8, ENC_BIG_ENDIAN); local_offset +=8; + proto_tree_add_item(SMInfo_header_tree, hf_infiniband_SMInfo_SM_Key, tvb, local_offset, 8, ENC_BIG_ENDIAN); local_offset +=8; + proto_tree_add_item(SMInfo_header_tree, hf_infiniband_SMInfo_ActCount, tvb, local_offset, 4, ENC_BIG_ENDIAN); local_offset +=4; + proto_tree_add_item(SMInfo_header_tree, hf_infiniband_SMInfo_Priority, tvb, local_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(SMInfo_header_tree, hf_infiniband_SMInfo_SMState, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset +=1; } /* Parse VendorDiag Attribute @@ -4414,7 +4414,7 @@ static void parse_VendorDiag(proto_tree* parentTree, tvbuff_t* tvb, gint *offset proto_item_set_text(VendorDiag_header_item, "%s", "VendorDiag"); VendorDiag_header_tree = proto_item_add_subtree(VendorDiag_header_item, ett_vendordiag); - proto_tree_add_item(VendorDiag_header_tree, hf_infiniband_VendorDiag_NextIndex, tvb, local_offset, 2, FALSE); local_offset +=2; + proto_tree_add_item(VendorDiag_header_tree, hf_infiniband_VendorDiag_NextIndex, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset +=2; proto_tree_add_item(VendorDiag_header_tree, hf_infiniband_VendorDiag_DiagData, tvb, local_offset, 62, ENC_NA); local_offset +=62; } @@ -4436,7 +4436,7 @@ static void parse_LedInfo(proto_tree* parentTree, tvbuff_t* tvb, gint *offset) proto_item_set_text(LedInfo_header_item, "%s", "LedInfo"); LedInfo_header_tree = proto_item_add_subtree(LedInfo_header_item, ett_ledinfo); - proto_tree_add_item(LedInfo_header_tree, hf_infiniband_LedInfo_LedMask, tvb, local_offset, 1, FALSE); + proto_tree_add_item(LedInfo_header_tree, hf_infiniband_LedInfo_LedMask, tvb, local_offset, 1, ENC_BIG_ENDIAN); } /* Parse LinkSpeedWidthPairsTable Attribute @@ -4457,11 +4457,11 @@ static void parse_LinkSpeedWidthPairsTable(proto_tree* parentTree, tvbuff_t* tvb proto_item_set_text(LinkSpeedWidthPairsTable_header_item, "%s", "LinkSpeedWidthPairsTable"); LinkSpeedWidthPairsTable_header_tree = proto_item_add_subtree(LinkSpeedWidthPairsTable_header_item, ett_linkspeedwidthpairs); - proto_tree_add_item(LinkSpeedWidthPairsTable_header_tree, hf_infiniband_LinkSpeedWidthPairsTable_NumTables, tvb, local_offset, 1, FALSE); local_offset +=1; + proto_tree_add_item(LinkSpeedWidthPairsTable_header_tree, hf_infiniband_LinkSpeedWidthPairsTable_NumTables, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset +=1; proto_tree_add_item(LinkSpeedWidthPairsTable_header_tree, hf_infiniband_LinkSpeedWidthPairsTable_PortMask, tvb, local_offset, 32, ENC_NA); local_offset +=32; - proto_tree_add_item(LinkSpeedWidthPairsTable_header_tree, hf_infiniband_LinkSpeedWidthPairsTable_SpeedTwoFive, tvb, local_offset, 1, FALSE); local_offset +=1; - proto_tree_add_item(LinkSpeedWidthPairsTable_header_tree, hf_infiniband_LinkSpeedWidthPairsTable_SpeedFive, tvb, local_offset, 1, FALSE); local_offset +=1; - proto_tree_add_item(LinkSpeedWidthPairsTable_header_tree, hf_infiniband_LinkSpeedWidthPairsTable_SpeedTen, tvb, local_offset, 1, FALSE); local_offset +=1; + proto_tree_add_item(LinkSpeedWidthPairsTable_header_tree, hf_infiniband_LinkSpeedWidthPairsTable_SpeedTwoFive, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset +=1; + proto_tree_add_item(LinkSpeedWidthPairsTable_header_tree, hf_infiniband_LinkSpeedWidthPairsTable_SpeedFive, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset +=1; + proto_tree_add_item(LinkSpeedWidthPairsTable_header_tree, hf_infiniband_LinkSpeedWidthPairsTable_SpeedTen, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset +=1; } /* Parse RID Field from Subnet Administraiton Packets. @@ -4480,81 +4480,81 @@ static void parse_RID(proto_tree* SA_header_tree, tvbuff_t* tvb, gint *offset, M { case 0x0011: /* NodeRecord */ - proto_tree_add_item(SA_header_tree, hf_infiniband_SA_LID, tvb, local_offset, 2, FALSE); local_offset+=2; + proto_tree_add_item(SA_header_tree, hf_infiniband_SA_LID, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset+=2; local_offset+=2; /* Reserved bits */ break; case 0x0012: /* PortInfoRecord */ - proto_tree_add_item(SA_header_tree, hf_infiniband_SA_EndportLID, tvb, local_offset, 2, FALSE); local_offset+=2; - proto_tree_add_item(SA_header_tree, hf_infiniband_SA_PortNum, tvb, local_offset, 1, FALSE); local_offset+=1; + proto_tree_add_item(SA_header_tree, hf_infiniband_SA_EndportLID, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset+=2; + proto_tree_add_item(SA_header_tree, hf_infiniband_SA_PortNum, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset+=1; local_offset+=1; /* Reserved bits */ break; case 0x0013: /* SLtoVLMappingTableRecord */ - proto_tree_add_item(SA_header_tree, hf_infiniband_SA_LID, tvb, local_offset, 2, FALSE); local_offset+=2; - proto_tree_add_item(SA_header_tree, hf_infiniband_SA_InputPortNum, tvb, local_offset, 1, FALSE); local_offset+=1; - proto_tree_add_item(SA_header_tree, hf_infiniband_SA_OutputPortNum, tvb, local_offset, 1, FALSE); local_offset+=1; + proto_tree_add_item(SA_header_tree, hf_infiniband_SA_LID, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset+=2; + proto_tree_add_item(SA_header_tree, hf_infiniband_SA_InputPortNum, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset+=1; + proto_tree_add_item(SA_header_tree, hf_infiniband_SA_OutputPortNum, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset+=1; local_offset+=4; /* Reserved bits */ break; case 0x0014: /* SwitchInfoRecord */ - proto_tree_add_item(SA_header_tree, hf_infiniband_SA_LID, tvb, local_offset, 2, FALSE); local_offset+=2; + proto_tree_add_item(SA_header_tree, hf_infiniband_SA_LID, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset+=2; local_offset+=2; /* Reserved bits */ break; case 0x0015: /* LinearForwardingTableRecord */ - proto_tree_add_item(SA_header_tree, hf_infiniband_SA_LID, tvb, local_offset, 2, FALSE); local_offset+=2; - proto_tree_add_item(SA_header_tree, hf_infiniband_SA_BlockNum_SixteenBit, tvb, local_offset, 2, FALSE); local_offset+=2; + proto_tree_add_item(SA_header_tree, hf_infiniband_SA_LID, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset+=2; + proto_tree_add_item(SA_header_tree, hf_infiniband_SA_BlockNum_SixteenBit, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset+=2; local_offset+=4; /* Reserved bits */ break; case 0x0016: /* RandomForwardingTableRecord */ - proto_tree_add_item(SA_header_tree, hf_infiniband_SA_LID, tvb, local_offset, 2, FALSE); local_offset+=2; - proto_tree_add_item(SA_header_tree, hf_infiniband_SA_BlockNum_SixteenBit, tvb, local_offset, 2, FALSE); local_offset+=2; + proto_tree_add_item(SA_header_tree, hf_infiniband_SA_LID, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset+=2; + proto_tree_add_item(SA_header_tree, hf_infiniband_SA_BlockNum_SixteenBit, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset+=2; local_offset+=4; /* Reserved bits */ break; case 0x0017: /* MulticastForwardingTableRecord */ - proto_tree_add_item(SA_header_tree, hf_infiniband_SA_LID, tvb, local_offset, 2, FALSE); local_offset+=2; - proto_tree_add_item(SA_header_tree, hf_infiniband_SA_Position, tvb, local_offset, 1, FALSE); - proto_tree_add_item(SA_header_tree, hf_infiniband_SA_BlockNum_NineBit, tvb, local_offset, 2, FALSE); local_offset+=2; + proto_tree_add_item(SA_header_tree, hf_infiniband_SA_LID, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset+=2; + proto_tree_add_item(SA_header_tree, hf_infiniband_SA_Position, tvb, local_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(SA_header_tree, hf_infiniband_SA_BlockNum_NineBit, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset+=2; local_offset+=4; /* Reserved bits */ break; case 0x0036: /*VLArbitrationTableRecord */ - proto_tree_add_item(SA_header_tree, hf_infiniband_SA_LID, tvb, local_offset, 2, FALSE); local_offset+=2; - proto_tree_add_item(SA_header_tree, hf_infiniband_SA_OutputPortNum, tvb, local_offset, 1, FALSE); local_offset+=1; - proto_tree_add_item(SA_header_tree, hf_infiniband_SA_BlockNum_EightBit, tvb, local_offset, 1, FALSE); local_offset+=1; + proto_tree_add_item(SA_header_tree, hf_infiniband_SA_LID, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset+=2; + proto_tree_add_item(SA_header_tree, hf_infiniband_SA_OutputPortNum, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset+=1; + proto_tree_add_item(SA_header_tree, hf_infiniband_SA_BlockNum_EightBit, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset+=1; local_offset+=4; /* Reserved bits */ break; case 0x0018: /* SMInfoRecord */ - proto_tree_add_item(SA_header_tree, hf_infiniband_SA_LID, tvb, local_offset, 2, FALSE); local_offset+=2; + proto_tree_add_item(SA_header_tree, hf_infiniband_SA_LID, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset+=2; local_offset+=2; /* Reserved bits */ break; case 0x0033: /* P_KeyTableRecord */ - proto_tree_add_item(SA_header_tree, hf_infiniband_SA_LID, tvb, local_offset, 2, FALSE); local_offset+=2; - proto_tree_add_item(SA_header_tree, hf_infiniband_SA_BlockNum_SixteenBit, tvb, local_offset, 2, FALSE); local_offset+=2; - proto_tree_add_item(SA_header_tree, hf_infiniband_SA_PortNum, tvb, local_offset, 1, FALSE); local_offset+=1; + proto_tree_add_item(SA_header_tree, hf_infiniband_SA_LID, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset+=2; + proto_tree_add_item(SA_header_tree, hf_infiniband_SA_BlockNum_SixteenBit, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset+=2; + proto_tree_add_item(SA_header_tree, hf_infiniband_SA_PortNum, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset+=1; local_offset+=3; /* Reserved bits */ break; case 0x00F3: /* InformInfoRecord */ proto_tree_add_item(SA_header_tree, hf_infiniband_InformInfoRecord_SubscriberGID, tvb, local_offset, 16, FALSE); local_offset+=16; - proto_tree_add_item(SA_header_tree, hf_infiniband_InformInfoRecord_Enum, tvb, local_offset, 2, FALSE); local_offset+=2; + proto_tree_add_item(SA_header_tree, hf_infiniband_InformInfoRecord_Enum, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset+=2; local_offset+=6; /* Reserved bits */ break; case 0x0020: /* LinkRecord */ - proto_tree_add_item(SA_header_tree, hf_infiniband_LinkRecord_FromLID, tvb, local_offset, 2, FALSE); local_offset+=2; - proto_tree_add_item(SA_header_tree, hf_infiniband_LinkRecord_FromPort, tvb, local_offset, 1, FALSE); local_offset+=1; + proto_tree_add_item(SA_header_tree, hf_infiniband_LinkRecord_FromLID, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset+=2; + proto_tree_add_item(SA_header_tree, hf_infiniband_LinkRecord_FromPort, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset+=1; break; case 0x0031: /* ServiceRecord */ - proto_tree_add_item(SA_header_tree, hf_infiniband_ServiceRecord_ServiceID, tvb, local_offset, 8, FALSE); local_offset+=8; + proto_tree_add_item(SA_header_tree, hf_infiniband_ServiceRecord_ServiceID, tvb, local_offset, 8, ENC_BIG_ENDIAN); local_offset+=8; proto_tree_add_item(SA_header_tree, hf_infiniband_ServiceRecord_ServiceGID, tvb, local_offset, 16, FALSE); local_offset+=16; - proto_tree_add_item(SA_header_tree, hf_infiniband_ServiceRecord_ServiceP_Key, tvb, local_offset, 2, FALSE); local_offset+=2; + proto_tree_add_item(SA_header_tree, hf_infiniband_ServiceRecord_ServiceP_Key, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset+=2; local_offset+=2; break; case 0x0038: @@ -4564,8 +4564,8 @@ static void parse_RID(proto_tree* SA_header_tree, tvbuff_t* tvb, gint *offset, M break; case 0x0030: /* GuidInfoRecord */ - proto_tree_add_item(SA_header_tree, hf_infiniband_SA_LID, tvb, local_offset, 2, FALSE); local_offset+=2; - proto_tree_add_item(SA_header_tree, hf_infiniband_SA_BlockNum_EightBit, tvb, local_offset, 1, FALSE); local_offset+=2; + proto_tree_add_item(SA_header_tree, hf_infiniband_SA_LID, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset+=2; + proto_tree_add_item(SA_header_tree, hf_infiniband_SA_BlockNum_EightBit, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset+=2; local_offset+=4; break; default: @@ -4594,17 +4594,17 @@ static void parse_InformInfo(proto_tree* parentTree, tvbuff_t* tvb, gint *offset InformInfo_header_tree = proto_item_add_subtree(InformInfo_header_item, ett_informinfo); proto_tree_add_item(InformInfo_header_tree, hf_infiniband_InformInfo_GID, tvb, local_offset, 16, FALSE); local_offset+=16; - proto_tree_add_item(InformInfo_header_tree, hf_infiniband_InformInfo_LIDRangeBegin, tvb, local_offset, 2, FALSE); local_offset+=2; - proto_tree_add_item(InformInfo_header_tree, hf_infiniband_InformInfo_LIDRangeEnd, tvb, local_offset, 2, FALSE); local_offset+=2; + proto_tree_add_item(InformInfo_header_tree, hf_infiniband_InformInfo_LIDRangeBegin, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset+=2; + proto_tree_add_item(InformInfo_header_tree, hf_infiniband_InformInfo_LIDRangeEnd, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset+=2; local_offset+=2; /* Reserved Bits */ - proto_tree_add_item(InformInfo_header_tree, hf_infiniband_InformInfo_IsGeneric, tvb, local_offset, 1, FALSE); local_offset+=1; - proto_tree_add_item(InformInfo_header_tree, hf_infiniband_InformInfo_Subscribe, tvb, local_offset, 1, FALSE); local_offset+=1; - proto_tree_add_item(InformInfo_header_tree, hf_infiniband_InformInfo_Type, tvb, local_offset, 2, FALSE); local_offset+=2; - proto_tree_add_item(InformInfo_header_tree, hf_infiniband_InformInfo_TrapNumberDeviceID, tvb, local_offset, 2, FALSE); local_offset+=2; - proto_tree_add_item(InformInfo_header_tree, hf_infiniband_InformInfo_QPN, tvb, local_offset, 3, FALSE); local_offset+=3; - proto_tree_add_item(InformInfo_header_tree, hf_infiniband_InformInfo_RespTimeValue, tvb, local_offset, 1, FALSE); local_offset+=1; + proto_tree_add_item(InformInfo_header_tree, hf_infiniband_InformInfo_IsGeneric, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset+=1; + proto_tree_add_item(InformInfo_header_tree, hf_infiniband_InformInfo_Subscribe, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset+=1; + proto_tree_add_item(InformInfo_header_tree, hf_infiniband_InformInfo_Type, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset+=2; + proto_tree_add_item(InformInfo_header_tree, hf_infiniband_InformInfo_TrapNumberDeviceID, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset+=2; + proto_tree_add_item(InformInfo_header_tree, hf_infiniband_InformInfo_QPN, tvb, local_offset, 3, ENC_BIG_ENDIAN); local_offset+=3; + proto_tree_add_item(InformInfo_header_tree, hf_infiniband_InformInfo_RespTimeValue, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset+=1; local_offset+=1; - proto_tree_add_item(InformInfo_header_tree, hf_infiniband_InformInfo_ProducerTypeVendorID, tvb, local_offset, 3, FALSE); local_offset+=3; + proto_tree_add_item(InformInfo_header_tree, hf_infiniband_InformInfo_ProducerTypeVendorID, tvb, local_offset, 3, ENC_BIG_ENDIAN); local_offset+=3; } /* Parse LinkRecord Attribute @@ -4627,8 +4627,8 @@ static void parse_LinkRecord(proto_tree* parentTree, tvbuff_t* tvb, gint *offset proto_item_set_text(LinkRecord_header_item, "%s", "LinkRecord"); LinkRecord_header_tree = proto_item_add_subtree(LinkRecord_header_item, ett_linkrecord); - proto_tree_add_item(LinkRecord_header_tree, hf_infiniband_LinkRecord_ToPort, tvb, local_offset, 1, FALSE); local_offset+=1; - proto_tree_add_item(LinkRecord_header_tree, hf_infiniband_LinkRecord_ToLID, tvb, local_offset, 2, FALSE); local_offset +=2; + proto_tree_add_item(LinkRecord_header_tree, hf_infiniband_LinkRecord_ToPort, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset+=1; + proto_tree_add_item(LinkRecord_header_tree, hf_infiniband_LinkRecord_ToLID, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset +=2; } /* Parse ServiceRecord Attribute @@ -4652,7 +4652,7 @@ static void parse_ServiceRecord(proto_tree* parentTree, tvbuff_t* tvb, gint *off proto_item_set_text(ServiceRecord_header_item, "%s", "ServiceRecord"); ServiceRecord_header_tree = proto_item_add_subtree(ServiceRecord_header_item, ett_servicerecord); - proto_tree_add_item(ServiceRecord_header_tree, hf_infiniband_ServiceRecord_ServiceLease, tvb, local_offset, 4, FALSE); local_offset+=4; + proto_tree_add_item(ServiceRecord_header_tree, hf_infiniband_ServiceRecord_ServiceLease, tvb, local_offset, 4, ENC_BIG_ENDIAN); local_offset+=4; proto_tree_add_item(ServiceRecord_header_tree, hf_infiniband_ServiceRecord_ServiceKey, tvb, local_offset, 16, ENC_NA); local_offset+=16; proto_tree_add_item(ServiceRecord_header_tree, hf_infiniband_ServiceRecord_ServiceName, tvb, local_offset, 64, ENC_NA); local_offset+=64; @@ -4689,23 +4689,23 @@ static void parse_PathRecord(proto_tree* parentTree, tvbuff_t* tvb, gint *offset proto_tree_add_item(PathRecord_header_tree, hf_infiniband_PathRecord_DGID, tvb, local_offset, 16, FALSE); local_offset+=16; proto_tree_add_item(PathRecord_header_tree, hf_infiniband_PathRecord_SGID, tvb, local_offset, 16, FALSE); local_offset+=16; - proto_tree_add_item(PathRecord_header_tree, hf_infiniband_PathRecord_DLID, tvb, local_offset, 2, FALSE); local_offset+=2; - proto_tree_add_item(PathRecord_header_tree, hf_infiniband_PathRecord_SLID, tvb, local_offset, 2, FALSE); local_offset+=2; - proto_tree_add_item(PathRecord_header_tree, hf_infiniband_PathRecord_RawTraffic, tvb, local_offset, 1, FALSE); - proto_tree_add_item(PathRecord_header_tree, hf_infiniband_PathRecord_FlowLabel, tvb, local_offset, 3, FALSE); local_offset+=3; - proto_tree_add_item(PathRecord_header_tree, hf_infiniband_PathRecord_HopLimit, tvb, local_offset, 1, FALSE); local_offset+=1; - proto_tree_add_item(PathRecord_header_tree, hf_infiniband_PathRecord_TClass, tvb, local_offset, 1, FALSE); local_offset+=1; - proto_tree_add_item(PathRecord_header_tree, hf_infiniband_PathRecord_Reversible, tvb, local_offset, 1, FALSE); - proto_tree_add_item(PathRecord_header_tree, hf_infiniband_PathRecord_NumbPath, tvb, local_offset, 1, FALSE); local_offset+=1; - proto_tree_add_item(PathRecord_header_tree, hf_infiniband_PathRecord_P_Key, tvb, local_offset, 2, FALSE); local_offset+=2; - proto_tree_add_item(PathRecord_header_tree, hf_infiniband_PathRecord_SL, tvb, local_offset, 2, FALSE); local_offset+=2; - proto_tree_add_item(PathRecord_header_tree, hf_infiniband_PathRecord_MTUSelector, tvb, local_offset, 1, FALSE); - proto_tree_add_item(PathRecord_header_tree, hf_infiniband_PathRecord_MTU, tvb, local_offset, 1, FALSE); local_offset+=1; - proto_tree_add_item(PathRecord_header_tree, hf_infiniband_PathRecord_RateSelector, tvb, local_offset, 1, FALSE); - proto_tree_add_item(PathRecord_header_tree, hf_infiniband_PathRecord_Rate, tvb, local_offset, 1, FALSE); local_offset+=1; - proto_tree_add_item(PathRecord_header_tree, hf_infiniband_PathRecord_PacketLifeTimeSelector, tvb, local_offset, 1, FALSE); - proto_tree_add_item(PathRecord_header_tree, hf_infiniband_PathRecord_PacketLifeTime, tvb, local_offset, 1, FALSE); local_offset+=1; - proto_tree_add_item(PathRecord_header_tree, hf_infiniband_PathRecord_Preference, tvb, local_offset, 1, FALSE); local_offset+=1; + proto_tree_add_item(PathRecord_header_tree, hf_infiniband_PathRecord_DLID, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset+=2; + proto_tree_add_item(PathRecord_header_tree, hf_infiniband_PathRecord_SLID, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset+=2; + proto_tree_add_item(PathRecord_header_tree, hf_infiniband_PathRecord_RawTraffic, tvb, local_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(PathRecord_header_tree, hf_infiniband_PathRecord_FlowLabel, tvb, local_offset, 3, ENC_BIG_ENDIAN); local_offset+=3; + proto_tree_add_item(PathRecord_header_tree, hf_infiniband_PathRecord_HopLimit, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset+=1; + proto_tree_add_item(PathRecord_header_tree, hf_infiniband_PathRecord_TClass, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset+=1; + proto_tree_add_item(PathRecord_header_tree, hf_infiniband_PathRecord_Reversible, tvb, local_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(PathRecord_header_tree, hf_infiniband_PathRecord_NumbPath, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset+=1; + proto_tree_add_item(PathRecord_header_tree, hf_infiniband_PathRecord_P_Key, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset+=2; + proto_tree_add_item(PathRecord_header_tree, hf_infiniband_PathRecord_SL, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset+=2; + proto_tree_add_item(PathRecord_header_tree, hf_infiniband_PathRecord_MTUSelector, tvb, local_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(PathRecord_header_tree, hf_infiniband_PathRecord_MTU, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset+=1; + proto_tree_add_item(PathRecord_header_tree, hf_infiniband_PathRecord_RateSelector, tvb, local_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(PathRecord_header_tree, hf_infiniband_PathRecord_Rate, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset+=1; + proto_tree_add_item(PathRecord_header_tree, hf_infiniband_PathRecord_PacketLifeTimeSelector, tvb, local_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(PathRecord_header_tree, hf_infiniband_PathRecord_PacketLifeTime, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset+=1; + proto_tree_add_item(PathRecord_header_tree, hf_infiniband_PathRecord_Preference, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset+=1; } /* Parse MCMemberRecord Attribute * IN: parentTree - The tree to add the dissection to @@ -4727,22 +4727,22 @@ static void parse_MCMemberRecord(proto_tree* parentTree, tvbuff_t* tvb, gint *of proto_item_set_text(MCMemberRecord_header_item, "%s", "MCMemberRecord"); MCMemberRecord_header_tree = proto_item_add_subtree(MCMemberRecord_header_item, ett_mcmemberrecord); - proto_tree_add_item(MCMemberRecord_header_tree, hf_infiniband_MCMemberRecord_Q_Key, tvb, local_offset, 4, FALSE); local_offset+=4; - proto_tree_add_item(MCMemberRecord_header_tree, hf_infiniband_MCMemberRecord_MLID, tvb, local_offset, 2, FALSE); local_offset+=2; - proto_tree_add_item(MCMemberRecord_header_tree, hf_infiniband_MCMemberRecord_MTUSelector, tvb, local_offset, 1, FALSE); - proto_tree_add_item(MCMemberRecord_header_tree, hf_infiniband_MCMemberRecord_MTU, tvb, local_offset, 1, FALSE); local_offset+=1; - proto_tree_add_item(MCMemberRecord_header_tree, hf_infiniband_MCMemberRecord_TClass, tvb, local_offset, 1, FALSE); local_offset+=1; - proto_tree_add_item(MCMemberRecord_header_tree, hf_infiniband_MCMemberRecord_P_Key, tvb, local_offset, 2, FALSE); local_offset+=2; - proto_tree_add_item(MCMemberRecord_header_tree, hf_infiniband_MCMemberRecord_RateSelector, tvb, local_offset, 1, FALSE); - proto_tree_add_item(MCMemberRecord_header_tree, hf_infiniband_MCMemberRecord_Rate, tvb, local_offset, 1, FALSE); local_offset+=1; - proto_tree_add_item(MCMemberRecord_header_tree, hf_infiniband_MCMemberRecord_PacketLifeTimeSelector, tvb, local_offset, 1, FALSE); - proto_tree_add_item(MCMemberRecord_header_tree, hf_infiniband_MCMemberRecord_PacketLifeTime, tvb, local_offset, 1, FALSE); local_offset+=1; - proto_tree_add_item(MCMemberRecord_header_tree, hf_infiniband_MCMemberRecord_SL, tvb, local_offset, 1, FALSE); - proto_tree_add_item(MCMemberRecord_header_tree, hf_infiniband_MCMemberRecord_FlowLabel, tvb, local_offset, 3, FALSE); local_offset+=3; - proto_tree_add_item(MCMemberRecord_header_tree, hf_infiniband_MCMemberRecord_HopLimit, tvb, local_offset, 1, FALSE); local_offset+=1; - proto_tree_add_item(MCMemberRecord_header_tree, hf_infiniband_MCMemberRecord_Scope, tvb, local_offset, 1, FALSE); - proto_tree_add_item(MCMemberRecord_header_tree, hf_infiniband_MCMemberRecord_JoinState, tvb, local_offset, 1, FALSE); local_offset+=1; - proto_tree_add_item(MCMemberRecord_header_tree, hf_infiniband_MCMemberRecord_ProxyJoin, tvb, local_offset, 1, FALSE); local_offset+=3; + proto_tree_add_item(MCMemberRecord_header_tree, hf_infiniband_MCMemberRecord_Q_Key, tvb, local_offset, 4, ENC_BIG_ENDIAN); local_offset+=4; + proto_tree_add_item(MCMemberRecord_header_tree, hf_infiniband_MCMemberRecord_MLID, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset+=2; + proto_tree_add_item(MCMemberRecord_header_tree, hf_infiniband_MCMemberRecord_MTUSelector, tvb, local_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(MCMemberRecord_header_tree, hf_infiniband_MCMemberRecord_MTU, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset+=1; + proto_tree_add_item(MCMemberRecord_header_tree, hf_infiniband_MCMemberRecord_TClass, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset+=1; + proto_tree_add_item(MCMemberRecord_header_tree, hf_infiniband_MCMemberRecord_P_Key, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset+=2; + proto_tree_add_item(MCMemberRecord_header_tree, hf_infiniband_MCMemberRecord_RateSelector, tvb, local_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(MCMemberRecord_header_tree, hf_infiniband_MCMemberRecord_Rate, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset+=1; + proto_tree_add_item(MCMemberRecord_header_tree, hf_infiniband_MCMemberRecord_PacketLifeTimeSelector, tvb, local_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(MCMemberRecord_header_tree, hf_infiniband_MCMemberRecord_PacketLifeTime, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset+=1; + proto_tree_add_item(MCMemberRecord_header_tree, hf_infiniband_MCMemberRecord_SL, tvb, local_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(MCMemberRecord_header_tree, hf_infiniband_MCMemberRecord_FlowLabel, tvb, local_offset, 3, ENC_BIG_ENDIAN); local_offset+=3; + proto_tree_add_item(MCMemberRecord_header_tree, hf_infiniband_MCMemberRecord_HopLimit, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset+=1; + proto_tree_add_item(MCMemberRecord_header_tree, hf_infiniband_MCMemberRecord_Scope, tvb, local_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(MCMemberRecord_header_tree, hf_infiniband_MCMemberRecord_JoinState, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset+=1; + proto_tree_add_item(MCMemberRecord_header_tree, hf_infiniband_MCMemberRecord_ProxyJoin, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset+=3; } /* Parse TraceRecord Attribute @@ -4800,28 +4800,28 @@ static void parse_MultiPathRecord(proto_tree* parentTree, tvbuff_t* tvb, gint *o proto_item_set_text(MultiPathRecord_header_item, "%s", "MultiPathRecord"); MultiPathRecord_header_tree = proto_item_add_subtree(MultiPathRecord_header_item, ett_multipathrecord); - proto_tree_add_item(MultiPathRecord_header_tree, hf_infiniband_MultiPathRecord_RawTraffic, tvb, local_offset, 1, FALSE); - proto_tree_add_item(MultiPathRecord_header_tree, hf_infiniband_MultiPathRecord_FlowLabel, tvb, local_offset, 3, FALSE); local_offset+=3; - proto_tree_add_item(MultiPathRecord_header_tree, hf_infiniband_MultiPathRecord_HopLimit, tvb, local_offset, 1, FALSE); local_offset+=1; - proto_tree_add_item(MultiPathRecord_header_tree, hf_infiniband_MultiPathRecord_TClass, tvb, local_offset, 1, FALSE); local_offset+=1; - proto_tree_add_item(MultiPathRecord_header_tree, hf_infiniband_MultiPathRecord_Reversible, tvb, local_offset, 1, FALSE); - proto_tree_add_item(MultiPathRecord_header_tree, hf_infiniband_MultiPathRecord_NumbPath, tvb, local_offset, 1, FALSE); local_offset+=1; - proto_tree_add_item(MultiPathRecord_header_tree, hf_infiniband_MultiPathRecord_P_Key, tvb, local_offset, 2, FALSE); local_offset+=2; - proto_tree_add_item(MultiPathRecord_header_tree, hf_infiniband_MultiPathRecord_SL, tvb, local_offset, 2, FALSE); local_offset+=2; - proto_tree_add_item(MultiPathRecord_header_tree, hf_infiniband_MultiPathRecord_MTUSelector, tvb, local_offset, 1, FALSE); - proto_tree_add_item(MultiPathRecord_header_tree, hf_infiniband_MultiPathRecord_MTU, tvb, local_offset, 1, FALSE); local_offset+=1; - proto_tree_add_item(MultiPathRecord_header_tree, hf_infiniband_MultiPathRecord_RateSelector, tvb, local_offset, 1, FALSE); - proto_tree_add_item(MultiPathRecord_header_tree, hf_infiniband_MultiPathRecord_Rate, tvb, local_offset, 1, FALSE); local_offset+=1; - proto_tree_add_item(MultiPathRecord_header_tree, hf_infiniband_MultiPathRecord_PacketLifeTimeSelector, tvb, local_offset, 1, FALSE); - proto_tree_add_item(MultiPathRecord_header_tree, hf_infiniband_MultiPathRecord_PacketLifeTime, tvb, local_offset, 1, FALSE); local_offset+=1; + proto_tree_add_item(MultiPathRecord_header_tree, hf_infiniband_MultiPathRecord_RawTraffic, tvb, local_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(MultiPathRecord_header_tree, hf_infiniband_MultiPathRecord_FlowLabel, tvb, local_offset, 3, ENC_BIG_ENDIAN); local_offset+=3; + proto_tree_add_item(MultiPathRecord_header_tree, hf_infiniband_MultiPathRecord_HopLimit, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset+=1; + proto_tree_add_item(MultiPathRecord_header_tree, hf_infiniband_MultiPathRecord_TClass, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset+=1; + proto_tree_add_item(MultiPathRecord_header_tree, hf_infiniband_MultiPathRecord_Reversible, tvb, local_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(MultiPathRecord_header_tree, hf_infiniband_MultiPathRecord_NumbPath, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset+=1; + proto_tree_add_item(MultiPathRecord_header_tree, hf_infiniband_MultiPathRecord_P_Key, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset+=2; + proto_tree_add_item(MultiPathRecord_header_tree, hf_infiniband_MultiPathRecord_SL, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset+=2; + proto_tree_add_item(MultiPathRecord_header_tree, hf_infiniband_MultiPathRecord_MTUSelector, tvb, local_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(MultiPathRecord_header_tree, hf_infiniband_MultiPathRecord_MTU, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset+=1; + proto_tree_add_item(MultiPathRecord_header_tree, hf_infiniband_MultiPathRecord_RateSelector, tvb, local_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(MultiPathRecord_header_tree, hf_infiniband_MultiPathRecord_Rate, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset+=1; + proto_tree_add_item(MultiPathRecord_header_tree, hf_infiniband_MultiPathRecord_PacketLifeTimeSelector, tvb, local_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(MultiPathRecord_header_tree, hf_infiniband_MultiPathRecord_PacketLifeTime, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset+=1; local_offset+=1; /* Reserved Bits */ - proto_tree_add_item(MultiPathRecord_header_tree, hf_infiniband_MultiPathRecord_IndependenceSelector, tvb, local_offset, 1, FALSE); - proto_tree_add_item(MultiPathRecord_header_tree, hf_infiniband_MultiPathRecord_GIDScope, tvb, local_offset, 1, FALSE); local_offset+=1; + proto_tree_add_item(MultiPathRecord_header_tree, hf_infiniband_MultiPathRecord_IndependenceSelector, tvb, local_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(MultiPathRecord_header_tree, hf_infiniband_MultiPathRecord_GIDScope, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset+=1; SDGIDCount = tvb_get_guint8(tvb, local_offset); - proto_tree_add_item(MultiPathRecord_header_tree, hf_infiniband_MultiPathRecord_SGIDCount, tvb, local_offset, 1, FALSE); local_offset+=1; + proto_tree_add_item(MultiPathRecord_header_tree, hf_infiniband_MultiPathRecord_SGIDCount, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset+=1; DGIDCount = tvb_get_guint8(tvb, local_offset); - proto_tree_add_item(MultiPathRecord_header_tree, hf_infiniband_MultiPathRecord_DGIDCount, tvb, local_offset, 1, FALSE); local_offset+=1; + proto_tree_add_item(MultiPathRecord_header_tree, hf_infiniband_MultiPathRecord_DGIDCount, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset+=1; local_offset+=7; /*Reserved Bits */ for(i = 0; i < SDGIDCount; i++) @@ -4877,26 +4877,26 @@ static void parse_PERF_PortCounters(proto_tree* parentTree, tvbuff_t* tvb, packe local_offset += 40; /* skip reserved field */ local_offset += 1; /* skip reserved field */ - proto_tree_add_item(perf_tree, hf_infiniband_PortCounters_PortSelect, tvb, local_offset, 1, FALSE); local_offset += 1; + proto_tree_add_item(perf_tree, hf_infiniband_PortCounters_PortSelect, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset += 1; proto_tree_add_item(perf_tree, hf_infiniband_PortCounters_CounterSelect, tvb, local_offset, 2, FALSE); local_offset += 2; - proto_tree_add_item(perf_tree, hf_infiniband_PortCounters_SymbolErrorCounter, tvb, local_offset, 2, FALSE); local_offset += 2; - proto_tree_add_item(perf_tree, hf_infiniband_PortCounters_LinkErrorRecoveryCounter, tvb, local_offset, 1, FALSE); local_offset += 1; - proto_tree_add_item(perf_tree, hf_infiniband_PortCounters_LinkDownedCounter, tvb, local_offset, 1, FALSE); local_offset += 1; - proto_tree_add_item(perf_tree, hf_infiniband_PortCounters_PortRcvErrors, tvb, local_offset, 2, FALSE); local_offset += 2; - proto_tree_add_item(perf_tree, hf_infiniband_PortCounters_PortRcvRemotePhysicalErrors, tvb, local_offset, 2, FALSE); local_offset += 2; - proto_tree_add_item(perf_tree, hf_infiniband_PortCounters_PortRcvSwitchRelayErrors, tvb, local_offset, 2, FALSE); local_offset += 2; - proto_tree_add_item(perf_tree, hf_infiniband_PortCounters_PortXmitDiscards, tvb, local_offset, 2, FALSE); local_offset += 2; - proto_tree_add_item(perf_tree, hf_infiniband_PortCounters_PortXmitConstraintErrors, tvb, local_offset, 1, FALSE); local_offset += 1; - proto_tree_add_item(perf_tree, hf_infiniband_PortCounters_PortRcvConstraintErrors, tvb, local_offset, 1, FALSE); local_offset += 1; + proto_tree_add_item(perf_tree, hf_infiniband_PortCounters_SymbolErrorCounter, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset += 2; + proto_tree_add_item(perf_tree, hf_infiniband_PortCounters_LinkErrorRecoveryCounter, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset += 1; + proto_tree_add_item(perf_tree, hf_infiniband_PortCounters_LinkDownedCounter, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset += 1; + proto_tree_add_item(perf_tree, hf_infiniband_PortCounters_PortRcvErrors, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset += 2; + proto_tree_add_item(perf_tree, hf_infiniband_PortCounters_PortRcvRemotePhysicalErrors, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset += 2; + proto_tree_add_item(perf_tree, hf_infiniband_PortCounters_PortRcvSwitchRelayErrors, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset += 2; + proto_tree_add_item(perf_tree, hf_infiniband_PortCounters_PortXmitDiscards, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset += 2; + 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; local_offset += 2; /* skip reserved field */ - proto_tree_add_item(perf_tree, hf_infiniband_PortCounters_VL15Dropped, tvb, local_offset, 2, FALSE); local_offset += 2; + 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, FALSE); local_offset += 4; proto_tree_add_item(perf_tree, hf_infiniband_PortCounters_PortRcvData, tvb, local_offset, 4, FALSE); local_offset += 4; - proto_tree_add_item(perf_tree, hf_infiniband_PortCounters_PortXmitPkts, tvb, local_offset, 4, FALSE); local_offset += 4; - proto_tree_add_item(perf_tree, hf_infiniband_PortCounters_PortRcvPkts, tvb, local_offset, 4, FALSE); local_offset += 4; + proto_tree_add_item(perf_tree, hf_infiniband_PortCounters_PortXmitPkts, tvb, local_offset, 4, ENC_BIG_ENDIAN); local_offset += 4; + proto_tree_add_item(perf_tree, hf_infiniband_PortCounters_PortRcvPkts, tvb, local_offset, 4, ENC_BIG_ENDIAN); local_offset += 4; *offset = local_offset; /* update caller's offset to point to end of the PortCounters payload */ return; @@ -4920,17 +4920,17 @@ static void parse_PERF_PortCountersExtended(proto_tree* parentTree, tvbuff_t* tv local_offset += 40; /* skip reserved field */ local_offset += 1; /* skip reserved field */ - proto_tree_add_item(perf_tree, hf_infiniband_PortCountersExt_PortSelect, tvb, local_offset, 1, FALSE); local_offset += 1; + proto_tree_add_item(perf_tree, hf_infiniband_PortCountersExt_PortSelect, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset += 1; proto_tree_add_item(perf_tree, hf_infiniband_PortCountersExt_CounterSelect, tvb, local_offset, 2, FALSE); local_offset += 2; local_offset += 4; /* skip reserved field */ proto_tree_add_item(perf_tree, hf_infiniband_PortCountersExt_PortXmitData, tvb, local_offset, 8, FALSE); local_offset += 8; proto_tree_add_item(perf_tree, hf_infiniband_PortCountersExt_PortRcvData, tvb, local_offset, 8, FALSE); local_offset += 8; - proto_tree_add_item(perf_tree, hf_infiniband_PortCountersExt_PortXmitPkts, tvb, local_offset, 8, FALSE); local_offset += 8; - proto_tree_add_item(perf_tree, hf_infiniband_PortCountersExt_PortRcvPkts, tvb, local_offset, 8, FALSE); local_offset += 8; - proto_tree_add_item(perf_tree, hf_infiniband_PortCountersExt_PortUnicastXmitPkts, tvb, local_offset, 8, FALSE); local_offset += 8; - proto_tree_add_item(perf_tree, hf_infiniband_PortCountersExt_PortUnicastRcvPkts, tvb, local_offset, 8, FALSE); local_offset += 8; - proto_tree_add_item(perf_tree, hf_infiniband_PortCountersExt_PortMulticastXmitPkts, tvb, local_offset, 8, FALSE); local_offset += 8; - proto_tree_add_item(perf_tree, hf_infiniband_PortCountersExt_PortMulticastRcvPkts, tvb, local_offset, 8, FALSE); local_offset += 8; + proto_tree_add_item(perf_tree, hf_infiniband_PortCountersExt_PortXmitPkts, tvb, local_offset, 8, ENC_BIG_ENDIAN); local_offset += 8; + proto_tree_add_item(perf_tree, hf_infiniband_PortCountersExt_PortRcvPkts, tvb, local_offset, 8, ENC_BIG_ENDIAN); local_offset += 8; + proto_tree_add_item(perf_tree, hf_infiniband_PortCountersExt_PortUnicastXmitPkts, tvb, local_offset, 8, ENC_BIG_ENDIAN); local_offset += 8; + proto_tree_add_item(perf_tree, hf_infiniband_PortCountersExt_PortUnicastRcvPkts, tvb, local_offset, 8, ENC_BIG_ENDIAN); local_offset += 8; + proto_tree_add_item(perf_tree, hf_infiniband_PortCountersExt_PortMulticastXmitPkts, tvb, local_offset, 8, ENC_BIG_ENDIAN); local_offset += 8; + proto_tree_add_item(perf_tree, hf_infiniband_PortCountersExt_PortMulticastRcvPkts, tvb, local_offset, 8, ENC_BIG_ENDIAN); local_offset += 8; *offset = local_offset; /* update caller's offset to point to end of the PortCountersExt payload */ return; diff --git a/epan/dissectors/packet-infiniband_sdp.c b/epan/dissectors/packet-infiniband_sdp.c index f61f749d35..4c6ebd8332 100644 --- a/epan/dissectors/packet-infiniband_sdp.c +++ b/epan/dissectors/packet-infiniband_sdp.c @@ -243,38 +243,38 @@ manual_override: SDP_BSDH_header_tree = proto_item_add_subtree(SDP_BSDH_header_item, ett_ib_sdp_bsdh); mid = tvb_get_guint8(tvb, local_offset); - proto_tree_add_item(SDP_BSDH_header_tree, hf_ib_sdp_mid, tvb, local_offset, 1, FALSE); local_offset += 1; + proto_tree_add_item(SDP_BSDH_header_tree, hf_ib_sdp_mid, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset += 1; - proto_tree_add_item(SDP_BSDH_header_tree, hf_ib_sdp_flags, tvb, local_offset, 1, FALSE); - proto_tree_add_item(SDP_BSDH_header_tree, hf_ib_sdp_flags_oobpres, tvb, local_offset, 2, FALSE); - proto_tree_add_item(SDP_BSDH_header_tree, hf_ib_sdp_flags_oob_pend, tvb, local_offset, 4, FALSE); - proto_tree_add_item(SDP_BSDH_header_tree, hf_ib_sdp_flags_reqpipe, tvb, local_offset, 4, FALSE); local_offset += 1; + proto_tree_add_item(SDP_BSDH_header_tree, hf_ib_sdp_flags, tvb, local_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(SDP_BSDH_header_tree, hf_ib_sdp_flags_oobpres, tvb, local_offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(SDP_BSDH_header_tree, hf_ib_sdp_flags_oob_pend, tvb, local_offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(SDP_BSDH_header_tree, hf_ib_sdp_flags_reqpipe, tvb, local_offset, 4, ENC_BIG_ENDIAN); local_offset += 1; - proto_tree_add_item(SDP_BSDH_header_tree, hf_ib_sdp_bufs, tvb, local_offset, 2, FALSE); local_offset += 2; - proto_tree_add_item(SDP_BSDH_header_tree, hf_ib_sdp_len, tvb, local_offset, 4, FALSE); local_offset += 4; - proto_tree_add_item(SDP_BSDH_header_tree, hf_ib_sdp_mseq, tvb, local_offset, 4, FALSE); local_offset += 4; - proto_tree_add_item(SDP_BSDH_header_tree, hf_ib_sdp_mseqack, tvb, local_offset, 4, FALSE); local_offset += 4; + proto_tree_add_item(SDP_BSDH_header_tree, hf_ib_sdp_bufs, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset += 2; + proto_tree_add_item(SDP_BSDH_header_tree, hf_ib_sdp_len, tvb, local_offset, 4, ENC_BIG_ENDIAN); local_offset += 4; + proto_tree_add_item(SDP_BSDH_header_tree, hf_ib_sdp_mseq, tvb, local_offset, 4, ENC_BIG_ENDIAN); local_offset += 4; + proto_tree_add_item(SDP_BSDH_header_tree, hf_ib_sdp_mseqack, tvb, local_offset, 4, ENC_BIG_ENDIAN); local_offset += 4; switch (mid) { case Hello: SDP_EH_header_item = proto_tree_add_item(SDP_header_tree, hf_ib_sdp_hh, tvb, local_offset, 48, ENC_NA); SDP_EH_header_tree = proto_item_add_subtree(SDP_EH_header_item, ett_ib_sdp_hh); - proto_tree_add_item(SDP_EH_header_tree, hf_ib_sdp_majv, tvb, local_offset, 1, FALSE); - proto_tree_add_item(SDP_EH_header_tree, hf_ib_sdp_minv, tvb, local_offset, 1, FALSE); local_offset += 1; - proto_tree_add_item(SDP_EH_header_tree, hf_ib_sdp_ipv, tvb, local_offset, 1, FALSE); - proto_tree_add_item(SDP_EH_header_tree, hf_ib_sdp_cap, tvb, local_offset, 1, FALSE); - proto_tree_add_item(SDP_EH_header_tree, hf_ib_sdp_cap_invalidate, tvb, local_offset, 1, FALSE); - proto_tree_add_item(SDP_EH_header_tree, hf_ib_sdp_cap_extmaxadverts, tvb, local_offset, 1, FALSE); local_offset += 1; + proto_tree_add_item(SDP_EH_header_tree, hf_ib_sdp_majv, tvb, local_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(SDP_EH_header_tree, hf_ib_sdp_minv, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset += 1; + proto_tree_add_item(SDP_EH_header_tree, hf_ib_sdp_ipv, tvb, local_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(SDP_EH_header_tree, hf_ib_sdp_cap, tvb, local_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(SDP_EH_header_tree, hf_ib_sdp_cap_invalidate, tvb, local_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(SDP_EH_header_tree, hf_ib_sdp_cap_extmaxadverts, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset += 1; local_offset += 1; /* skip reserved */ - proto_tree_add_item(SDP_EH_header_tree, hf_ib_sdp_maxadverts, tvb, local_offset, 1, FALSE); local_offset += 1; - proto_tree_add_item(SDP_EH_header_tree, hf_ib_sdp_desremrcvsz, tvb, local_offset, 4, FALSE); local_offset += 4; - proto_tree_add_item(SDP_EH_header_tree, hf_ib_sdp_localrcvsz, tvb, local_offset, 4, FALSE); local_offset += 4; - proto_tree_add_item(SDP_EH_header_tree, hf_ib_sdp_localport, tvb, local_offset, 2, FALSE); local_offset += 2; + proto_tree_add_item(SDP_EH_header_tree, hf_ib_sdp_maxadverts, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset += 1; + proto_tree_add_item(SDP_EH_header_tree, hf_ib_sdp_desremrcvsz, tvb, local_offset, 4, ENC_BIG_ENDIAN); local_offset += 4; + proto_tree_add_item(SDP_EH_header_tree, hf_ib_sdp_localrcvsz, tvb, local_offset, 4, ENC_BIG_ENDIAN); local_offset += 4; + proto_tree_add_item(SDP_EH_header_tree, hf_ib_sdp_localport, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset += 2; local_offset += 2; /* skip reserved */ proto_tree_add_item(SDP_EH_header_tree, hf_ib_sdp_src_ip, tvb, local_offset, 16, FALSE); local_offset += 16; proto_tree_add_item(SDP_EH_header_tree, hf_ib_sdp_dst_ip, tvb, local_offset, 16, FALSE); local_offset += 16; local_offset += 2; /* skip reserved */ - proto_tree_add_item(SDP_EH_header_tree, hf_ib_sdp_extmaxadverts, tvb, local_offset, 2, FALSE); local_offset += 2; + proto_tree_add_item(SDP_EH_header_tree, hf_ib_sdp_extmaxadverts, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset += 2; break; case HelloAck: proto_tree_add_item(SDP_header_tree, hf_ib_sdp_hah, tvb, local_offset, 48, ENC_NA); diff --git a/epan/dissectors/packet-interlink.c b/epan/dissectors/packet-interlink.c index c11bcef2bc..cfbc68419f 100644 --- a/epan/dissectors/packet-interlink.c +++ b/epan/dissectors/packet-interlink.c @@ -101,11 +101,11 @@ dissect_interlink(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (ilh_tree) { proto_tree_add_item(ilh_tree, hf_interlink_id, tvb, offset, 4, FALSE); offset += 4; - proto_tree_add_item(ilh_tree, hf_interlink_version, tvb, offset, 2, TRUE); + proto_tree_add_item(ilh_tree, hf_interlink_version, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; - proto_tree_add_item(ilh_tree, hf_interlink_cmd, tvb, offset, 2, TRUE); + proto_tree_add_item(ilh_tree, hf_interlink_cmd, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; - proto_tree_add_item(ilh_tree, hf_interlink_seq, tvb, offset, 2, TRUE); + proto_tree_add_item(ilh_tree, hf_interlink_seq, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; } else { offset += 10; @@ -116,7 +116,7 @@ dissect_interlink(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree *flags_tree = NULL; flags_item = proto_tree_add_item(ilh_tree, hf_interlink_flags, - tvb, offset, 2, TRUE); + tvb, offset, 2, ENC_LITTLE_ENDIAN); if (flags_item) { flags_tree = proto_item_add_subtree(flags_item, ett_interlink_flags); } @@ -143,11 +143,11 @@ dissect_interlink(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ilb_type, ilb_version); if (ilb_tree) { - proto_tree_add_item(ilb_tree, hf_interlink_block_type, tvb, offset, 1, FALSE); + proto_tree_add_item(ilb_tree, hf_interlink_block_type, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(ilb_tree, hf_interlink_block_version, tvb, offset, 1, FALSE); + proto_tree_add_item(ilb_tree, hf_interlink_block_version, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(ilb_tree, hf_interlink_block_length, tvb, offset, 2, TRUE); + proto_tree_add_item(ilb_tree, hf_interlink_block_length, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; } else { offset += 4; diff --git a/epan/dissectors/packet-ip.c b/epan/dissectors/packet-ip.c index 6e8adaf608..68897e01da 100644 --- a/epan/dissectors/packet-ip.c +++ b/epan/dissectors/packet-ip.c @@ -1507,14 +1507,14 @@ dissect_ip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) iph->ip_ttl = tvb_get_guint8(tvb, offset + 8); pinfo->ip_ttl = iph->ip_ttl; if (tree) { - ttl_item = proto_tree_add_item(ip_tree, hf_ip_ttl, tvb, offset + 8, 1, FALSE); + ttl_item = proto_tree_add_item(ip_tree, hf_ip_ttl, tvb, offset + 8, 1, ENC_BIG_ENDIAN); } else { ttl_item = NULL; } iph->ip_p = tvb_get_guint8(tvb, offset + 9); if (tree) { - proto_tree_add_item(ip_tree, hf_ip_proto, tvb, offset + 9, 1, FALSE); + proto_tree_add_item(ip_tree, hf_ip_proto, tvb, offset + 9, 1, ENC_BIG_ENDIAN); } iph->ip_sum = tvb_get_ntohs(tvb, offset + 10); diff --git a/epan/dissectors/packet-ipmi-app.c b/epan/dissectors/packet-ipmi-app.c index 5e3a973c6e..db8ab9269e 100644 --- a/epan/dissectors/packet-ipmi-app.c +++ b/epan/dissectors/packet-ipmi-app.c @@ -431,17 +431,17 @@ rs01(tvbuff_t *tvb, proto_tree *tree) len = tvb_length(tvb); - proto_tree_add_item(tree, hf_ipmi_app_01_dev_id, tvb, 0, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_app_01_dev_id, tvb, 0, 1, ENC_LITTLE_ENDIAN); proto_tree_add_bitmask_text(tree, tvb, 1, 1, NULL, NULL, ett_ipmi_app_01_byte2, byte2, TRUE, 0); proto_tree_add_bitmask_text(tree, tvb, 2, 1, NULL, NULL, ett_ipmi_app_01_byte3, byte3, TRUE, 0); - proto_tree_add_item(tree, hf_ipmi_app_01_fw_rev_min, tvb, 3, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_app_01_fw_rev_min, tvb, 3, 1, ENC_LITTLE_ENDIAN); - proto_tree_add_item(tree, hf_ipmi_app_01_ipmi_version, tvb, 4, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_app_01_ipmi_version, tvb, 4, 1, ENC_LITTLE_ENDIAN); proto_tree_add_bitmask_text(tree, tvb, 5, 1, "Additional device support: ", "None", ett_ipmi_app_01_byte6, byte6, TRUE, 0); - proto_tree_add_item(tree, hf_ipmi_app_01_manufacturer, tvb, 6, 3, TRUE); - proto_tree_add_item(tree, hf_ipmi_app_01_product, tvb, 9, 2, TRUE); + proto_tree_add_item(tree, hf_ipmi_app_01_manufacturer, tvb, 6, 3, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_app_01_product, tvb, 9, 2, ENC_LITTLE_ENDIAN); if (len > 11) { /* IPMI states that Aux Revision should be displayed in MSB order */ proto_tree_add_item(tree, hf_ipmi_app_01_fw_aux, tvb, 11, 4, ENC_NA); @@ -551,10 +551,10 @@ rq24(tvbuff_t *tvb, proto_tree *tree) byte1, TRUE, 0); proto_tree_add_bitmask_text(tree, tvb, 1, 1, NULL, NULL, ett_ipmi_app_24_timer_action, byte2, TRUE, 0); - proto_tree_add_item(tree, hf_ipmi_app_24_pretimeout, tvb, 2, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_app_24_pretimeout, tvb, 2, 1, ENC_LITTLE_ENDIAN); proto_tree_add_bitmask_text(tree, tvb, 3, 1, "Timer Use Expiration flags clear: ", "None", ett_ipmi_app_24_expiration_flags, byte4, TRUE, BMT_NO_TFS); - proto_tree_add_item(tree, hf_ipmi_app_24_initial_countdown, tvb, 4, 2, TRUE); + proto_tree_add_item(tree, hf_ipmi_app_24_initial_countdown, tvb, 4, 2, ENC_LITTLE_ENDIAN); } /* Get Watchdog Timer. @@ -574,11 +574,11 @@ rs25(tvbuff_t *tvb, proto_tree *tree) byte1, TRUE, 0); proto_tree_add_bitmask_text(tree, tvb, 1, 1, NULL, NULL, ett_ipmi_app_25_timer_action, byte2, TRUE, 0); - proto_tree_add_item(tree, hf_ipmi_app_25_pretimeout, tvb, 2, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_app_25_pretimeout, tvb, 2, 1, ENC_LITTLE_ENDIAN); proto_tree_add_bitmask_text(tree, tvb, 3, 1, "Timer Use Expiration flags: ", "None", ett_ipmi_app_25_expiration_flags, byte4, TRUE, BMT_NO_TFS); - proto_tree_add_item(tree, hf_ipmi_app_25_initial_countdown, tvb, 4, 2, TRUE); - proto_tree_add_item(tree, hf_ipmi_app_25_present_countdown, tvb, 6, 2, TRUE); + proto_tree_add_item(tree, hf_ipmi_app_25_initial_countdown, tvb, 4, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_app_25_present_countdown, tvb, 6, 2, ENC_LITTLE_ENDIAN); } /* Set BMC Global Enables. @@ -756,8 +756,8 @@ rs38(tvbuff_t *tvb, proto_tree *tree) proto_tree_add_bitmask_text(tree, tvb, 2, 1, NULL, NULL, ett_ipmi_app_38_rs_byte3, byte3, TRUE, BMT_NO_FALSE); proto_tree_add_bitmask_text(tree, tvb, 3, 1, "Supported connections: ", "None", ett_ipmi_app_38_rs_byte4, byte4, TRUE, 0); - proto_tree_add_item(tree, hf_ipmi_app_38_rs_oem_iana, tvb, 4, 3, TRUE); - proto_tree_add_item(tree, hf_ipmi_app_38_rs_oem_aux, tvb, 7, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_app_38_rs_oem_iana, tvb, 4, 3, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_app_38_rs_oem_aux, tvb, 7, 1, ENC_LITTLE_ENDIAN); } /* Get Session Challenge @@ -775,7 +775,7 @@ rq39(tvbuff_t *tvb, proto_tree *tree) static void rs39(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_app_39_temp_session, tvb, 0, 4, TRUE); + proto_tree_add_item(tree, hf_ipmi_app_39_temp_session, tvb, 0, 4, ENC_LITTLE_ENDIAN); proto_tree_add_item(tree, hf_ipmi_app_39_challenge, tvb, 4, 16, ENC_NA); } @@ -798,7 +798,7 @@ rq3a(tvbuff_t *tvb, proto_tree *tree) proto_tree_add_bitmask_text(tree, tvb, 1, 1, NULL, NULL, ett_ipmi_app_3a_rq_byte2, byte2, TRUE, 0); proto_tree_add_item(tree, hf_ipmi_app_3a_authcode, tvb, 2, 16, ENC_NA); - proto_tree_add_item(tree, hf_ipmi_app_3a_outbound_seq, tvb, 18, 4, TRUE); + proto_tree_add_item(tree, hf_ipmi_app_3a_outbound_seq, tvb, 18, 4, ENC_LITTLE_ENDIAN); } static void @@ -809,8 +809,8 @@ rs3a(tvbuff_t *tvb, proto_tree *tree) proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_app_3a_rs_byte1, byte1, TRUE, 0); - proto_tree_add_item(tree, hf_ipmi_app_3a_session_id, tvb, 1, 4, TRUE); - proto_tree_add_item(tree, hf_ipmi_app_3a_inbound_seq, tvb, 5, 4, TRUE); + proto_tree_add_item(tree, hf_ipmi_app_3a_session_id, tvb, 1, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_app_3a_inbound_seq, tvb, 5, 4, ENC_LITTLE_ENDIAN); proto_tree_add_bitmask_text(tree, tvb, 9, 1, NULL, NULL, ett_ipmi_app_3a_rs_byte10, byte10, TRUE, 0); } @@ -857,9 +857,9 @@ static const value_string cc3b[] = { static void rq3c(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_app_3c_session_id, tvb, 0, 4, TRUE); + proto_tree_add_item(tree, hf_ipmi_app_3c_session_id, tvb, 0, 4, ENC_LITTLE_ENDIAN); if (tvb_length(tvb) > 4) { - proto_tree_add_item(tree, hf_ipmi_app_3c_session_handle, tvb, 4, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_app_3c_session_handle, tvb, 4, 1, ENC_LITTLE_ENDIAN); } } diff --git a/epan/dissectors/packet-ipmi-chassis.c b/epan/dissectors/packet-ipmi-chassis.c index 3fa4962adc..1137e25b73 100644 --- a/epan/dissectors/packet-ipmi-chassis.c +++ b/epan/dissectors/packet-ipmi-chassis.c @@ -339,7 +339,7 @@ bootopt_00(tvbuff_t *tvb, proto_tree *tree) static void bootopt_01(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_chs_bo01_spsel, tvb, 0, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_chs_bo01_spsel, tvb, 0, 1, ENC_LITTLE_ENDIAN); } static void @@ -368,7 +368,7 @@ bootopt_04(tvbuff_t *tvb, proto_tree *tree) &hf_ipmi_chs_bo04_bootinit_ack_os, &hf_ipmi_chs_bo04_bootinit_ack_osloader, &hf_ipmi_chs_bo04_bootinit_ack_bios, NULL }; - proto_tree_add_item(tree, hf_ipmi_chs_bo04_write_mask, tvb, 0, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_chs_bo04_write_mask, tvb, 0, 1, ENC_LITTLE_ENDIAN); proto_tree_add_bitmask_text(tree, tvb, 1, 1, "Boot Initiator Acknowledge data: ", "None", ett_ipmi_chs_bo04_byte2, byte2, TRUE, BMT_NO_TFS); } @@ -394,7 +394,7 @@ bootopt_05(tvbuff_t *tvb, proto_tree *tree) byte3, TRUE, 0); proto_tree_add_bitmask_text(tree, tvb, 3, 1, NULL, NULL, ett_ipmi_chs_bo05_byte4, byte4, TRUE, 0); - proto_tree_add_item(tree, hf_ipmi_chs_bo05_byte5, tvb, 4, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_chs_bo05_byte5, tvb, 4, 1, ENC_LITTLE_ENDIAN); } static void @@ -404,14 +404,14 @@ bootopt_06(tvbuff_t *tvb, proto_tree *tree) proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_chs_bo06_byte1, byte1, TRUE, 0); - proto_tree_add_item(tree, hf_ipmi_chs_bo06_session_id, tvb, 1, 4, TRUE); + proto_tree_add_item(tree, hf_ipmi_chs_bo06_session_id, tvb, 1, 4, ENC_LITTLE_ENDIAN); ipmi_add_timestamp(tree, hf_ipmi_chs_bo06_bootinfo_timestamp, tvb, 5); } static void bootopt_07(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_chs_bo07_block_selector, tvb, 0, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_chs_bo07_block_selector, tvb, 0, 1, ENC_LITTLE_ENDIAN); proto_tree_add_item(tree, hf_ipmi_chs_bo07_block_data, tvb, 1, tvb_length(tvb) - 1, ENC_NA); } @@ -441,13 +441,13 @@ rs00(tvbuff_t *tvb, proto_tree *tree) proto_tree_add_bitmask_text(tree, tvb, 0, 1, "Capabilities: ", "None", ett_ipmi_chs_00_capflags, byte1, TRUE, BMT_NO_TFS); - proto_tree_add_item(tree, hf_ipmi_chs_00_fru_dev_addr, tvb, 1, 1, TRUE); - proto_tree_add_item(tree, hf_ipmi_chs_00_sdr_dev_addr, tvb, 2, 1, TRUE); - proto_tree_add_item(tree, hf_ipmi_chs_00_sel_dev_addr, tvb, 3, 1, TRUE); - proto_tree_add_item(tree, hf_ipmi_chs_00_sm_dev_addr, tvb, 4, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_chs_00_fru_dev_addr, tvb, 1, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_chs_00_sdr_dev_addr, tvb, 2, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_chs_00_sel_dev_addr, tvb, 3, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_chs_00_sm_dev_addr, tvb, 4, 1, ENC_LITTLE_ENDIAN); if (tvb_length(tvb) >= 5) { - proto_tree_add_item(tree, hf_ipmi_chs_00_bridge_dev_addr, tvb, 5, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_chs_00_bridge_dev_addr, tvb, 5, 1, ENC_LITTLE_ENDIAN); } } @@ -503,7 +503,7 @@ rq04(tvbuff_t *tvb, proto_tree *tree) static const int *byte2[] = { &hf_ipmi_chs_04_perm_on, NULL }; if (tvb_length(tvb) > 0) { - proto_tree_add_item(tree, hf_ipmi_chs_04_ival, tvb, 0, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_chs_04_ival, tvb, 0, 1, ENC_LITTLE_ENDIAN); } if (tvb_length(tvb) > 1) { @@ -521,13 +521,13 @@ rq05(tvbuff_t *tvb, proto_tree *tree) proto_tree_add_bitmask_text(tree, tvb, 0, 1, "Capabilities: ", "None", ett_ipmi_chs_05_flags, byte1, TRUE, 0); - proto_tree_add_item(tree, hf_ipmi_chs_05_fru_dev_addr, tvb, 1, 1, TRUE); - proto_tree_add_item(tree, hf_ipmi_chs_05_sdr_dev_addr, tvb, 2, 1, TRUE); - proto_tree_add_item(tree, hf_ipmi_chs_05_sel_dev_addr, tvb, 3, 1, TRUE); - proto_tree_add_item(tree, hf_ipmi_chs_05_sm_dev_addr, tvb, 4, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_chs_05_fru_dev_addr, tvb, 1, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_chs_05_sdr_dev_addr, tvb, 2, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_chs_05_sel_dev_addr, tvb, 3, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_chs_05_sm_dev_addr, tvb, 4, 1, ENC_LITTLE_ENDIAN); if (tvb_length(tvb) > 5) { /* Bridge device address is optional */ - proto_tree_add_item(tree, hf_ipmi_chs_05_bridge_dev_addr, tvb, 5, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_chs_05_bridge_dev_addr, tvb, 5, 1, ENC_LITTLE_ENDIAN); } } @@ -563,7 +563,7 @@ rs07(tvbuff_t *tvb, proto_tree *tree) proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_chs_07_byte1, byte1, TRUE, 0); - proto_tree_add_item(tree, hf_ipmi_chs_07_chan, tvb, 1, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_chs_07_chan, tvb, 1, 1, ENC_LITTLE_ENDIAN); } /* Set System Boot Options @@ -642,8 +642,8 @@ rq09(tvbuff_t *tvb, proto_tree *tree) pno, "%sBoot option parameter selector: %s (0x%02x)", ipmi_dcd8(pno, 0x7f), desc, pno); - proto_tree_add_item(tree, hf_ipmi_chs_09_rq_set_select, tvb, 1, 1, TRUE); - proto_tree_add_item(tree, hf_ipmi_chs_09_rq_block_select, tvb, 2, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_chs_09_rq_set_select, tvb, 1, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_chs_09_rq_block_select, tvb, 2, 1, ENC_LITTLE_ENDIAN); } static void @@ -696,8 +696,8 @@ static const value_string cc09[] = { static void rs0f(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_chs_0f_minpercnt, tvb, 0, 1, TRUE); - proto_tree_add_item(tree, hf_ipmi_chs_0f_counter, tvb, 1, 4, TRUE); + proto_tree_add_item(tree, hf_ipmi_chs_0f_minpercnt, tvb, 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_chs_0f_counter, tvb, 1, 4, ENC_LITTLE_ENDIAN); } static ipmi_cmd_t cmd_chassis[] = { diff --git a/epan/dissectors/packet-ipmi-picmg.c b/epan/dissectors/packet-ipmi-picmg.c index da0362ba53..35db7492e1 100644 --- a/epan/dissectors/packet-ipmi-picmg.c +++ b/epan/dissectors/packet-ipmi-picmg.c @@ -532,9 +532,9 @@ static const struct true_false_string tfs_36_fail_unknown = { static void rs00(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_picmg_00_version, tvb, 0, 1, TRUE); - proto_tree_add_item(tree, hf_ipmi_picmg_00_max_fruid, tvb, 1, 1, TRUE); - proto_tree_add_item(tree, hf_ipmi_picmg_00_ipmc_fruid, tvb, 2, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_picmg_00_version, tvb, 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_picmg_00_max_fruid, tvb, 1, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_picmg_00_ipmc_fruid, tvb, 2, 1, ENC_LITTLE_ENDIAN); } /* Get Address Info Command. @@ -543,28 +543,28 @@ static void rq01(tvbuff_t *tvb, proto_tree *tree) { if (tvb_length(tvb) > 0) { - proto_tree_add_item(tree, hf_ipmi_picmg_01_rq_fruid, tvb, 0, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_picmg_01_rq_fruid, tvb, 0, 1, ENC_LITTLE_ENDIAN); } if (tvb_length(tvb) > 1) { - proto_tree_add_item(tree, hf_ipmi_picmg_01_rq_addr_key_type, tvb, 1, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_picmg_01_rq_addr_key_type, tvb, 1, 1, ENC_LITTLE_ENDIAN); } if (tvb_length(tvb) > 2) { - proto_tree_add_item(tree, hf_ipmi_picmg_01_rq_addr_key, tvb, 2, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_picmg_01_rq_addr_key, tvb, 2, 1, ENC_LITTLE_ENDIAN); } if (tvb_length(tvb) > 3) { - proto_tree_add_item(tree, hf_ipmi_picmg_01_rq_site_type, tvb, 3, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_picmg_01_rq_site_type, tvb, 3, 1, ENC_LITTLE_ENDIAN); } } static void rs01(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_picmg_01_rs_hwaddr, tvb, 0, 1, TRUE); - proto_tree_add_item(tree, hf_ipmi_picmg_01_rs_ipmbaddr, tvb, 1, 1, TRUE); - proto_tree_add_item(tree, hf_ipmi_picmg_01_rs_rsrv, tvb, 2, 1, TRUE); - proto_tree_add_item(tree, hf_ipmi_picmg_01_rs_fruid, tvb, 3, 1, TRUE); - proto_tree_add_item(tree, hf_ipmi_picmg_01_rs_site_num, tvb, 4, 1, TRUE); - proto_tree_add_item(tree, hf_ipmi_picmg_01_rs_site_type, tvb, 5, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_picmg_01_rs_hwaddr, tvb, 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_picmg_01_rs_ipmbaddr, tvb, 1, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_picmg_01_rs_rsrv, tvb, 2, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_picmg_01_rs_fruid, tvb, 3, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_picmg_01_rs_site_num, tvb, 4, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_picmg_01_rs_site_type, tvb, 5, 1, ENC_LITTLE_ENDIAN); /* TBD Next byte is carrier number in MTCA */ } @@ -589,8 +589,8 @@ rq03(tvbuff_t *tvb, proto_tree *tree) static void rq04(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_picmg_04_fruid, tvb, 0, 1, TRUE); - proto_tree_add_item(tree, hf_ipmi_picmg_04_cmd, tvb, 1, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_picmg_04_fruid, tvb, 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_picmg_04_cmd, tvb, 1, 1, ENC_LITTLE_ENDIAN); } /* Get FRU LED Properties @@ -598,7 +598,7 @@ rq04(tvbuff_t *tvb, proto_tree *tree) static void rq05(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_picmg_05_fruid, tvb, 0, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_picmg_05_fruid, tvb, 0, 1, ENC_LITTLE_ENDIAN); } static void @@ -609,7 +609,7 @@ rs05(tvbuff_t *tvb, proto_tree *tree) proto_tree_add_bitmask_text(tree, tvb, 0, 1, "General Status LEDs: ", "None", ett_ipmi_picmg_05_byte1, byte1, TRUE, 0); - proto_tree_add_item(tree, hf_ipmi_picmg_05_app_leds, tvb, 1, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_picmg_05_app_leds, tvb, 1, 1, ENC_LITTLE_ENDIAN); } /* Get LED Color Capabilities @@ -617,8 +617,8 @@ rs05(tvbuff_t *tvb, proto_tree *tree) static void rq06(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_picmg_06_fruid, tvb, 0, 1, TRUE); - proto_tree_add_item(tree, hf_ipmi_picmg_06_ledid, tvb, 1, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_picmg_06_fruid, tvb, 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_picmg_06_ledid, tvb, 1, 1, ENC_LITTLE_ENDIAN); } static void @@ -673,8 +673,8 @@ parse_led_state(proto_tree *tree, tvbuff_t *tvb, guint offs, const char *desc) static void rq07(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_picmg_07_fruid, tvb, 0, 1, TRUE); - proto_tree_add_item(tree, hf_ipmi_picmg_07_ledid, tvb, 1, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_picmg_07_fruid, tvb, 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_picmg_07_ledid, tvb, 1, 1, ENC_LITTLE_ENDIAN); parse_led_state(tree, tvb, 2, ""); } @@ -683,8 +683,8 @@ rq07(tvbuff_t *tvb, proto_tree *tree) static void rq08(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_picmg_08_fruid, tvb, 0, 1, TRUE); - proto_tree_add_item(tree, hf_ipmi_picmg_08_ledid, tvb, 1, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_picmg_08_fruid, tvb, 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_picmg_08_ledid, tvb, 1, 1, ENC_LITTLE_ENDIAN); } static void @@ -700,7 +700,7 @@ rs08(tvbuff_t *tvb, proto_tree *tree) parse_led_state(tree, tvb, 4, "Override "); } if (tvb_length(tvb) > 7) { - proto_tree_add_item(tree, hf_ipmi_picmg_08_lamptest_duration, tvb, 7, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_picmg_08_lamptest_duration, tvb, 7, 1, ENC_LITTLE_ENDIAN); } } @@ -754,7 +754,7 @@ rq0a(tvbuff_t *tvb, proto_tree *tree) static const int *byte2[] = { &hf_ipmi_picmg_0a_msk_d_locked, &hf_ipmi_picmg_0a_msk_locked, NULL }; static const int *byte3[] = { &hf_ipmi_picmg_0a_d_locked, &hf_ipmi_picmg_0a_locked, NULL }; - proto_tree_add_item(tree, hf_ipmi_picmg_0a_fruid, tvb, 0, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_picmg_0a_fruid, tvb, 0, 1, ENC_LITTLE_ENDIAN); proto_tree_add_bitmask_text(tree, tvb, 1, 1, "Will affect bits: ", "None", ett_ipmi_picmg_0a_byte2, byte2, TRUE, BMT_NO_TFS); proto_tree_add_bitmask_text(tree, tvb, 2, 1, "Activation Policy Set Bits: ", NULL, @@ -766,7 +766,7 @@ rq0a(tvbuff_t *tvb, proto_tree *tree) static void rq0b(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_picmg_0b_fruid, tvb, 0, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_picmg_0b_fruid, tvb, 0, 1, ENC_LITTLE_ENDIAN); } static void @@ -784,8 +784,8 @@ rs0b(tvbuff_t *tvb, proto_tree *tree) static void rq0c(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_picmg_0c_fruid, tvb, 0, 1, TRUE); - proto_tree_add_item(tree, hf_ipmi_picmg_0c_cmd, tvb, 1, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_picmg_0c_fruid, tvb, 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_picmg_0c_cmd, tvb, 1, 1, ENC_LITTLE_ENDIAN); } /* Get Device Locator Record ID @@ -793,16 +793,16 @@ rq0c(tvbuff_t *tvb, proto_tree *tree) static void rq0d(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_picmg_0d_fruid, tvb, 0, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_picmg_0d_fruid, tvb, 0, 1, ENC_LITTLE_ENDIAN); if (tvb_length(tvb) > 1) { - proto_tree_add_item(tree, hf_ipmi_picmg_0d_start, tvb, 1, 2, TRUE); + proto_tree_add_item(tree, hf_ipmi_picmg_0d_start, tvb, 1, 2, ENC_LITTLE_ENDIAN); } } static void rs0d(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_picmg_0d_recordid, tvb, 0, 2, TRUE); + proto_tree_add_item(tree, hf_ipmi_picmg_0d_recordid, tvb, 0, 2, ENC_LITTLE_ENDIAN); } static void @@ -873,14 +873,14 @@ rs0f(tvbuff_t *tvb, proto_tree *tree) static void rq10(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_picmg_10_fruid, tvb, 0, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_picmg_10_fruid, tvb, 0, 1, ENC_LITTLE_ENDIAN); } static void rs10(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_picmg_10_nslots, tvb, 0, 1, TRUE); - proto_tree_add_item(tree, hf_ipmi_picmg_10_ipmc_loc, tvb, 1, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_picmg_10_nslots, tvb, 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_picmg_10_ipmc_loc, tvb, 1, 1, ENC_LITTLE_ENDIAN); } /* Set Power Level @@ -895,10 +895,10 @@ rq11(tvbuff_t *tvb, proto_tree *tree) }; guint8 v = tvb_get_guint8(tvb, 1); - proto_tree_add_item(tree, hf_ipmi_picmg_11_fruid, tvb, 0, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_picmg_11_fruid, tvb, 0, 1, ENC_LITTLE_ENDIAN); proto_tree_add_uint_format_value(tree, hf_ipmi_picmg_11_power_level, tvb, 1, 1, v, "%s", val_to_str(v, plvl_vals, "Power Level %d")); - proto_tree_add_item(tree, hf_ipmi_picmg_11_set_to_desired, tvb, 2, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_picmg_11_set_to_desired, tvb, 2, 1, ENC_LITTLE_ENDIAN); } /* Get Power Level @@ -906,8 +906,8 @@ rq11(tvbuff_t *tvb, proto_tree *tree) static void rq12(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_picmg_12_fruid, tvb, 0, 1, TRUE); - proto_tree_add_item(tree, hf_ipmi_picmg_12_pwr_type, tvb, 1, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_picmg_12_fruid, tvb, 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_picmg_12_pwr_type, tvb, 1, 1, ENC_LITTLE_ENDIAN); } static void @@ -918,7 +918,7 @@ rs12(tvbuff_t *tvb, proto_tree *tree) guint32 tmp; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_picmg_12_byte1, byte1, TRUE, BMT_NO_FALSE); - proto_tree_add_item(tree, hf_ipmi_picmg_12_delay, tvb, 1, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_picmg_12_delay, tvb, 1, 1, ENC_LITTLE_ENDIAN); v = tvb_get_guint8(tvb, 2); proto_tree_add_uint_format_value(tree, hf_ipmi_picmg_12_pwr_mult, tvb, 2, 1, v, "%d.%dW", v / 10, v % 10); @@ -944,7 +944,7 @@ static void rq13(tvbuff_t *tvb, proto_tree *tree) { if (tvb_length(tvb) > 0) { - proto_tree_add_item(tree, hf_ipmi_picmg_13_fruid, tvb, 0, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_picmg_13_fruid, tvb, 0, 1, ENC_LITTLE_ENDIAN); } } @@ -953,7 +953,7 @@ rq13(tvbuff_t *tvb, proto_tree *tree) static void rq14(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_picmg_14_fruid, tvb, 0, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_picmg_14_fruid, tvb, 0, 1, ENC_LITTLE_ENDIAN); } static void @@ -961,9 +961,9 @@ rs14(tvbuff_t *tvb, proto_tree *tree) { static const int *prop[] = { &hf_ipmi_picmg_14_local_control, NULL }; - proto_tree_add_item(tree, hf_ipmi_picmg_14_speed_min, tvb, 0, 1, TRUE); - proto_tree_add_item(tree, hf_ipmi_picmg_14_speed_max, tvb, 1, 1, TRUE); - proto_tree_add_item(tree, hf_ipmi_picmg_14_speed_norm, tvb, 2, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_picmg_14_speed_min, tvb, 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_picmg_14_speed_max, tvb, 1, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_picmg_14_speed_norm, tvb, 2, 1, ENC_LITTLE_ENDIAN); proto_tree_add_bitmask_text(tree, tvb, 3, 1, "Fan Tray Properties: ", "None", ett_ipmi_picmg_14_prop, prop, TRUE, 0); } @@ -975,11 +975,11 @@ rq15(tvbuff_t *tvb, proto_tree *tree) { guint8 v = tvb_get_guint8(tvb, 1); - proto_tree_add_item(tree, hf_ipmi_picmg_15_fruid, tvb, 0, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_picmg_15_fruid, tvb, 0, 1, ENC_LITTLE_ENDIAN); proto_tree_add_uint_format_value(tree, hf_ipmi_picmg_15_fan_level, tvb, 1, 1, v, "%s", val_to_str(v, fan_level_vals, "%d")); if (tvb_length(tvb) > 2) { - proto_tree_add_item(tree, hf_ipmi_picmg_15_local_enable, tvb, 2, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_picmg_15_local_enable, tvb, 2, 1, ENC_LITTLE_ENDIAN); } } @@ -988,7 +988,7 @@ rq15(tvbuff_t *tvb, proto_tree *tree) static void rq16(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_picmg_16_fruid, tvb, 0, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_picmg_16_fruid, tvb, 0, 1, ENC_LITTLE_ENDIAN); } static void @@ -1000,10 +1000,10 @@ rs16(tvbuff_t *tvb, proto_tree *tree) proto_tree_add_uint_format_value(tree, hf_ipmi_picmg_16_override_level, tvb, 0, 1, v, "%s", val_to_str(v, fan_level_vals, "%d")); if (tvb_length(tvb) > 1) { - proto_tree_add_item(tree, hf_ipmi_picmg_16_local_level, tvb, 1, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_picmg_16_local_level, tvb, 1, 1, ENC_LITTLE_ENDIAN); } if (tvb_length(tvb) > 2) { - proto_tree_add_item(tree, hf_ipmi_picmg_16_local_enable, tvb, 2, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_picmg_16_local_enable, tvb, 2, 1, ENC_LITTLE_ENDIAN); } } @@ -1037,7 +1037,7 @@ rq17(tvbuff_t *tvb, proto_tree *tree) cmd, "%s (0x%02x)", val_to_str(cmd, to_shmm ? vals_17_cmd_toshmm : vals_17_cmd_fromshmm, "Reserved"), cmd); - proto_tree_add_item(tree, hf_ipmi_picmg_17_resid, tvb, 1, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_picmg_17_resid, tvb, 1, 1, ENC_LITTLE_ENDIAN); } static void @@ -1070,7 +1070,7 @@ rs17(tvbuff_t *tvb, proto_tree *tree) if (!ipmi_getsaveddata(0, &val)) { /* Without knowing the command, we cannot decipher the response */ - proto_tree_add_item(tree, hf_ipmi_picmg_17_status, tvb, 0, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_picmg_17_status, tvb, 0, 1, ENC_LITTLE_ENDIAN); return; } @@ -1085,15 +1085,15 @@ rs17(tvbuff_t *tvb, proto_tree *tree) static void rq18(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_picmg_18_li_key_type, tvb, 0, 1, TRUE); - proto_tree_add_item(tree, hf_ipmi_picmg_18_li_key, tvb, 1, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_picmg_18_li_key_type, tvb, 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_picmg_18_li_key, tvb, 1, 1, ENC_LITTLE_ENDIAN); } static void rs18(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_picmg_18_link_num, tvb, 0, 1, TRUE); - proto_tree_add_item(tree, hf_ipmi_picmg_18_sensor_num, tvb, 1, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_picmg_18_link_num, tvb, 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_picmg_18_sensor_num, tvb, 1, 1, ENC_LITTLE_ENDIAN); } /* Get Shelf Manager IPMB Address @@ -1101,8 +1101,8 @@ rs18(tvbuff_t *tvb, proto_tree *tree) static void rs1b(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_picmg_1b_addr_active, tvb, 0, 1, TRUE); - proto_tree_add_item(tree, hf_ipmi_picmg_1b_addr_backup, tvb, 0, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_picmg_1b_addr_active, tvb, 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_picmg_1b_addr_backup, tvb, 0, 1, ENC_LITTLE_ENDIAN); } /* Set Fan Policy @@ -1110,12 +1110,12 @@ rs1b(tvbuff_t *tvb, proto_tree *tree) static void rq1c(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_picmg_1c_fan_site_number, tvb, 0, 1, TRUE); - proto_tree_add_item(tree, hf_ipmi_picmg_1c_fan_enable_state, tvb, 1, 1, TRUE); - proto_tree_add_item(tree, hf_ipmi_picmg_1c_fan_policy_timeout, tvb, 2, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_picmg_1c_fan_site_number, tvb, 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_picmg_1c_fan_enable_state, tvb, 1, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_picmg_1c_fan_policy_timeout, tvb, 2, 1, ENC_LITTLE_ENDIAN); if (tvb_length(tvb) > 3) { - proto_tree_add_item(tree, hf_ipmi_picmg_1c_site_number, tvb, 3, 1, TRUE); - proto_tree_add_item(tree, hf_ipmi_picmg_1c_site_type, tvb, 4, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_picmg_1c_site_number, tvb, 3, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_picmg_1c_site_type, tvb, 4, 1, ENC_LITTLE_ENDIAN); } } @@ -1124,19 +1124,19 @@ rq1c(tvbuff_t *tvb, proto_tree *tree) static void rq1d(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_picmg_1d_fan_site_number, tvb, 0, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_picmg_1d_fan_site_number, tvb, 0, 1, ENC_LITTLE_ENDIAN); if (tvb_length(tvb) > 1) { - proto_tree_add_item(tree, hf_ipmi_picmg_1d_site_number, tvb, 1, 1, TRUE); - proto_tree_add_item(tree, hf_ipmi_picmg_1d_site_type, tvb, 2, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_picmg_1d_site_number, tvb, 1, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_picmg_1d_site_type, tvb, 2, 1, ENC_LITTLE_ENDIAN); } } static void rs1d(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_picmg_1d_policy, tvb, 0, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_picmg_1d_policy, tvb, 0, 1, ENC_LITTLE_ENDIAN); if (tvb_length(tvb) > 1) { - proto_tree_add_item(tree, hf_ipmi_picmg_1d_coverage, tvb, 1, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_picmg_1d_coverage, tvb, 1, 1, ENC_LITTLE_ENDIAN); } } @@ -1145,7 +1145,7 @@ rs1d(tvbuff_t *tvb, proto_tree *tree) static void rq1e(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_picmg_1e_fruid, tvb, 0, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_picmg_1e_fruid, tvb, 0, 1, ENC_LITTLE_ENDIAN); } static void @@ -1163,15 +1163,15 @@ rs1e(tvbuff_t *tvb, proto_tree *tree) static void rq1f(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_picmg_1f_rq_fruid, tvb, 0, 1, TRUE); - proto_tree_add_item(tree, hf_ipmi_picmg_1f_rq_op, tvb, 1, 1, TRUE); - proto_tree_add_item(tree, hf_ipmi_picmg_1f_rq_lockid, tvb, 2, 2, TRUE); + proto_tree_add_item(tree, hf_ipmi_picmg_1f_rq_fruid, tvb, 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_picmg_1f_rq_op, tvb, 1, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_picmg_1f_rq_lockid, tvb, 2, 2, ENC_LITTLE_ENDIAN); } static void rs1f(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_picmg_1f_rs_lockid, tvb, 0, 2, TRUE); + proto_tree_add_item(tree, hf_ipmi_picmg_1f_rs_lockid, tvb, 0, 2, ENC_LITTLE_ENDIAN); ipmi_add_timestamp(tree, hf_ipmi_picmg_1f_rs_tstamp, tvb, 2); } @@ -1186,9 +1186,9 @@ static const value_string cc1f[] = { static void rq20(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_picmg_20_fruid, tvb, 0, 1, TRUE); - proto_tree_add_item(tree, hf_ipmi_picmg_20_lockid, tvb, 1, 2, TRUE); - proto_tree_add_item(tree, hf_ipmi_picmg_20_offset, tvb, 3, 2, TRUE); + proto_tree_add_item(tree, hf_ipmi_picmg_20_fruid, tvb, 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_picmg_20_lockid, tvb, 1, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_picmg_20_offset, tvb, 3, 2, ENC_LITTLE_ENDIAN); proto_tree_add_item(tree, hf_ipmi_picmg_20_data, tvb, 5, tvb_length(tvb) - 5, ENC_NA); } @@ -1208,7 +1208,7 @@ static const value_string cc20[] = { static void rq21(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_picmg_21_addr_num, tvb, 0, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_picmg_21_addr_num, tvb, 0, 1, ENC_LITTLE_ENDIAN); } static void @@ -1218,17 +1218,17 @@ rs21(tvbuff_t *tvb, proto_tree *tree) guint8 addrtype; ipmi_add_timestamp(tree, hf_ipmi_picmg_21_tstamp, tvb, 0); - proto_tree_add_item(tree, hf_ipmi_picmg_21_addr_count, tvb, 4, 1, TRUE); - proto_tree_add_item(tree, hf_ipmi_picmg_21_site_type, tvb, 5, 1, TRUE); - proto_tree_add_item(tree, hf_ipmi_picmg_21_site_num, tvb, 6, 1, TRUE); - proto_tree_add_item(tree, hf_ipmi_picmg_21_max_unavail, tvb, 7, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_picmg_21_addr_count, tvb, 4, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_picmg_21_site_type, tvb, 5, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_picmg_21_site_num, tvb, 6, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_picmg_21_max_unavail, tvb, 7, 1, ENC_LITTLE_ENDIAN); proto_tree_add_bitmask_text(tree, tvb, 8, 1, NULL, NULL, ett_ipmi_picmg_21_byte9, byte9, TRUE, 0); addrtype = tvb_get_guint8(tvb, 8) & 0x7f; if (addrtype == 0x01) { /* IP address and RMCP port are in network byte order! */ proto_tree_add_item(tree, hf_ipmi_picmg_21_ipaddr, tvb, 9, 4, FALSE); - proto_tree_add_item(tree, hf_ipmi_picmg_21_rmcpport, tvb, 13, 2, FALSE); + proto_tree_add_item(tree, hf_ipmi_picmg_21_rmcpport, tvb, 13, 2, ENC_BIG_ENDIAN); }; } @@ -1241,7 +1241,7 @@ rq22(tvbuff_t *tvb, proto_tree *tree) ipmi_setsaveddata(0, tvb_get_guint8(tvb, 0)); return; } - proto_tree_add_item(tree, hf_ipmi_picmg_22_feed_idx, tvb, 0, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_picmg_22_feed_idx, tvb, 0, 1, ENC_LITTLE_ENDIAN); } static void @@ -1251,7 +1251,7 @@ rs22(tvbuff_t *tvb, proto_tree *tree) guint16 v; guint i, max; - proto_tree_add_item(tree, hf_ipmi_picmg_22_update_cnt, tvb, 0, 2, TRUE); + proto_tree_add_item(tree, hf_ipmi_picmg_22_update_cnt, tvb, 0, 2, ENC_LITTLE_ENDIAN); max = tvb_length(tvb) / 2 - 1; if (!max) { @@ -1285,13 +1285,13 @@ rs2e(tvbuff_t *tvb, proto_tree *tree) &hf_ipmi_picmg_2e_ipmc_degraded, &hf_ipmi_picmg_2e_deferred_activate, &hf_ipmi_picmg_2e_services_affected, &hf_ipmi_picmg_2e_manual_rollback, &hf_ipmi_picmg_2e_auto_rollback, &hf_ipmi_picmg_2e_self_test, NULL }; - proto_tree_add_item(tree, hf_ipmi_picmg_2e_version, tvb, 0, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_picmg_2e_version, tvb, 0, 1, ENC_LITTLE_ENDIAN); proto_tree_add_bitmask_text(tree, tvb, 1, 1, "Capabilities: ", "None", ett_ipmi_picmg_2e_byte2, byte2, TRUE, 0); - proto_tree_add_item(tree, hf_ipmi_picmg_2e_upgrade_tout, tvb, 2, 1, TRUE); - proto_tree_add_item(tree, hf_ipmi_picmg_2e_selftest_tout, tvb, 3, 1, TRUE); - proto_tree_add_item(tree, hf_ipmi_picmg_2e_rollback_tout, tvb, 4, 1, TRUE); - proto_tree_add_item(tree, hf_ipmi_picmg_2e_inaccessibility_tout, tvb, 5, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_picmg_2e_upgrade_tout, tvb, 2, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_picmg_2e_selftest_tout, tvb, 3, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_picmg_2e_rollback_tout, tvb, 4, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_picmg_2e_inaccessibility_tout, tvb, 5, 1, ENC_LITTLE_ENDIAN); add_component_bits(tree, tvb, 6, "Components present: "); } @@ -1319,7 +1319,7 @@ parse_version(tvbuff_t *tvb, proto_tree *tree) proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_picmg_prop01_byte1, byte1, TRUE, 0); - proto_tree_add_item(tree, hf_ipmi_picmg_prop01_fw_minor, tvb, 1, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_picmg_prop01_fw_minor, tvb, 1, 1, ENC_LITTLE_ENDIAN); proto_tree_add_item(tree, hf_ipmi_picmg_prop01_fw_aux, tvb, 2, 4, ENC_NA); } @@ -1364,7 +1364,7 @@ rq2f(tvbuff_t *tvb, proto_tree *tree) desc = "Reserved"; } - proto_tree_add_item(tree, hf_ipmi_picmg_2f_comp_id, tvb, 0, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_picmg_2f_comp_id, tvb, 0, 1, ENC_LITTLE_ENDIAN); proto_tree_add_uint_format_value(tree, hf_ipmi_picmg_2f_comp_prop, tvb, 1, 1, pno, "%s (0x%02x)", desc, pno); } @@ -1420,7 +1420,7 @@ static void rq31(tvbuff_t *tvb, proto_tree *tree) { add_component_bits(tree, tvb, 0, "Components: "); - proto_tree_add_item(tree, hf_ipmi_picmg_31_action, tvb, 1, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_picmg_31_action, tvb, 1, 1, ENC_LITTLE_ENDIAN); } static const value_string cc31[] = { @@ -1434,7 +1434,7 @@ static const value_string cc31[] = { static void rq32(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_picmg_32_block, tvb, 0, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_picmg_32_block, tvb, 0, 1, ENC_LITTLE_ENDIAN); proto_tree_add_item(tree, hf_ipmi_picmg_32_data, tvb, 1, tvb_length(tvb) - 1, ENC_NA); } @@ -1442,8 +1442,8 @@ static void rs32(tvbuff_t *tvb, proto_tree *tree) { if (tvb_length(tvb) > 0) { - proto_tree_add_item(tree, hf_ipmi_picmg_32_sec_offs, tvb, 0, 4, TRUE); - proto_tree_add_item(tree, hf_ipmi_picmg_32_sec_len, tvb, 4, 4, TRUE); + proto_tree_add_item(tree, hf_ipmi_picmg_32_sec_offs, tvb, 0, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_picmg_32_sec_len, tvb, 4, 4, ENC_LITTLE_ENDIAN); } } @@ -1459,8 +1459,8 @@ static const value_string cc32[] = { static void rq33(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_picmg_33_comp_id, tvb, 0, 1, TRUE); - proto_tree_add_item(tree, hf_ipmi_picmg_33_img_len, tvb, 1, 4, TRUE); + proto_tree_add_item(tree, hf_ipmi_picmg_33_comp_id, tvb, 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_picmg_33_img_len, tvb, 1, 4, ENC_LITTLE_ENDIAN); } static const value_string cc33[] = { @@ -1505,7 +1505,7 @@ static void rq35(tvbuff_t *tvb, proto_tree *tree) { if (tvb_length(tvb) > 0) { - proto_tree_add_item(tree, hf_ipmi_picmg_35_rollback_override, tvb, 0, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_picmg_35_rollback_override, tvb, 0, 1, ENC_LITTLE_ENDIAN); } } diff --git a/epan/dissectors/packet-ipmi-se.c b/epan/dissectors/packet-ipmi-se.c index 38988c7cd7..e7f0737631 100644 --- a/epan/dissectors/packet-ipmi-se.c +++ b/epan/dissectors/packet-ipmi-se.c @@ -1799,11 +1799,11 @@ parse_platform_event(tvbuff_t *tvb, proto_tree *tree) evtype = tvb_get_guint8(tvb, 3) & 0x7f; eti = get_evtype_info(evtype); - proto_tree_add_item(tree, hf_ipmi_se_evt_rev, tvb, 0, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_se_evt_rev, tvb, 0, 1, ENC_LITTLE_ENDIAN); proto_tree_add_uint_format_value(tree, hf_ipmi_se_evt_sensor_type, tvb, 1, 1, stype, "%s (0x%02x)", si->desc, stype); proto_tree_add_item(tree, hf_ipmi_se_evt_sensor_num, tvb, 2, 1, TRUE); - ti = proto_tree_add_item(tree, hf_ipmi_se_evt_byte3, tvb, 3, 1, TRUE); + ti = proto_tree_add_item(tree, hf_ipmi_se_evt_byte3, tvb, 3, 1, ENC_LITTLE_ENDIAN); s_tree = proto_item_add_subtree(ti, ett_ipmi_se_evt_byte3); proto_tree_add_item(s_tree, hf_ipmi_se_evt_dir, tvb, 3, 1, TRUE); proto_tree_add_uint_format(s_tree, hf_ipmi_se_evt_type, tvb, 3, 1, evtype, @@ -1815,7 +1815,7 @@ parse_platform_event(tvbuff_t *tvb, proto_tree *tree) b3 = (offs >> 4) & 0x3; off_vals = eti->offsets ? eti->offsets : si->offsets ? si->offsets : et_empty; - ti = proto_tree_add_item(tree, hf_ipmi_se_evt_data1, tvb, 4, 1, TRUE); + ti = proto_tree_add_item(tree, hf_ipmi_se_evt_data1, tvb, 4, 1, ENC_LITTLE_ENDIAN); s_tree = proto_item_add_subtree(ti, ett_ipmi_se_evt_evd_byte1); proto_tree_add_uint_format(s_tree, hf_ipmi_se_evt_data1_b2, tvb, 4, 1, b2 << 6, "%sByte 2: %s (0x%02x)", @@ -1854,11 +1854,11 @@ parse_platform_event(tvbuff_t *tvb, proto_tree *tree) if ((eti->intrp2 && eti->intrp2(tree, next_tvb, si, b2, offs, d)) || (si->intrp2 && si->intrp2(tree, next_tvb, si, b2, offs, d))) { /* One of them succeeded. */ - ti = proto_tree_add_item(tree, hf_ipmi_se_evt_data2, next_tvb, 0, 1, TRUE); + ti = proto_tree_add_item(tree, hf_ipmi_se_evt_data2, next_tvb, 0, 1, ENC_LITTLE_ENDIAN); PROTO_ITEM_SET_HIDDEN(ti); } else { /* Just add as hex */ - proto_tree_add_item(tree, hf_ipmi_se_evt_data2, next_tvb, 0, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_se_evt_data2, next_tvb, 0, 1, ENC_LITTLE_ENDIAN); } /* Now the same for byte 3 */ @@ -1871,11 +1871,11 @@ parse_platform_event(tvbuff_t *tvb, proto_tree *tree) if ((eti->intrp3 && eti->intrp3(tree, next_tvb, si, b3, offs, d)) || (si->intrp3 && si->intrp3(tree, next_tvb, si, b3, offs, d))) { /* One of them succeeded. */ - ti = proto_tree_add_item(tree, hf_ipmi_se_evt_data3, next_tvb, 0, 1, TRUE); + ti = proto_tree_add_item(tree, hf_ipmi_se_evt_data3, next_tvb, 0, 1, ENC_LITTLE_ENDIAN); PROTO_ITEM_SET_HIDDEN(ti); } else { /* Just add as hex */ - proto_tree_add_item(tree, hf_ipmi_se_evt_data3, next_tvb, 0, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_se_evt_data3, next_tvb, 0, 1, ENC_LITTLE_ENDIAN); } } @@ -1916,7 +1916,7 @@ static const value_string cp15_op_vals[] = { static void cfgparam_00(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_se_cp00_sip, tvb, 0, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_se_cp00_sip, tvb, 0, 1, ENC_LITTLE_ENDIAN); } static void @@ -1943,19 +1943,19 @@ cfgparam_02(tvbuff_t *tvb, proto_tree *tree) static void cfgparam_03(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_se_cp03_startup, tvb, 0, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_se_cp03_startup, tvb, 0, 1, ENC_LITTLE_ENDIAN); } static void cfgparam_04(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_se_cp04_alert_startup, tvb, 0, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_se_cp04_alert_startup, tvb, 0, 1, ENC_LITTLE_ENDIAN); } static void cfgparam_05(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_se_cp05_num_evfilters, tvb, 0, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_se_cp05_num_evfilters, tvb, 0, 1, ENC_LITTLE_ENDIAN); } static void @@ -1979,7 +1979,7 @@ cfgparam_07(tvbuff_t *tvb, proto_tree *tree) static void cfgparam_08(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_se_cp08_policies, tvb, 0, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_se_cp08_policies, tvb, 0, 1, ENC_LITTLE_ENDIAN); } static void @@ -2003,7 +2003,7 @@ cfgparam_10(tvbuff_t *tvb, proto_tree *tree) static void cfgparam_11(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_se_cp11_num_alertstr, tvb, 0, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_se_cp11_num_alertstr, tvb, 0, 1, ENC_LITTLE_ENDIAN); } static void @@ -2015,11 +2015,11 @@ cfgparam_12(tvbuff_t *tvb, proto_tree *tree) proto_tree *s_tree; guint8 tmp; - ti = proto_tree_add_item(tree, hf_ipmi_se_cp12_byte1, tvb, 0, 1, TRUE); + ti = proto_tree_add_item(tree, hf_ipmi_se_cp12_byte1, tvb, 0, 1, ENC_LITTLE_ENDIAN); s_tree = proto_item_add_subtree(ti, ett_ipmi_se_cp12_byte1); tmp = tvb_get_guint8(tvb, 0) & 0x7f; if (tmp) { - proto_tree_add_item(s_tree, hf_ipmi_se_cp12_alert_stringsel, tvb, 0, 1, TRUE); + proto_tree_add_item(s_tree, hf_ipmi_se_cp12_alert_stringsel, tvb, 0, 1, ENC_LITTLE_ENDIAN); } else { proto_tree_add_uint_format(s_tree, hf_ipmi_se_cp12_alert_stringsel, tvb, 0, 1, tmp, "%sSelects volatile string parameters", ipmi_dcd8(tmp, 0x7f)); @@ -2035,14 +2035,14 @@ cfgparam_13(tvbuff_t *tvb, proto_tree *tree) static const int *byte1[] = { &hf_ipmi_se_cp13_stringsel, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_se_cp13_byte1, byte1, TRUE, 0); - proto_tree_add_item(tree, hf_ipmi_se_cp13_blocksel, tvb, 1, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_se_cp13_blocksel, tvb, 1, 1, ENC_LITTLE_ENDIAN); proto_tree_add_item(tree, hf_ipmi_se_cp13_string, tvb, 2, tvb_length(tvb) - 2, TRUE); } static void cfgparam_14(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_se_cp14_num_gct, tvb, 0, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_se_cp14_num_gct, tvb, 0, 1, ENC_LITTLE_ENDIAN); } static void @@ -2178,7 +2178,7 @@ rq00(tvbuff_t *tvb, proto_tree *tree) proto_tree_add_uint_format(tree, hf_ipmi_se_00_addr, tvb, 0, 1, addr, "Disable Message Generation (0xFF)"); } else { - proto_tree_add_item(tree, hf_ipmi_se_00_addr, tvb, 0, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_se_00_addr, tvb, 0, 1, ENC_LITTLE_ENDIAN); } proto_tree_add_bitmask_text(tree, tvb, 1, 1, NULL, NULL, ett_ipmi_se_00_byte2, byte2, TRUE, 0); @@ -2197,7 +2197,7 @@ rs01(tvbuff_t *tvb, proto_tree *tree) proto_tree_add_uint_format(tree, hf_ipmi_se_01_addr, tvb, 0, 1, addr, "Message Generation Disabled (0xFF)"); } else { - proto_tree_add_item(tree, hf_ipmi_se_01_addr, tvb, 0, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_se_01_addr, tvb, 0, 1, ENC_LITTLE_ENDIAN); } proto_tree_add_bitmask_text(tree, tvb, 1, 1, NULL, NULL, ett_ipmi_se_01_byte2, byte2, TRUE, 0); @@ -2220,10 +2220,10 @@ rs10(tvbuff_t *tvb, proto_tree *tree) &hf_ipmi_se_10_action_oem_action, &hf_ipmi_se_10_action_pwr_cycle, &hf_ipmi_se_10_action_reset, &hf_ipmi_se_10_action_pwr_down, &hf_ipmi_se_10_action_alert, NULL }; - proto_tree_add_item(tree, hf_ipmi_se_10_pef_version, tvb, 0, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_se_10_pef_version, tvb, 0, 1, ENC_LITTLE_ENDIAN); proto_tree_add_bitmask_text(tree, tvb, 1, 1, "Action support: ", "None", ett_ipmi_se_10_action, byte2, TRUE, 0); - proto_tree_add_item(tree, hf_ipmi_se_10_entries, tvb, 2, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_se_10_entries, tvb, 2, 1, ENC_LITTLE_ENDIAN); } /* Arm PEF Postpone Timer. @@ -2326,8 +2326,8 @@ rq13(tvbuff_t *tvb, proto_tree *tree) pno, "%sParameter selector: %s (0x%02x)", ipmi_dcd8(pno, 0x7f), desc, pno); - proto_tree_add_item(tree, hf_ipmi_se_13_set, tvb, 1, 1, TRUE); - proto_tree_add_item(tree, hf_ipmi_se_13_block, tvb, 2, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_se_13_set, tvb, 1, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_se_13_block, tvb, 2, 1, ENC_LITTLE_ENDIAN); } static void @@ -2393,7 +2393,7 @@ rq14(tvbuff_t *tvb, proto_tree *tree) static const gint *byte1[] = { &hf_ipmi_se_14_processed_by, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_se_14_byte1, byte1, TRUE, 0); - proto_tree_add_item(tree, hf_ipmi_se_14_rid, tvb, 1, 2, TRUE); + proto_tree_add_item(tree, hf_ipmi_se_14_rid, tvb, 1, 2, ENC_LITTLE_ENDIAN); } static const value_string cc14[] = { @@ -2411,15 +2411,15 @@ rs15(tvbuff_t *tvb, proto_tree *tree) ipmi_add_timestamp(tree, hf_ipmi_se_15_tstamp, tvb, 0); tmp = tvb_get_letohs(tvb, 4); if (tmp != 0xffff) { - proto_tree_add_item(tree, hf_ipmi_se_15_lastrec, tvb, 4, 2, TRUE); + proto_tree_add_item(tree, hf_ipmi_se_15_lastrec, tvb, 4, 2, ENC_LITTLE_ENDIAN); } else { proto_tree_add_uint_format_value(tree, hf_ipmi_se_15_lastrec, tvb, 4, 2, tmp, "SEL is empty (0x%04x)", tmp); } - proto_tree_add_item(tree, hf_ipmi_se_15_proc_sw, tvb, 6, 2, TRUE); + proto_tree_add_item(tree, hf_ipmi_se_15_proc_sw, tvb, 6, 2, ENC_LITTLE_ENDIAN); tmp = tvb_get_letohs(tvb, 8); if (tmp != 0x0000) { - proto_tree_add_item(tree, hf_ipmi_se_15_proc_bmc, tvb, 8, 2, TRUE); + proto_tree_add_item(tree, hf_ipmi_se_15_proc_bmc, tvb, 8, 2, ENC_LITTLE_ENDIAN); } else { proto_tree_add_uint_format_value(tree, hf_ipmi_se_15_proc_bmc, tvb, 8, 2, tmp, "Event processed but cannot be logged (0x%04x)", tmp); @@ -2451,7 +2451,7 @@ rq16(tvbuff_t *tvb, proto_tree *tree) proto_tree_add_bitmask_text(tree, tvb, 1, 1, NULL, NULL, ett_ipmi_se_16_byte2, byte2, TRUE, 0); proto_tree_add_bitmask_text(tree, tvb, 2, 1, NULL, NULL, ett_ipmi_se_16_byte3, byte3, TRUE, 0); if (tvb_length(tvb) > 3) { - proto_tree_add_item(tree, hf_ipmi_se_16_gen, tvb, 3, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_se_16_gen, tvb, 3, 1, ENC_LITTLE_ENDIAN); sub = tvb_new_subset(tvb, 4, tvb_length(tvb) - 4, tvb_length(tvb) - 4); parse_platform_event(sub, tree); } @@ -2464,7 +2464,7 @@ rs16(tvbuff_t *tvb, proto_tree *tree) if (ipmi_getsaveddata(0, &val) && val == 0x01) { /* Operation == Get Alert Immediate Status */ - proto_tree_add_item(tree, hf_ipmi_se_16_status, tvb, 0, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_se_16_status, tvb, 0, 1, ENC_LITTLE_ENDIAN); } } @@ -2480,14 +2480,14 @@ static const value_string cc16[] = { static void rq17(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_se_17_seq, tvb, 0, 2, TRUE); + proto_tree_add_item(tree, hf_ipmi_se_17_seq, tvb, 0, 2, ENC_LITTLE_ENDIAN); ipmi_add_timestamp(tree, hf_ipmi_se_17_tstamp, tvb, 2); - proto_tree_add_item(tree, hf_ipmi_se_17_evsrc, tvb, 6, 1, TRUE); - proto_tree_add_item(tree, hf_ipmi_se_17_sensor_dev, tvb, 7, 1, TRUE); - proto_tree_add_item(tree, hf_ipmi_se_17_sensor_num, tvb, 8, 1, TRUE); - proto_tree_add_item(tree, hf_ipmi_se_17_evdata1, tvb, 9, 1, TRUE); - proto_tree_add_item(tree, hf_ipmi_se_17_evdata2, tvb, 10, 1, TRUE); - proto_tree_add_item(tree, hf_ipmi_se_17_evdata3, tvb, 11, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_se_17_evsrc, tvb, 6, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_se_17_sensor_dev, tvb, 7, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_se_17_sensor_num, tvb, 8, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_se_17_evdata1, tvb, 9, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_se_17_evdata2, tvb, 10, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_se_17_evdata3, tvb, 11, 1, ENC_LITTLE_ENDIAN); } /* Get Device SDR Info. @@ -2512,15 +2512,15 @@ rs20(tvbuff_t *tvb, proto_tree *tree) guint32 val; if (ipmi_getsaveddata(0, &val) && val) { - proto_tree_add_item(tree, hf_ipmi_se_20_rs_sdr, tvb, 0, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_se_20_rs_sdr, tvb, 0, 1, ENC_LITTLE_ENDIAN); } else { - proto_tree_add_item(tree, hf_ipmi_se_20_rs_num, tvb, 0, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_se_20_rs_num, tvb, 0, 1, ENC_LITTLE_ENDIAN); } proto_tree_add_bitmask_text(tree, tvb, 1, 1, NULL, NULL, ett_ipmi_se_20_rs_byte2, byte2, TRUE, 0); if (tvb_get_guint8(tvb, 1) & 0x80) { /* Dynamic sensor population */ - proto_tree_add_item(tree, hf_ipmi_se_20_rs_change, tvb, 2, 4, TRUE); + proto_tree_add_item(tree, hf_ipmi_se_20_rs_change, tvb, 2, 4, ENC_LITTLE_ENDIAN); } } @@ -2534,9 +2534,9 @@ rq21(tvbuff_t *tvb, proto_tree *tree) len = tvb_get_guint8(tvb, 5); - proto_tree_add_item(tree, hf_ipmi_se_21_rid, tvb, 0, 2, TRUE); - proto_tree_add_item(tree, hf_ipmi_se_21_record, tvb, 2, 2, TRUE); - proto_tree_add_item(tree, hf_ipmi_se_21_offset, tvb, 4, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_se_21_rid, tvb, 0, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_se_21_record, tvb, 2, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_se_21_offset, tvb, 4, 1, ENC_LITTLE_ENDIAN); proto_tree_add_uint_format_value(tree, hf_ipmi_se_21_len, tvb, 5, 1, len, "%u%s", len, len == 0xff ? "(entire record)" : ""); } @@ -2544,7 +2544,7 @@ rq21(tvbuff_t *tvb, proto_tree *tree) static void rs21(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_se_21_next, tvb, 0, 2, TRUE); + proto_tree_add_item(tree, hf_ipmi_se_21_next, tvb, 0, 2, ENC_LITTLE_ENDIAN); proto_tree_add_item(tree, hf_ipmi_se_21_recdata, tvb, 2, tvb_length(tvb) - 2, ENC_NA); } @@ -2558,7 +2558,7 @@ static const value_string cc21[] = { static void rs22(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_se_22_resid, tvb, 0, 2, TRUE); + proto_tree_add_item(tree, hf_ipmi_se_22_resid, tvb, 0, 2, ENC_LITTLE_ENDIAN); } /* Get Sensor Reading Factors. @@ -2566,8 +2566,8 @@ rs22(tvbuff_t *tvb, proto_tree *tree) static void rq23(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_se_23_rq_sensor, tvb, 0, 1, TRUE); - proto_tree_add_item(tree, hf_ipmi_se_23_rq_reading, tvb, 1, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_se_23_rq_sensor, tvb, 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_se_23_rq_reading, tvb, 1, 1, ENC_LITTLE_ENDIAN); } static inline gint16 @@ -2588,7 +2588,7 @@ rs23(tvbuff_t *tvb, proto_tree *tree) guint16 tol, acc, accexp, tmp; gint16 m, b, bexp, rexp; - proto_tree_add_item(tree, hf_ipmi_se_23_rs_next_reading, tvb, 0, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_se_23_rs_next_reading, tvb, 0, 1, ENC_LITTLE_ENDIAN); m = tvb_get_guint8(tvb, 1); tmp = tvb_get_guint8(tvb, 2); @@ -2654,10 +2654,10 @@ rs23(tvbuff_t *tvb, proto_tree *tree) static void rq24(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_se_24_sensor, tvb, 0, 1, TRUE); - proto_tree_add_item(tree, hf_ipmi_se_24_mask, tvb, 1, 1, TRUE); - proto_tree_add_item(tree, hf_ipmi_se_24_hyst_pos, tvb, 2, 1, TRUE); - proto_tree_add_item(tree, hf_ipmi_se_24_hyst_neg, tvb, 3, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_se_24_sensor, tvb, 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_se_24_mask, tvb, 1, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_se_24_hyst_pos, tvb, 2, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_se_24_hyst_neg, tvb, 3, 1, ENC_LITTLE_ENDIAN); } /* Get Sensor Hysteresis. @@ -2665,15 +2665,15 @@ rq24(tvbuff_t *tvb, proto_tree *tree) static void rq25(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_se_25_sensor, tvb, 0, 1, TRUE); - proto_tree_add_item(tree, hf_ipmi_se_25_mask, tvb, 1, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_se_25_sensor, tvb, 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_se_25_mask, tvb, 1, 1, ENC_LITTLE_ENDIAN); } static void rs25(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_se_25_hyst_pos, tvb, 0, 1, TRUE); - proto_tree_add_item(tree, hf_ipmi_se_25_hyst_neg, tvb, 1, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_se_25_hyst_pos, tvb, 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_se_25_hyst_neg, tvb, 1, 1, ENC_LITTLE_ENDIAN); } /* Common for Get/Set Thresholds */ @@ -2685,12 +2685,12 @@ add_thresholds(tvbuff_t *tvb, int offs, proto_tree *tree, const char *desc) proto_tree_add_bitmask_text(tree, tvb, offs, 1, desc, "None", ett_ipmi_se_XX_mask, threshold_mask, TRUE, 0); - proto_tree_add_item(tree, hf_ipmi_se_XX_thr_lnc, tvb, offs + 1, 1, TRUE); - proto_tree_add_item(tree, hf_ipmi_se_XX_thr_lc, tvb, offs + 2, 1, TRUE); - proto_tree_add_item(tree, hf_ipmi_se_XX_thr_lnr, tvb, offs + 3, 1, TRUE); - proto_tree_add_item(tree, hf_ipmi_se_XX_thr_unc, tvb, offs + 4, 1, TRUE); - proto_tree_add_item(tree, hf_ipmi_se_XX_thr_uc, tvb, offs + 5, 1, TRUE); - proto_tree_add_item(tree, hf_ipmi_se_XX_thr_unr, tvb, offs + 6, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_se_XX_thr_lnc, tvb, offs + 1, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_se_XX_thr_lc, tvb, offs + 2, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_se_XX_thr_lnr, tvb, offs + 3, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_se_XX_thr_unc, tvb, offs + 4, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_se_XX_thr_uc, tvb, offs + 5, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_se_XX_thr_unr, tvb, offs + 6, 1, ENC_LITTLE_ENDIAN); } /* Set Sensor Thresholds. @@ -2698,7 +2698,7 @@ add_thresholds(tvbuff_t *tvb, int offs, proto_tree *tree, const char *desc) static void rq26(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_se_26_sensor, tvb, 0, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_se_26_sensor, tvb, 0, 1, ENC_LITTLE_ENDIAN); add_thresholds(tvb, 1, tree, "Set thresholds: "); } @@ -2707,7 +2707,7 @@ rq26(tvbuff_t *tvb, proto_tree *tree) static void rq27(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_se_27_sensor, tvb, 0, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_se_27_sensor, tvb, 0, 1, ENC_LITTLE_ENDIAN); } static void @@ -2762,7 +2762,7 @@ rq28(tvbuff_t *tvb, proto_tree *tree) static const int *byte2[] = { &hf_ipmi_se_28_fl_evm, &hf_ipmi_se_28_fl_scan, &hf_ipmi_se_28_fl_action, NULL }; static const struct true_false_string tfs_lect = { "Select", "Do not select" }; - proto_tree_add_item(tree, hf_ipmi_se_28_sensor, tvb, 0, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_se_28_sensor, tvb, 0, 1, ENC_LITTLE_ENDIAN); proto_tree_add_bitmask_text(tree, tvb, 1, 1, NULL, NULL, ett_ipmi_se_28_byte2, byte2, TRUE, 0); add_events(tvb, 2, tree, &tfs_lect, "Selected events"); } @@ -2772,7 +2772,7 @@ rq28(tvbuff_t *tvb, proto_tree *tree) static void rq29(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_se_29_sensor, tvb, 0, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_se_29_sensor, tvb, 0, 1, ENC_LITTLE_ENDIAN); } static void @@ -2792,7 +2792,7 @@ rq2a(tvbuff_t *tvb, proto_tree *tree) static const int *byte2[] = { &hf_ipmi_se_2a_fl_sel, NULL }; static const struct true_false_string rearm_tfs = { "Re-arm", "Do not re-arm" }; - proto_tree_add_item(tree, hf_ipmi_se_2a_sensor, tvb, 0, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_se_2a_sensor, tvb, 0, 1, ENC_LITTLE_ENDIAN); proto_tree_add_bitmask_text(tree, tvb, 1, 1, NULL, NULL, ett_ipmi_se_2a_byte2, byte2, TRUE, 0); add_events(tvb, 2, tree, &rearm_tfs, "Re-arm Events"); } @@ -2802,7 +2802,7 @@ rq2a(tvbuff_t *tvb, proto_tree *tree) static void rq2b(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_se_2b_sensor, tvb, 0, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_se_2b_sensor, tvb, 0, 1, ENC_LITTLE_ENDIAN); } static void @@ -2820,7 +2820,7 @@ rs2b(tvbuff_t *tvb, proto_tree *tree) static void rq2d(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_se_2d_sensor, tvb, 0, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_se_2d_sensor, tvb, 0, 1, ENC_LITTLE_ENDIAN); } static void @@ -2839,7 +2839,7 @@ rs2d(tvbuff_t *tvb, proto_tree *tree) proto_tree *s_tree; int i, j, len; - proto_tree_add_item(tree, hf_ipmi_se_2d_reading, tvb, 0, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_se_2d_reading, tvb, 0, 1, ENC_LITTLE_ENDIAN); proto_tree_add_bitmask_text(tree, tvb, 1, 1, NULL, NULL, ett_ipmi_se_2d_byte2, byte2, TRUE, 0); len = tvb_length(tvb); for (i = 0; i < 2 && i < len - 2; i++) { @@ -2869,7 +2869,7 @@ rq2e(tvbuff_t *tvb, proto_tree *tree) evtype = tvb_get_guint8(tvb, 2) & 0x7f; eti = get_evtype_info(evtype); - proto_tree_add_item(tree, hf_ipmi_se_2e_sensor, tvb, 0, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_se_2e_sensor, tvb, 0, 1, ENC_LITTLE_ENDIAN); proto_tree_add_uint_format_value(tree, hf_ipmi_se_2e_stype, tvb, 1, 1, stype, "%s (0x%02x)", si->desc, stype); @@ -2884,7 +2884,7 @@ rq2e(tvbuff_t *tvb, proto_tree *tree) static void rq2f(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_se_2f_sensor, tvb, 0, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_se_2f_sensor, tvb, 0, 1, ENC_LITTLE_ENDIAN); } static void diff --git a/epan/dissectors/packet-ipmi-session.c b/epan/dissectors/packet-ipmi-session.c index d38614f601..8ad23c7d43 100644 --- a/epan/dissectors/packet-ipmi-session.c +++ b/epan/dissectors/packet-ipmi-session.c @@ -183,7 +183,7 @@ dissect_ipmi_session(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) authtype == IPMI_AUTH_RMCPP ? "2.0+" : "1.5", session_id); sess_tree = proto_item_add_subtree(ti, ett_ipmi_session); - proto_tree_add_item(sess_tree, hf_ipmi_session_authtype, tvb, offset, 1, TRUE); + proto_tree_add_item(sess_tree, hf_ipmi_session_authtype, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; if (authtype == IPMI_AUTH_RMCPP) { @@ -197,7 +197,7 @@ dissect_ipmi_session(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) s_tree = proto_item_add_subtree(ti, ett_ipmi_session_payloadtype); proto_tree_add_item(s_tree, hf_ipmi_session_payloadtype_enc, tvb, offset, 1, TRUE); proto_tree_add_item(s_tree, hf_ipmi_session_payloadtype_auth, tvb, offset, 1, TRUE); - proto_tree_add_item(s_tree, hf_ipmi_session_payloadtype, tvb, offset, 1, TRUE); + proto_tree_add_item(s_tree, hf_ipmi_session_payloadtype, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; if (payloadtype == IPMI_OEM_EXPLICIT) { @@ -206,24 +206,24 @@ dissect_ipmi_session(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(sess_tree, hf_ipmi_session_oem_payload_id, tvb, offset, 2, ENC_NA); offset += 2; } - proto_tree_add_item(sess_tree, hf_ipmi_session_id, tvb, offset, 4, TRUE); + proto_tree_add_item(sess_tree, hf_ipmi_session_id, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; - proto_tree_add_item(sess_tree, hf_ipmi_session_sequence, tvb, offset, 4, TRUE); + proto_tree_add_item(sess_tree, hf_ipmi_session_sequence, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; - proto_tree_add_item(sess_tree, hf_ipmi_session_msg_len_2b, tvb, offset, 2, TRUE); + proto_tree_add_item(sess_tree, hf_ipmi_session_msg_len_2b, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; } else { /* IPMI v1.5 */ - proto_tree_add_item(sess_tree, hf_ipmi_session_sequence, tvb, offset, 4, TRUE); + proto_tree_add_item(sess_tree, hf_ipmi_session_sequence, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; - proto_tree_add_item(sess_tree, hf_ipmi_session_id, tvb, offset, 4, TRUE); + proto_tree_add_item(sess_tree, hf_ipmi_session_id, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; if (authtype != IPMI_AUTH_NONE) { proto_tree_add_item(sess_tree, hf_ipmi_session_authcode, tvb, offset, 16, ENC_NA); offset += 16; } - proto_tree_add_item(sess_tree, hf_ipmi_session_msg_len_1b, tvb, offset, 1, TRUE); + proto_tree_add_item(sess_tree, hf_ipmi_session_msg_len_1b, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; } } diff --git a/epan/dissectors/packet-ipmi-storage.c b/epan/dissectors/packet-ipmi-storage.c index 4a35439e87..8cc5c842d2 100644 --- a/epan/dissectors/packet-ipmi-storage.c +++ b/epan/dissectors/packet-ipmi-storage.c @@ -246,7 +246,7 @@ static const value_string log_type_vals[] = { static void rq10(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_stor_10_fruid, tvb, 0, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_stor_10_fruid, tvb, 0, 1, ENC_LITTLE_ENDIAN); } static void @@ -254,7 +254,7 @@ rs10(tvbuff_t *tvb, proto_tree *tree) { static const int *flags[] = { &hf_ipmi_stor_10_access, NULL }; - proto_tree_add_item(tree, hf_ipmi_stor_10_size, tvb, 0, 2, TRUE); + proto_tree_add_item(tree, hf_ipmi_stor_10_size, tvb, 0, 2, ENC_LITTLE_ENDIAN); proto_tree_add_bitmask_text(tree, tvb, 2, 1, NULL, NULL, ett_ipmi_stor_10_flags, flags, TRUE, 0); } @@ -263,15 +263,15 @@ rs10(tvbuff_t *tvb, proto_tree *tree) static void rq11(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_stor_11_fruid, tvb, 0, 1, TRUE); - proto_tree_add_item(tree, hf_ipmi_stor_11_offset, tvb, 1, 2, TRUE); - proto_tree_add_item(tree, hf_ipmi_stor_11_count, tvb, 3, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_stor_11_fruid, tvb, 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_stor_11_offset, tvb, 1, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_stor_11_count, tvb, 3, 1, ENC_LITTLE_ENDIAN); } static void rs11(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_stor_11_ret_count, tvb, 0, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_stor_11_ret_count, tvb, 0, 1, ENC_LITTLE_ENDIAN); proto_tree_add_item(tree, hf_ipmi_stor_11_data, tvb, 1, tvb_length(tvb) - 1, ENC_NA); } @@ -285,15 +285,15 @@ static const value_string cc11[] = { static void rq12(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_stor_12_fruid, tvb, 0, 1, TRUE); - proto_tree_add_item(tree, hf_ipmi_stor_12_offset, tvb, 1, 2, TRUE); + proto_tree_add_item(tree, hf_ipmi_stor_12_fruid, tvb, 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_stor_12_offset, tvb, 1, 2, ENC_LITTLE_ENDIAN); proto_tree_add_item(tree, hf_ipmi_stor_12_data, tvb, 1, tvb_length(tvb) - 1, ENC_NA); } static void rs12(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_stor_12_ret_count, tvb, 0, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_stor_12_ret_count, tvb, 0, 1, ENC_LITTLE_ENDIAN); } static const value_string cc12[] = { @@ -311,9 +311,9 @@ rs20(tvbuff_t *tvb, proto_tree *tree) &hf_ipmi_stor_20_op_delete, &hf_ipmi_stor_20_op_partial_add, &hf_ipmi_stor_20_op_reserve, &hf_ipmi_stor_20_op_allocinfo, NULL }; - proto_tree_add_item(tree, hf_ipmi_stor_20_sdr_version, tvb, 0, 1, TRUE); - proto_tree_add_item(tree, hf_ipmi_stor_20_rec_count, tvb, 1, 2, TRUE); - proto_tree_add_item(tree, hf_ipmi_stor_20_free_space, tvb, 3, 2, TRUE); + proto_tree_add_item(tree, hf_ipmi_stor_20_sdr_version, tvb, 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_stor_20_rec_count, tvb, 1, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_stor_20_free_space, tvb, 3, 2, ENC_LITTLE_ENDIAN); ipmi_add_timestamp(tree, hf_ipmi_stor_20_ts_add, tvb, 5); ipmi_add_timestamp(tree, hf_ipmi_stor_20_ts_erase, tvb, 9); proto_tree_add_bitmask_text(tree, tvb, 13, 1, "Operation Support: ", NULL, @@ -325,11 +325,11 @@ rs20(tvbuff_t *tvb, proto_tree *tree) static void rs21(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_stor_21_units, tvb, 0, 2, TRUE); - proto_tree_add_item(tree, hf_ipmi_stor_21_size, tvb, 2, 2, TRUE); - proto_tree_add_item(tree, hf_ipmi_stor_21_free, tvb, 4, 2, TRUE); - proto_tree_add_item(tree, hf_ipmi_stor_21_largest, tvb, 6, 2, TRUE); - proto_tree_add_item(tree, hf_ipmi_stor_21_maxrec, tvb, 8, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_stor_21_units, tvb, 0, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_stor_21_size, tvb, 2, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_stor_21_free, tvb, 4, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_stor_21_largest, tvb, 6, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_stor_21_maxrec, tvb, 8, 1, ENC_LITTLE_ENDIAN); } /* Reserve SDR Repository @@ -337,7 +337,7 @@ rs21(tvbuff_t *tvb, proto_tree *tree) static void rs22(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_stor_22_rsrv_id, tvb, 0, 2, TRUE); + proto_tree_add_item(tree, hf_ipmi_stor_22_rsrv_id, tvb, 0, 2, ENC_LITTLE_ENDIAN); } /* Get SDR @@ -347,9 +347,9 @@ rq23(tvbuff_t *tvb, proto_tree *tree) { guint8 v = tvb_get_guint8(tvb, 5); - proto_tree_add_item(tree, hf_ipmi_stor_23_rsrv_id, tvb, 0, 2, TRUE); - proto_tree_add_item(tree, hf_ipmi_stor_23_rec_id, tvb, 2, 2, TRUE); - proto_tree_add_item(tree, hf_ipmi_stor_23_offset, tvb, 4, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_stor_23_rsrv_id, tvb, 0, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_stor_23_rec_id, tvb, 2, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_stor_23_offset, tvb, 4, 1, ENC_LITTLE_ENDIAN); proto_tree_add_uint_format_value(tree, hf_ipmi_stor_23_count, tvb, 5, 1, v, "%d%s", v, v == 0xff ? " (entire record)" : ""); } @@ -357,7 +357,7 @@ rq23(tvbuff_t *tvb, proto_tree *tree) static void rs23(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_stor_23_next, tvb, 0, 2, TRUE); + proto_tree_add_item(tree, hf_ipmi_stor_23_next, tvb, 0, 2, ENC_LITTLE_ENDIAN); proto_tree_add_item(tree, hf_ipmi_stor_23_data, tvb, 2, tvb_length(tvb) - 2, ENC_NA); } @@ -372,7 +372,7 @@ rq24(tvbuff_t *tvb, proto_tree *tree) static void rs24(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_stor_24_added_rec_id, tvb, 0, 2, TRUE); + proto_tree_add_item(tree, hf_ipmi_stor_24_added_rec_id, tvb, 0, 2, ENC_LITTLE_ENDIAN); } /* Partial Add SDR @@ -382,9 +382,9 @@ rq25(tvbuff_t *tvb, proto_tree *tree) { static const int *byte6[] = { &hf_ipmi_stor_25_inprogress, NULL }; - proto_tree_add_item(tree, hf_ipmi_stor_25_rsrv_id, tvb, 0, 2, TRUE); - proto_tree_add_item(tree, hf_ipmi_stor_25_rec_id, tvb, 2, 2, TRUE); - proto_tree_add_item(tree, hf_ipmi_stor_25_offset, tvb, 4, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_stor_25_rsrv_id, tvb, 0, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_stor_25_rec_id, tvb, 2, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_stor_25_offset, tvb, 4, 1, ENC_LITTLE_ENDIAN); proto_tree_add_bitmask_text(tree, tvb, 5, 1, NULL, NULL, ett_ipmi_stor_25_byte6, byte6, TRUE, 0); proto_tree_add_item(tree, hf_ipmi_stor_25_data, tvb, 6, tvb_length(tvb) - 6, ENC_NA); @@ -393,7 +393,7 @@ rq25(tvbuff_t *tvb, proto_tree *tree) static void rs25(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_stor_25_added_rec_id, tvb, 0, 2, TRUE); + proto_tree_add_item(tree, hf_ipmi_stor_25_added_rec_id, tvb, 0, 2, ENC_LITTLE_ENDIAN); } static const value_string cc25[] = { @@ -406,14 +406,14 @@ static const value_string cc25[] = { static void rq26(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_stor_25_rsrv_id, tvb, 0, 2, TRUE); - proto_tree_add_item(tree, hf_ipmi_stor_25_rec_id, tvb, 2, 2, TRUE); + proto_tree_add_item(tree, hf_ipmi_stor_25_rsrv_id, tvb, 0, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_stor_25_rec_id, tvb, 2, 2, ENC_LITTLE_ENDIAN); } static void rs26(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_stor_26_del_rec_id, tvb, 0, 2, TRUE); + proto_tree_add_item(tree, hf_ipmi_stor_26_del_rec_id, tvb, 0, 2, ENC_LITTLE_ENDIAN); } /* Clear SDR Repository @@ -421,9 +421,9 @@ rs26(tvbuff_t *tvb, proto_tree *tree) static void rq27(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_stor_27_rsrv_id, tvb, 0, 2, TRUE); + proto_tree_add_item(tree, hf_ipmi_stor_27_rsrv_id, tvb, 0, 2, ENC_LITTLE_ENDIAN); proto_tree_add_item(tree, hf_ipmi_stor_27_clr, tvb, 2, 3, TRUE); - proto_tree_add_item(tree, hf_ipmi_stor_27_action, tvb, 5, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_stor_27_action, tvb, 5, 1, ENC_LITTLE_ENDIAN); } static void @@ -479,9 +479,9 @@ rs40(tvbuff_t *tvb, proto_tree *tree) static const int *ops[] = { &hf_ipmi_stor_40_op_overflow, &hf_ipmi_stor_40_op_delete, &hf_ipmi_stor_40_op_partial_add, &hf_ipmi_stor_40_op_reserve, &hf_ipmi_stor_40_op_allocinfo, NULL }; - proto_tree_add_item(tree, hf_ipmi_stor_40_sel_version, tvb, 0, 1, TRUE); - proto_tree_add_item(tree, hf_ipmi_stor_40_entries, tvb, 1, 2, TRUE); - proto_tree_add_item(tree, hf_ipmi_stor_40_free_space, tvb, 3, 2, TRUE); + proto_tree_add_item(tree, hf_ipmi_stor_40_sel_version, tvb, 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_stor_40_entries, tvb, 1, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_stor_40_free_space, tvb, 3, 2, ENC_LITTLE_ENDIAN); ipmi_add_timestamp(tree, hf_ipmi_stor_40_ts_add, tvb, 5); ipmi_add_timestamp(tree, hf_ipmi_stor_40_ts_erase, tvb, 9); proto_tree_add_bitmask_text(tree, tvb, 13, 1, "Operation Support: ", NULL, @@ -498,11 +498,11 @@ static const value_string cc40[] = { static void rs41(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_stor_41_units, tvb, 0, 2, TRUE); - proto_tree_add_item(tree, hf_ipmi_stor_41_size, tvb, 2, 2, TRUE); - proto_tree_add_item(tree, hf_ipmi_stor_41_free, tvb, 4, 2, TRUE); - proto_tree_add_item(tree, hf_ipmi_stor_41_largest, tvb, 6, 2, TRUE); - proto_tree_add_item(tree, hf_ipmi_stor_41_maxrec, tvb, 8, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_stor_41_units, tvb, 0, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_stor_41_size, tvb, 2, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_stor_41_free, tvb, 4, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_stor_41_largest, tvb, 6, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_stor_41_maxrec, tvb, 8, 1, ENC_LITTLE_ENDIAN); } /* Reserve SEL @@ -510,7 +510,7 @@ rs41(tvbuff_t *tvb, proto_tree *tree) static void rs42(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_stor_42_rsrv_id, tvb, 0, 2, TRUE); + proto_tree_add_item(tree, hf_ipmi_stor_42_rsrv_id, tvb, 0, 2, ENC_LITTLE_ENDIAN); } static const value_string cc42[] = { @@ -525,9 +525,9 @@ rq43(tvbuff_t *tvb, proto_tree *tree) { guint8 v = tvb_get_guint8(tvb, 5); - proto_tree_add_item(tree, hf_ipmi_stor_43_rsrv_id, tvb, 0, 2, TRUE); - proto_tree_add_item(tree, hf_ipmi_stor_43_rec_id, tvb, 2, 2, TRUE); - proto_tree_add_item(tree, hf_ipmi_stor_43_offset, tvb, 4, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_stor_43_rsrv_id, tvb, 0, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_stor_43_rec_id, tvb, 2, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_stor_43_offset, tvb, 4, 1, ENC_LITTLE_ENDIAN); proto_tree_add_uint_format_value(tree, hf_ipmi_stor_43_count, tvb, 5, 1, v, "%d%s", v, v == 0xff ? " (entire record)" : ""); } @@ -535,7 +535,7 @@ rq43(tvbuff_t *tvb, proto_tree *tree) static void rs43(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_stor_43_next, tvb, 0, 2, TRUE); + proto_tree_add_item(tree, hf_ipmi_stor_43_next, tvb, 0, 2, ENC_LITTLE_ENDIAN); proto_tree_add_item(tree, hf_ipmi_stor_43_data, tvb, 2, tvb_length(tvb) - 2, ENC_NA); } @@ -556,7 +556,7 @@ rq44(tvbuff_t *tvb, proto_tree *tree) static void rs44(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_stor_44_added_rec_id, tvb, 0, 2, TRUE); + proto_tree_add_item(tree, hf_ipmi_stor_44_added_rec_id, tvb, 0, 2, ENC_LITTLE_ENDIAN); } static const value_string cc44[] = { @@ -572,9 +572,9 @@ rq45(tvbuff_t *tvb, proto_tree *tree) { static const int *byte6[] = { &hf_ipmi_stor_45_inprogress, NULL }; - proto_tree_add_item(tree, hf_ipmi_stor_45_rsrv_id, tvb, 0, 2, TRUE); - proto_tree_add_item(tree, hf_ipmi_stor_45_rec_id, tvb, 2, 2, TRUE); - proto_tree_add_item(tree, hf_ipmi_stor_45_offset, tvb, 4, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_stor_45_rsrv_id, tvb, 0, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_stor_45_rec_id, tvb, 2, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_stor_45_offset, tvb, 4, 1, ENC_LITTLE_ENDIAN); proto_tree_add_bitmask_text(tree, tvb, 5, 1, NULL, NULL, ett_ipmi_stor_45_byte6, byte6, TRUE, 0); proto_tree_add_item(tree, hf_ipmi_stor_45_data, tvb, 6, tvb_length(tvb) - 6, ENC_NA); @@ -583,7 +583,7 @@ rq45(tvbuff_t *tvb, proto_tree *tree) static void rs45(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_stor_45_added_rec_id, tvb, 0, 2, TRUE); + proto_tree_add_item(tree, hf_ipmi_stor_45_added_rec_id, tvb, 0, 2, ENC_LITTLE_ENDIAN); } static const value_string cc45[] = { @@ -597,14 +597,14 @@ static const value_string cc45[] = { static void rq46(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_stor_45_rsrv_id, tvb, 0, 2, TRUE); - proto_tree_add_item(tree, hf_ipmi_stor_45_rec_id, tvb, 2, 2, TRUE); + proto_tree_add_item(tree, hf_ipmi_stor_45_rsrv_id, tvb, 0, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_stor_45_rec_id, tvb, 2, 2, ENC_LITTLE_ENDIAN); } static void rs46(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_stor_46_del_rec_id, tvb, 0, 2, TRUE); + proto_tree_add_item(tree, hf_ipmi_stor_46_del_rec_id, tvb, 0, 2, ENC_LITTLE_ENDIAN); } static const value_string cc46[] = { @@ -618,9 +618,9 @@ static const value_string cc46[] = { static void rq47(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_stor_47_rsrv_id, tvb, 0, 2, TRUE); + proto_tree_add_item(tree, hf_ipmi_stor_47_rsrv_id, tvb, 0, 2, ENC_LITTLE_ENDIAN); proto_tree_add_item(tree, hf_ipmi_stor_47_clr, tvb, 2, 3, TRUE); - proto_tree_add_item(tree, hf_ipmi_stor_47_action, tvb, 5, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_stor_47_action, tvb, 5, 1, ENC_LITTLE_ENDIAN); } static void @@ -676,9 +676,9 @@ rs5a(tvbuff_t *tvb, proto_tree *tree) ipmi_add_timestamp(tree, hf_ipmi_stor_5a_ts_add, tvb, 0); if (v == 0) { - proto_tree_add_item(tree, hf_ipmi_stor_5a_num_entries, tvb, 4, 4, TRUE); + proto_tree_add_item(tree, hf_ipmi_stor_5a_num_entries, tvb, 4, 4, ENC_LITTLE_ENDIAN); } else if (v == 1 || v == 2) { - proto_tree_add_item(tree, hf_ipmi_stor_5a_iana, tvb, 4, 3, TRUE); + proto_tree_add_item(tree, hf_ipmi_stor_5a_iana, tvb, 4, 3, ENC_LITTLE_ENDIAN); proto_tree_add_item(tree, hf_ipmi_stor_5a_bytes, tvb, 7, 7, ENC_NA); } } @@ -701,9 +701,9 @@ rq5b(tvbuff_t *tvb, proto_tree *tree) ipmi_add_timestamp(tree, hf_ipmi_stor_5b_ts_add, tvb, 1); if (v == 0) { - proto_tree_add_item(tree, hf_ipmi_stor_5b_num_entries, tvb, 5, 4, TRUE); + proto_tree_add_item(tree, hf_ipmi_stor_5b_num_entries, tvb, 5, 4, ENC_LITTLE_ENDIAN); } else if (v == 1 || v == 2) { - proto_tree_add_item(tree, hf_ipmi_stor_5b_iana, tvb, 5, 3, TRUE); + proto_tree_add_item(tree, hf_ipmi_stor_5b_iana, tvb, 5, 3, ENC_LITTLE_ENDIAN); proto_tree_add_item(tree, hf_ipmi_stor_5b_bytes, tvb, 8, 8, ENC_NA); } } diff --git a/epan/dissectors/packet-ipmi-transport.c b/epan/dissectors/packet-ipmi-transport.c index 9ef8ec0e86..4de53b9c7f 100644 --- a/epan/dissectors/packet-ipmi-transport.c +++ b/epan/dissectors/packet-ipmi-transport.c @@ -775,7 +775,7 @@ lan_07(tvbuff_t *tvb, proto_tree *tree) static const int *byte2[] = { &hf_ipmi_trn_lan07_flags, NULL }; static const int *byte3[] = { &hf_ipmi_trn_lan07_precedence, &hf_ipmi_trn_lan07_tos, NULL }; - proto_tree_add_item(tree, hf_ipmi_trn_lan07_ttl, tvb, 0, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_trn_lan07_ttl, tvb, 0, 1, ENC_LITTLE_ENDIAN); proto_tree_add_bitmask_text(tree, tvb, 1, 1, NULL, NULL, ett_ipmi_trn_lan07_byte2, byte2, TRUE, 0); proto_tree_add_bitmask_text(tree, tvb, 2, 1, NULL, NULL, ett_ipmi_trn_lan07_byte3, byte3, TRUE, 0); } @@ -783,13 +783,13 @@ lan_07(tvbuff_t *tvb, proto_tree *tree) static void lan_08(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_trn_lan08_rmcp_port, tvb, 0, 2, TRUE); + proto_tree_add_item(tree, hf_ipmi_trn_lan08_rmcp_port, tvb, 0, 2, ENC_LITTLE_ENDIAN); } static void lan_09(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_trn_lan09_rmcp_port, tvb, 0, 2, TRUE); + proto_tree_add_item(tree, hf_ipmi_trn_lan09_rmcp_port, tvb, 0, 2, ENC_LITTLE_ENDIAN); } static void @@ -803,7 +803,7 @@ lan_10(tvbuff_t *tvb, proto_tree *tree) static void lan_11(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_trn_lan11_arp_interval, tvb, 0, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_trn_lan11_arp_interval, tvb, 0, 1, ENC_LITTLE_ENDIAN); } static void @@ -853,7 +853,7 @@ lan_18(tvbuff_t *tvb, proto_tree *tree) proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_trn_lan18_byte1, byte1, TRUE, 0); proto_tree_add_bitmask_text(tree, tvb, 1, 1, NULL, NULL, ett_ipmi_trn_lan18_byte2, byte2, TRUE, 0); - proto_tree_add_item(tree, hf_ipmi_trn_lan18_tout, tvb, 2, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_trn_lan18_tout, tvb, 2, 1, ENC_LITTLE_ENDIAN); proto_tree_add_bitmask_text(tree, tvb, 1, 1, NULL, NULL, ett_ipmi_trn_lan18_byte4, byte4, TRUE, 0); } @@ -964,7 +964,7 @@ lan_25(tvbuff_t *tvb, proto_tree *tree) byte34, TRUE, 0); break; default: - proto_tree_add_item(tree, hf_ipmi_trn_lan25_address, tvb, 2, tvb_length(tvb) - 2, TRUE); + proto_tree_add_item(tree, hf_ipmi_trn_lan25_address, tvb, 2, tvb_length(tvb) - 2, ENC_LITTLE_ENDIAN); break; } } @@ -1070,8 +1070,8 @@ rq02(tvbuff_t *tvb, proto_tree *tree) ett_ipmi_trn_02_byte1, byte1, TRUE, 0); proto_tree_add_uint_format_value(tree, hf_ipmi_trn_02_param, tvb, 1, 1, pno, "%s (0x%02x)", desc, pno); - proto_tree_add_item(tree, hf_ipmi_trn_02_set, tvb, 2, 1, TRUE); - proto_tree_add_item(tree, hf_ipmi_trn_02_block, tvb, 2, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_trn_02_set, tvb, 2, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_trn_02_block, tvb, 2, 1, ENC_LITTLE_ENDIAN); } static void @@ -1166,15 +1166,15 @@ rq04(tvbuff_t *tvb, proto_tree *tree) static void rs04(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_trn_04_rx_ippkts, tvb, 0, 2, TRUE); - proto_tree_add_item(tree, hf_ipmi_trn_04_rx_iphdr_err, tvb, 2, 2, TRUE); - proto_tree_add_item(tree, hf_ipmi_trn_04_rx_ipaddr_err, tvb, 4, 2, TRUE); - proto_tree_add_item(tree, hf_ipmi_trn_04_rx_ippkts_frag, tvb, 6, 2, TRUE); - proto_tree_add_item(tree, hf_ipmi_trn_04_tx_ippkts, tvb, 8, 2, TRUE); - proto_tree_add_item(tree, hf_ipmi_trn_04_rx_udppkts, tvb, 10, 2, TRUE); - proto_tree_add_item(tree, hf_ipmi_trn_04_rx_validrmcp, tvb, 12, 2, TRUE); - proto_tree_add_item(tree, hf_ipmi_trn_04_rx_udpproxy, tvb, 14, 2, TRUE); - proto_tree_add_item(tree, hf_ipmi_trn_04_dr_udpproxy, tvb, 16, 2, TRUE); + proto_tree_add_item(tree, hf_ipmi_trn_04_rx_ippkts, tvb, 0, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_trn_04_rx_iphdr_err, tvb, 2, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_trn_04_rx_ipaddr_err, tvb, 4, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_trn_04_rx_ippkts_frag, tvb, 6, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_trn_04_tx_ippkts, tvb, 8, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_trn_04_rx_udppkts, tvb, 10, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_trn_04_rx_validrmcp, tvb, 12, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_trn_04_rx_udpproxy, tvb, 14, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_trn_04_dr_udpproxy, tvb, 16, 2, ENC_LITTLE_ENDIAN); } static void @@ -1219,9 +1219,9 @@ serial_05(tvbuff_t *tvb, proto_tree *tree) ett_ipmi_trn_serial05_byte1, byte1, TRUE, BMT_NO_TFS); proto_tree_add_bitmask_text(tree, tvb, 1, 1, "CBCP negotiation options: ", "None", ett_ipmi_trn_serial05_byte2, byte2, TRUE, BMT_NO_TFS); - proto_tree_add_item(tree, hf_ipmi_trn_serial05_cb_dest1, tvb, 2, 1, TRUE); - proto_tree_add_item(tree, hf_ipmi_trn_serial05_cb_dest2, tvb, 3, 1, TRUE); - proto_tree_add_item(tree, hf_ipmi_trn_serial05_cb_dest3, tvb, 4, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_trn_serial05_cb_dest1, tvb, 2, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_trn_serial05_cb_dest2, tvb, 3, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_trn_serial05_cb_dest3, tvb, 4, 1, ENC_LITTLE_ENDIAN); } static void @@ -1303,7 +1303,7 @@ serial_13(tvbuff_t *tvb, proto_tree *tree) static void serial_14(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_trn_serial14_page_blackout, tvb, 0, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_trn_serial14_page_blackout, tvb, 0, 1, ENC_LITTLE_ENDIAN); } static void @@ -1334,7 +1334,7 @@ serial_17(tvbuff_t *tvb, proto_tree *tree) ett_ipmi_trn_serial17_byte1, byte1, TRUE, 0); proto_tree_add_bitmask_text(tree, tvb, 1, 1, NULL, NULL, ett_ipmi_trn_serial17_byte2, byte2, TRUE, 0); - proto_tree_add_item(tree, hf_ipmi_trn_serial17_alert_ack_timeout, tvb, 2, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_trn_serial17_alert_ack_timeout, tvb, 2, 1, ENC_LITTLE_ENDIAN); proto_tree_add_bitmask_text(tree, tvb, 3, 1, NULL, NULL, ett_ipmi_trn_serial17_byte4, byte4, TRUE, 0); @@ -1353,7 +1353,7 @@ serial_17(tvbuff_t *tvb, proto_tree *tree) byte5[1] = &hf_ipmi_trn_serial17_ppp_sel; break; default: - proto_tree_add_item(tree, hf_ipmi_trn_serial17_unknown, tvb, 4, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_trn_serial17_unknown, tvb, 4, 1, ENC_LITTLE_ENDIAN); return; } proto_tree_add_bitmask_text(tree, tvb, 4, 1, NULL, NULL, @@ -1363,7 +1363,7 @@ serial_17(tvbuff_t *tvb, proto_tree *tree) static void serial_18(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_trn_serial18_call_retry, tvb, 0, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_trn_serial18_call_retry, tvb, 0, 1, ENC_LITTLE_ENDIAN); } static void @@ -1398,7 +1398,7 @@ serial_21(tvbuff_t *tvb, proto_tree *tree) proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_trn_serial21_byte1, byte1, TRUE, 0); - proto_tree_add_item(tree, hf_ipmi_trn_serial21_blockno, tvb, 1, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_trn_serial21_blockno, tvb, 1, 1, ENC_LITTLE_ENDIAN); proto_tree_add_item(tree, hf_ipmi_trn_serial21_dialstr, tvb, 2, 1, TRUE); } @@ -1435,7 +1435,7 @@ serial_25(tvbuff_t *tvb, proto_tree *tree) { static const gint *byte2[] = { &hf_ipmi_trn_serial25_dialstr_sel, &hf_ipmi_trn_serial25_tapsrv_sel, NULL }; - proto_tree_add_item(tree, hf_ipmi_trn_serial25_tap_acct, tvb, 0, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_trn_serial25_tap_acct, tvb, 0, 1, ENC_LITTLE_ENDIAN); proto_tree_add_bitmask_text(tree, tvb, 1, 1, NULL, NULL, ett_ipmi_trn_serial25_byte2, byte2, TRUE, 0); } @@ -1443,14 +1443,14 @@ serial_25(tvbuff_t *tvb, proto_tree *tree) static void serial_26(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_trn_serial26_tap_acct, tvb, 0, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_trn_serial26_tap_acct, tvb, 0, 1, ENC_LITTLE_ENDIAN); proto_tree_add_item(tree, hf_ipmi_trn_serial26_tap_passwd, tvb, 1, 6, TRUE); } static void serial_27(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_trn_serial27_tap_acct, tvb, 0, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_trn_serial27_tap_acct, tvb, 0, 1, ENC_LITTLE_ENDIAN); proto_tree_add_item(tree, hf_ipmi_trn_serial27_tap_pager_id, tvb, 1, 16, TRUE); } @@ -1470,7 +1470,7 @@ serial_28(tvbuff_t *tvb, proto_tree *tree) proto_tree_add_bitmask_text(tree, tvb, 1, 1, NULL, NULL, ett_ipmi_trn_serial28_byte2, byte2, TRUE, 0); proto_tree_add_item(tree, hf_ipmi_trn_serial28_srvtype, tvb, 2, 3, TRUE); - proto_tree_add_item(tree, hf_ipmi_trn_serial28_ctrl_esc, tvb, 5, 4, TRUE); + proto_tree_add_item(tree, hf_ipmi_trn_serial28_ctrl_esc, tvb, 5, 4, ENC_LITTLE_ENDIAN); proto_tree_add_bitmask_text(tree, tvb, 9, 1, NULL, NULL, ett_ipmi_trn_serial28_byte10, byte10, TRUE, 0); proto_tree_add_bitmask_text(tree, tvb, 10, 1, NULL, NULL, @@ -1516,13 +1516,13 @@ serial_30(tvbuff_t *tvb, proto_tree *tree) static void serial_31(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_trn_serial31_port, tvb, 0, 2, TRUE); + proto_tree_add_item(tree, hf_ipmi_trn_serial31_port, tvb, 0, 2, ENC_LITTLE_ENDIAN); } static void serial_32(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_trn_serial32_port, tvb, 0, 2, TRUE); + proto_tree_add_item(tree, hf_ipmi_trn_serial32_port, tvb, 0, 2, ENC_LITTLE_ENDIAN); } static void @@ -1543,14 +1543,14 @@ serial_34(tvbuff_t *tvb, proto_tree *tree) static void serial_35(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_trn_serial35_recv_accm, tvb, 0, 4, FALSE); - proto_tree_add_item(tree, hf_ipmi_trn_serial35_xmit_accm, tvb, 4, 4, FALSE); + proto_tree_add_item(tree, hf_ipmi_trn_serial35_recv_accm, tvb, 0, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_trn_serial35_xmit_accm, tvb, 4, 4, ENC_BIG_ENDIAN); } static void serial_36(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_trn_serial36_snoop_accm, tvb, 0, 4, FALSE); + proto_tree_add_item(tree, hf_ipmi_trn_serial36_snoop_accm, tvb, 0, 4, ENC_BIG_ENDIAN); } static void @@ -1565,14 +1565,14 @@ serial_37(tvbuff_t *tvb, proto_tree *tree) static void serial_38(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_trn_serial38_acct_sel, tvb, 0, 1, TRUE); - proto_tree_add_item(tree, hf_ipmi_trn_serial38_dialstr_sel, tvb, 1, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_trn_serial38_acct_sel, tvb, 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_trn_serial38_dialstr_sel, tvb, 1, 1, ENC_LITTLE_ENDIAN); } static void serial_39(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_trn_serial39_acct_sel, tvb, 0, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_trn_serial39_acct_sel, tvb, 0, 1, ENC_LITTLE_ENDIAN); proto_tree_add_item(tree, hf_ipmi_trn_serial39_ipaddr, tvb, 1, 4, FALSE); } @@ -1581,7 +1581,7 @@ serial_40(tvbuff_t *tvb, proto_tree *tree) { int slen; - proto_tree_add_item(tree, hf_ipmi_trn_serial40_acct_sel, tvb, 0, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_trn_serial40_acct_sel, tvb, 0, 1, ENC_LITTLE_ENDIAN); slen = tvb_length(tvb) - 1; if (slen > 16) { slen = 16; @@ -1594,7 +1594,7 @@ serial_41(tvbuff_t *tvb, proto_tree *tree) { int slen; - proto_tree_add_item(tree, hf_ipmi_trn_serial41_acct_sel, tvb, 0, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_trn_serial41_acct_sel, tvb, 0, 1, ENC_LITTLE_ENDIAN); slen = tvb_length(tvb) - 1; if (slen > 16) { slen = 16; @@ -1607,7 +1607,7 @@ serial_42(tvbuff_t *tvb, proto_tree *tree) { int slen; - proto_tree_add_item(tree, hf_ipmi_trn_serial42_acct_sel, tvb, 0, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_trn_serial42_acct_sel, tvb, 0, 1, ENC_LITTLE_ENDIAN); slen = tvb_length(tvb) - 1; if (slen > 16) { slen = 16; @@ -1620,7 +1620,7 @@ serial_43(tvbuff_t *tvb, proto_tree *tree) { static const gint *byte1[] = { &hf_ipmi_trn_serial43_auth_proto, NULL }; - proto_tree_add_item(tree, hf_ipmi_trn_serial43_acct_sel, tvb, 0, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_trn_serial43_acct_sel, tvb, 0, 1, ENC_LITTLE_ENDIAN); proto_tree_add_bitmask_text(tree, tvb, 1, 1, NULL, NULL, ett_ipmi_trn_serial43_byte1, byte1, TRUE, 0); } @@ -1628,8 +1628,8 @@ serial_43(tvbuff_t *tvb, proto_tree *tree) static void serial_44(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_trn_serial44_acct_sel, tvb, 0, 1, TRUE); - proto_tree_add_item(tree, hf_ipmi_trn_serial44_hold_time, tvb, 1, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_trn_serial44_acct_sel, tvb, 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_trn_serial44_hold_time, tvb, 1, 1, ENC_LITTLE_ENDIAN); } static void @@ -1642,13 +1642,13 @@ serial_45(tvbuff_t *tvb, proto_tree *tree) static void serial_46(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_trn_serial46_tx_bufsize, tvb, 0, 2, TRUE); + proto_tree_add_item(tree, hf_ipmi_trn_serial46_tx_bufsize, tvb, 0, 2, ENC_LITTLE_ENDIAN); } static void serial_47(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_trn_serial47_rx_bufsize, tvb, 0, 2, TRUE); + proto_tree_add_item(tree, hf_ipmi_trn_serial47_rx_bufsize, tvb, 0, 2, ENC_LITTLE_ENDIAN); } static void @@ -1662,7 +1662,7 @@ serial_49(tvbuff_t *tvb, proto_tree *tree) { int slen; - proto_tree_add_item(tree, hf_ipmi_trn_serial49_blockno, tvb, 0, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_trn_serial49_blockno, tvb, 0, 1, ENC_LITTLE_ENDIAN); slen = tvb_length(tvb) - 1; if (slen > 16) { slen = 16; @@ -1687,7 +1687,7 @@ serial_51(tvbuff_t *tvb, proto_tree *tree) static const gint *byte3[] = { &hf_ipmi_trn_serial51_ipmi_sharing, &hf_ipmi_trn_serial51_ipmi_sol, &hf_ipmi_trn_serial51_chan_num, NULL }; - proto_tree_add_item(tree, hf_ipmi_trn_serial51_port_assoc_sel, tvb, 0, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_trn_serial51_port_assoc_sel, tvb, 0, 1, ENC_LITTLE_ENDIAN); proto_tree_add_bitmask_text(tree, tvb, 1, 1, NULL, NULL, ett_ipmi_trn_serial51_byte2, byte2, TRUE, 0); proto_tree_add_bitmask_text(tree, tvb, 2, 1, NULL, NULL, @@ -1697,14 +1697,14 @@ serial_51(tvbuff_t *tvb, proto_tree *tree) static void serial_52(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_trn_serial52_port_assoc_sel, tvb, 0, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_trn_serial52_port_assoc_sel, tvb, 0, 1, ENC_LITTLE_ENDIAN); proto_tree_add_item(tree, hf_ipmi_trn_serial52_conn_name, tvb, 1, 16, ENC_NA); } static void serial_53(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_trn_serial53_port_assoc_sel, tvb, 0, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_trn_serial53_port_assoc_sel, tvb, 0, 1, ENC_LITTLE_ENDIAN); proto_tree_add_item(tree, hf_ipmi_trn_serial53_chan_name, tvb, 1, 16, ENC_NA); } @@ -1837,8 +1837,8 @@ rq11(tvbuff_t *tvb, proto_tree *tree) ett_ipmi_trn_11_byte1, byte1, TRUE, 0); proto_tree_add_uint_format_value(tree, hf_ipmi_trn_11_param, tvb, 1, 1, pno, "%s (0x%02x)", desc, pno); - proto_tree_add_item(tree, hf_ipmi_trn_11_set, tvb, 2, 1, TRUE); - proto_tree_add_item(tree, hf_ipmi_trn_11_block, tvb, 2, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_trn_11_set, tvb, 2, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_trn_11_block, tvb, 2, 1, ENC_LITTLE_ENDIAN); } static void @@ -1950,7 +1950,7 @@ rq14(tvbuff_t *tvb, proto_tree *tree) proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_trn_14_byte1, byte1, TRUE, 0); - proto_tree_add_item(tree, hf_ipmi_trn_14_block, tvb, 1, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_trn_14_block, tvb, 1, 1, ENC_LITTLE_ENDIAN); proto_tree_add_item(tree, hf_ipmi_trn_14_data, tvb, 2, 16, ENC_NA); } @@ -1963,7 +1963,7 @@ rq15(tvbuff_t *tvb, proto_tree *tree) proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_trn_15_byte1, byte1, TRUE, 0); - proto_tree_add_item(tree, hf_ipmi_trn_15_block, tvb, 1, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_trn_15_block, tvb, 1, 1, ENC_LITTLE_ENDIAN); } static void @@ -1981,11 +1981,11 @@ rq16(tvbuff_t *tvb, proto_tree *tree) proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_trn_16_byte1, byte1, TRUE, 0); - proto_tree_add_item(tree, hf_ipmi_trn_16_src_port, tvb, 1, 2, TRUE); - proto_tree_add_item(tree, hf_ipmi_trn_16_dst_port, tvb, 3, 2, TRUE); + proto_tree_add_item(tree, hf_ipmi_trn_16_src_port, tvb, 1, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_trn_16_dst_port, tvb, 3, 2, ENC_LITTLE_ENDIAN); proto_tree_add_item(tree, hf_ipmi_trn_16_src_addr, tvb, 5, 4, FALSE); proto_tree_add_item(tree, hf_ipmi_trn_16_dst_addr, tvb, 9, 4, FALSE); - proto_tree_add_item(tree, hf_ipmi_trn_16_bytes, tvb, 13, 2, TRUE); + proto_tree_add_item(tree, hf_ipmi_trn_16_bytes, tvb, 13, 2, ENC_LITTLE_ENDIAN); } static const value_string cc16[] = { @@ -2028,7 +2028,7 @@ rs17(tvbuff_t *tvb, proto_tree *tree) if (ipmi_getsaveddata(0, &bno) && bno == 0) { /* Request for length */ - proto_tree_add_item(tree, hf_ipmi_trn_17_size, tvb, 0, 2, TRUE); + proto_tree_add_item(tree, hf_ipmi_trn_17_size, tvb, 0, 2, ENC_LITTLE_ENDIAN); } else { proto_tree_add_item(tree, hf_ipmi_trn_17_data, tvb, 0, tvb_length(tvb) < 16 ? tvb_length(tvb) : 16, ENC_NA); @@ -2049,7 +2049,7 @@ rq18(tvbuff_t *tvb, proto_tree *tree) proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_trn_18_byte1, byte1, TRUE, 0); - proto_tree_add_item(tree, hf_ipmi_trn_18_ipmi_ver, tvb, 1, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_trn_18_ipmi_ver, tvb, 1, 1, ENC_LITTLE_ENDIAN); } /* Callback @@ -2087,9 +2087,9 @@ parse_callback_options(tvbuff_t *tvb, guint offs, proto_tree *tree) proto_tree_add_bitmask_text(tree, tvb, offs + 1, 1, "CBCP negotiation options: ", "None", ett_ipmi_trn_XX_cbcp, cbcp, TRUE, BMT_NO_TFS); - proto_tree_add_item(tree, hf_ipmi_trn_XX_dst1, tvb, offs + 2, 1, TRUE); - proto_tree_add_item(tree, hf_ipmi_trn_XX_dst2, tvb, offs + 3, 1, TRUE); - proto_tree_add_item(tree, hf_ipmi_trn_XX_dst3, tvb, offs + 4, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_trn_XX_dst1, tvb, offs + 2, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_trn_XX_dst2, tvb, offs + 3, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ipmi_trn_XX_dst3, tvb, offs + 4, 1, ENC_LITTLE_ENDIAN); } /* Set User Callback Options diff --git a/epan/dissectors/packet-ipmi.c b/epan/dissectors/packet-ipmi.c index 6f89a1f167..6cb6fc2332 100644 --- a/epan/dissectors/packet-ipmi.c +++ b/epan/dissectors/packet-ipmi.c @@ -1233,7 +1233,7 @@ ipmi_do_dissect(tvbuff_t *tvb, proto_tree *ipmi_tree, ipmi_dissect_format_t *dfm if (dfmt->flags & IPMI_D_SESSION_HANDLE) { proto_tree_add_item(hdr_tree, hf_ipmi_session_handle, - tvb, offs++, 1, TRUE); + tvb, offs++, 1, ENC_LITTLE_ENDIAN); } /* Broadcast byte (optional) */ @@ -1244,7 +1244,7 @@ ipmi_do_dissect(tvbuff_t *tvb, proto_tree *ipmi_tree, ipmi_dissect_format_t *dfm /* Target SA, if present */ if (dfmt->flags & IPMI_D_TRG_SA) { - proto_tree_add_item(hdr_tree, hf_ipmi_header_trg, tvb, offs++, 1, TRUE); + proto_tree_add_item(hdr_tree, hf_ipmi_header_trg, tvb, offs++, 1, ENC_LITTLE_ENDIAN); } /* Network function + target LUN */ @@ -1253,7 +1253,7 @@ ipmi_do_dissect(tvbuff_t *tvb, proto_tree *ipmi_tree, ipmi_dissect_format_t *dfm ndesc, is_resp ? "Response" : "Request", hdr.netfn); s_tree = proto_item_add_subtree(ti, ett_header_byte_1); - proto_tree_add_item(s_tree, hf_ipmi_header_trg_lun, tvb, offs, 1, TRUE); + proto_tree_add_item(s_tree, hf_ipmi_header_trg_lun, tvb, offs, 1, ENC_LITTLE_ENDIAN); proto_tree_add_uint_format(s_tree, hf_ipmi_header_netfn, tvb, offs, 1, hdr.netfn << 2, "%sNetFn: %s %s (0x%02x)", ipmi_dcd8(hdr.netfn << 2, 0xfc), @@ -1277,7 +1277,7 @@ ipmi_do_dissect(tvbuff_t *tvb, proto_tree *ipmi_tree, ipmi_dissect_format_t *dfm data_chk_offs = offs; /* Source SA */ - proto_tree_add_item(hdr_tree, hf_ipmi_header_src, tvb, offs++, 1, TRUE); + proto_tree_add_item(hdr_tree, hf_ipmi_header_src, tvb, offs++, 1, ENC_LITTLE_ENDIAN); /* Sequence number + source LUN */ ti = proto_tree_add_text(hdr_tree, tvb, offs, 1, @@ -1285,8 +1285,8 @@ ipmi_do_dissect(tvbuff_t *tvb, proto_tree *ipmi_tree, ipmi_dissect_format_t *dfm hdr.src_lun, hdr.seq); s_tree = proto_item_add_subtree(ti, ett_header_byte_4); - proto_tree_add_item(s_tree, hf_ipmi_header_src_lun, tvb, offs, 1, TRUE); - proto_tree_add_item(s_tree, hf_ipmi_header_sequence, tvb, offs, 1, TRUE); + proto_tree_add_item(s_tree, hf_ipmi_header_src_lun, tvb, offs, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(s_tree, hf_ipmi_header_sequence, tvb, offs, 1, ENC_LITTLE_ENDIAN); offs++; /* Command */ diff --git a/epan/dissectors/packet-ipnet.c b/epan/dissectors/packet-ipnet.c index 4eb2dcd301..21b374fbbc 100644 --- a/epan/dissectors/packet-ipnet.c +++ b/epan/dissectors/packet-ipnet.c @@ -77,14 +77,14 @@ dissect_ipnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ti = proto_tree_add_item (tree, proto_ipnet, tvb, 0, 24, FALSE); fh_tree = proto_item_add_subtree(ti, ett_raw); - proto_tree_add_item(fh_tree, hf_version, tvb, 0, 1, FALSE); - proto_tree_add_item(fh_tree, hf_family, tvb, 1, 1, FALSE); - proto_tree_add_item(fh_tree, hf_htype, tvb, 2, 2, FALSE); - proto_tree_add_item(fh_tree, hf_pktlen, tvb, 4, 4, FALSE); - proto_tree_add_item(fh_tree, hf_ifindex, tvb, 8, 4, FALSE); - proto_tree_add_item(fh_tree, hf_grifindex, tvb, 12, 4, FALSE); - proto_tree_add_item(fh_tree, hf_zsrc, tvb, 16, 4, FALSE); - proto_tree_add_item(fh_tree, hf_zdst, tvb, 20, 4, FALSE); + proto_tree_add_item(fh_tree, hf_version, tvb, 0, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(fh_tree, hf_family, tvb, 1, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(fh_tree, hf_htype, tvb, 2, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(fh_tree, hf_pktlen, tvb, 4, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(fh_tree, hf_ifindex, tvb, 8, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(fh_tree, hf_grifindex, tvb, 12, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(fh_tree, hf_zsrc, tvb, 16, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(fh_tree, hf_zdst, tvb, 20, 4, ENC_BIG_ENDIAN); } pktlen = tvb_get_ntohl(tvb, 4); diff --git a/epan/dissectors/packet-ipv6.c b/epan/dissectors/packet-ipv6.c index b19b164f90..40fba0c88d 100644 --- a/epan/dissectors/packet-ipv6.c +++ b/epan/dissectors/packet-ipv6.c @@ -597,10 +597,10 @@ dissect_routing6(tvbuff_t *tvb, int offset, proto_tree *tree, packet_info *pinfo "Length: %u (%d bytes)", rt.ip6r_len, len); proto_tree_add_item(rthdr_tree, hf_ipv6_routing_hdr_type, tvb, - offset + offsetof(struct ip6_rthdr, ip6r_type), 1, FALSE); + offset + offsetof(struct ip6_rthdr, ip6r_type), 1, ENC_BIG_ENDIAN); proto_tree_add_item(rthdr_tree, hf_ipv6_routing_hdr_left, tvb, - offset + offsetof(struct ip6_rthdr, ip6r_segleft), 1, FALSE); + offset + offsetof(struct ip6_rthdr, ip6r_segleft), 1, ENC_BIG_ENDIAN); seg_left = tvb_get_guint8(tvb, offset + offsetof(struct ip6_rthdr, ip6r_segleft)); @@ -641,10 +641,10 @@ dissect_routing6(tvbuff_t *tvb, int offset, proto_tree *tree, packet_info *pinfo offset += 4; memcpy((guint8 *)&dstAddr, (guint8 *)pinfo->dst.data, pinfo->dst.len); - proto_tree_add_item(rthdr_tree, hf_ipv6_routing_hdr_rpl_cmprI, tvb, offset, 4, FALSE); - proto_tree_add_item(rthdr_tree, hf_ipv6_routing_hdr_rpl_cmprE, tvb, offset, 4, FALSE); - proto_tree_add_item(rthdr_tree, hf_ipv6_routing_hdr_rpl_pad, tvb, offset, 4, FALSE); - proto_tree_add_item(rthdr_tree, hf_ipv6_routing_hdr_rpl_reserved, tvb, offset, 4, FALSE); + proto_tree_add_item(rthdr_tree, hf_ipv6_routing_hdr_rpl_cmprI, tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(rthdr_tree, hf_ipv6_routing_hdr_rpl_cmprE, tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(rthdr_tree, hf_ipv6_routing_hdr_rpl_pad, tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(rthdr_tree, hf_ipv6_routing_hdr_rpl_reserved, tvb, offset, 4, ENC_BIG_ENDIAN); cmprI = tvb_get_guint8(tvb, offset) & 0xF0; cmprE = tvb_get_guint8(tvb, offset) & 0x0F; @@ -739,13 +739,13 @@ dissect_frag6(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, #endif proto_tree_add_item(rthdr_tree, hf_ipv6_frag_offset, tvb, - offset + offsetof(struct ip6_frag, ip6f_offlg), 2, FALSE); + offset + offsetof(struct ip6_frag, ip6f_offlg), 2, ENC_BIG_ENDIAN); proto_tree_add_item(rthdr_tree, hf_ipv6_frag_more, tvb, offset + offsetof(struct ip6_frag, ip6f_offlg), 2, FALSE); proto_tree_add_item(rthdr_tree, hf_ipv6_frag_id, tvb, - offset + offsetof(struct ip6_frag, ip6f_ident), 4, FALSE); + offset + offsetof(struct ip6_frag, ip6f_ident), 4, ENC_BIG_ENDIAN); } return len; } @@ -1121,11 +1121,11 @@ dissect_shim6_opt_loclist(proto_tree * opt_tree, tvbuff_t * tvb, gint *offset) guint optlen; int p = *offset; - proto_tree_add_item(opt_tree, hf_ipv6_shim6_opt_loclist, tvb, p, 4, FALSE); + proto_tree_add_item(opt_tree, hf_ipv6_shim6_opt_loclist, tvb, p, 4, ENC_BIG_ENDIAN); p += 4; optlen = tvb_get_guint8(tvb, p); - proto_tree_add_item(opt_tree, hf_ipv6_shim6_opt_locnum, tvb, p, 1, FALSE); + proto_tree_add_item(opt_tree, hf_ipv6_shim6_opt_locnum, tvb, p, 1, ENC_BIG_ENDIAN); p++; /* Verification Methods */ @@ -1135,7 +1135,7 @@ dissect_shim6_opt_loclist(proto_tree * opt_tree, tvbuff_t * tvb, gint *offset) for (count=0; count < optlen; count++) proto_tree_add_item(subtree, hf_ipv6_shim6_opt_loc_verif_methods, tvb, - p+count, 1, FALSE); + p+count, 1, ENC_BIG_ENDIAN); p += optlen; /* Padding, included in length field */ @@ -1167,11 +1167,11 @@ dissect_shim6_opt_loc_pref(proto_tree * opt_tree, tvbuff_t * tvb, gint *offset, p = *offset; - proto_tree_add_item(opt_tree, hf_ipv6_shim6_opt_loclist, tvb, p, 4, FALSE); + proto_tree_add_item(opt_tree, hf_ipv6_shim6_opt_loclist, tvb, p, 4, ENC_BIG_ENDIAN); p += 4; optlen = tvb_get_guint8(tvb, p); - proto_tree_add_item(opt_tree, hf_ipv6_shim6_opt_elemlen, tvb, p, 1, FALSE); + proto_tree_add_item(opt_tree, hf_ipv6_shim6_opt_elemlen, tvb, p, 1, ENC_BIG_ENDIAN); if (optlen < 1 || optlen > 3) { it = proto_tree_add_text(opt_tree, tvb, p, 1, @@ -1191,13 +1191,13 @@ dissect_shim6_opt_loc_pref(proto_tree * opt_tree, tvbuff_t * tvb, gint *offset, /* Flags */ if (optlen >= 1) - proto_tree_add_item(subtree, hf_ipv6_shim6_loc_flag, tvb, p, 1, FALSE); + proto_tree_add_item(subtree, hf_ipv6_shim6_loc_flag, tvb, p, 1, ENC_BIG_ENDIAN); /* Priority */ if (optlen >= 2) - proto_tree_add_item(subtree, hf_ipv6_shim6_loc_prio, tvb, p+1, 1, FALSE); + proto_tree_add_item(subtree, hf_ipv6_shim6_loc_prio, tvb, p+1, 1, ENC_BIG_ENDIAN); /* Weight */ if (optlen >= 3) - proto_tree_add_item(subtree, hf_ipv6_shim6_loc_weight, tvb, p+2, 1, FALSE); + proto_tree_add_item(subtree, hf_ipv6_shim6_loc_weight, tvb, p+2, 1, ENC_BIG_ENDIAN); /* * Shim6 Draft 08 doesn't specify the format when the Element length is * more than three, except that any such formats MUST be defined so that @@ -1238,13 +1238,13 @@ dissect_shimopts(tvbuff_t *tvb, int offset, proto_tree *tree, packet_info *pinfo ti = proto_tree_add_text(tree, tvb, offset, total_len, "%s", ctype); opt_tree = proto_item_add_subtree(ti, ett_ipv6_shim6_option); - proto_tree_add_item(opt_tree, hf_ipv6_shim6_opt_type, tvb, offset, 2, FALSE); + proto_tree_add_item(opt_tree, hf_ipv6_shim6_opt_type, tvb, offset, 2, ENC_BIG_ENDIAN); /* Critical */ proto_tree_add_item(opt_tree, hf_ipv6_shim6_opt_critical, tvb, offset+1, 1, FALSE); /* Content Length */ - proto_tree_add_item(opt_tree, hf_ipv6_shim6_opt_len, tvb, offset + 2, 2, FALSE); + proto_tree_add_item(opt_tree, hf_ipv6_shim6_opt_len, tvb, offset + 2, 2, ENC_BIG_ENDIAN); ti = proto_tree_add_uint_format(opt_tree, hf_ipv6_shim6_opt_total_len, tvb, offset+2, 2, total_len, "Total Length: %u", total_len); PROTO_ITEM_SET_GENERATED(ti); @@ -1284,7 +1284,7 @@ dissect_shimopts(tvbuff_t *tvb, int offset, proto_tree *tree, packet_info *pinfo p += 16; break; case SHIM6_OPT_FII: - proto_tree_add_item(opt_tree, hf_ipv6_shim6_opt_fii, tvb, p, 4, FALSE); + proto_tree_add_item(opt_tree, hf_ipv6_shim6_opt_fii, tvb, p, 4, ENC_BIG_ENDIAN); p += 4; break; default: @@ -1345,10 +1345,10 @@ dissect_shim6_probes(proto_tree * shim_tree, tvbuff_t * tvb, gint offset, proto_tree_add_item(probe_tree, hf_ipv6_shim6_pdst, tvb, offset, 16, FALSE); offset += 16; - proto_tree_add_item(probe_tree, hf_ipv6_shim6_pnonce, tvb, offset, 4, FALSE); + proto_tree_add_item(probe_tree, hf_ipv6_shim6_pnonce, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(probe_tree, hf_ipv6_shim6_pdata, tvb, offset, 4, FALSE); + proto_tree_add_item(probe_tree, hf_ipv6_shim6_pdata, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; } } @@ -1370,23 +1370,23 @@ dissect_shimctrl(tvbuff_t *tvb, gint offset, guint type, proto_tree *shim_tree) case SHIM6_TYPE_I1: dissect_shim6_ct(shim_tree, hf_ipv6_shim6_ct, tvb, p, "Initiator Context Tag"); p += 6; - proto_tree_add_item(shim_tree, hf_ipv6_shim6_inonce, tvb, p, 4, FALSE); + proto_tree_add_item(shim_tree, hf_ipv6_shim6_inonce, tvb, p, 4, ENC_BIG_ENDIAN); p += 4; break; case SHIM6_TYPE_R1: proto_tree_add_text(shim_tree, tvb, p, 2, "Reserved2"); p += 2; - proto_tree_add_item(shim_tree, hf_ipv6_shim6_inonce, tvb, p, 4, FALSE); + proto_tree_add_item(shim_tree, hf_ipv6_shim6_inonce, tvb, p, 4, ENC_BIG_ENDIAN); p += 4; - proto_tree_add_item(shim_tree, hf_ipv6_shim6_rnonce, tvb, p, 4, FALSE); + proto_tree_add_item(shim_tree, hf_ipv6_shim6_rnonce, tvb, p, 4, ENC_BIG_ENDIAN); p += 4; break; case SHIM6_TYPE_I2: dissect_shim6_ct(shim_tree, hf_ipv6_shim6_ct, tvb, p, "Initiator Context Tag"); p += 6; - proto_tree_add_item(shim_tree, hf_ipv6_shim6_inonce, tvb, p, 4, FALSE); + proto_tree_add_item(shim_tree, hf_ipv6_shim6_inonce, tvb, p, 4, ENC_BIG_ENDIAN); p += 4; - proto_tree_add_item(shim_tree, hf_ipv6_shim6_rnonce, tvb, p, 4, FALSE); + proto_tree_add_item(shim_tree, hf_ipv6_shim6_rnonce, tvb, p, 4, ENC_BIG_ENDIAN); p += 4; proto_tree_add_text(shim_tree, tvb, p, 4, "Reserved2"); p += 4; @@ -1394,21 +1394,21 @@ dissect_shimctrl(tvbuff_t *tvb, gint offset, guint type, proto_tree *shim_tree) case SHIM6_TYPE_R2: dissect_shim6_ct(shim_tree, hf_ipv6_shim6_ct, tvb, p, "Responder Context Tag"); p += 6; - proto_tree_add_item(shim_tree, hf_ipv6_shim6_inonce, tvb, p, 4, FALSE); + proto_tree_add_item(shim_tree, hf_ipv6_shim6_inonce, tvb, p, 4, ENC_BIG_ENDIAN); p += 4; break; case SHIM6_TYPE_R1BIS: dissect_shim6_ct(shim_tree, hf_ipv6_shim6_ct, tvb, p, "Packet Context Tag"); p += 6; - proto_tree_add_item(shim_tree, hf_ipv6_shim6_rnonce, tvb, p, 4, FALSE); + proto_tree_add_item(shim_tree, hf_ipv6_shim6_rnonce, tvb, p, 4, ENC_BIG_ENDIAN); p += 4; break; case SHIM6_TYPE_I2BIS: dissect_shim6_ct(shim_tree, hf_ipv6_shim6_ct, tvb, p, "Initiator Context Tag"); p += 6; - proto_tree_add_item(shim_tree, hf_ipv6_shim6_inonce, tvb, p, 4, FALSE); + proto_tree_add_item(shim_tree, hf_ipv6_shim6_inonce, tvb, p, 4, ENC_BIG_ENDIAN); p += 4; - proto_tree_add_item(shim_tree, hf_ipv6_shim6_rnonce, tvb, p, 4, FALSE); + proto_tree_add_item(shim_tree, hf_ipv6_shim6_rnonce, tvb, p, 4, ENC_BIG_ENDIAN); p += 4; proto_tree_add_text(shim_tree, tvb, p, 6, "Reserved2"); p += 6; @@ -1419,7 +1419,7 @@ dissect_shimctrl(tvbuff_t *tvb, gint offset, guint type, proto_tree *shim_tree) case SHIM6_TYPE_UPD_ACK: dissect_shim6_ct(shim_tree, hf_ipv6_shim6_ct, tvb, p, "Receiver Context Tag"); p += 6; - proto_tree_add_item(shim_tree, hf_ipv6_shim6_rnonce, tvb, p, 4, FALSE); + proto_tree_add_item(shim_tree, hf_ipv6_shim6_rnonce, tvb, p, 4, ENC_BIG_ENDIAN); p += 4; break; case SHIM6_TYPE_KEEPALIVE: @@ -1565,11 +1565,11 @@ dissect_shim6(tvbuff_t *tvb, int offset, proto_tree *tree, packet_info * pinfo) /* Message Type */ proto_tree_add_item(shim_tree, hf_ipv6_shim6_type, tvb, offset + offsetof(struct ip6_shim, ip6s_p), 1, - FALSE + ENC_BIG_ENDIAN ); /* Protocol bit (Must be zero for SHIM6) */ - proto_tree_add_item(shim_tree, hf_ipv6_shim6_proto, tvb, p, 1, FALSE); + proto_tree_add_item(shim_tree, hf_ipv6_shim6_proto, tvb, p, 1, ENC_BIG_ENDIAN); p++; /* Checksum */ @@ -1654,19 +1654,19 @@ dissect_ipv6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* !!! warning: (4-bit) version, (6-bit) DSCP, (1-bit) ECN-ECT, (1-bit) ECN-CE and (20-bit) Flow */ pi = proto_tree_add_item(ipv6_tree, hf_ipv6_version, tvb, - offset + offsetof(struct ip6_hdr, ip6_vfc), 1, FALSE); + offset + offsetof(struct ip6_hdr, ip6_vfc), 1, ENC_BIG_ENDIAN); pt = proto_item_add_subtree(pi,ett_ipv6_version); pi = proto_tree_add_item(pt, hf_ip_version, tvb, offset + offsetof(struct ip6_hdr, ip6_vfc), 1, FALSE); PROTO_ITEM_SET_GENERATED(pi); ipv6_tc = proto_tree_add_item(ipv6_tree, hf_ipv6_class, tvb, - offset + offsetof(struct ip6_hdr, ip6_flow), 4, FALSE); + offset + offsetof(struct ip6_hdr, ip6_flow), 4, ENC_BIG_ENDIAN); ipv6_tc_tree = proto_item_add_subtree(ipv6_tc, ett_ipv6_traffic_class); proto_tree_add_item(ipv6_tc_tree, hf_ipv6_traffic_class_dscp, tvb, - offset + offsetof(struct ip6_hdr, ip6_flow), 4, FALSE); + offset + offsetof(struct ip6_hdr, ip6_flow), 4, ENC_BIG_ENDIAN); proto_tree_add_item(ipv6_tc_tree, hf_ipv6_traffic_class_ect, tvb, offset + offsetof(struct ip6_hdr, ip6_flow), 4, FALSE); @@ -1675,10 +1675,10 @@ dissect_ipv6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset + offsetof(struct ip6_hdr, ip6_flow), 4, FALSE); proto_tree_add_item(ipv6_tree, hf_ipv6_flow, tvb, - offset + offsetof(struct ip6_hdr, ip6_flow), 4, FALSE); + offset + offsetof(struct ip6_hdr, ip6_flow), 4, ENC_BIG_ENDIAN); proto_tree_add_item(ipv6_tree, hf_ipv6_plen, tvb, - offset + offsetof(struct ip6_hdr, ip6_plen), 2, FALSE); + offset + offsetof(struct ip6_hdr, ip6_plen), 2, ENC_BIG_ENDIAN); proto_tree_add_uint_format(ipv6_tree, hf_ipv6_nxt, tvb, offset + offsetof(struct ip6_hdr, ip6_nxt), 1, @@ -1687,7 +1687,7 @@ dissect_ipv6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ipprotostr(ipv6.ip6_nxt), ipv6.ip6_nxt); proto_tree_add_item(ipv6_tree, hf_ipv6_hlim, tvb, - offset + offsetof(struct ip6_hdr, ip6_hlim), 1, FALSE); + offset + offsetof(struct ip6_hdr, ip6_hlim), 1, ENC_BIG_ENDIAN); /* Add the different items for the source address */ proto_tree_add_item(ipv6_tree, hf_ipv6_src, tvb, @@ -1717,14 +1717,14 @@ dissect_ipv6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset + IP6H_SRC + 2, 4, FALSE); PROTO_ITEM_SET_GENERATED(ti); ti = proto_tree_add_item(ipv6_tree, hf_ipv6_src_6to4_sla_id, tvb, - offset + IP6H_SRC + 6, 2, FALSE); + offset + IP6H_SRC + 6, 2, ENC_BIG_ENDIAN); PROTO_ITEM_SET_GENERATED(ti); ti = proto_tree_add_item(ipv6_tree, hf_ipv6_6to4_gateway_ipv4, tvb, offset + IP6H_SRC + 2, 4, FALSE); PROTO_ITEM_SET_GENERATED(ti); PROTO_ITEM_SET_HIDDEN(ti); ti = proto_tree_add_item(ipv6_tree, hf_ipv6_6to4_sla_id, tvb, - offset + IP6H_SRC + 6, 2, FALSE); + offset + IP6H_SRC + 6, 2, ENC_BIG_ENDIAN); PROTO_ITEM_SET_GENERATED(ti); PROTO_ITEM_SET_HIDDEN(ti); } else if (tvb_get_ntohl(tvb, offset + IP6H_SRC) == 0x20010000) { /* RFC 4380 section 4 */ @@ -1804,14 +1804,14 @@ dissect_ipv6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset + IP6H_DST + 2, 4, FALSE); PROTO_ITEM_SET_GENERATED(ti); ti = proto_tree_add_item(ipv6_tree, hf_ipv6_dst_6to4_sla_id, tvb, - offset + IP6H_DST + 6, 2, FALSE); + offset + IP6H_DST + 6, 2, ENC_BIG_ENDIAN); PROTO_ITEM_SET_GENERATED(ti); ti = proto_tree_add_item(ipv6_tree, hf_ipv6_6to4_gateway_ipv4, tvb, offset + IP6H_DST + 2, 4, FALSE); PROTO_ITEM_SET_GENERATED(ti); PROTO_ITEM_SET_HIDDEN(ti); ti = proto_tree_add_item(ipv6_tree, hf_ipv6_6to4_sla_id, tvb, - offset + IP6H_DST + 6, 2, FALSE); + offset + IP6H_DST + 6, 2, ENC_BIG_ENDIAN); PROTO_ITEM_SET_GENERATED(ti); PROTO_ITEM_SET_HIDDEN(ti); } else if (tvb_get_ntohl(tvb, offset + IP6H_DST) == 0x20010000) { /* RFC 4380 section 4 */ diff --git a/epan/dissectors/packet-ipvs-syncd.c b/epan/dissectors/packet-ipvs-syncd.c index 647beba5ca..0c9c813f3b 100644 --- a/epan/dissectors/packet-ipvs-syncd.c +++ b/epan/dissectors/packet-ipvs-syncd.c @@ -109,13 +109,13 @@ dissect_ipvs_syncd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) col_clear(pinfo->cinfo, COL_INFO); cnt = tvb_get_guint8(tvb, offset); - proto_tree_add_item(tree, hf_conn_count, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_conn_count, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(tree, hf_syncid, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_syncid, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(tree, hf_size, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_size, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; for (conn = 0; conn < cnt; conn++) @@ -127,19 +127,19 @@ dissect_ipvs_syncd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) ti = proto_tree_add_text(tree, tvb, offset, 24, "Connection #%d", conn+1); ctree = proto_item_add_subtree(ti, ett_conn); - proto_tree_add_item(ctree, hf_resv8, tvb, offset, 1, FALSE); + proto_tree_add_item(ctree, hf_resv8, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(ctree, hf_proto, tvb, offset, 1, FALSE); + proto_tree_add_item(ctree, hf_proto, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(ctree, hf_cport, tvb, offset, 2, FALSE); + proto_tree_add_item(ctree, hf_cport, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(ctree, hf_vport, tvb, offset, 2, FALSE); + proto_tree_add_item(ctree, hf_vport, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(ctree, hf_dport, tvb, offset, 2, FALSE); + proto_tree_add_item(ctree, hf_dport, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(ctree, hf_caddr, tvb, offset, 4, FALSE); @@ -152,7 +152,7 @@ dissect_ipvs_syncd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) offset += 4; flags = tvb_get_ntohs(tvb, offset); - fi = proto_tree_add_item(ctree, hf_flags, tvb, offset, 2, FALSE); + fi = proto_tree_add_item(ctree, hf_flags, tvb, offset, 2, ENC_BIG_ENDIAN); ftree = proto_item_add_subtree(fi, ett_flags); if ( (flags & 0x0F) == IP_VS_CONN_F_MASQ ) @@ -209,28 +209,28 @@ dissect_ipvs_syncd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) offset += 2; - proto_tree_add_item(ctree, hf_state, tvb, offset, 2, FALSE); + proto_tree_add_item(ctree, hf_state, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; /* we have full connection info */ if ( flags & IP_VS_CONN_F_SEQ_MASK ) { - proto_tree_add_item(ctree, hf_in_seq_init, tvb, offset, 4, FALSE); + proto_tree_add_item(ctree, hf_in_seq_init, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(ctree, hf_in_seq_delta, tvb, offset, 4, FALSE); + proto_tree_add_item(ctree, hf_in_seq_delta, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(ctree, hf_in_seq_pdelta, tvb, offset, 4, FALSE); + proto_tree_add_item(ctree, hf_in_seq_pdelta, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(ctree, hf_out_seq_init, tvb, offset, 4, FALSE); + proto_tree_add_item(ctree, hf_out_seq_init, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(ctree, hf_out_seq_delta, tvb, offset, 4, FALSE); + proto_tree_add_item(ctree, hf_out_seq_delta, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(ctree, hf_out_seq_pdelta, tvb, offset, 4, FALSE); + proto_tree_add_item(ctree, hf_out_seq_pdelta, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; } diff --git a/epan/dissectors/packet-ipx.c b/epan/dissectors/packet-ipx.c index ee73bca51a..d0b45287c5 100644 --- a/epan/dissectors/packet-ipx.c +++ b/epan/dissectors/packet-ipx.c @@ -305,7 +305,7 @@ dissect_ipx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) hidden_item = proto_tree_add_string(ipx_tree, hf_ipx_addr, tvb, 0, 0, str); PROTO_ITEM_SET_HIDDEN(hidden_item); - proto_tree_add_item(ipx_tree, hf_ipx_checksum, tvb, 0, 2, FALSE); + proto_tree_add_item(ipx_tree, hf_ipx_checksum, tvb, 0, 2, ENC_BIG_ENDIAN); proto_tree_add_uint_format(ipx_tree, hf_ipx_len, tvb, 2, 2, ipxh->ipx_length, "Length: %d bytes", ipxh->ipx_length); ipx_hops = tvb_get_guint8(tvb, 4); @@ -632,14 +632,14 @@ dissect_spx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) "Datastream Type: 0x%02X", datastream_type); } - proto_tree_add_item(spx_tree, hf_spx_src_id, tvb, 2, 2, FALSE); - proto_tree_add_item(spx_tree, hf_spx_dst_id, tvb, 4, 2, FALSE); + proto_tree_add_item(spx_tree, hf_spx_src_id, tvb, 2, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(spx_tree, hf_spx_dst_id, tvb, 4, 2, ENC_BIG_ENDIAN); } spx_seq = tvb_get_ntohs(tvb, 6); if (tree) { proto_tree_add_uint(spx_tree, hf_spx_seq_nr, tvb, 6, 2, spx_seq); - proto_tree_add_item(spx_tree, hf_spx_ack_nr, tvb, 8, 2, FALSE); - proto_tree_add_item(spx_tree, hf_spx_all_nr, tvb, 10, 2, FALSE); + proto_tree_add_item(spx_tree, hf_spx_ack_nr, tvb, 8, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(spx_tree, hf_spx_all_nr, tvb, 10, 2, ENC_BIG_ENDIAN); } /* diff --git a/epan/dissectors/packet-ipxwan.c b/epan/dissectors/packet-ipxwan.c index 5e2a6860a0..cf5bccb389 100644 --- a/epan/dissectors/packet-ipxwan.c +++ b/epan/dissectors/packet-ipxwan.c @@ -158,10 +158,10 @@ dissect_ipxwan(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset, 1, packet_type); offset += 1; proto_tree_add_item(ipxwan_tree, hf_ipxwan_node_id, tvb, - offset, 4, FALSE); + offset, 4, ENC_BIG_ENDIAN); offset += 4; proto_tree_add_item(ipxwan_tree, hf_ipxwan_sequence_number, tvb, - offset, 1, FALSE); + offset, 1, ENC_BIG_ENDIAN); offset += 1; num_options = tvb_get_guint8(tvb, offset); proto_tree_add_uint(ipxwan_tree, hf_ipxwan_num_options, tvb, @@ -181,7 +181,7 @@ dissect_ipxwan(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvb, offset, 1, option_number); offset += 1; proto_tree_add_item(option_tree, hf_ipxwan_accept_option, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; option_data_len = tvb_get_ntohs(tvb, offset); proto_tree_add_uint(option_tree, hf_ipxwan_option_data_len, @@ -199,7 +199,7 @@ dissect_ipxwan(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } else { proto_tree_add_item(option_tree, hf_ipxwan_routing_type, tvb, - offset, 1, FALSE); + offset, 1, ENC_BIG_ENDIAN); } break; @@ -256,7 +256,7 @@ dissect_ipxwan(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } else { proto_tree_add_item(option_tree, hf_ipxwan_request_size, tvb, - offset, 4, FALSE); + offset, 4, ENC_BIG_ENDIAN); delta_time = tvb_get_ntohl(tvb, offset); proto_tree_add_uint_format(option_tree, hf_ipxwan_delta_time, tvb, diff --git a/epan/dissectors/packet-isakmp.c b/epan/dissectors/packet-isakmp.c index 1aa33d71e1..27d098e902 100644 --- a/epan/dissectors/packet-isakmp.c +++ b/epan/dissectors/packet-isakmp.c @@ -2747,10 +2747,10 @@ dissect_isakmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset += 1; if(isakmp_version == 1) { - proto_tree_add_item(isakmp_tree, hf_isakmp_exchangetype_v1, tvb, offset, 1, FALSE); + proto_tree_add_item(isakmp_tree, hf_isakmp_exchangetype_v1, tvb, offset, 1, ENC_BIG_ENDIAN); col_add_str(pinfo->cinfo, COL_INFO,val_to_str(hdr.exch_type, exchange_v1_type, "Unknown %d")); } else if (isakmp_version == 2){ - proto_tree_add_item(isakmp_tree, hf_isakmp_exchangetype_v2, tvb, offset, 1, FALSE); + proto_tree_add_item(isakmp_tree, hf_isakmp_exchangetype_v2, tvb, offset, 1, ENC_BIG_ENDIAN); col_add_str(pinfo->cinfo, COL_INFO,val_to_str(hdr.exch_type, exchange_v2_type, "Unknown %d")); } offset += 1; @@ -2759,7 +2759,7 @@ dissect_isakmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_item * fti; proto_tree * ftree; - fti = proto_tree_add_item(isakmp_tree, hf_isakmp_flags, tvb, offset, 1, FALSE); + fti = proto_tree_add_item(isakmp_tree, hf_isakmp_flags, tvb, offset, 1, ENC_BIG_ENDIAN); ftree = proto_item_add_subtree(fti, ett_isakmp_flags); if (isakmp_version == 1) { @@ -2781,7 +2781,7 @@ dissect_isakmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } hdr.message_id = tvb_get_ntohl(tvb, offset); - proto_tree_add_item(isakmp_tree, hf_isakmp_messageid, tvb, offset, 4, FALSE); + proto_tree_add_item(isakmp_tree, hf_isakmp_messageid, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; if (hdr.length < ISAKMP_HDR_SIZE) { @@ -2806,7 +2806,7 @@ dissect_isakmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) return; } tvb_ensure_bytes_exist(tvb, offset, len); - proto_tree_add_item(isakmp_tree, hf_isakmp_length, tvb, offset, 4, FALSE); + proto_tree_add_item(isakmp_tree, hf_isakmp_length, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; if (hdr.flags & E_FLAG) { @@ -2865,7 +2865,7 @@ dissect_payload_header(tvbuff_t *tvb, int offset, int length, if (isakmp_version == 2) { proto_tree_add_item(ntree, hf_isakmp_criticalpayload, tvb, offset+1, 1, FALSE); } - proto_tree_add_item(ntree, hf_isakmp_payloadlen, tvb, offset + 2, 2, FALSE); + proto_tree_add_item(ntree, hf_isakmp_payloadlen, tvb, offset + 2, 2, ENC_BIG_ENDIAN); *next_payload_p = next_payload; *payload_length_p = payload_length; @@ -2882,7 +2882,7 @@ dissect_sa(tvbuff_t *tvb, int offset, int length, proto_tree *tree, int isakmp_v if (isakmp_version == 1) { doi = tvb_get_ntohl(tvb, offset); - proto_tree_add_item(tree, hf_isakmp_sa_doi, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_isakmp_sa_doi, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; length -= 4; @@ -2933,7 +2933,7 @@ dissect_proposal(tvbuff_t *tvb, int offset, int length, proto_tree *tree, int is proto_item_append_text(tree, " # %d", proposal_num); - proto_tree_add_item(tree, hf_isakmp_prop_number, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_isakmp_prop_number, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; length -= 1; @@ -2941,21 +2941,21 @@ dissect_proposal(tvbuff_t *tvb, int offset, int length, proto_tree *tree, int is if (isakmp_version == 1) { - proto_tree_add_item(tree, hf_isakmp_prop_protoid_v1, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_isakmp_prop_protoid_v1, tvb, offset, 1, ENC_BIG_ENDIAN); }else if (isakmp_version == 2) { - proto_tree_add_item(tree, hf_isakmp_prop_protoid_v2, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_isakmp_prop_protoid_v2, tvb, offset, 1, ENC_BIG_ENDIAN); } offset += 1; length -= 1; spi_size = tvb_get_guint8(tvb, offset); - proto_tree_add_item(tree, hf_isakmp_spisize, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_isakmp_spisize, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; length -= 1; num_transforms = tvb_get_guint8(tvb, offset); - proto_tree_add_item(tree, hf_isakmp_prop_transforms, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_isakmp_prop_transforms, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; length -= 1; @@ -3014,7 +3014,7 @@ dissect_rohc_supported(tvbuff_t *tvb, proto_tree *rohc_tree, int offset ) offset += 2; if (len) { - proto_tree_add_item(sub_rohc_tree, hf_isakmp_notify_data_rohc_attr_length, tvb, offset, 2, FALSE); + proto_tree_add_item(sub_rohc_tree, hf_isakmp_notify_data_rohc_attr_length, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; } if (optlen==0) @@ -3025,19 +3025,19 @@ dissect_rohc_supported(tvbuff_t *tvb, proto_tree *rohc_tree, int offset ) proto_tree_add_item(sub_rohc_tree, hf_isakmp_notify_data_rohc_attr_value, tvb, offset, optlen, ENC_NA); switch(rohc) { case ROHC_MAX_CID: - proto_tree_add_item(sub_rohc_tree, hf_isakmp_notify_data_rohc_attr_max_cid, tvb, offset, optlen, FALSE); + proto_tree_add_item(sub_rohc_tree, hf_isakmp_notify_data_rohc_attr_max_cid, tvb, offset, optlen, ENC_BIG_ENDIAN); break; case ROHC_PROFILE: - proto_tree_add_item(sub_rohc_tree, hf_isakmp_notify_data_rohc_attr_profile, tvb, offset, optlen, FALSE); + proto_tree_add_item(sub_rohc_tree, hf_isakmp_notify_data_rohc_attr_profile, tvb, offset, optlen, ENC_BIG_ENDIAN); break; case ROHC_INTEG: - proto_tree_add_item(sub_rohc_tree, hf_isakmp_notify_data_rohc_attr_integ, tvb, offset, optlen, FALSE); + proto_tree_add_item(sub_rohc_tree, hf_isakmp_notify_data_rohc_attr_integ, tvb, offset, optlen, ENC_BIG_ENDIAN); break; case ROHC_ICV_LEN: - proto_tree_add_item(sub_rohc_tree, hf_isakmp_notify_data_rohc_attr_icv_len, tvb, offset, optlen, FALSE); + proto_tree_add_item(sub_rohc_tree, hf_isakmp_notify_data_rohc_attr_icv_len, tvb, offset, optlen, ENC_BIG_ENDIAN); break; case ROHC_MRRU: - proto_tree_add_item(sub_rohc_tree, hf_isakmp_notify_data_rohc_attr_mrru, tvb, offset, optlen, FALSE); + proto_tree_add_item(sub_rohc_tree, hf_isakmp_notify_data_rohc_attr_mrru, tvb, offset, optlen, ENC_BIG_ENDIAN); break; default: @@ -3159,7 +3159,7 @@ dissect_transform_attribute(tvbuff_t *tvb, proto_tree *transform_attr_type_tree, offset += 2; if (len) { - proto_tree_add_item(sub_transform_attr_type_tree, hf_isakmp_tf_attr_length, tvb, offset, 2, FALSE); + proto_tree_add_item(sub_transform_attr_type_tree, hf_isakmp_tf_attr_length, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; } if (optlen==0) @@ -3170,47 +3170,47 @@ dissect_transform_attribute(tvbuff_t *tvb, proto_tree *transform_attr_type_tree, proto_tree_add_item(sub_transform_attr_type_tree, hf_isakmp_tf_attr_value, tvb, offset, optlen, ENC_NA); switch(transform_attr_type) { case ISAKMP_ATTR_LIFE_TYPE: - proto_tree_add_item(sub_transform_attr_type_tree, hf_isakmp_tf_attr_life_type, tvb, offset, optlen, FALSE); + proto_tree_add_item(sub_transform_attr_type_tree, hf_isakmp_tf_attr_life_type, tvb, offset, optlen, ENC_BIG_ENDIAN); proto_item_append_text(transform_attr_type_item," : %s", val_to_str(tvb_get_ntohs(tvb, offset), transform_attr_sa_life_type, "Unknown %d")); break; case ISAKMP_ATTR_LIFE_DURATION: dissect_life_duration(tvb, sub_transform_attr_type_tree, transform_attr_type_item, hf_isakmp_tf_attr_life_duration, offset, optlen); break; case ISAKMP_ATTR_GROUP_DESC: - proto_tree_add_item(sub_transform_attr_type_tree, hf_isakmp_tf_attr_group_description, tvb, offset, optlen, FALSE); + proto_tree_add_item(sub_transform_attr_type_tree, hf_isakmp_tf_attr_group_description, tvb, offset, optlen, ENC_BIG_ENDIAN); proto_item_append_text(transform_attr_type_item," : %s", val_to_str(tvb_get_ntohs(tvb, offset), transform_dh_group_type, "Unknown %d")); break; case ISAKMP_ATTR_ENCAP_MODE: - proto_tree_add_item(sub_transform_attr_type_tree, hf_isakmp_tf_attr_encap_mode, tvb, offset, optlen, FALSE); + proto_tree_add_item(sub_transform_attr_type_tree, hf_isakmp_tf_attr_encap_mode, tvb, offset, optlen, ENC_BIG_ENDIAN); proto_item_append_text(transform_attr_type_item," : %s", val_to_str(tvb_get_ntohs(tvb, offset), transform_attr_encap_type, "Unknown %d")); break; case ISAKMP_ATTR_AUTH_ALGORITHM: - proto_tree_add_item(sub_transform_attr_type_tree, hf_isakmp_tf_attr_auth_algorithm, tvb, offset, optlen, FALSE); + proto_tree_add_item(sub_transform_attr_type_tree, hf_isakmp_tf_attr_auth_algorithm, tvb, offset, optlen, ENC_BIG_ENDIAN); proto_item_append_text(transform_attr_type_item," : %s", val_to_str(tvb_get_ntohs(tvb, offset), transform_attr_auth_type, "Unknown %d")); break; case ISAKMP_ATTR_KEY_LENGTH: - proto_tree_add_item(sub_transform_attr_type_tree, hf_isakmp_tf_attr_key_length, tvb, offset, optlen, FALSE); + proto_tree_add_item(sub_transform_attr_type_tree, hf_isakmp_tf_attr_key_length, tvb, offset, optlen, ENC_BIG_ENDIAN); proto_item_append_text(transform_attr_type_item," : %d", tvb_get_ntohs(tvb, offset)); break; case ISAKMP_ATTR_KEY_ROUNDS: - proto_tree_add_item(sub_transform_attr_type_tree, hf_isakmp_tf_attr_key_rounds, tvb, offset, optlen, FALSE); + proto_tree_add_item(sub_transform_attr_type_tree, hf_isakmp_tf_attr_key_rounds, tvb, offset, optlen, ENC_BIG_ENDIAN); proto_item_append_text(transform_attr_type_item," : %d", tvb_get_ntohs(tvb, offset)); break; case ISAKMP_ATTR_CMPR_DICT_SIZE: - proto_tree_add_item(sub_transform_attr_type_tree, hf_isakmp_tf_attr_cmpr_dict_size, tvb, offset, optlen, FALSE); + proto_tree_add_item(sub_transform_attr_type_tree, hf_isakmp_tf_attr_cmpr_dict_size, tvb, offset, optlen, ENC_BIG_ENDIAN); break; case ISAKMP_ATTR_CMPR_ALGORITHM: proto_tree_add_item(sub_transform_attr_type_tree, hf_isakmp_tf_attr_cmpr_algorithm, tvb, offset, optlen, ENC_NA); break; case ISAKMP_ATTR_ECN_TUNNEL: - proto_tree_add_item(sub_transform_attr_type_tree, hf_isakmp_tf_attr_ecn_tunnel, tvb, offset, optlen, FALSE); + proto_tree_add_item(sub_transform_attr_type_tree, hf_isakmp_tf_attr_ecn_tunnel, tvb, offset, optlen, ENC_BIG_ENDIAN); proto_item_append_text(transform_attr_type_item," : %s", val_to_str(tvb_get_ntohs(tvb, offset), transform_attr_ecn_type, "Unknown %d")); break; case ISAKMP_ATTR_EXT_SEQ_NBR: - proto_tree_add_item(sub_transform_attr_type_tree, hf_isakmp_tf_attr_ext_seq_nbr, tvb, offset, optlen, FALSE); + proto_tree_add_item(sub_transform_attr_type_tree, hf_isakmp_tf_attr_ext_seq_nbr, tvb, offset, optlen, ENC_BIG_ENDIAN); proto_item_append_text(transform_attr_type_item," : %s", val_to_str(tvb_get_ntohs(tvb, offset), transform_attr_ext_seq_nbr_type, "Unknown %d")); case ISAKMP_ATTR_AUTH_KEY_LENGTH: - proto_tree_add_item(sub_transform_attr_type_tree, hf_isakmp_tf_attr_auth_key_length, tvb, offset, optlen, FALSE); + proto_tree_add_item(sub_transform_attr_type_tree, hf_isakmp_tf_attr_auth_key_length, tvb, offset, optlen, ENC_BIG_ENDIAN); proto_item_append_text(transform_attr_type_item," : %d", tvb_get_ntohs(tvb, offset)); break; case ISAKMP_ATTR_SIG_ENCO_ALGORITHM: @@ -3258,7 +3258,7 @@ dissect_transform_ike_attribute(tvbuff_t *tvb, proto_tree *transform_attr_type_t offset += 2; if (len) { - proto_tree_add_item(sub_transform_attr_type_tree, hf_isakmp_ike_attr_length, tvb, offset, 2, FALSE); + proto_tree_add_item(sub_transform_attr_type_tree, hf_isakmp_ike_attr_length, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; } if (optlen==0) @@ -3270,35 +3270,35 @@ dissect_transform_ike_attribute(tvbuff_t *tvb, proto_tree *transform_attr_type_t switch(transform_attr_type) { case IKE_ATTR_ENCRYPTION_ALGORITHM: - proto_tree_add_item(sub_transform_attr_type_tree, hf_isakmp_ike_attr_encryption_algorithm, tvb, offset, optlen, FALSE); + proto_tree_add_item(sub_transform_attr_type_tree, hf_isakmp_ike_attr_encryption_algorithm, tvb, offset, optlen, ENC_BIG_ENDIAN); proto_item_append_text(transform_attr_type_item," : %s", val_to_str(tvb_get_ntohs(tvb, offset), transform_attr_enc_type, "Unknown %d")); #ifdef HAVE_LIBGCRYPT decr->encr_alg = tvb_get_ntohs(tvb, offset); #endif break; case IKE_ATTR_HASH_ALGORITHM: - proto_tree_add_item(sub_transform_attr_type_tree, hf_isakmp_ike_attr_hash_algorithm, tvb, offset, optlen, FALSE); + proto_tree_add_item(sub_transform_attr_type_tree, hf_isakmp_ike_attr_hash_algorithm, tvb, offset, optlen, ENC_BIG_ENDIAN); proto_item_append_text(transform_attr_type_item," : %s", val_to_str(tvb_get_ntohs(tvb, offset), transform_attr_hash_type, "Unknown %d")); #ifdef HAVE_LIBGCRYPT decr->hash_alg = tvb_get_ntohs(tvb, offset); #endif break; case IKE_ATTR_AUTHENTICATION_METHOD: - proto_tree_add_item(sub_transform_attr_type_tree, hf_isakmp_ike_attr_authentication_method, tvb, offset, optlen, FALSE); + proto_tree_add_item(sub_transform_attr_type_tree, hf_isakmp_ike_attr_authentication_method, tvb, offset, optlen, ENC_BIG_ENDIAN); proto_item_append_text(transform_attr_type_item," : %s", val_to_str(tvb_get_ntohs(tvb, offset), transform_attr_authmeth_type, "Unknown %d")); #ifdef HAVE_LIBGCRYPT decr->is_psk = tvb_get_ntohs(tvb, offset) == 0x01 ? TRUE : FALSE; #endif break; case IKE_ATTR_GROUP_DESCRIPTION: - proto_tree_add_item(sub_transform_attr_type_tree, hf_isakmp_ike_attr_group_description, tvb, offset, optlen, FALSE); + proto_tree_add_item(sub_transform_attr_type_tree, hf_isakmp_ike_attr_group_description, tvb, offset, optlen, ENC_BIG_ENDIAN); proto_item_append_text(transform_attr_type_item," : %s", val_to_str(tvb_get_ntohs(tvb, offset), transform_dh_group_type, "Unknown %d")); #ifdef HAVE_LIBGCRYPT decr->group = tvb_get_ntohs(tvb, offset); #endif break; case IKE_ATTR_GROUP_TYPE: - proto_tree_add_item(sub_transform_attr_type_tree, hf_isakmp_ike_attr_group_type, tvb, offset, optlen, FALSE); + proto_tree_add_item(sub_transform_attr_type_tree, hf_isakmp_ike_attr_group_type, tvb, offset, optlen, ENC_BIG_ENDIAN); proto_item_append_text(transform_attr_type_item," : %s", val_to_str(tvb_get_ntohs(tvb, offset), transform_attr_grp_type, "Unknown %d")); break; case IKE_ATTR_GROUP_PRIME: @@ -3317,7 +3317,7 @@ dissect_transform_ike_attribute(tvbuff_t *tvb, proto_tree *transform_attr_type_t proto_tree_add_item(sub_transform_attr_type_tree, hf_isakmp_ike_attr_group_curve_b, tvb, offset, optlen, ENC_NA); break; case IKE_ATTR_LIFE_TYPE: - proto_tree_add_item(sub_transform_attr_type_tree, hf_isakmp_ike_attr_life_type, tvb, offset, optlen, FALSE); + proto_tree_add_item(sub_transform_attr_type_tree, hf_isakmp_ike_attr_life_type, tvb, offset, optlen, ENC_BIG_ENDIAN); proto_item_append_text(transform_attr_type_item," : %s", val_to_str(tvb_get_ntohs(tvb, offset), transform_attr_sa_life_type, "Unknown %d")); break; case IKE_ATTR_LIFE_DURATION: @@ -3327,7 +3327,7 @@ dissect_transform_ike_attribute(tvbuff_t *tvb, proto_tree *transform_attr_type_t proto_tree_add_item(sub_transform_attr_type_tree, hf_isakmp_ike_attr_prf, tvb, offset, optlen, ENC_NA); break; case IKE_ATTR_KEY_LENGTH: - proto_tree_add_item(sub_transform_attr_type_tree, hf_isakmp_ike_attr_key_length, tvb, offset, optlen, FALSE); + proto_tree_add_item(sub_transform_attr_type_tree, hf_isakmp_ike_attr_key_length, tvb, offset, optlen, ENC_BIG_ENDIAN); proto_item_append_text(transform_attr_type_item," : %d", tvb_get_ntohs(tvb, offset)); break; case IKE_ATTR_FIELD_SIZE: @@ -3372,7 +3372,7 @@ dissect_transform_ike2_attribute(tvbuff_t *tvb, proto_tree *transform_attr_type_ offset += 2; if (len) { - proto_tree_add_item(sub_transform_attr_type_tree, hf_isakmp_ike2_attr_length, tvb, offset, 2, FALSE); + proto_tree_add_item(sub_transform_attr_type_tree, hf_isakmp_ike2_attr_length, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; } if (optlen==0) @@ -3383,7 +3383,7 @@ dissect_transform_ike2_attribute(tvbuff_t *tvb, proto_tree *transform_attr_type_ proto_tree_add_item(sub_transform_attr_type_tree, hf_isakmp_ike2_attr_value, tvb, offset, optlen, ENC_NA); switch(transform_attr_type) { case IKE2_ATTR_KEY_LENGTH: - proto_tree_add_item(sub_transform_attr_type_tree, hf_isakmp_ike2_attr_key_length, tvb, offset, optlen, FALSE); + proto_tree_add_item(sub_transform_attr_type_tree, hf_isakmp_ike2_attr_key_length, tvb, offset, optlen, ENC_BIG_ENDIAN); proto_item_append_text(transform_attr_type_item," : %d", tvb_get_ntohs(tvb, offset)); break; break; @@ -3414,7 +3414,7 @@ _U_ transform_num = tvb_get_guint8(tvb, offset); proto_item_append_text(tree," # %d",transform_num); - proto_tree_add_item(tree, hf_isakmp_trans_number, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_isakmp_trans_number, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; transform_id = tvb_get_guint8(tvb, offset); @@ -3440,7 +3440,7 @@ _U_ val_to_str(transform_id, transform_id_ipcomp, "UNKNOWN-IPCOMP-TRANS-TYPE"), transform_id); break; default: - proto_tree_add_item(tree, hf_isakmp_trans_id, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_isakmp_trans_id, tvb, offset, 1, ENC_BIG_ENDIAN); break; } offset += 3; @@ -3474,22 +3474,22 @@ _U_ switch(transform_type){ case TF_IKE2_ENCR: - proto_tree_add_item(tree, hf_isakmp_trans_encr, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_isakmp_trans_encr, tvb, offset, 2, ENC_BIG_ENDIAN); break; case TF_IKE2_PRF: - proto_tree_add_item(tree, hf_isakmp_trans_prf, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_isakmp_trans_prf, tvb, offset, 2, ENC_BIG_ENDIAN); break; case TF_IKE2_INTEG: - proto_tree_add_item(tree, hf_isakmp_trans_integ, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_isakmp_trans_integ, tvb, offset, 2, ENC_BIG_ENDIAN); break; case TF_IKE2_DH: - proto_tree_add_item(tree, hf_isakmp_trans_dh, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_isakmp_trans_dh, tvb, offset, 2, ENC_BIG_ENDIAN); break; case TF_IKE2_ESN: - proto_tree_add_item(tree, hf_isakmp_trans_esn, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_isakmp_trans_esn, tvb, offset, 2, ENC_BIG_ENDIAN); break; default: - proto_tree_add_item(tree, hf_isakmp_trans_id_v2, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_isakmp_trans_id_v2, tvb, offset, 2, ENC_BIG_ENDIAN); break; } offset += 2; @@ -3559,7 +3559,7 @@ dissect_id(tvbuff_t *tvb, int offset, int length, proto_tree *tree, int isakmp_v proto_tree_add_uint_format(tree, hf_isakmp_id_protoid, tvb, offset,1, protocol_id, "Protocol ID: Unused"); else - proto_tree_add_item(tree, hf_isakmp_id_protoid, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_isakmp_id_protoid, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; length -= 1; @@ -3569,7 +3569,7 @@ dissect_id(tvbuff_t *tvb, int offset, int length, proto_tree *tree, int isakmp_v proto_tree_add_uint_format(tree, hf_isakmp_id_port, tvb, offset, 2, port, "Port: Unused"); else - proto_tree_add_item(tree, hf_isakmp_id_port, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_isakmp_id_port, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; length -= 2; @@ -3732,13 +3732,13 @@ dissect_cisco_fragmentation(tvbuff_t *tvb, int offset, int length, proto_tree *t if (length < 4) return; - proto_tree_add_item(tree, hf_isakmp_cisco_frag_packetid, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_isakmp_cisco_frag_packetid, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; seq = tvb_get_guint8(tvb, offset); - proto_tree_add_item(tree, hf_isakmp_cisco_frag_seq, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_isakmp_cisco_frag_seq, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; last = tvb_get_guint8(tvb, offset); - proto_tree_add_item(tree, hf_isakmp_cisco_frag_last, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_isakmp_cisco_frag_last, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; length-=4; @@ -3785,23 +3785,23 @@ dissect_notif(tvbuff_t *tvb, int offset, int length, proto_tree *tree, int isakm if (isakmp_version == 1) { - proto_tree_add_item(tree, hf_isakmp_notify_doi, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_isakmp_notify_doi, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 4; length -= 4; } if (isakmp_version == 1) { - proto_tree_add_item(tree, hf_isakmp_notify_protoid_v1, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_isakmp_notify_protoid_v1, tvb, offset, 1, ENC_BIG_ENDIAN); }else if (isakmp_version == 2) { - proto_tree_add_item(tree, hf_isakmp_notify_protoid_v2, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_isakmp_notify_protoid_v2, tvb, offset, 1, ENC_BIG_ENDIAN); } offset += 1; length -= 1; spi_size = tvb_get_guint8(tvb, offset); - proto_tree_add_item(tree, hf_isakmp_spisize, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_isakmp_spisize, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; length -= 1; @@ -3831,10 +3831,10 @@ dissect_notif(tvbuff_t *tvb, int offset, int length, proto_tree *tree, int isakm { switch (msgtype) { case 36136: /* DPD ARE YOU THERE */ - proto_tree_add_item(tree, hf_isakmp_notify_data_dpd_are_you_there, tvb, offset, length, FALSE); + proto_tree_add_item(tree, hf_isakmp_notify_data_dpd_are_you_there, tvb, offset, length, ENC_BIG_ENDIAN); break; case 36137: /* DPD ARE YOU THERE ACK */ - proto_tree_add_item(tree, hf_isakmp_notify_data_dpd_are_you_there_ack, tvb, offset, length, FALSE); + proto_tree_add_item(tree, hf_isakmp_notify_data_dpd_are_you_there_ack, tvb, offset, length, ENC_BIG_ENDIAN); break; case 40501: /* UNITY Load Balance */ proto_tree_add_item(tree, hf_isakmp_notify_data_unity_load_balance, tvb, offset, length, FALSE); @@ -3848,12 +3848,12 @@ dissect_notif(tvbuff_t *tvb, int offset, int length, proto_tree *tree, int isakm { switch(msgtype){ case 16387: /* IPCOMP_SUPPORTED */ - proto_tree_add_item(tree, hf_isakmp_notify_data_ipcomp_cpi, tvb, offset, 2, FALSE); - proto_tree_add_item(tree, hf_isakmp_notify_data_ipcomp_transform_id, tvb, offset+2, 1, FALSE); + proto_tree_add_item(tree, hf_isakmp_notify_data_ipcomp_cpi, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_isakmp_notify_data_ipcomp_transform_id, tvb, offset+2, 1, ENC_BIG_ENDIAN); break; case 16407: /* REDIRECT */ - proto_tree_add_item(tree, hf_isakmp_notify_data_redirect_gw_ident_type, tvb, offset, 1, FALSE); - proto_tree_add_item(tree, hf_isakmp_notify_data_redirect_gw_ident_len, tvb, offset+1, 1, FALSE); + proto_tree_add_item(tree, hf_isakmp_notify_data_redirect_gw_ident_type, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_isakmp_notify_data_redirect_gw_ident_len, tvb, offset+1, 1, ENC_BIG_ENDIAN); switch(tvb_get_guint8(tvb, offset)){ /* Ident Type ? */ case 1: proto_tree_add_item(tree, hf_isakmp_notify_data_redirect_new_resp_gw_ident_ipv4, tvb, offset+2, 4, FALSE); @@ -3876,8 +3876,8 @@ dissect_notif(tvbuff_t *tvb, int offset, int length, proto_tree *tree, int isakm } break; case 16408: /* REDIRECT_FROM */ - proto_tree_add_item(tree, hf_isakmp_notify_data_redirect_gw_ident_type, tvb, offset, 1, FALSE); - proto_tree_add_item(tree, hf_isakmp_notify_data_redirect_gw_ident_len, tvb, offset+1, 1, FALSE); + proto_tree_add_item(tree, hf_isakmp_notify_data_redirect_gw_ident_type, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_isakmp_notify_data_redirect_gw_ident_len, tvb, offset+1, 1, ENC_BIG_ENDIAN); switch(tvb_get_guint8(tvb, offset)){ /* Ident Type ? */ case 1: proto_tree_add_item(tree, hf_isakmp_notify_data_redirect_org_resp_gw_ident_ipv4, tvb, offset+2, 4, FALSE); @@ -3912,9 +3912,9 @@ dissect_notif(tvbuff_t *tvb, int offset, int length, proto_tree *tree, int isakm case 16422: /* IKEV2_MESSAGE_ID_SYNC */ proto_tree_add_item(tree, hf_isakmp_notify_data_ha_nonce_data, tvb, offset, 4, FALSE); offset += 4; - proto_tree_add_item(tree, hf_isakmp_notify_data_ha_expected_send_req_msg_id, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_isakmp_notify_data_ha_expected_send_req_msg_id, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(tree, hf_isakmp_notify_data_ha_expected_recv_req_msg_id, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_isakmp_notify_data_ha_expected_recv_req_msg_id, tvb, offset, 4, ENC_BIG_ENDIAN); break; case 16423: /* IPSEC_REPLAY_COUNTER_SYNC */ proto_tree_add_item(tree, hf_isakmp_notify_data_ha_incoming_ipsec_sa_delta_value, tvb, offset, length, ENC_NA); @@ -3934,7 +3934,7 @@ dissect_delete(tvbuff_t *tvb, int offset, int length, proto_tree *tree, int isak if (isakmp_version == 1) { - proto_tree_add_item(tree, hf_isakmp_delete_doi, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_isakmp_delete_doi, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 4; length -= 4; } @@ -3942,21 +3942,21 @@ dissect_delete(tvbuff_t *tvb, int offset, int length, proto_tree *tree, int isak if (isakmp_version == 1) { - proto_tree_add_item(tree, hf_isakmp_delete_protoid_v1, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_isakmp_delete_protoid_v1, tvb, offset, 1, ENC_BIG_ENDIAN); }else if (isakmp_version == 2) { - proto_tree_add_item(tree, hf_isakmp_delete_protoid_v2, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_isakmp_delete_protoid_v2, tvb, offset, 1, ENC_BIG_ENDIAN); } offset += 1; length -= 1; spi_size = tvb_get_guint8(tvb, offset); - proto_tree_add_item(tree, hf_isakmp_spisize, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_isakmp_spisize, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; length -= 1; - proto_tree_add_item(tree, hf_isakmp_num_spis, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_isakmp_num_spis, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; length -= 2; @@ -3987,15 +3987,15 @@ dissect_vid(tvbuff_t *tvb, int offset, int length, proto_tree *tree) if (length >= 20 && memcmp(pVID, VID_CP, 20) == 0) { offset += 20; - proto_tree_add_item(tree, hf_isakmp_vid_cp_product, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_isakmp_vid_cp_product, tvb, offset, 4, ENC_BIG_ENDIAN); offset +=4; - proto_tree_add_item(tree, hf_isakmp_vid_cp_version, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_isakmp_vid_cp_version, tvb, offset, 4, ENC_BIG_ENDIAN); offset +=4; proto_tree_add_item(tree, hf_isakmp_vid_cp_timestamp, tvb, offset, 4, FALSE); offset +=4; - proto_tree_add_item(tree, hf_isakmp_vid_cp_reserved, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_isakmp_vid_cp_reserved, tvb, offset, 4, ENC_BIG_ENDIAN); offset +=4; - proto_tree_add_item(tree, hf_isakmp_vid_cp_features, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_isakmp_vid_cp_features, tvb, offset, 4, ENC_BIG_ENDIAN); offset +=4; } @@ -4003,10 +4003,10 @@ dissect_vid(tvbuff_t *tvb, int offset, int length, proto_tree *tree) if (length >= 14 && memcmp(pVID, VID_CISCO_UNITY, 14) == 0) { offset += 14; - proto_tree_add_item(tree, hf_isakmp_vid_cisco_unity_major, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_isakmp_vid_cisco_unity_major, tvb, offset, 1, ENC_BIG_ENDIAN); proto_item_append_text(tree, " %u", tvb_get_guint8(tvb,offset)); offset += 1; - proto_tree_add_item(tree, hf_isakmp_vid_cisco_unity_minor, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_isakmp_vid_cisco_unity_minor, tvb, offset, 1, ENC_BIG_ENDIAN); proto_item_append_text(tree, ".%u", tvb_get_guint8(tvb,offset)); offset += 1; } @@ -4015,7 +4015,7 @@ dissect_vid(tvbuff_t *tvb, int offset, int length, proto_tree *tree) if (length >= 16 && memcmp(pVID, VID_MS_NT5_ISAKMPOAKLEY, 16) == 0) { offset += 16; - proto_tree_add_item(tree, hf_isakmp_vid_ms_nt5_isakmpoakley, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_isakmp_vid_ms_nt5_isakmpoakley, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; } @@ -4061,7 +4061,7 @@ dissect_config_attribute(tvbuff_t *tvb, proto_tree *cfg_attr_type_tree, int offs offset += 2; if (len) { - proto_tree_add_item(sub_cfg_attr_type_tree, hf_isakmp_cfg_attr_length, tvb, offset, 2, FALSE); + proto_tree_add_item(sub_cfg_attr_type_tree, hf_isakmp_cfg_attr_length, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; } if (optlen==0) @@ -4114,7 +4114,7 @@ dissect_config_attribute(tvbuff_t *tvb, proto_tree *cfg_attr_type_tree, int offs } break; case INTERNAL_ADDRESS_EXPIRY: /* 5 */ - proto_tree_add_item(sub_cfg_attr_type_tree, hf_isakmp_cfg_attr_internal_address_expiry, tvb, offset, 4, FALSE); + proto_tree_add_item(sub_cfg_attr_type_tree, hf_isakmp_cfg_attr_internal_address_expiry, tvb, offset, 4, ENC_BIG_ENDIAN); break; case INTERNAL_IP4_DHCP: /* 6 */ offset_end = offset + optlen; @@ -4209,7 +4209,7 @@ dissect_config_attribute(tvbuff_t *tvb, proto_tree *cfg_attr_type_tree, int offs { while (offset_end-offset > 0) { - proto_tree_add_item(sub_cfg_attr_type_tree, hf_isakmp_cfg_attr_supported_attributes, tvb, offset, 2, FALSE); + proto_tree_add_item(sub_cfg_attr_type_tree, hf_isakmp_cfg_attr_supported_attributes, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; } @@ -4224,14 +4224,14 @@ dissect_config_attribute(tvbuff_t *tvb, proto_tree *cfg_attr_type_tree, int offs { proto_tree_add_item(sub_cfg_attr_type_tree, hf_isakmp_cfg_attr_internal_ip6_subnet_ip, tvb, offset, 16, FALSE); offset += 16; - proto_tree_add_item(sub_cfg_attr_type_tree, hf_isakmp_cfg_attr_internal_ip6_subnet_prefix, tvb, offset, 1, FALSE); + proto_tree_add_item(sub_cfg_attr_type_tree, hf_isakmp_cfg_attr_internal_ip6_subnet_prefix, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; } } break; case INTERNAL_IP6_LINK: /* 17 */ - proto_tree_add_item(sub_cfg_attr_type_tree, hf_isakmp_cfg_attr_internal_ip6_link_interface, tvb, offset, 8, FALSE); + proto_tree_add_item(sub_cfg_attr_type_tree, hf_isakmp_cfg_attr_internal_ip6_link_interface, tvb, offset, 8, ENC_BIG_ENDIAN); offset += 8; proto_tree_add_item(sub_cfg_attr_type_tree, hf_isakmp_cfg_attr_internal_ip6_link_id, tvb, offset, optlen-8, ENC_NA); offset += optlen-8; @@ -4245,7 +4245,7 @@ dissect_config_attribute(tvbuff_t *tvb, proto_tree *cfg_attr_type_tree, int offs { proto_tree_add_item(sub_cfg_attr_type_tree, hf_isakmp_cfg_attr_internal_ip6_prefix_ip, tvb, offset, 16, FALSE); offset += 16; - proto_tree_add_item(sub_cfg_attr_type_tree, hf_isakmp_cfg_attr_internal_ip6_prefix_length, tvb, offset, 1, FALSE); + proto_tree_add_item(sub_cfg_attr_type_tree, hf_isakmp_cfg_attr_internal_ip6_prefix_length, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; } @@ -4280,7 +4280,7 @@ dissect_config_attribute(tvbuff_t *tvb, proto_tree *cfg_attr_type_tree, int offs proto_item_append_text(cfg_attr_type_item," : %s", tvb_get_ephemeral_string(tvb, offset,optlen)); break; case XAUTH_STATUS: /* 16527 */ - proto_tree_add_item(sub_cfg_attr_type_tree, hf_isakmp_cfg_attr_xauth_status, tvb, offset, optlen, FALSE); + proto_tree_add_item(sub_cfg_attr_type_tree, hf_isakmp_cfg_attr_xauth_status, tvb, offset, optlen, ENC_BIG_ENDIAN); proto_item_append_text(cfg_attr_type_item," : %s", val_to_str(tvb_get_ntohs(tvb, offset), cfgattr_xauth_status, "Unknown %d")); break; case XAUTH_NEXT_PIN: /* 16528 */ @@ -4318,7 +4318,7 @@ dissect_config(tvbuff_t *tvb, int offset, int length, proto_tree *tree, int isak proto_tree_add_item(tree, hf_isakmp_cfg_type_v1,tvb, offset, 1, FALSE); offset += 2; - proto_tree_add_item(tree, hf_isakmp_cfg_identifier,tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_isakmp_cfg_identifier,tvb, offset, 1, ENC_BIG_ENDIAN); offset += 2; } else if (isakmp_version == 2) { @@ -4379,7 +4379,7 @@ dissect_ts(tvbuff_t *tvb, int offset, int length, proto_tree *tree) num = tvb_get_guint8(tvb, offset); proto_item_append_text(tree," # %d", num); - proto_tree_add_item(tree, hf_isakmp_ts_number_of_ts, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_isakmp_ts_number_of_ts, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; length -= 1; @@ -4400,19 +4400,19 @@ dissect_ts(tvbuff_t *tvb, int offset, int length, proto_tree *tree) proto_tree_add_uint_format(tree, hf_isakmp_ts_protoid, tvb, offset,1, protocol_id, "Protocol ID: Unused"); else - proto_tree_add_item(tree, hf_isakmp_ts_protoid, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_isakmp_ts_protoid, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; length -= 1; - proto_tree_add_item(tree, hf_isakmp_ts_selector_length, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_isakmp_ts_selector_length, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; length -= 2; - proto_tree_add_item(tree, hf_isakmp_ts_start_port, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_isakmp_ts_start_port, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; length -= 2; - proto_tree_add_item(tree, hf_isakmp_ts_end_port, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_isakmp_ts_end_port, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; length -= 2; @@ -4429,19 +4429,19 @@ dissect_ts(tvbuff_t *tvb, int offset, int length, proto_tree *tree) proto_tree_add_uint_format(tree, hf_isakmp_ts_protoid, tvb, offset,1, protocol_id, "Protocol ID: Unused"); else - proto_tree_add_item(tree, hf_isakmp_ts_protoid, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_isakmp_ts_protoid, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; length -= 1; - proto_tree_add_item(tree, hf_isakmp_ts_selector_length, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_isakmp_ts_selector_length, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; length -= 2; - proto_tree_add_item(tree, hf_isakmp_ts_start_port, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_isakmp_ts_start_port, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; length -= 2; - proto_tree_add_item(tree, hf_isakmp_ts_end_port, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_isakmp_ts_end_port, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; length -= 2; @@ -4458,37 +4458,37 @@ dissect_ts(tvbuff_t *tvb, int offset, int length, proto_tree *tree) offset += 1; /* Reserved */ length -= 1; - proto_tree_add_item(tree, hf_isakmp_ts_selector_length, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_isakmp_ts_selector_length, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; length -= 2; offset += 1; /* Reserved */ length -= 1; - proto_tree_add_item(tree, hf_isakmp_ts_start_addr_fc, tvb, offset, 3, FALSE); + proto_tree_add_item(tree, hf_isakmp_ts_start_addr_fc, tvb, offset, 3, ENC_BIG_ENDIAN); offset += 3; length -= 3; offset += 1; /* Reserved */ length -= 1; - proto_tree_add_item(tree, hf_isakmp_ts_end_addr_fc, tvb, offset, 3, FALSE); + proto_tree_add_item(tree, hf_isakmp_ts_end_addr_fc, tvb, offset, 3, ENC_BIG_ENDIAN); offset += 3; length -= 3; - proto_tree_add_item(tree, hf_isakmp_ts_start_r_ctl, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_isakmp_ts_start_r_ctl, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; length -= 1; - proto_tree_add_item(tree, hf_isakmp_ts_end_r_ctl, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_isakmp_ts_end_r_ctl, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; length -= 1; - proto_tree_add_item(tree, hf_isakmp_ts_start_type, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_isakmp_ts_start_type, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; length -= 1; - proto_tree_add_item(tree, hf_isakmp_ts_end_type, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_isakmp_ts_end_type, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; length -= 1; break; @@ -4682,7 +4682,7 @@ dissect_enc(tvbuff_t *tvb, decr_payloads_tree = proto_item_add_subtree(item, ett_isakmp_decrypted_payloads); } - padlen_item = proto_tree_add_item(decr_tree, hf_isakmp_enc_pad_length, decr_tvb, payloads_len + pad_len, 1, FALSE); + padlen_item = proto_tree_add_item(decr_tree, hf_isakmp_enc_pad_length, decr_tvb, payloads_len + pad_len, 1, ENC_BIG_ENDIAN); if (pad_len > 0) { if (payloads_len < 0) { proto_item_append_text(padlen_item, " [too long]"); diff --git a/epan/dissectors/packet-iscsi.c b/epan/dissectors/packet-iscsi.c index 7797b73d25..0fb93df786 100644 --- a/epan/dissectors/packet-iscsi.c +++ b/epan/dissectors/packet-iscsi.c @@ -913,28 +913,28 @@ dissect_iscsi_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint off if(opcode == ISCSI_OPCODE_NOP_OUT) { /* NOP Out */ if(iscsi_protocol_version > ISCSI_PROTOCOL_DRAFT09) { - proto_tree_add_item(ti, hf_iscsi_TotalAHSLength, tvb, offset + 4, 1, FALSE); + proto_tree_add_item(ti, hf_iscsi_TotalAHSLength, tvb, offset + 4, 1, ENC_BIG_ENDIAN); } proto_tree_add_uint(ti, hf_iscsi_DataSegmentLength, tvb, offset + 5, 3, tvb_get_ntoh24(tvb, offset + 5)); proto_tree_add_item(ti, hf_iscsi_LUN, tvb, offset + 8, 8, ENC_NA); - proto_tree_add_item(ti, hf_iscsi_InitiatorTaskTag, tvb, offset + 16, 4, FALSE); - proto_tree_add_item(ti, hf_iscsi_TargetTransferTag, tvb, offset + 20, 4, FALSE); - proto_tree_add_item(ti, hf_iscsi_CmdSN, tvb, offset + 24, 4, FALSE); - proto_tree_add_item(ti, hf_iscsi_ExpStatSN, tvb, offset + 28, 4, FALSE); + proto_tree_add_item(ti, hf_iscsi_InitiatorTaskTag, tvb, offset + 16, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(ti, hf_iscsi_TargetTransferTag, tvb, offset + 20, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(ti, hf_iscsi_CmdSN, tvb, offset + 24, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(ti, hf_iscsi_ExpStatSN, tvb, offset + 28, 4, ENC_BIG_ENDIAN); offset = handleHeaderDigest(iscsi_session, ti, tvb, offset, 48); offset = handleDataSegment(ti, tvb, offset, data_segment_len, end_offset, hf_iscsi_ping_data); } else if(opcode == ISCSI_OPCODE_NOP_IN) { /* NOP In */ if(iscsi_protocol_version > ISCSI_PROTOCOL_DRAFT09) { - proto_tree_add_item(ti, hf_iscsi_TotalAHSLength, tvb, offset + 4, 1, FALSE); + proto_tree_add_item(ti, hf_iscsi_TotalAHSLength, tvb, offset + 4, 1, ENC_BIG_ENDIAN); } proto_tree_add_uint(ti, hf_iscsi_DataSegmentLength, tvb, offset + 5, 3, tvb_get_ntoh24(tvb, offset + 5)); proto_tree_add_item(ti, hf_iscsi_LUN, tvb, offset + 8, 8, ENC_NA); - proto_tree_add_item(ti, hf_iscsi_InitiatorTaskTag, tvb, offset + 16, 4, FALSE); - proto_tree_add_item(ti, hf_iscsi_TargetTransferTag, tvb, offset + 20, 4, FALSE); - proto_tree_add_item(ti, hf_iscsi_StatSN, tvb, offset + 24, 4, FALSE); - proto_tree_add_item(ti, hf_iscsi_ExpCmdSN, tvb, offset + 28, 4, FALSE); - proto_tree_add_item(ti, hf_iscsi_MaxCmdSN, tvb, offset + 32, 4, FALSE); + proto_tree_add_item(ti, hf_iscsi_InitiatorTaskTag, tvb, offset + 16, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(ti, hf_iscsi_TargetTransferTag, tvb, offset + 20, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(ti, hf_iscsi_StatSN, tvb, offset + 24, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(ti, hf_iscsi_ExpCmdSN, tvb, offset + 28, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(ti, hf_iscsi_MaxCmdSN, tvb, offset + 32, 4, ENC_BIG_ENDIAN); offset = handleHeaderDigest(iscsi_session, ti, tvb, offset, 48); offset = handleDataSegment(ti, tvb, offset, data_segment_len, end_offset, hf_iscsi_ping_data); } else if(opcode == ISCSI_OPCODE_SCSI_COMMAND) { @@ -958,16 +958,16 @@ dissect_iscsi_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint off proto_tree_add_uint(tt, hf_iscsi_SCSICommand_Attr, tvb, offset + 1, 1, b); } if(iscsi_protocol_version < ISCSI_PROTOCOL_DRAFT12) { - proto_tree_add_item(ti, hf_iscsi_SCSICommand_CRN, tvb, offset + 3, 1, FALSE); + proto_tree_add_item(ti, hf_iscsi_SCSICommand_CRN, tvb, offset + 3, 1, ENC_BIG_ENDIAN); } - proto_tree_add_item(ti, hf_iscsi_TotalAHSLength, tvb, offset + 4, 1, FALSE); + proto_tree_add_item(ti, hf_iscsi_TotalAHSLength, tvb, offset + 4, 1, ENC_BIG_ENDIAN); proto_tree_add_uint(ti, hf_iscsi_DataSegmentLength, tvb, offset + 5, 3, tvb_get_ntoh24(tvb, offset + 5)); proto_tree_add_item(ti, hf_iscsi_LUN, tvb, offset + 8, 8, ENC_NA); - proto_tree_add_item(ti, hf_iscsi_InitiatorTaskTag, tvb, offset + 16, 4, FALSE); - proto_tree_add_item(ti, hf_iscsi_ExpectedDataTransferLength, tvb, offset + 20, 4, FALSE); + proto_tree_add_item(ti, hf_iscsi_InitiatorTaskTag, tvb, offset + 16, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(ti, hf_iscsi_ExpectedDataTransferLength, tvb, offset + 20, 4, ENC_BIG_ENDIAN); cdata->itlq.data_length=tvb_get_ntohl(tvb, offset+20); - proto_tree_add_item(ti, hf_iscsi_CmdSN, tvb, offset + 24, 4, FALSE); - proto_tree_add_item(ti, hf_iscsi_ExpStatSN, tvb, offset + 28, 4, FALSE); + proto_tree_add_item(ti, hf_iscsi_CmdSN, tvb, offset + 24, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(ti, hf_iscsi_ExpStatSN, tvb, offset + 28, 4, ENC_BIG_ENDIAN); if(ahsLen > 0) { guint ahs_offset=offset+48; guint16 ahs_length=0; @@ -976,11 +976,11 @@ dissect_iscsi_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint off while(ahs_offset<(offset+48+ahsLen)){ ahs_length=tvb_get_ntohs(tvb, ahs_offset); - proto_tree_add_item(ti, hf_iscsi_AHS_length, tvb, ahs_offset, 2, FALSE); + proto_tree_add_item(ti, hf_iscsi_AHS_length, tvb, ahs_offset, 2, ENC_BIG_ENDIAN); ahs_offset+=2; ahs_type=tvb_get_guint8(tvb, ahs_offset); - proto_tree_add_item(ti, hf_iscsi_AHS_type, tvb, ahs_offset, 1, FALSE); + proto_tree_add_item(ti, hf_iscsi_AHS_type, tvb, ahs_offset, 1, ENC_BIG_ENDIAN); ahs_offset++; switch(ahs_type){ @@ -995,7 +995,7 @@ dissect_iscsi_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint off /* skip reserved byte */ ahs_offset++; /* read data length */ - proto_tree_add_item(ti, hf_iscsi_AHS_read_data_length, tvb, ahs_offset, 4, FALSE); + proto_tree_add_item(ti, hf_iscsi_AHS_read_data_length, tvb, ahs_offset, 4, ENC_BIG_ENDIAN); cdata->itlq.bidir_data_length=tvb_get_ntohl(tvb, ahs_offset); ahs_offset+=4; break; @@ -1029,26 +1029,26 @@ dissect_iscsi_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint off proto_tree_add_boolean(tt, hf_iscsi_SCSIResponse_O, tvb, offset + 1, 1, b); proto_tree_add_boolean(tt, hf_iscsi_SCSIResponse_U, tvb, offset + 1, 1, b); } - proto_tree_add_item(ti, hf_iscsi_SCSIResponse_Response, tvb, offset + 2, 1, FALSE); - proto_tree_add_item(ti, hf_iscsi_SCSIResponse_Status, tvb, offset + 3, 1, FALSE); + proto_tree_add_item(ti, hf_iscsi_SCSIResponse_Response, tvb, offset + 2, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ti, hf_iscsi_SCSIResponse_Status, tvb, offset + 3, 1, ENC_BIG_ENDIAN); if(iscsi_protocol_version > ISCSI_PROTOCOL_DRAFT09) { - proto_tree_add_item(ti, hf_iscsi_TotalAHSLength, tvb, offset + 4, 1, FALSE); + proto_tree_add_item(ti, hf_iscsi_TotalAHSLength, tvb, offset + 4, 1, ENC_BIG_ENDIAN); } proto_tree_add_uint(ti, hf_iscsi_DataSegmentLength, tvb, offset + 5, 3, tvb_get_ntoh24(tvb, offset + 5)); - proto_tree_add_item(ti, hf_iscsi_InitiatorTaskTag, tvb, offset + 16, 4, FALSE); + proto_tree_add_item(ti, hf_iscsi_InitiatorTaskTag, tvb, offset + 16, 4, ENC_BIG_ENDIAN); if(iscsi_protocol_version <= ISCSI_PROTOCOL_DRAFT09) { - proto_tree_add_item(ti, hf_iscsi_SCSIResponse_ResidualCount, tvb, offset + 20, 4, FALSE); + proto_tree_add_item(ti, hf_iscsi_SCSIResponse_ResidualCount, tvb, offset + 20, 4, ENC_BIG_ENDIAN); } - proto_tree_add_item(ti, hf_iscsi_StatSN, tvb, offset + 24, 4, FALSE); - proto_tree_add_item(ti, hf_iscsi_ExpCmdSN, tvb, offset + 28, 4, FALSE); - proto_tree_add_item(ti, hf_iscsi_MaxCmdSN, tvb, offset + 32, 4, FALSE); - proto_tree_add_item(ti, hf_iscsi_ExpDataSN, tvb, offset + 36, 4, FALSE); + proto_tree_add_item(ti, hf_iscsi_StatSN, tvb, offset + 24, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(ti, hf_iscsi_ExpCmdSN, tvb, offset + 28, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(ti, hf_iscsi_MaxCmdSN, tvb, offset + 32, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(ti, hf_iscsi_ExpDataSN, tvb, offset + 36, 4, ENC_BIG_ENDIAN); if(iscsi_protocol_version <= ISCSI_PROTOCOL_DRAFT09) { - proto_tree_add_item(ti, hf_iscsi_SCSIResponse_BidiReadResidualCount, tvb, offset + 44, 4, FALSE); + proto_tree_add_item(ti, hf_iscsi_SCSIResponse_BidiReadResidualCount, tvb, offset + 44, 4, ENC_BIG_ENDIAN); } else { - proto_tree_add_item(ti, hf_iscsi_SCSIResponse_BidiReadResidualCount, tvb, offset + 40, 4, FALSE); - proto_tree_add_item(ti, hf_iscsi_SCSIResponse_ResidualCount, tvb, offset + 44, 4, FALSE); + proto_tree_add_item(ti, hf_iscsi_SCSIResponse_BidiReadResidualCount, tvb, offset + 40, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(ti, hf_iscsi_SCSIResponse_ResidualCount, tvb, offset + 44, 4, ENC_BIG_ENDIAN); } offset = handleHeaderDigest(iscsi_session, ti, tvb, offset, 48); /* do not update offset here because the data segment is @@ -1056,32 +1056,32 @@ dissect_iscsi_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint off handleDataDigest(ti, tvb, offset, paddedDataSegmentLength); } else if(opcode == ISCSI_OPCODE_TASK_MANAGEMENT_FUNCTION) { /* Task Management Function */ - proto_tree_add_item(ti, hf_iscsi_TaskManagementFunction_Function, tvb, offset + 1, 1, FALSE); + proto_tree_add_item(ti, hf_iscsi_TaskManagementFunction_Function, tvb, offset + 1, 1, ENC_BIG_ENDIAN); if(iscsi_protocol_version > ISCSI_PROTOCOL_DRAFT09) { - proto_tree_add_item(ti, hf_iscsi_TotalAHSLength, tvb, offset + 4, 1, FALSE); + proto_tree_add_item(ti, hf_iscsi_TotalAHSLength, tvb, offset + 4, 1, ENC_BIG_ENDIAN); proto_tree_add_uint(ti, hf_iscsi_DataSegmentLength, tvb, offset + 5, 3, tvb_get_ntoh24(tvb, offset + 5)); } proto_tree_add_item(ti, hf_iscsi_LUN, tvb, offset + 8, 8, ENC_NA); - proto_tree_add_item(ti, hf_iscsi_InitiatorTaskTag, tvb, offset + 16, 4, FALSE); - proto_tree_add_item(ti, hf_iscsi_TaskManagementFunction_ReferencedTaskTag, tvb, offset + 20, 4, FALSE); - proto_tree_add_item(ti, hf_iscsi_CmdSN, tvb, offset + 24, 4, FALSE); - proto_tree_add_item(ti, hf_iscsi_ExpStatSN, tvb, offset + 28, 4, FALSE); - proto_tree_add_item(ti, hf_iscsi_RefCmdSN, tvb, offset + 32, 4, FALSE); + proto_tree_add_item(ti, hf_iscsi_InitiatorTaskTag, tvb, offset + 16, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(ti, hf_iscsi_TaskManagementFunction_ReferencedTaskTag, tvb, offset + 20, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(ti, hf_iscsi_CmdSN, tvb, offset + 24, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(ti, hf_iscsi_ExpStatSN, tvb, offset + 28, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(ti, hf_iscsi_RefCmdSN, tvb, offset + 32, 4, ENC_BIG_ENDIAN); offset = handleHeaderDigest(iscsi_session, ti, tvb, offset, 48); } else if(opcode == ISCSI_OPCODE_TASK_MANAGEMENT_FUNCTION_RESPONSE) { /* Task Management Function Response */ - proto_tree_add_item(ti, hf_iscsi_TaskManagementFunction_Response, tvb, offset + 2, 1, FALSE); + proto_tree_add_item(ti, hf_iscsi_TaskManagementFunction_Response, tvb, offset + 2, 1, ENC_BIG_ENDIAN); if(iscsi_protocol_version <= ISCSI_PROTOCOL_DRAFT09) { - proto_tree_add_item(ti, hf_iscsi_TotalAHSLength, tvb, offset + 4, 1, FALSE); + proto_tree_add_item(ti, hf_iscsi_TotalAHSLength, tvb, offset + 4, 1, ENC_BIG_ENDIAN); proto_tree_add_uint(ti, hf_iscsi_DataSegmentLength, tvb, offset + 5, 3, tvb_get_ntoh24(tvb, offset + 5)); } - proto_tree_add_item(ti, hf_iscsi_InitiatorTaskTag, tvb, offset + 16, 4, FALSE); + proto_tree_add_item(ti, hf_iscsi_InitiatorTaskTag, tvb, offset + 16, 4, ENC_BIG_ENDIAN); if(iscsi_protocol_version < ISCSI_PROTOCOL_DRAFT12) { - proto_tree_add_item(ti, hf_iscsi_TaskManagementFunction_ReferencedTaskTag, tvb, offset + 20, 4, FALSE); + proto_tree_add_item(ti, hf_iscsi_TaskManagementFunction_ReferencedTaskTag, tvb, offset + 20, 4, ENC_BIG_ENDIAN); } - proto_tree_add_item(ti, hf_iscsi_StatSN, tvb, offset + 24, 4, FALSE); - proto_tree_add_item(ti, hf_iscsi_ExpCmdSN, tvb, offset + 28, 4, FALSE); - proto_tree_add_item(ti, hf_iscsi_MaxCmdSN, tvb, offset + 32, 4, FALSE); + proto_tree_add_item(ti, hf_iscsi_StatSN, tvb, offset + 24, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(ti, hf_iscsi_ExpCmdSN, tvb, offset + 28, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(ti, hf_iscsi_MaxCmdSN, tvb, offset + 32, 4, ENC_BIG_ENDIAN); offset = handleHeaderDigest(iscsi_session, ti, tvb, offset, 48); } else if(opcode == ISCSI_OPCODE_LOGIN_COMMAND) { /* Login Command */ @@ -1104,51 +1104,51 @@ dissect_iscsi_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint off if(iscsi_protocol_version == ISCSI_PROTOCOL_DRAFT08) { proto_tree_add_boolean(ti, hf_iscsi_Login_X, tvb, offset + 1, 1, b); } - proto_tree_add_item(ti, hf_iscsi_Login_CSG, tvb, offset + 1, 1, FALSE); + proto_tree_add_item(ti, hf_iscsi_Login_CSG, tvb, offset + 1, 1, ENC_BIG_ENDIAN); /* NSG is undefined unless T is set */ if(b&0x80){ - proto_tree_add_item(ti, hf_iscsi_Login_NSG, tvb, offset + 1, 1, FALSE); + proto_tree_add_item(ti, hf_iscsi_Login_NSG, tvb, offset + 1, 1, ENC_BIG_ENDIAN); } } - proto_tree_add_item(ti, hf_iscsi_VersionMax, tvb, offset + 2, 1, FALSE); - proto_tree_add_item(ti, hf_iscsi_VersionMin, tvb, offset + 3, 1, FALSE); + proto_tree_add_item(ti, hf_iscsi_VersionMax, tvb, offset + 2, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ti, hf_iscsi_VersionMin, tvb, offset + 3, 1, ENC_BIG_ENDIAN); if(iscsi_protocol_version > ISCSI_PROTOCOL_DRAFT09) { - proto_tree_add_item(ti, hf_iscsi_TotalAHSLength, tvb, offset + 4, 1, FALSE); + proto_tree_add_item(ti, hf_iscsi_TotalAHSLength, tvb, offset + 4, 1, ENC_BIG_ENDIAN); } proto_tree_add_uint(ti, hf_iscsi_DataSegmentLength, tvb, offset + 5, 3, tvb_get_ntoh24(tvb, offset + 5)); if(iscsi_protocol_version == ISCSI_PROTOCOL_DRAFT08) { - proto_tree_add_item(ti, hf_iscsi_CID, tvb, offset + 8, 2, FALSE); - proto_tree_add_item(ti, hf_iscsi_ISID8, tvb, offset + 12, 2, FALSE); + proto_tree_add_item(ti, hf_iscsi_CID, tvb, offset + 8, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(ti, hf_iscsi_ISID8, tvb, offset + 12, 2, ENC_BIG_ENDIAN); } else { proto_item *tf = proto_tree_add_item(ti, hf_iscsi_ISID, tvb, offset + 8, 6, ENC_NA); proto_tree *tt = proto_item_add_subtree(tf, ett_iscsi_ISID); if(iscsi_protocol_version == ISCSI_PROTOCOL_DRAFT09) { - proto_tree_add_item(tt, hf_iscsi_ISID_Type, tvb, offset + 8, 1, FALSE); - proto_tree_add_item(tt, hf_iscsi_ISID_NamingAuthority, tvb, offset + 9, 3, FALSE); - proto_tree_add_item(tt, hf_iscsi_ISID_Qualifier, tvb, offset + 12, 2, FALSE); + proto_tree_add_item(tt, hf_iscsi_ISID_Type, tvb, offset + 8, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tt, hf_iscsi_ISID_NamingAuthority, tvb, offset + 9, 3, ENC_BIG_ENDIAN); + proto_tree_add_item(tt, hf_iscsi_ISID_Qualifier, tvb, offset + 12, 2, ENC_BIG_ENDIAN); } else { - proto_tree_add_item(tt, hf_iscsi_ISID_t, tvb, offset + 8, 1, FALSE); - proto_tree_add_item(tt, hf_iscsi_ISID_a, tvb, offset + 8, 1, FALSE); - proto_tree_add_item(tt, hf_iscsi_ISID_b, tvb, offset + 9, 2, FALSE); - proto_tree_add_item(tt, hf_iscsi_ISID_c, tvb, offset + 11, 1, FALSE); - proto_tree_add_item(tt, hf_iscsi_ISID_d, tvb, offset + 12, 2, FALSE); + proto_tree_add_item(tt, hf_iscsi_ISID_t, tvb, offset + 8, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tt, hf_iscsi_ISID_a, tvb, offset + 8, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tt, hf_iscsi_ISID_b, tvb, offset + 9, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(tt, hf_iscsi_ISID_c, tvb, offset + 11, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tt, hf_iscsi_ISID_d, tvb, offset + 12, 2, ENC_BIG_ENDIAN); } } if(iscsi_protocol_version < ISCSI_PROTOCOL_DRAFT12) { - proto_tree_add_item(ti, hf_iscsi_TSID, tvb, offset + 14, 2, FALSE); + proto_tree_add_item(ti, hf_iscsi_TSID, tvb, offset + 14, 2, ENC_BIG_ENDIAN); } else { - proto_tree_add_item(ti, hf_iscsi_TSIH, tvb, offset + 14, 2, FALSE); + proto_tree_add_item(ti, hf_iscsi_TSIH, tvb, offset + 14, 2, ENC_BIG_ENDIAN); } - proto_tree_add_item(ti, hf_iscsi_InitiatorTaskTag, tvb, offset + 16, 4, FALSE); + proto_tree_add_item(ti, hf_iscsi_InitiatorTaskTag, tvb, offset + 16, 4, ENC_BIG_ENDIAN); if(iscsi_protocol_version > ISCSI_PROTOCOL_DRAFT08) { - proto_tree_add_item(ti, hf_iscsi_CID, tvb, offset + 20, 2, FALSE); + proto_tree_add_item(ti, hf_iscsi_CID, tvb, offset + 20, 2, ENC_BIG_ENDIAN); } - proto_tree_add_item(ti, hf_iscsi_CmdSN, tvb, offset + 24, 4, FALSE); - proto_tree_add_item(ti, hf_iscsi_ExpStatSN, tvb, offset + 28, 4, FALSE); + proto_tree_add_item(ti, hf_iscsi_CmdSN, tvb, offset + 24, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(ti, hf_iscsi_ExpStatSN, tvb, offset + 28, 4, ENC_BIG_ENDIAN); if(digestsActive){ offset = handleHeaderDigest(iscsi_session, ti, tvb, offset, 48); } else { @@ -1173,49 +1173,49 @@ dissect_iscsi_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint off if(iscsi_protocol_version >= ISCSI_PROTOCOL_DRAFT13) { proto_tree_add_boolean(ti, hf_iscsi_Login_C, tvb, offset + 1, 1, b); } - proto_tree_add_item(ti, hf_iscsi_Login_CSG, tvb, offset + 1, 1, FALSE); + proto_tree_add_item(ti, hf_iscsi_Login_CSG, tvb, offset + 1, 1, ENC_BIG_ENDIAN); /* NSG is undefined unless T is set */ if(b&0x80){ - proto_tree_add_item(ti, hf_iscsi_Login_NSG, tvb, offset + 1, 1, FALSE); + proto_tree_add_item(ti, hf_iscsi_Login_NSG, tvb, offset + 1, 1, ENC_BIG_ENDIAN); } } - proto_tree_add_item(ti, hf_iscsi_VersionMax, tvb, offset + 2, 1, FALSE); - proto_tree_add_item(ti, hf_iscsi_VersionActive, tvb, offset + 3, 1, FALSE); + proto_tree_add_item(ti, hf_iscsi_VersionMax, tvb, offset + 2, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ti, hf_iscsi_VersionActive, tvb, offset + 3, 1, ENC_BIG_ENDIAN); if(iscsi_protocol_version > ISCSI_PROTOCOL_DRAFT09) { - proto_tree_add_item(ti, hf_iscsi_TotalAHSLength, tvb, offset + 4, 1, FALSE); + proto_tree_add_item(ti, hf_iscsi_TotalAHSLength, tvb, offset + 4, 1, ENC_BIG_ENDIAN); } proto_tree_add_uint(ti, hf_iscsi_DataSegmentLength, tvb, offset + 5, 3, tvb_get_ntoh24(tvb, offset + 5)); if(iscsi_protocol_version == ISCSI_PROTOCOL_DRAFT08) { - proto_tree_add_item(ti, hf_iscsi_ISID8, tvb, offset + 12, 2, FALSE); + proto_tree_add_item(ti, hf_iscsi_ISID8, tvb, offset + 12, 2, ENC_BIG_ENDIAN); } else { proto_item *tf = proto_tree_add_item(ti, hf_iscsi_ISID, tvb, offset + 8, 6, ENC_NA); proto_tree *tt = proto_item_add_subtree(tf, ett_iscsi_ISID); if(iscsi_protocol_version == ISCSI_PROTOCOL_DRAFT09) { - proto_tree_add_item(tt, hf_iscsi_ISID_Type, tvb, offset + 8, 1, FALSE); - proto_tree_add_item(tt, hf_iscsi_ISID_NamingAuthority, tvb, offset + 9, 3, FALSE); - proto_tree_add_item(tt, hf_iscsi_ISID_Qualifier, tvb, offset + 12, 2, FALSE); + proto_tree_add_item(tt, hf_iscsi_ISID_Type, tvb, offset + 8, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tt, hf_iscsi_ISID_NamingAuthority, tvb, offset + 9, 3, ENC_BIG_ENDIAN); + proto_tree_add_item(tt, hf_iscsi_ISID_Qualifier, tvb, offset + 12, 2, ENC_BIG_ENDIAN); } else { - proto_tree_add_item(tt, hf_iscsi_ISID_t, tvb, offset + 8, 1, FALSE); - proto_tree_add_item(tt, hf_iscsi_ISID_a, tvb, offset + 8, 1, FALSE); - proto_tree_add_item(tt, hf_iscsi_ISID_b, tvb, offset + 9, 2, FALSE); - proto_tree_add_item(tt, hf_iscsi_ISID_c, tvb, offset + 11, 1, FALSE); - proto_tree_add_item(tt, hf_iscsi_ISID_d, tvb, offset + 12, 2, FALSE); + proto_tree_add_item(tt, hf_iscsi_ISID_t, tvb, offset + 8, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tt, hf_iscsi_ISID_a, tvb, offset + 8, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tt, hf_iscsi_ISID_b, tvb, offset + 9, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(tt, hf_iscsi_ISID_c, tvb, offset + 11, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tt, hf_iscsi_ISID_d, tvb, offset + 12, 2, ENC_BIG_ENDIAN); } } if(iscsi_protocol_version < ISCSI_PROTOCOL_DRAFT12) { - proto_tree_add_item(ti, hf_iscsi_TSID, tvb, offset + 14, 2, FALSE); + proto_tree_add_item(ti, hf_iscsi_TSID, tvb, offset + 14, 2, ENC_BIG_ENDIAN); } else { - proto_tree_add_item(ti, hf_iscsi_TSIH, tvb, offset + 14, 2, FALSE); + proto_tree_add_item(ti, hf_iscsi_TSIH, tvb, offset + 14, 2, ENC_BIG_ENDIAN); } - proto_tree_add_item(ti, hf_iscsi_InitiatorTaskTag, tvb, offset + 16, 4, FALSE); - proto_tree_add_item(ti, hf_iscsi_StatSN, tvb, offset + 24, 4, FALSE); - proto_tree_add_item(ti, hf_iscsi_ExpCmdSN, tvb, offset + 28, 4, FALSE); - proto_tree_add_item(ti, hf_iscsi_MaxCmdSN, tvb, offset + 32, 4, FALSE); - proto_tree_add_item(ti, hf_iscsi_Login_Status, tvb, offset + 36, 2, FALSE); + proto_tree_add_item(ti, hf_iscsi_InitiatorTaskTag, tvb, offset + 16, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(ti, hf_iscsi_StatSN, tvb, offset + 24, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(ti, hf_iscsi_ExpCmdSN, tvb, offset + 28, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(ti, hf_iscsi_MaxCmdSN, tvb, offset + 32, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(ti, hf_iscsi_Login_Status, tvb, offset + 36, 2, ENC_BIG_ENDIAN); if(digestsActive){ offset = handleHeaderDigest(iscsi_session, ti, tvb, offset, 48); } else { @@ -1235,16 +1235,16 @@ dissect_iscsi_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint off } } if(iscsi_protocol_version > ISCSI_PROTOCOL_DRAFT09) { - proto_tree_add_item(ti, hf_iscsi_TotalAHSLength, tvb, offset + 4, 1, FALSE); + proto_tree_add_item(ti, hf_iscsi_TotalAHSLength, tvb, offset + 4, 1, ENC_BIG_ENDIAN); } proto_tree_add_uint(ti, hf_iscsi_DataSegmentLength, tvb, offset + 5, 3, tvb_get_ntoh24(tvb, offset + 5)); if(iscsi_protocol_version > ISCSI_PROTOCOL_DRAFT09) { proto_tree_add_item(ti, hf_iscsi_LUN, tvb, offset + 8, 8, ENC_NA); } - proto_tree_add_item(ti, hf_iscsi_InitiatorTaskTag, tvb, offset + 16, 4, FALSE); - proto_tree_add_item(ti, hf_iscsi_TargetTransferTag, tvb, offset + 20, 4, FALSE); - proto_tree_add_item(ti, hf_iscsi_CmdSN, tvb, offset + 24, 4, FALSE); - proto_tree_add_item(ti, hf_iscsi_ExpStatSN, tvb, offset + 28, 4, FALSE); + proto_tree_add_item(ti, hf_iscsi_InitiatorTaskTag, tvb, offset + 16, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(ti, hf_iscsi_TargetTransferTag, tvb, offset + 20, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(ti, hf_iscsi_CmdSN, tvb, offset + 24, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(ti, hf_iscsi_ExpStatSN, tvb, offset + 28, 4, ENC_BIG_ENDIAN); offset = handleHeaderDigest(iscsi_session, ti, tvb, offset, 48); offset = handleDataSegmentAsTextKeys(pinfo, ti, tvb, offset, data_segment_len, end_offset, TRUE); } else if(opcode == ISCSI_OPCODE_TEXT_RESPONSE) { @@ -1260,17 +1260,17 @@ dissect_iscsi_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint off } } if(iscsi_protocol_version > ISCSI_PROTOCOL_DRAFT09) { - proto_tree_add_item(ti, hf_iscsi_TotalAHSLength, tvb, offset + 4, 1, FALSE); + proto_tree_add_item(ti, hf_iscsi_TotalAHSLength, tvb, offset + 4, 1, ENC_BIG_ENDIAN); } proto_tree_add_uint(ti, hf_iscsi_DataSegmentLength, tvb, offset + 5, 3, tvb_get_ntoh24(tvb, offset + 5)); if(iscsi_protocol_version > ISCSI_PROTOCOL_DRAFT09) { proto_tree_add_item(ti, hf_iscsi_LUN, tvb, offset + 8, 8, ENC_NA); } - proto_tree_add_item(ti, hf_iscsi_InitiatorTaskTag, tvb, offset + 16, 4, FALSE); - proto_tree_add_item(ti, hf_iscsi_TargetTransferTag, tvb, offset + 20, 4, FALSE); - proto_tree_add_item(ti, hf_iscsi_StatSN, tvb, offset + 24, 4, FALSE); - proto_tree_add_item(ti, hf_iscsi_ExpCmdSN, tvb, offset + 28, 4, FALSE); - proto_tree_add_item(ti, hf_iscsi_MaxCmdSN, tvb, offset + 32, 4, FALSE); + proto_tree_add_item(ti, hf_iscsi_InitiatorTaskTag, tvb, offset + 16, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(ti, hf_iscsi_TargetTransferTag, tvb, offset + 20, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(ti, hf_iscsi_StatSN, tvb, offset + 24, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(ti, hf_iscsi_ExpCmdSN, tvb, offset + 28, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(ti, hf_iscsi_MaxCmdSN, tvb, offset + 32, 4, ENC_BIG_ENDIAN); offset = handleHeaderDigest(iscsi_session, ti, tvb, offset, 48); offset = handleDataSegmentAsTextKeys(pinfo, ti, tvb, offset, data_segment_len, end_offset, TRUE); } else if(opcode == ISCSI_OPCODE_SCSI_DATA_OUT) { @@ -1283,15 +1283,15 @@ dissect_iscsi_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint off proto_tree_add_boolean(tt, hf_iscsi_SCSIData_F, tvb, offset + 1, 1, b); } if(iscsi_protocol_version > ISCSI_PROTOCOL_DRAFT09) { - proto_tree_add_item(ti, hf_iscsi_TotalAHSLength, tvb, offset + 4, 1, FALSE); + proto_tree_add_item(ti, hf_iscsi_TotalAHSLength, tvb, offset + 4, 1, ENC_BIG_ENDIAN); } proto_tree_add_uint(ti, hf_iscsi_DataSegmentLength, tvb, offset + 5, 3, tvb_get_ntoh24(tvb, offset + 5)); proto_tree_add_item(ti, hf_iscsi_LUN, tvb, offset + 8, 8, ENC_NA); - proto_tree_add_item(ti, hf_iscsi_InitiatorTaskTag, tvb, offset + 16, 4, FALSE); - proto_tree_add_item(ti, hf_iscsi_TargetTransferTag, tvb, offset + 20, 4, FALSE); - proto_tree_add_item(ti, hf_iscsi_ExpStatSN, tvb, offset + 28, 4, FALSE); - proto_tree_add_item(ti, hf_iscsi_DataSN, tvb, offset + 36, 4, FALSE); - proto_tree_add_item(ti, hf_iscsi_BufferOffset, tvb, offset + 40, 4, FALSE); + proto_tree_add_item(ti, hf_iscsi_InitiatorTaskTag, tvb, offset + 16, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(ti, hf_iscsi_TargetTransferTag, tvb, offset + 20, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(ti, hf_iscsi_ExpStatSN, tvb, offset + 28, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(ti, hf_iscsi_DataSN, tvb, offset + 36, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(ti, hf_iscsi_BufferOffset, tvb, offset + 40, 4, ENC_BIG_ENDIAN); data_offset=tvb_get_ntohl(tvb, offset+40); offset = handleHeaderDigest(iscsi_session, ti, tvb, offset, 48); @@ -1317,31 +1317,31 @@ dissect_iscsi_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint off proto_tree_add_boolean(tt, hf_iscsi_SCSIData_S, tvb, offset + 1, 1, b); } if(S_bit){ - proto_tree_add_item(ti, hf_iscsi_SCSIResponse_Status, tvb, offset + 3, 1, FALSE); + proto_tree_add_item(ti, hf_iscsi_SCSIResponse_Status, tvb, offset + 3, 1, ENC_BIG_ENDIAN); } if(iscsi_protocol_version > ISCSI_PROTOCOL_DRAFT09) { - proto_tree_add_item(ti, hf_iscsi_TotalAHSLength, tvb, offset + 4, 1, FALSE); + proto_tree_add_item(ti, hf_iscsi_TotalAHSLength, tvb, offset + 4, 1, ENC_BIG_ENDIAN); } proto_tree_add_uint(ti, hf_iscsi_DataSegmentLength, tvb, offset + 5, 3, tvb_get_ntoh24(tvb, offset + 5)); if(iscsi_protocol_version > ISCSI_PROTOCOL_DRAFT09) { proto_tree_add_item(ti, hf_iscsi_LUN, tvb, offset + 8, 8, ENC_NA); } - proto_tree_add_item(ti, hf_iscsi_InitiatorTaskTag, tvb, offset + 16, 4, FALSE); + proto_tree_add_item(ti, hf_iscsi_InitiatorTaskTag, tvb, offset + 16, 4, ENC_BIG_ENDIAN); if(iscsi_protocol_version <= ISCSI_PROTOCOL_DRAFT09) { - proto_tree_add_item(ti, hf_iscsi_SCSIData_ResidualCount, tvb, offset + 20, 4, FALSE); + proto_tree_add_item(ti, hf_iscsi_SCSIData_ResidualCount, tvb, offset + 20, 4, ENC_BIG_ENDIAN); } else { - proto_tree_add_item(ti, hf_iscsi_TargetTransferTag, tvb, offset + 20, 4, FALSE); + proto_tree_add_item(ti, hf_iscsi_TargetTransferTag, tvb, offset + 20, 4, ENC_BIG_ENDIAN); } - proto_tree_add_item(ti, hf_iscsi_StatSN, tvb, offset + 24, 4, FALSE); - proto_tree_add_item(ti, hf_iscsi_ExpCmdSN, tvb, offset + 28, 4, FALSE); - proto_tree_add_item(ti, hf_iscsi_MaxCmdSN, tvb, offset + 32, 4, FALSE); - proto_tree_add_item(ti, hf_iscsi_DataSN, tvb, offset + 36, 4, FALSE); - proto_tree_add_item(ti, hf_iscsi_BufferOffset, tvb, offset + 40, 4, FALSE); + proto_tree_add_item(ti, hf_iscsi_StatSN, tvb, offset + 24, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(ti, hf_iscsi_ExpCmdSN, tvb, offset + 28, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(ti, hf_iscsi_MaxCmdSN, tvb, offset + 32, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(ti, hf_iscsi_DataSN, tvb, offset + 36, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(ti, hf_iscsi_BufferOffset, tvb, offset + 40, 4, ENC_BIG_ENDIAN); data_offset=tvb_get_ntohl(tvb, offset+40); if(iscsi_protocol_version > ISCSI_PROTOCOL_DRAFT09) { - proto_tree_add_item(ti, hf_iscsi_SCSIData_ResidualCount, tvb, offset + 44, 4, FALSE); + proto_tree_add_item(ti, hf_iscsi_SCSIData_ResidualCount, tvb, offset + 44, 4, ENC_BIG_ENDIAN); } offset = handleHeaderDigest(iscsi_session, ti, tvb, offset, 48); /* do not update offset here because the data segment is @@ -1350,39 +1350,39 @@ dissect_iscsi_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint off } else if(opcode == ISCSI_OPCODE_LOGOUT_COMMAND) { /* Logout Command */ if(iscsi_protocol_version >= ISCSI_PROTOCOL_DRAFT13) { - proto_tree_add_item(ti, hf_iscsi_Logout_Reason, tvb, offset + 1, 1, FALSE); + proto_tree_add_item(ti, hf_iscsi_Logout_Reason, tvb, offset + 1, 1, ENC_BIG_ENDIAN); } if(iscsi_protocol_version > ISCSI_PROTOCOL_DRAFT09) { - proto_tree_add_item(ti, hf_iscsi_TotalAHSLength, tvb, offset + 4, 1, FALSE); + proto_tree_add_item(ti, hf_iscsi_TotalAHSLength, tvb, offset + 4, 1, ENC_BIG_ENDIAN); proto_tree_add_uint(ti, hf_iscsi_DataSegmentLength, tvb, offset + 5, 3, tvb_get_ntoh24(tvb, offset + 5)); } if(iscsi_protocol_version == ISCSI_PROTOCOL_DRAFT08) { - proto_tree_add_item(ti, hf_iscsi_CID, tvb, offset + 8, 2, FALSE); - proto_tree_add_item(ti, hf_iscsi_Logout_Reason, tvb, offset + 11, 1, FALSE); + proto_tree_add_item(ti, hf_iscsi_CID, tvb, offset + 8, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(ti, hf_iscsi_Logout_Reason, tvb, offset + 11, 1, ENC_BIG_ENDIAN); } - proto_tree_add_item(ti, hf_iscsi_InitiatorTaskTag, tvb, offset + 16, 4, FALSE); + proto_tree_add_item(ti, hf_iscsi_InitiatorTaskTag, tvb, offset + 16, 4, ENC_BIG_ENDIAN); if(iscsi_protocol_version > ISCSI_PROTOCOL_DRAFT08) { - proto_tree_add_item(ti, hf_iscsi_CID, tvb, offset + 20, 2, FALSE); + proto_tree_add_item(ti, hf_iscsi_CID, tvb, offset + 20, 2, ENC_BIG_ENDIAN); if(iscsi_protocol_version < ISCSI_PROTOCOL_DRAFT13) { - proto_tree_add_item(ti, hf_iscsi_Logout_Reason, tvb, offset + 23, 1, FALSE); + proto_tree_add_item(ti, hf_iscsi_Logout_Reason, tvb, offset + 23, 1, ENC_BIG_ENDIAN); } } - proto_tree_add_item(ti, hf_iscsi_CmdSN, tvb, offset + 24, 4, FALSE); - proto_tree_add_item(ti, hf_iscsi_ExpStatSN, tvb, offset + 28, 4, FALSE); + proto_tree_add_item(ti, hf_iscsi_CmdSN, tvb, offset + 24, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(ti, hf_iscsi_ExpStatSN, tvb, offset + 28, 4, ENC_BIG_ENDIAN); offset = handleHeaderDigest(iscsi_session, ti, tvb, offset, 48); } else if(opcode == ISCSI_OPCODE_LOGOUT_RESPONSE) { /* Logout Response */ - proto_tree_add_item(ti, hf_iscsi_Logout_Response, tvb, offset + 2, 1, FALSE); + proto_tree_add_item(ti, hf_iscsi_Logout_Response, tvb, offset + 2, 1, ENC_BIG_ENDIAN); if(iscsi_protocol_version > ISCSI_PROTOCOL_DRAFT09) { - proto_tree_add_item(ti, hf_iscsi_TotalAHSLength, tvb, offset + 4, 1, FALSE); + proto_tree_add_item(ti, hf_iscsi_TotalAHSLength, tvb, offset + 4, 1, ENC_BIG_ENDIAN); proto_tree_add_uint(ti, hf_iscsi_DataSegmentLength, tvb, offset + 5, 3, tvb_get_ntoh24(tvb, offset + 5)); } - proto_tree_add_item(ti, hf_iscsi_InitiatorTaskTag, tvb, offset + 16, 4, FALSE); - proto_tree_add_item(ti, hf_iscsi_StatSN, tvb, offset + 24, 4, FALSE); - proto_tree_add_item(ti, hf_iscsi_ExpCmdSN, tvb, offset + 28, 4, FALSE); - proto_tree_add_item(ti, hf_iscsi_MaxCmdSN, tvb, offset + 32, 4, FALSE); - proto_tree_add_item(ti, hf_iscsi_Time2Wait, tvb, offset + 40, 2, FALSE); - proto_tree_add_item(ti, hf_iscsi_Time2Retain, tvb, offset + 42, 2, FALSE); + proto_tree_add_item(ti, hf_iscsi_InitiatorTaskTag, tvb, offset + 16, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(ti, hf_iscsi_StatSN, tvb, offset + 24, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(ti, hf_iscsi_ExpCmdSN, tvb, offset + 28, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(ti, hf_iscsi_MaxCmdSN, tvb, offset + 32, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(ti, hf_iscsi_Time2Wait, tvb, offset + 40, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(ti, hf_iscsi_Time2Retain, tvb, offset + 42, 2, ENC_BIG_ENDIAN); offset = handleHeaderDigest(iscsi_session, ti, tvb, offset, 48); } else if(opcode == ISCSI_OPCODE_SNACK_REQUEST) { /* SNACK Request */ @@ -1396,58 +1396,58 @@ dissect_iscsi_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint off proto_tree_add_item(ti, hf_iscsi_snack_type, tvb, offset + 1, 1, b); } if(iscsi_protocol_version > ISCSI_PROTOCOL_DRAFT09) { - proto_tree_add_item(ti, hf_iscsi_TotalAHSLength, tvb, offset + 4, 1, FALSE); + proto_tree_add_item(ti, hf_iscsi_TotalAHSLength, tvb, offset + 4, 1, ENC_BIG_ENDIAN); proto_tree_add_uint(ti, hf_iscsi_DataSegmentLength, tvb, offset + 5, 3, tvb_get_ntoh24(tvb, offset + 5)); proto_tree_add_item(ti, hf_iscsi_LUN, tvb, offset + 8, 8, ENC_NA); } - proto_tree_add_item(ti, hf_iscsi_InitiatorTaskTag, tvb, offset + 16, 4, FALSE); + proto_tree_add_item(ti, hf_iscsi_InitiatorTaskTag, tvb, offset + 16, 4, ENC_BIG_ENDIAN); if(iscsi_protocol_version <= ISCSI_PROTOCOL_DRAFT09) { - proto_tree_add_item(ti, hf_iscsi_BegRun, tvb, offset + 20, 4, FALSE); - proto_tree_add_item(ti, hf_iscsi_RunLength, tvb, offset + 24, 4, FALSE); - proto_tree_add_item(ti, hf_iscsi_ExpStatSN, tvb, offset + 28, 4, FALSE); - proto_tree_add_item(ti, hf_iscsi_ExpDataSN, tvb, offset + 36, 4, FALSE); + proto_tree_add_item(ti, hf_iscsi_BegRun, tvb, offset + 20, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(ti, hf_iscsi_RunLength, tvb, offset + 24, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(ti, hf_iscsi_ExpStatSN, tvb, offset + 28, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(ti, hf_iscsi_ExpDataSN, tvb, offset + 36, 4, ENC_BIG_ENDIAN); } else { - proto_tree_add_item(ti, hf_iscsi_TargetTransferTag, tvb, offset + 20, 4, FALSE); - proto_tree_add_item(ti, hf_iscsi_ExpStatSN, tvb, offset + 28, 4, FALSE); - proto_tree_add_item(ti, hf_iscsi_BegRun, tvb, offset + 40, 4, FALSE); - proto_tree_add_item(ti, hf_iscsi_RunLength, tvb, offset + 44, 4, FALSE); + proto_tree_add_item(ti, hf_iscsi_TargetTransferTag, tvb, offset + 20, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(ti, hf_iscsi_ExpStatSN, tvb, offset + 28, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(ti, hf_iscsi_BegRun, tvb, offset + 40, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(ti, hf_iscsi_RunLength, tvb, offset + 44, 4, ENC_BIG_ENDIAN); } offset = handleHeaderDigest(iscsi_session, ti, tvb, offset, 48); } else if(opcode == ISCSI_OPCODE_R2T) { /* R2T */ if(iscsi_protocol_version > ISCSI_PROTOCOL_DRAFT09) { - proto_tree_add_item(ti, hf_iscsi_TotalAHSLength, tvb, offset + 4, 1, FALSE); + proto_tree_add_item(ti, hf_iscsi_TotalAHSLength, tvb, offset + 4, 1, ENC_BIG_ENDIAN); proto_tree_add_uint(ti, hf_iscsi_DataSegmentLength, tvb, offset + 5, 3, tvb_get_ntoh24(tvb, offset + 5)); proto_tree_add_item(ti, hf_iscsi_LUN, tvb, offset + 8, 8, ENC_NA); } - proto_tree_add_item(ti, hf_iscsi_InitiatorTaskTag, tvb, offset + 16, 4, FALSE); - proto_tree_add_item(ti, hf_iscsi_TargetTransferTag, tvb, offset + 20, 4, FALSE); - proto_tree_add_item(ti, hf_iscsi_StatSN, tvb, offset + 24, 4, FALSE); - proto_tree_add_item(ti, hf_iscsi_ExpCmdSN, tvb, offset + 28, 4, FALSE); - proto_tree_add_item(ti, hf_iscsi_MaxCmdSN, tvb, offset + 32, 4, FALSE); - proto_tree_add_item(ti, hf_iscsi_R2TSN, tvb, offset + 36, 4, FALSE); - proto_tree_add_item(ti, hf_iscsi_BufferOffset, tvb, offset + 40, 4, FALSE); - proto_tree_add_item(ti, hf_iscsi_DesiredDataLength, tvb, offset + 44, 4, FALSE); + proto_tree_add_item(ti, hf_iscsi_InitiatorTaskTag, tvb, offset + 16, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(ti, hf_iscsi_TargetTransferTag, tvb, offset + 20, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(ti, hf_iscsi_StatSN, tvb, offset + 24, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(ti, hf_iscsi_ExpCmdSN, tvb, offset + 28, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(ti, hf_iscsi_MaxCmdSN, tvb, offset + 32, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(ti, hf_iscsi_R2TSN, tvb, offset + 36, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(ti, hf_iscsi_BufferOffset, tvb, offset + 40, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(ti, hf_iscsi_DesiredDataLength, tvb, offset + 44, 4, ENC_BIG_ENDIAN); offset = handleHeaderDigest(iscsi_session, ti, tvb, offset, 48); } else if(opcode == ISCSI_OPCODE_ASYNC_MESSAGE) { int dsl, snsl; /* Asynchronous Message */ if(iscsi_protocol_version > ISCSI_PROTOCOL_DRAFT09) { - proto_tree_add_item(ti, hf_iscsi_TotalAHSLength, tvb, offset + 4, 1, FALSE); + proto_tree_add_item(ti, hf_iscsi_TotalAHSLength, tvb, offset + 4, 1, ENC_BIG_ENDIAN); } dsl=tvb_get_ntoh24(tvb, offset+5); proto_tree_add_uint(ti, hf_iscsi_DataSegmentLength, tvb, offset + 5, 3, tvb_get_ntoh24(tvb, offset + 5)); proto_tree_add_item(ti, hf_iscsi_LUN, tvb, offset + 8, 8, ENC_NA); - proto_tree_add_item(ti, hf_iscsi_StatSN, tvb, offset + 24, 4, FALSE); - proto_tree_add_item(ti, hf_iscsi_ExpCmdSN, tvb, offset + 28, 4, FALSE); - proto_tree_add_item(ti, hf_iscsi_MaxCmdSN, tvb, offset + 32, 4, FALSE); - proto_tree_add_item(ti, hf_iscsi_AsyncEvent, tvb, offset + 36, 1, FALSE); - proto_tree_add_item(ti, hf_iscsi_EventVendorCode, tvb, offset + 37, 1, FALSE); - proto_tree_add_item(ti, hf_iscsi_Parameter1, tvb, offset + 38, 2, FALSE); - proto_tree_add_item(ti, hf_iscsi_Parameter2, tvb, offset + 40, 2, FALSE); - proto_tree_add_item(ti, hf_iscsi_Parameter3, tvb, offset + 42, 2, FALSE); + proto_tree_add_item(ti, hf_iscsi_StatSN, tvb, offset + 24, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(ti, hf_iscsi_ExpCmdSN, tvb, offset + 28, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(ti, hf_iscsi_MaxCmdSN, tvb, offset + 32, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(ti, hf_iscsi_AsyncEvent, tvb, offset + 36, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ti, hf_iscsi_EventVendorCode, tvb, offset + 37, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ti, hf_iscsi_Parameter1, tvb, offset + 38, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(ti, hf_iscsi_Parameter2, tvb, offset + 40, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(ti, hf_iscsi_Parameter3, tvb, offset + 42, 2, ENC_BIG_ENDIAN); offset = handleHeaderDigest(iscsi_session, ti, tvb, offset, 48); /* If we have a datasegment this contains scsi sense info followed @@ -1485,15 +1485,15 @@ dissect_iscsi_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint off const char *next_opcode_str; /* Reject */ - proto_tree_add_item(ti, hf_iscsi_Reject_Reason, tvb, offset + 2, 1, FALSE); + proto_tree_add_item(ti, hf_iscsi_Reject_Reason, tvb, offset + 2, 1, ENC_BIG_ENDIAN); if(iscsi_protocol_version > ISCSI_PROTOCOL_DRAFT09) { - proto_tree_add_item(ti, hf_iscsi_TotalAHSLength, tvb, offset + 4, 1, FALSE); + proto_tree_add_item(ti, hf_iscsi_TotalAHSLength, tvb, offset + 4, 1, ENC_BIG_ENDIAN); } proto_tree_add_uint(ti, hf_iscsi_DataSegmentLength, tvb, offset + 5, 3, tvb_get_ntoh24(tvb, offset + 5)); - proto_tree_add_item(ti, hf_iscsi_StatSN, tvb, offset + 24, 4, FALSE); - proto_tree_add_item(ti, hf_iscsi_ExpCmdSN, tvb, offset + 28, 4, FALSE); - proto_tree_add_item(ti, hf_iscsi_MaxCmdSN, tvb, offset + 32, 4, FALSE); - proto_tree_add_item(ti, hf_iscsi_DataSN, tvb, offset + 36, 4, FALSE); + proto_tree_add_item(ti, hf_iscsi_StatSN, tvb, offset + 24, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(ti, hf_iscsi_ExpCmdSN, tvb, offset + 28, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(ti, hf_iscsi_MaxCmdSN, tvb, offset + 32, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(ti, hf_iscsi_DataSN, tvb, offset + 36, 4, ENC_BIG_ENDIAN); offset = handleHeaderDigest(iscsi_session, ti, tvb, offset, 48); next_opcode = tvb_get_guint8(tvb, offset) & 0x3f; @@ -1511,7 +1511,7 @@ dissect_iscsi_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint off opcode == ISCSI_OPCODE_VENDOR_SPECIFIC_T2) { /* Vendor specific opcodes */ if(iscsi_protocol_version > ISCSI_PROTOCOL_DRAFT09) { - proto_tree_add_item(ti, hf_iscsi_TotalAHSLength, tvb, offset + 4, 1, FALSE); + proto_tree_add_item(ti, hf_iscsi_TotalAHSLength, tvb, offset + 4, 1, ENC_BIG_ENDIAN); } proto_tree_add_uint(ti, hf_iscsi_DataSegmentLength, tvb, offset + 5, 3, tvb_get_ntoh24(tvb, offset + 5)); offset = handleHeaderDigest(iscsi_session, ti, tvb, offset, 48); @@ -1641,7 +1641,7 @@ dissect_iscsi_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint off if((end_offset - offset) >= 2) { int senseLen = tvb_get_ntohs(tvb, offset); if(ti != NULL) - proto_tree_add_item(ti, hf_iscsi_SenseLength, tvb, offset, 2, FALSE); + proto_tree_add_item(ti, hf_iscsi_SenseLength, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; if(senseLen > 0){ tvbuff_t *data_tvb; diff --git a/epan/dissectors/packet-isis-hello.c b/epan/dissectors/packet-isis-hello.c index f95bcbfcc4..294787dd2a 100644 --- a/epan/dissectors/packet-isis-hello.c +++ b/epan/dissectors/packet-isis-hello.c @@ -866,7 +866,7 @@ isis_dissect_isis_hello(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int if (tree) { proto_tree_add_item(hello_tree, hf_isis_hello_holding_timer, tvb, - offset, 2, FALSE); + offset, 2, ENC_BIG_ENDIAN); } offset += 2; @@ -880,7 +880,7 @@ isis_dissect_isis_hello(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int if (hello_type == ISIS_TYPE_PTP_HELLO) { if (tree) { proto_tree_add_item(hello_tree, hf_isis_hello_local_circuit_id, tvb, - offset, 1, FALSE ); + offset, 1, ENC_BIG_ENDIAN ); } offset += 1; } else { diff --git a/epan/dissectors/packet-isis-lsp.c b/epan/dissectors/packet-isis-lsp.c index f114475c73..55afae6217 100644 --- a/epan/dissectors/packet-isis-lsp.c +++ b/epan/dissectors/packet-isis-lsp.c @@ -1790,7 +1790,7 @@ isis_dissect_isis_lsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int o if (tree) { proto_tree_add_item(lsp_tree, hf_isis_lsp_remaining_life, - tvb, offset, 2, FALSE); + tvb, offset, 2, ENC_BIG_ENDIAN); } lifetime = tvb_get_ntohs(tvb, offset); offset += 2; @@ -1812,7 +1812,7 @@ isis_dissect_isis_lsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int o if (tree) { proto_tree_add_item(lsp_tree, hf_isis_lsp_sequence_number, - tvb, offset, 4, FALSE); + tvb, offset, 4, ENC_BIG_ENDIAN); } if (check_col(pinfo->cinfo, COL_INFO)) { col_append_fstr(pinfo->cinfo, COL_INFO, ", Sequence: 0x%08x, Lifetime: %5us", diff --git a/epan/dissectors/packet-isis.c b/epan/dissectors/packet-isis.c index d09f906626..78bc9c6d64 100644 --- a/epan/dissectors/packet-isis.c +++ b/epan/dissectors/packet-isis.c @@ -144,7 +144,7 @@ dissect_isis(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { proto_tree_add_item(isis_tree, hf_isis_irpd, tvb, offset, 1, - FALSE ); + ENC_BIG_ENDIAN ); } offset += 1; diff --git a/epan/dissectors/packet-isl.c b/epan/dissectors/packet-isl.c index 1edb606018..cf79bc5697 100644 --- a/epan/dissectors/packet-isl.c +++ b/epan/dissectors/packet-isl.c @@ -165,18 +165,18 @@ dissect_isl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int fcs_len) hidden_item = proto_tree_add_item(fh_tree, hf_isl_addr, tvb, 0, 6, FALSE); PROTO_ITEM_SET_HIDDEN(hidden_item); dst_tree = proto_item_add_subtree(ti, ett_isl_dst); - proto_tree_add_item(dst_tree, hf_isl_type, tvb, 5, 1, FALSE); + proto_tree_add_item(dst_tree, hf_isl_type, tvb, 5, 1, ENC_BIG_ENDIAN); switch (type) { case TYPE_ETHER: - proto_tree_add_item(dst_tree, hf_isl_user_eth, tvb, 5, 1, FALSE); + proto_tree_add_item(dst_tree, hf_isl_user_eth, tvb, 5, 1, ENC_BIG_ENDIAN); break; default: /* XXX - the spec appears to indicate that the "User" field is used for TYPE_TR to distinguish between types of packets. */ - proto_tree_add_item(dst_tree, hf_isl_user, tvb, 5, 1, FALSE); + proto_tree_add_item(dst_tree, hf_isl_user, tvb, 5, 1, ENC_BIG_ENDIAN); break; } proto_tree_add_item(fh_tree, hf_isl_src, tvb, 6, 6, FALSE); @@ -235,14 +235,14 @@ dissect_isl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int fcs_len) /* ...but this is the manufacturer's ID portion of the source address field (which is, admittedly, an OUI). */ - proto_tree_add_item(fh_tree, hf_isl_hsa, payload_tvb, 3, 3, FALSE); + proto_tree_add_item(fh_tree, hf_isl_hsa, payload_tvb, 3, 3, ENC_BIG_ENDIAN); } col_add_fstr(pinfo->cinfo, COL_INFO, "VLAN ID: %u", tvb_get_ntohs(tvb, 20) >> 1); if (tree) { - proto_tree_add_item(fh_tree, hf_isl_vlan_id, payload_tvb, 6, 2, FALSE); + proto_tree_add_item(fh_tree, hf_isl_vlan_id, payload_tvb, 6, 2, ENC_BIG_ENDIAN); proto_tree_add_item(fh_tree, hf_isl_bpdu, payload_tvb, 6, 2, FALSE); - proto_tree_add_item(fh_tree, hf_isl_index, payload_tvb, 8, 2, FALSE); + proto_tree_add_item(fh_tree, hf_isl_index, payload_tvb, 8, 2, ENC_BIG_ENDIAN); } switch (type) { @@ -310,13 +310,13 @@ dissect_isl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int fcs_len) case TYPE_TR: if (tree) { - proto_tree_add_item(fh_tree, hf_isl_src_vlan_id, payload_tvb, 10, 2, FALSE); + proto_tree_add_item(fh_tree, hf_isl_src_vlan_id, payload_tvb, 10, 2, ENC_BIG_ENDIAN); proto_tree_add_item(fh_tree, hf_isl_explorer, payload_tvb, 10, 2, FALSE); - proto_tree_add_item(fh_tree, hf_isl_dst_route_descriptor, payload_tvb, 12, 2, FALSE); - proto_tree_add_item(fh_tree, hf_isl_src_route_descriptor, payload_tvb, 14, 2, FALSE); + proto_tree_add_item(fh_tree, hf_isl_dst_route_descriptor, payload_tvb, 12, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(fh_tree, hf_isl_src_route_descriptor, payload_tvb, 14, 2, ENC_BIG_ENDIAN); /* This doesn't appear to be present in at least one capture I've seen. */ proto_tree_add_item(fh_tree, hf_isl_fcs_not_incl, payload_tvb, 16, 1, FALSE); - proto_tree_add_item(fh_tree, hf_isl_esize, payload_tvb, 16, 1, FALSE); + proto_tree_add_item(fh_tree, hf_isl_esize, payload_tvb, 16, 1, ENC_BIG_ENDIAN); } next_tvb = tvb_new_subset_remaining(payload_tvb, 17); call_dissector(tr_handle, next_tvb, pinfo, tree); diff --git a/epan/dissectors/packet-ismacryp.c b/epan/dissectors/packet-ismacryp.c index 382e89823a..682f33289c 100644 --- a/epan/dissectors/packet-ismacryp.c +++ b/epan/dissectors/packet-ismacryp.c @@ -351,7 +351,7 @@ static void dissect_ismacryp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tre /* we are being asked for details */ /* get total length of AU headers (first 2 bytes) */ ismacryp_item = proto_tree_add_item(ismacryp_tree, hf_ismacryp_au_headers_length, - tvb, poffset->offset_bytes, AU_HEADERS_LENGTH_SIZE, FALSE ); + tvb, poffset->offset_bytes, AU_HEADERS_LENGTH_SIZE, ENC_BIG_ENDIAN ); proto_item_append_text(ismacryp_item, " (bits)"); /* add text to AU Header tree indicating length */ au_headers_length=tvb_get_ntohs(tvb,poffset->offset_bytes); /* 2 byte au headers length */ poffset->offset_bytes+=AU_HEADERS_LENGTH_SIZE; diff --git a/epan/dissectors/packet-ismp.c b/epan/dissectors/packet-ismp.c index f572bb3d7a..c5b8d5c8ee 100644 --- a/epan/dissectors/packet-ismp.c +++ b/epan/dissectors/packet-ismp.c @@ -263,20 +263,20 @@ dissect_ismp_edp(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *ismp tvb_ether_to_str(tvb, offset+6), tvb_get_ntohl(tvb, offset+12)); - proto_tree_add_item(edp_tree, hf_ismp_edp_version, tvb, offset, 2, FALSE); + proto_tree_add_item(edp_tree, hf_ismp_edp_version, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(edp_tree, hf_ismp_edp_module_ip, tvb, offset, 4, FALSE); offset += 4; proto_tree_add_item(edp_tree, hf_ismp_edp_module_mac, tvb, offset, 6, FALSE); offset += 6; - proto_tree_add_item(edp_tree, hf_ismp_edp_module_port, tvb, offset, 4, FALSE); + proto_tree_add_item(edp_tree, hf_ismp_edp_module_port, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; proto_tree_add_item(edp_tree, hf_ismp_edp_chassis_mac, tvb, offset, 6, FALSE); offset += 6; proto_tree_add_item(edp_tree, hf_ismp_edp_chassis_ip, tvb, offset, 4, FALSE); offset += 4; device_type = tvb_get_ntohs(tvb, offset); - proto_tree_add_item(edp_tree, hf_ismp_edp_device_type, tvb, offset, 2, FALSE); + proto_tree_add_item(edp_tree, hf_ismp_edp_device_type, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_uint_format(edp_tree, hf_ismp_edp_module_rev, tvb, offset, 4, tvb_get_ntohl(tvb, offset), "Module Firmware Revision: %02x.%02x.%02x.%02x", tvb_get_guint8(tvb, offset), @@ -353,7 +353,7 @@ dissect_ismp_edp(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *ismp /* determine the number of neighbors and create EDP neighbors subtree */ num_neighbors = tvb_get_ntohs(tvb, offset); - proto_tree_add_item(edp_tree, hf_ismp_edp_num_neighbors, tvb, offset, 2, FALSE); + proto_tree_add_item(edp_tree, hf_ismp_edp_num_neighbors, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; if (num_neighbors > 0) { @@ -387,7 +387,7 @@ dissect_ismp_edp(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *ismp tvb_reported_length_remaining(tvb, offset) >= 2) { num_tuples = tvb_get_ntohs(tvb, offset); - proto_tree_add_item(edp_tree, hf_ismp_edp_num_tuples, tvb, offset, 2, FALSE); + proto_tree_add_item(edp_tree, hf_ismp_edp_num_tuples, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; } else if (tvb_reported_length_remaining(tvb, offset) > 0) { @@ -513,15 +513,15 @@ dissect_ismp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ismp_tree = proto_item_add_subtree(ti, ett_ismp); /* add an items to the subtree */ - proto_tree_add_item(ismp_tree, hf_ismp_version, tvb, offset, 2, FALSE); + proto_tree_add_item(ismp_tree, hf_ismp_version, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; message_type = tvb_get_ntohs(tvb, offset); - proto_tree_add_item(ismp_tree, hf_ismp_message_type, tvb, offset, 2, FALSE); + proto_tree_add_item(ismp_tree, hf_ismp_message_type, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(ismp_tree, hf_ismp_seq_num, tvb, offset, 2, FALSE); + proto_tree_add_item(ismp_tree, hf_ismp_seq_num, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; code_length = tvb_get_guint8(tvb, offset); - proto_tree_add_item(ismp_tree, hf_ismp_code_length, tvb, offset, 1, FALSE); + proto_tree_add_item(ismp_tree, hf_ismp_code_length, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; proto_tree_add_item(ismp_tree, hf_ismp_auth_data, tvb, offset, code_length, ENC_NA); offset += code_length; diff --git a/epan/dissectors/packet-isup.c b/epan/dissectors/packet-isup.c index 4cf5a3fbc7..1f52f1eab5 100644 --- a/epan/dissectors/packet-isup.c +++ b/epan/dissectors/packet-isup.c @@ -2503,14 +2503,14 @@ dissect_ansi_isup_cause_indicators_parameter(tvbuff_t *parameter_tvb, proto_tree switch (coding_standard) { case 0: /*CCITT*/ - proto_tree_add_item(parameter_tree, hf_isup_cause_location, parameter_tvb, offset, 1, FALSE); - proto_tree_add_item(parameter_tree, hf_ansi_isup_coding_standard, parameter_tvb, offset, 1, FALSE); + proto_tree_add_item(parameter_tree, hf_isup_cause_location, parameter_tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(parameter_tree, hf_ansi_isup_coding_standard, parameter_tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(parameter_tree, hf_isup_extension_ind, parameter_tvb, offset, 1, FALSE); offset ++; length--; if (length == 0) return; - proto_tree_add_item(parameter_tree, hf_isup_cause_indicator, parameter_tvb, offset, 1, FALSE); + proto_tree_add_item(parameter_tree, hf_isup_cause_indicator, parameter_tvb, offset, 1, ENC_BIG_ENDIAN); cause_value=tvb_get_guint8(parameter_tvb, offset)&0x7f; offset ++; length--; @@ -2524,14 +2524,14 @@ dissect_ansi_isup_cause_indicators_parameter(tvbuff_t *parameter_tvb, proto_tree return; case 2: /*ANSI*/ - proto_tree_add_item(parameter_tree, hf_isup_cause_location, parameter_tvb, offset, 1, FALSE); - proto_tree_add_item(parameter_tree, hf_ansi_isup_coding_standard, parameter_tvb, offset, 1, FALSE); + proto_tree_add_item(parameter_tree, hf_isup_cause_location, parameter_tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(parameter_tree, hf_ansi_isup_coding_standard, parameter_tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(parameter_tree, hf_isup_extension_ind, parameter_tvb, offset, 1, FALSE); offset ++; length--; if (length == 0) return; - proto_tree_add_item(parameter_tree, hf_ansi_isup_cause_indicator, parameter_tvb, offset, 1, FALSE); + proto_tree_add_item(parameter_tree, hf_ansi_isup_cause_indicator, parameter_tvb, offset, 1, ENC_BIG_ENDIAN); cause_value=tvb_get_guint8(parameter_tvb, offset)&0x7f; proto_item_set_text(parameter_item, "Cause indicators: %s (%u)", val_to_str_ext_const(cause_value, &ansi_isup_cause_code_vals_ext, "spare"), @@ -2546,7 +2546,7 @@ dissect_ansi_isup_cause_indicators_parameter(tvbuff_t *parameter_tvb, proto_tree tvb_bytes_to_str(parameter_tvb, offset, length)); return; default: - proto_tree_add_item(parameter_tree, hf_ansi_isup_coding_standard, parameter_tvb, offset, 1, FALSE); + proto_tree_add_item(parameter_tree, hf_ansi_isup_coding_standard, parameter_tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(parameter_tree, hf_isup_extension_ind, parameter_tvb, offset, 1, FALSE); break; } @@ -3232,32 +3232,32 @@ extern int dissect_codec_mode(proto_tree *tree, tvbuff_t *tvb, int offset, int l offset = offset + 1; tempdata = tvb_get_guint8(tvb, offset); - acs_item = proto_tree_add_item(tree, hf_active_code_set, tvb, offset, 1, TRUE); + acs_item = proto_tree_add_item(tree, hf_active_code_set, tvb, offset, 1, ENC_LITTLE_ENDIAN); acs_tree = proto_item_add_subtree(acs_item,ett_acs); - proto_tree_add_item(acs_tree, hf_active_code_set_12_2, tvb, offset, 1, TRUE); - proto_tree_add_item(acs_tree, hf_active_code_set_10_2, tvb, offset, 1, TRUE); - proto_tree_add_item(acs_tree, hf_active_code_set_7_95, tvb, offset, 1, TRUE); - proto_tree_add_item(acs_tree, hf_active_code_set_7_40, tvb, offset, 1, TRUE); - proto_tree_add_item(acs_tree, hf_active_code_set_6_70, tvb, offset, 1, TRUE); - proto_tree_add_item(acs_tree, hf_active_code_set_5_90, tvb, offset, 1, TRUE); - proto_tree_add_item(acs_tree, hf_active_code_set_5_15, tvb, offset, 1, TRUE); - proto_tree_add_item(acs_tree, hf_active_code_set_4_75, tvb, offset, 1, TRUE); + proto_tree_add_item(acs_tree, hf_active_code_set_12_2, tvb, offset, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(acs_tree, hf_active_code_set_10_2, tvb, offset, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(acs_tree, hf_active_code_set_7_95, tvb, offset, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(acs_tree, hf_active_code_set_7_40, tvb, offset, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(acs_tree, hf_active_code_set_6_70, tvb, offset, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(acs_tree, hf_active_code_set_5_90, tvb, offset, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(acs_tree, hf_active_code_set_5_15, tvb, offset, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(acs_tree, hf_active_code_set_4_75, tvb, offset, 1, ENC_LITTLE_ENDIAN); } if ( len > 3 ) { offset = offset + 1; tempdata = tvb_get_guint8(tvb, offset); - scs_item = proto_tree_add_item(tree, hf_supported_code_set, tvb, offset, 1, TRUE); + scs_item = proto_tree_add_item(tree, hf_supported_code_set, tvb, offset, 1, ENC_LITTLE_ENDIAN); scs_tree = proto_item_add_subtree(scs_item,ett_scs); - proto_tree_add_item(scs_tree, hf_supported_code_set_12_2, tvb, offset, 1, TRUE); - proto_tree_add_item(scs_tree, hf_supported_code_set_10_2, tvb, offset, 1, TRUE); - proto_tree_add_item(scs_tree, hf_supported_code_set_7_95, tvb, offset, 1, TRUE); - proto_tree_add_item(scs_tree, hf_supported_code_set_7_40, tvb, offset, 1, TRUE); - proto_tree_add_item(scs_tree, hf_supported_code_set_6_70, tvb, offset, 1, TRUE); - proto_tree_add_item(scs_tree, hf_supported_code_set_5_90, tvb, offset, 1, TRUE); - proto_tree_add_item(scs_tree, hf_supported_code_set_5_15, tvb, offset, 1, TRUE); - proto_tree_add_item(scs_tree, hf_supported_code_set_4_75, tvb, offset, 1, TRUE); + proto_tree_add_item(scs_tree, hf_supported_code_set_12_2, tvb, offset, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(scs_tree, hf_supported_code_set_10_2, tvb, offset, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(scs_tree, hf_supported_code_set_7_95, tvb, offset, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(scs_tree, hf_supported_code_set_7_40, tvb, offset, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(scs_tree, hf_supported_code_set_6_70, tvb, offset, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(scs_tree, hf_supported_code_set_5_90, tvb, offset, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(scs_tree, hf_supported_code_set_5_15, tvb, offset, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(scs_tree, hf_supported_code_set_4_75, tvb, offset, 1, ENC_LITTLE_ENDIAN); } if ( len > 4 ) { offset = offset + 1; @@ -3375,9 +3375,9 @@ dissect_bat_ase_Encapsulated_Application_Information(tvbuff_t *parameter_tvb, pa offset = offset + 1; proto_tree_add_item( bat_ase_element_tree, hf_isup_extension_ind, parameter_tvb, offset, 1, FALSE ); proto_tree_add_item( bat_ase_element_tree, hf_Send_notification_ind_for_pass_on_not_possible, parameter_tvb, offset, 1, FALSE ); - proto_tree_add_item( bat_ase_element_tree, hf_Instruction_ind_for_pass_on_not_possible, parameter_tvb, offset, 1, FALSE ); + proto_tree_add_item( bat_ase_element_tree, hf_Instruction_ind_for_pass_on_not_possible, parameter_tvb, offset, 1, ENC_BIG_ENDIAN ); proto_tree_add_item( bat_ase_element_tree, hf_Send_notification_ind_for_general_action, parameter_tvb, offset, 1, FALSE ); - proto_tree_add_item( bat_ase_element_tree, hf_Instruction_ind_for_general_action, parameter_tvb, offset, 1, FALSE ); + proto_tree_add_item( bat_ase_element_tree, hf_Instruction_ind_for_general_action, parameter_tvb, offset, 1, ENC_BIG_ENDIAN ); offset = offset + 1; } content_len = length_indicator - 1 ; /* exclude the treated Compatibility information */ @@ -3656,21 +3656,21 @@ dissect_isup_application_transport_parameter(tvbuff_t *parameter_tvb, packet_inf si_and_apm_seg_ind = tvb_get_guint8(parameter_tvb, offset); proto_tree_add_item( parameter_tree, hf_isup_extension_ind, parameter_tvb, offset, 1, FALSE ); proto_tree_add_item( parameter_tree, hf_isup_apm_si_ind, parameter_tvb, offset, 1, FALSE ); - proto_tree_add_item( parameter_tree, hf_isup_apm_segmentation_ind, parameter_tvb, offset, 1, FALSE ); + proto_tree_add_item( parameter_tree, hf_isup_apm_segmentation_ind, parameter_tvb, offset, 1, ENC_BIG_ENDIAN ); offset = offset + 1; /* Octet 3a */ if ( (si_and_apm_seg_ind & H_8BIT_MASK) == 0x00) { apm_Segmentation_local_ref = tvb_get_guint8(parameter_tvb, offset); proto_tree_add_item( parameter_tree, hf_isup_extension_ind, parameter_tvb, offset, 1, FALSE ); - proto_tree_add_item( parameter_tree, hf_isup_apm_slr, parameter_tvb, offset, 1, FALSE ); + proto_tree_add_item( parameter_tree, hf_isup_apm_slr, parameter_tvb, offset, 1, ENC_BIG_ENDIAN ); offset = offset + 1; } /* For APM'98'-user applications. ( aci 0 - 3 ), APM-user information field starts at octet 4 */ if (aci16 > 3) { /* Octet 4 Originating Address length */ octet = tvb_get_guint8(parameter_tvb,offset); - proto_tree_add_item( parameter_tree, hf_isup_orig_addr_len, parameter_tvb, offset, 1, FALSE ); + proto_tree_add_item( parameter_tree, hf_isup_orig_addr_len, parameter_tvb, offset, 1, ENC_BIG_ENDIAN ); offset++; if ( octet != 0){ /* 4b */ @@ -3678,7 +3678,7 @@ dissect_isup_application_transport_parameter(tvbuff_t *parameter_tvb, packet_inf /* nature of address indicator */ offset++; proto_tree_add_item( parameter_tree, hf_isup_inn_indicator, parameter_tvb, offset, 1, FALSE ); - proto_tree_add_item( parameter_tree, hf_isup_numbering_plan_indicator, parameter_tvb, offset, 1, FALSE ); + proto_tree_add_item( parameter_tree, hf_isup_numbering_plan_indicator, parameter_tvb, offset, 1, ENC_BIG_ENDIAN ); offset++; /* Address digits */ proto_tree_add_text(parameter_tree, parameter_tvb, offset, octet - 2, "Address digits"); @@ -3686,7 +3686,7 @@ dissect_isup_application_transport_parameter(tvbuff_t *parameter_tvb, packet_inf } /* Octet 5 Destination Address length */ octet = tvb_get_guint8(parameter_tvb,offset); - proto_tree_add_item( parameter_tree, hf_isup_dest_addr_len, parameter_tvb, offset, 1, FALSE ); + proto_tree_add_item( parameter_tree, hf_isup_dest_addr_len, parameter_tvb, offset, 1, ENC_BIG_ENDIAN ); offset++; if ( octet != 0){ /* 4b */ @@ -3694,7 +3694,7 @@ dissect_isup_application_transport_parameter(tvbuff_t *parameter_tvb, packet_inf /* nature of address indicator */ offset++; proto_tree_add_item( parameter_tree, hf_isup_inn_indicator, parameter_tvb, offset, 1, FALSE ); - proto_tree_add_item( parameter_tree, hf_isup_numbering_plan_indicator, parameter_tvb, offset, 1, FALSE ); + proto_tree_add_item( parameter_tree, hf_isup_numbering_plan_indicator, parameter_tvb, offset, 1, ENC_BIG_ENDIAN ); offset++; /* Address digits */ proto_tree_add_text(parameter_tree, parameter_tvb, offset, octet - 2, "Address digits"); diff --git a/epan/dissectors/packet-itdm.c b/epan/dissectors/packet-itdm.c index fd775a22c7..dd3722a693 100644 --- a/epan/dissectors/packet-itdm.c +++ b/epan/dissectors/packet-itdm.c @@ -224,43 +224,43 @@ dissect_itdm_125usec(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) itdm_item = proto_tree_add_item(tree, proto_itdm, tvb, 0, -1, FALSE); itdm_tree = proto_item_add_subtree(itdm_item, ett_itdm); - proto_tree_add_item(itdm_tree, hf_itdm_timestamp, tvb, offset, 2, FALSE); + proto_tree_add_item(itdm_tree, hf_itdm_timestamp, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(itdm_tree, hf_itdm_seqnum, tvb, offset, 1, FALSE); + proto_tree_add_item(itdm_tree, hf_itdm_seqnum, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(itdm_tree, hf_itdm_sop_eop, tvb, offset, 1, FALSE); + proto_tree_add_item(itdm_tree, hf_itdm_sop_eop, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(itdm_tree, hf_itdm_last_pack, tvb, offset, 1, FALSE); - proto_tree_add_item(itdm_tree, hf_itdm_pktlen, tvb, offset, 2, FALSE); + proto_tree_add_item(itdm_tree, hf_itdm_pktlen, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(itdm_tree, hf_itdm_chksum, tvb, offset, 2, FALSE); + proto_tree_add_item(itdm_tree, hf_itdm_chksum, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(itdm_tree, hf_itdm_uid, tvb, offset, 3, FALSE); + proto_tree_add_item(itdm_tree, hf_itdm_uid, tvb, offset, 3, ENC_BIG_ENDIAN); offset += 3; proto_tree_add_item(itdm_tree, hf_itdm_ack, tvb, offset, 1, FALSE); proto_tree_add_item(itdm_tree, hf_itdm_act, tvb, offset, 1, FALSE); - proto_tree_add_item(itdm_tree, hf_itdm_chcmd, tvb, offset, 1, FALSE); + proto_tree_add_item(itdm_tree, hf_itdm_chcmd, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(itdm_tree, hf_itdm_chid, tvb, offset, 3, FALSE); + proto_tree_add_item(itdm_tree, hf_itdm_chid, tvb, offset, 3, ENC_BIG_ENDIAN); offset += 3; if (chcmd == ITDM_CMD_PACKET_RATE) { - proto_tree_add_item(itdm_tree, hf_itdm_pktrate, tvb, offset, 4, FALSE); + proto_tree_add_item(itdm_tree, hf_itdm_pktrate, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; } else { - proto_tree_add_item(itdm_tree, hf_itdm_chloc1, tvb, offset, 2, FALSE); + proto_tree_add_item(itdm_tree, hf_itdm_chloc1, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; if (chcmd == ITDM_CMD_CYCLIC_REAF || chcmd == ITDM_CMD_NEW_CHAN || chcmd == ITDM_CMD_CLOSE_CHAN) { - proto_tree_add_item(itdm_tree, hf_itdm_cxnsize, tvb, offset, 2, FALSE); + proto_tree_add_item(itdm_tree, hf_itdm_cxnsize, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; } else { - proto_tree_add_item(itdm_tree, hf_itdm_chloc2, tvb, offset, 2, FALSE); + proto_tree_add_item(itdm_tree, hf_itdm_chloc2, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; } } @@ -320,43 +320,43 @@ dissect_itdm_control(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) itdm_ctl_tree = proto_item_add_subtree(itdm_ctl_item, ett_itdm_ctl); /* These eventually should go into a SFP.0 dissector... */ - proto_tree_add_item(itdm_ctl_tree, hf_itdm_timestamp, tvb, offset, 2, FALSE); + proto_tree_add_item(itdm_ctl_tree, hf_itdm_timestamp, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(itdm_ctl_tree, hf_itdm_seqnum, tvb, offset, 1, FALSE); + proto_tree_add_item(itdm_ctl_tree, hf_itdm_seqnum, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(itdm_ctl_tree, hf_itdm_sop_eop, tvb, offset, 1, FALSE); + proto_tree_add_item(itdm_ctl_tree, hf_itdm_sop_eop, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(itdm_ctl_tree, hf_itdm_last_pack, tvb, offset, 1, FALSE); - proto_tree_add_item(itdm_ctl_tree, hf_itdm_pktlen, tvb, offset, 2, FALSE); + proto_tree_add_item(itdm_ctl_tree, hf_itdm_pktlen, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(itdm_ctl_tree, hf_itdm_chksum, tvb, offset, 2, FALSE); + proto_tree_add_item(itdm_ctl_tree, hf_itdm_chksum, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(itdm_ctl_tree, hf_itdm_uid, tvb, offset, 3, FALSE); + proto_tree_add_item(itdm_ctl_tree, hf_itdm_uid, tvb, offset, 3, ENC_BIG_ENDIAN); offset += 3; - proto_tree_add_item(itdm_ctl_tree, hf_itdm_ctl_transid, tvb, offset, 4, FALSE); + proto_tree_add_item(itdm_ctl_tree, hf_itdm_ctl_transid, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(itdm_ctl_tree, hf_itdm_ctl_command, tvb, offset, 1, FALSE); + proto_tree_add_item(itdm_ctl_tree, hf_itdm_ctl_command, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; if (command != ITDM_CTL_CMD_AFI_REQ) { - proto_tree_add_item(itdm_ctl_tree, hf_itdm_ctl_flowid, tvb, offset, 3, FALSE); + proto_tree_add_item(itdm_ctl_tree, hf_itdm_ctl_flowid, tvb, offset, 3, ENC_BIG_ENDIAN); } offset += 3; - proto_tree_add_item(itdm_ctl_tree, hf_itdm_ctl_dm, tvb, offset, 1, FALSE); + proto_tree_add_item(itdm_ctl_tree, hf_itdm_ctl_dm, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; /* rsvd.. */ offset += 1; - proto_tree_add_item(itdm_ctl_tree, hf_itdm_ctl_emts, tvb, offset, 2, FALSE); + proto_tree_add_item(itdm_ctl_tree, hf_itdm_ctl_emts, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(itdm_ctl_tree, hf_itdm_ctl_pktrate, tvb, offset, 4, FALSE); + proto_tree_add_item(itdm_ctl_tree, hf_itdm_ctl_pktrate, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; if (command != ITDM_CTL_CMD_AFI_REQ) { - proto_tree_add_item(itdm_ctl_tree, hf_itdm_ctl_ptid, tvb, offset, 4, FALSE); + proto_tree_add_item(itdm_ctl_tree, hf_itdm_ctl_ptid, tvb, offset, 4, ENC_BIG_ENDIAN); } offset += 4; /* rsvd.. */ offset += 2; - proto_tree_add_item(itdm_ctl_tree, hf_itdm_ctl_cksum, tvb, offset, 2, FALSE); + proto_tree_add_item(itdm_ctl_tree, hf_itdm_ctl_cksum, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; } diff --git a/epan/dissectors/packet-iwarp-ddp-rdmap.c b/epan/dissectors/packet-iwarp-ddp-rdmap.c index 6855399294..b07c77c860 100644 --- a/epan/dissectors/packet-iwarp-ddp-rdmap.c +++ b/epan/dissectors/packet-iwarp-ddp-rdmap.c @@ -304,10 +304,10 @@ dissect_iwarp_rdmap(tvbuff_t *tvb, proto_tree *rdma_tree, guint32 offset, ett_iwarp_rdma); proto_tree_add_item(rdma_header_tree, hf_iwarp_rdma_sinkstag, tvb, - offset, RDMA_SINKSTAG_LEN, FALSE); + offset, RDMA_SINKSTAG_LEN, ENC_BIG_ENDIAN); offset += RDMA_SINKSTAG_LEN; proto_tree_add_item(rdma_header_tree, hf_iwarp_rdma_sinkto, tvb, - offset, RDMA_SINKTO_LEN, FALSE); + offset, RDMA_SINKTO_LEN, ENC_BIG_ENDIAN); offset += RDMA_SINKTO_LEN; rdmardsz = (guint32) tvb_get_ntohl(tvb, offset); @@ -318,7 +318,7 @@ dissect_iwarp_rdmap(tvbuff_t *tvb, proto_tree *rdma_tree, guint32 offset, offset += RDMA_RDMARDSZ_LEN; proto_tree_add_item(rdma_header_tree, hf_iwarp_rdma_srcstag, tvb, - offset, RDMA_SRCSTAG_LEN, FALSE); + offset, RDMA_SRCSTAG_LEN, ENC_BIG_ENDIAN); offset += RDMA_SRCSTAG_LEN; proto_tree_add_item(rdma_header_tree, hf_iwarp_rdma_srcto, tvb, offset, RDMA_SRCTO_LEN, ENC_NA); @@ -340,41 +340,41 @@ dissect_iwarp_rdmap(tvbuff_t *tvb, proto_tree *rdma_tree, guint32 offset, term_ctrl_field_tree = proto_item_add_subtree( term_ctrl_field_subitem, ett_iwarp_rdma); proto_tree_add_item(term_ctrl_field_tree, hf_iwarp_rdma_term_layer, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); switch (layer) { case IWARP_LAYER_RDMA: proto_tree_add_item(term_ctrl_field_tree, hf_iwarp_rdma_term_etype_rdma, tvb, offset, 1, - FALSE); + ENC_BIG_ENDIAN); offset += 1; proto_tree_add_item(term_ctrl_field_tree, hf_iwarp_rdma_term_errcode_rdma, tvb, offset, 1, - FALSE); + ENC_BIG_ENDIAN); offset += 1; break; case IWARP_LAYER_DDP: proto_tree_add_item(term_ctrl_field_tree, hf_iwarp_rdma_term_etype_ddp, tvb, offset, 1, - FALSE); + ENC_BIG_ENDIAN); offset += 1; switch (etype) { case IWARP_ETYPE_DDP_TAGGED: proto_tree_add_item(term_ctrl_field_tree, hf_iwarp_rdma_term_errcode_ddp_tagged, tvb, - offset, 1, FALSE); + offset, 1, ENC_BIG_ENDIAN); offset += 1; break; case IWARP_ETYPE_DDP_UNTAGGED: proto_tree_add_item(term_ctrl_field_tree, hf_iwarp_rdma_term_errcode_ddp_untagged, tvb, - offset, 1, FALSE); + offset, 1, ENC_BIG_ENDIAN); offset += 1; break; default: proto_tree_add_item(term_ctrl_field_tree, hf_iwarp_rdma_term_errcode, tvb, offset, 1, - FALSE); + ENC_BIG_ENDIAN); offset += 1; break; } @@ -382,19 +382,19 @@ dissect_iwarp_rdmap(tvbuff_t *tvb, proto_tree *rdma_tree, guint32 offset, case IWARP_LAYER_LLP: proto_tree_add_item(term_ctrl_field_tree, hf_iwarp_rdma_term_etype_llp, tvb, offset, 1, - FALSE); + ENC_BIG_ENDIAN); offset += 1; proto_tree_add_item(term_ctrl_field_tree, hf_iwarp_rdma_term_errcode_llp, tvb, offset, 1, - FALSE); + ENC_BIG_ENDIAN); offset += 1; break; default: proto_tree_add_item(term_ctrl_field_tree, - hf_iwarp_rdma_term_etype, tvb, offset, 1, FALSE); + hf_iwarp_rdma_term_etype, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; proto_tree_add_item(term_ctrl_field_tree, - hf_iwarp_rdma_term_errcode, tvb, offset, 1, FALSE); + hf_iwarp_rdma_term_errcode, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; break; } @@ -409,14 +409,14 @@ dissect_iwarp_rdmap(tvbuff_t *tvb, proto_tree *rdma_tree, guint32 offset, hdrct = tvb_get_guint8(tvb, offset) & IWARP_HDRCT; proto_tree_add_item(header_ctrl_field_tree, - hf_iwarp_rdma_term_hdrct_m, tvb, offset, 1, FALSE); + hf_iwarp_rdma_term_hdrct_m, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(header_ctrl_field_tree, - hf_iwarp_rdma_term_hdrct_d, tvb, offset, 1, FALSE); + hf_iwarp_rdma_term_hdrct_d, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(header_ctrl_field_tree, - hf_iwarp_rdma_term_hdrct_r, tvb, offset, 1, FALSE); + hf_iwarp_rdma_term_hdrct_r, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(rdma_header_tree, hf_iwarp_rdma_term_rsvd, tvb, - offset, 2, FALSE); + offset, 2, ENC_BIG_ENDIAN); offset += 2; @@ -524,9 +524,9 @@ dissect_iwarp_ddp_rdmap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(ddp_ctrl_field_tree, hf_iwarp_ddp_l_flag, tvb, offset, DDP_CONTROL_FIELD_LEN, FALSE); proto_tree_add_item(ddp_ctrl_field_tree, hf_iwarp_ddp_rsvd, tvb, - offset, DDP_CONTROL_FIELD_LEN, FALSE); + offset, DDP_CONTROL_FIELD_LEN, ENC_BIG_ENDIAN); proto_tree_add_item(ddp_ctrl_field_tree, hf_iwarp_ddp_dv, tvb, offset, - DDP_CONTROL_FIELD_LEN, FALSE); + DDP_CONTROL_FIELD_LEN, ENC_BIG_ENDIAN); offset += DDP_CONTROL_FIELD_LEN; @@ -555,11 +555,11 @@ dissect_iwarp_ddp_rdmap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ett_iwarp_rdma); proto_tree_add_item(rdma_ctrl_field_tree, hf_iwarp_rdma_version, tvb, - offset, RDMA_CONTROL_FIELD_LEN, FALSE); + offset, RDMA_CONTROL_FIELD_LEN, ENC_BIG_ENDIAN); proto_tree_add_item(rdma_ctrl_field_tree, hf_iwarp_rdma_rsvd, tvb, - offset, RDMA_CONTROL_FIELD_LEN, FALSE); + offset, RDMA_CONTROL_FIELD_LEN, ENC_BIG_ENDIAN); proto_tree_add_item(rdma_ctrl_field_tree, hf_iwarp_rdma_opcode, tvb, - offset, RDMA_CONTROL_FIELD_LEN, FALSE); + offset, RDMA_CONTROL_FIELD_LEN, ENC_BIG_ENDIAN); offset += RDMA_CONTROL_FIELD_LEN; /* dissection of DDP rsvdULP[8:39] with respect to RDMAP */ @@ -574,7 +574,7 @@ dissect_iwarp_ddp_rdmap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (rdma_msg_opcode == RDMA_SEND_INVALIDATE || rdma_msg_opcode == RDMA_SEND_SE_INVALIDATE) { proto_tree_add_item(rdma_tree, hf_iwarp_rdma_inval_stag, - tvb, offset, RDMA_INVAL_STAG_LEN, FALSE); + tvb, offset, RDMA_INVAL_STAG_LEN, ENC_BIG_ENDIAN); } if (!is_tagged_buffer_model) { @@ -616,13 +616,13 @@ dissect_iwarp_ddp_rdmap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ett_iwarp_ddp); proto_tree_add_item(ddp_buffer_model_tree, hf_iwarp_ddp_qn, tvb, - offset, DDP_QN_LEN, FALSE); + offset, DDP_QN_LEN, ENC_BIG_ENDIAN); offset += DDP_QN_LEN; proto_tree_add_item(ddp_buffer_model_tree, hf_iwarp_ddp_msn, tvb, - offset, DDP_MSN_LEN, FALSE); + offset, DDP_MSN_LEN, ENC_BIG_ENDIAN); offset += DDP_MSN_LEN; proto_tree_add_item(ddp_buffer_model_tree, hf_iwarp_ddp_mo, tvb, - offset, DDP_MO_LEN, FALSE); + offset, DDP_MO_LEN, ENC_BIG_ENDIAN); offset += DDP_MO_LEN; if (rdma_msg_opcode == RDMA_SEND diff --git a/epan/dissectors/packet-iwarp-mpa.c b/epan/dissectors/packet-iwarp-mpa.c index 001ab7513e..694f0369b2 100644 --- a/epan/dissectors/packet-iwarp-mpa.c +++ b/epan/dissectors/packet-iwarp-mpa.c @@ -510,11 +510,11 @@ dissect_mpa_req_rep(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_tree_add_item(mpa_header_tree, hf_mpa_flag_r, tvb, offset, MPA_REQ_REP_FLAG_LEN, FALSE); proto_tree_add_item(mpa_header_tree, hf_mpa_flag_res, tvb, - offset, MPA_REQ_REP_FLAG_LEN, FALSE); + offset, MPA_REQ_REP_FLAG_LEN, ENC_BIG_ENDIAN); offset += MPA_REQ_REP_FLAG_LEN; proto_tree_add_item(mpa_header_tree, hf_mpa_rev, tvb, - offset, MPA_REQ_REP_REV_LEN, FALSE); + offset, MPA_REQ_REP_REV_LEN, ENC_BIG_ENDIAN); offset += MPA_REQ_REP_REV_LEN; /* check whether the Private Data Length conforms to RFC 5044 */ @@ -606,7 +606,7 @@ dissect_fpdu_crc(tvbuff_t *tvb, proto_tree *tree, mpa_state_t *state, } } else { proto_tree_add_item(tree, hf_mpa_crc, tvb, offset, MPA_CRC_LEN, - FALSE); + ENC_BIG_ENDIAN); } } @@ -628,7 +628,7 @@ dissect_fpdu_markers(tvbuff_t *tvb, proto_tree *tree, mpa_state_t *state, for (i=0; i<number_of_markers(state, tcpinfo, endpoint); i++) { proto_tree_add_item(mpa_marker_tree, hf_mpa_marker_res, tvb, - offset, MPA_MARKER_RSVD_LEN, FALSE); + offset, MPA_MARKER_RSVD_LEN, ENC_BIG_ENDIAN); fpduptr = (guint16) tvb_get_ntohs(tvb, offset+MPA_MARKER_RSVD_LEN); proto_tree_add_uint_format_value(mpa_marker_tree, hf_mpa_marker_fpduptr, tvb, diff --git a/epan/dissectors/packet-jmirror.c b/epan/dissectors/packet-jmirror.c index 285b3f88c1..3725382f9c 100644 --- a/epan/dissectors/packet-jmirror.c +++ b/epan/dissectors/packet-jmirror.c @@ -133,13 +133,13 @@ dissect_jmirror(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) jmirror_tree = proto_item_add_subtree(ti, ett_jmirror); /* Insert the Jmirror Identifier into the protocol tree and assign value to filter variable */ - proto_tree_add_item(jmirror_tree, hf_jmirror_mid, tvb, offset, MIRROR_ID_SZ, FALSE); + proto_tree_add_item(jmirror_tree, hf_jmirror_mid, tvb, offset, MIRROR_ID_SZ, ENC_BIG_ENDIAN); /* Push the tvbuff_t offset pointer along to the Session Identifier */ offset += MIRROR_ID_SZ; /* Insert the Session Identifier into the protocol tree and assign value to filter variable */ - proto_tree_add_item(jmirror_tree, hf_jmirror_sid, tvb, offset, SESSION_ID_SZ, FALSE); + proto_tree_add_item(jmirror_tree, hf_jmirror_sid, tvb, offset, SESSION_ID_SZ, ENC_BIG_ENDIAN); /* Push the tvbuff_t offset pointer along to the start of the mirrored packet */ offset += SESSION_ID_SZ; diff --git a/epan/dissectors/packet-jpeg.c b/epan/dissectors/packet-jpeg.c index fda1af0e7f..904a002072 100644 --- a/epan/dissectors/packet-jpeg.c +++ b/epan/dissectors/packet-jpeg.c @@ -94,15 +94,15 @@ dissect_jpeg( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) ti = proto_tree_add_item(jpeg_tree, hf_rtp_jpeg_main_hdr, tvb, offset, 8, ENC_NA); main_hdr_tree = proto_item_add_subtree(ti, ett_jpeg); - proto_tree_add_item(main_hdr_tree, hf_rtp_jpeg_main_hdr_ts, tvb, offset, 1, FALSE); + proto_tree_add_item(main_hdr_tree, hf_rtp_jpeg_main_hdr_ts, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(main_hdr_tree, hf_rtp_jpeg_main_hdr_offs, tvb, offset, 3, FALSE); + proto_tree_add_item(main_hdr_tree, hf_rtp_jpeg_main_hdr_offs, tvb, offset, 3, ENC_BIG_ENDIAN); fragment_offset = tvb_get_ntoh24(tvb, offset); offset += 3; - proto_tree_add_item(main_hdr_tree, hf_rtp_jpeg_main_hdr_type, tvb, offset, 1, FALSE); + proto_tree_add_item(main_hdr_tree, hf_rtp_jpeg_main_hdr_type, tvb, offset, 1, ENC_BIG_ENDIAN); type = tvb_get_guint8(tvb, offset); offset += 1; - proto_tree_add_item(main_hdr_tree, hf_rtp_jpeg_main_hdr_q, tvb, offset, 1, FALSE); + proto_tree_add_item(main_hdr_tree, hf_rtp_jpeg_main_hdr_q, tvb, offset, 1, ENC_BIG_ENDIAN); q = tvb_get_guint8(tvb, offset); offset += 1; w = tvb_get_guint8(tvb, offset) * 8; @@ -115,22 +115,22 @@ dissect_jpeg( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) if (type >= 64 && type <= 127) { ti = proto_tree_add_item(jpeg_tree, hf_rtp_jpeg_restart_hdr, tvb, offset, 4, ENC_NA); restart_hdr_tree = proto_item_add_subtree(ti, ett_jpeg); - proto_tree_add_item(restart_hdr_tree, hf_rtp_jpeg_restart_hdr_interval, tvb, offset, 2, FALSE); + proto_tree_add_item(restart_hdr_tree, hf_rtp_jpeg_restart_hdr_interval, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(restart_hdr_tree, hf_rtp_jpeg_restart_hdr_f, tvb, offset, 2, FALSE); - proto_tree_add_item(restart_hdr_tree, hf_rtp_jpeg_restart_hdr_l, tvb, offset, 2, FALSE); - proto_tree_add_item(restart_hdr_tree, hf_rtp_jpeg_restart_hdr_count, tvb, offset, 2, FALSE); + proto_tree_add_item(restart_hdr_tree, hf_rtp_jpeg_restart_hdr_f, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(restart_hdr_tree, hf_rtp_jpeg_restart_hdr_l, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(restart_hdr_tree, hf_rtp_jpeg_restart_hdr_count, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; } if (q >= 128 && fragment_offset == 0) { ti = proto_tree_add_item(jpeg_tree, hf_rtp_jpeg_qtable_hdr, tvb, offset, -1, ENC_NA); qtable_hdr_tree = proto_item_add_subtree(ti, ett_jpeg); - proto_tree_add_item(qtable_hdr_tree, hf_rtp_jpeg_qtable_hdr_mbz, tvb, offset, 1, FALSE); + proto_tree_add_item(qtable_hdr_tree, hf_rtp_jpeg_qtable_hdr_mbz, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(qtable_hdr_tree, hf_rtp_jpeg_qtable_hdr_prec, tvb, offset, 1, FALSE); + proto_tree_add_item(qtable_hdr_tree, hf_rtp_jpeg_qtable_hdr_prec, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(qtable_hdr_tree, hf_rtp_jpeg_qtable_hdr_length, tvb, offset, 2, FALSE); + proto_tree_add_item(qtable_hdr_tree, hf_rtp_jpeg_qtable_hdr_length, tvb, offset, 2, ENC_BIG_ENDIAN); len = tvb_get_ntohs(tvb, offset); offset += 2; if (len > 0) { diff --git a/epan/dissectors/packet-juniper.c b/epan/dissectors/packet-juniper.c index 57872de789..f7303d9100 100644 --- a/epan/dissectors/packet-juniper.c +++ b/epan/dissectors/packet-juniper.c @@ -1179,7 +1179,7 @@ static void dissect_juniper_ggsn(tvbuff_t* tvb, packet_info* pinfo, proto_tree* proto = tvb_get_letohs(tvb, offset); /* fetch protocol */ proto_tree_add_uint(juniper_subtree, hf_juniper_proto, tvb, offset, 2, proto); - proto_tree_add_item(juniper_subtree, hf_juniper_vlan, tvb, offset+2, 2, TRUE); + proto_tree_add_item(juniper_subtree, hf_juniper_vlan, tvb, offset+2, 2, ENC_LITTLE_ENDIAN); offset += 4; dissect_juniper_payload_proto(tvb, pinfo, tree, ti, proto, offset); diff --git a/epan/dissectors/packet-jxta.c b/epan/dissectors/packet-jxta.c index 9821bac62e..cdb23e0a06 100644 --- a/epan/dissectors/packet-jxta.c +++ b/epan/dissectors/packet-jxta.c @@ -1395,7 +1395,7 @@ static int dissect_jxta_message(tvbuff_t * tvb, packet_info * pinfo, proto_tree /* parse element count */ elem_count = tvb_get_ntohs(tvb, tree_offset); - proto_tree_add_item(jxta_msg_tree, hf_jxta_message_element_count, tvb, tree_offset, sizeof(guint16), FALSE); + proto_tree_add_item(jxta_msg_tree, hf_jxta_message_element_count, tvb, tree_offset, sizeof(guint16), ENC_BIG_ENDIAN); tree_offset += sizeof(guint16); /* FIXME bondolo Element count 0 (Process elements until FIN) should be supported. */ @@ -1653,7 +1653,7 @@ static int dissect_jxta_message_element_1(tvbuff_t * tvb, packet_info * pinfo, p /* content */ content_len = tvb_get_ntohl(tvb, tree_offset); - proto_tree_add_item(jxta_elem_tree, hf_jxta_element_content_len, tvb, tree_offset, sizeof(guint32), FALSE); + proto_tree_add_item(jxta_elem_tree, hf_jxta_element_content_len, tvb, tree_offset, sizeof(guint32), ENC_BIG_ENDIAN); tree_offset += sizeof(guint32); element_content_tvb = tvb_new_subset(tvb, tree_offset, content_len, content_len); @@ -1945,11 +1945,11 @@ static int dissect_jxta_message_element_2(tvbuff_t * tvb, packet_info * pinfo, p if ((flags & JXTAMSG2_ELMFLAG_UINT64_LENS) != 0) { content_len = tvb_get_ntoh64(tvb, tree_offset); - proto_tree_add_item(jxta_elem_tree, hf_jxta_element_content_len64, tvb, tree_offset, sizeof(guint64), FALSE); + proto_tree_add_item(jxta_elem_tree, hf_jxta_element_content_len64, tvb, tree_offset, sizeof(guint64), ENC_BIG_ENDIAN); tree_offset += sizeof(guint64); } else { content_len = tvb_get_ntohl(tvb, tree_offset); - proto_tree_add_item(jxta_elem_tree, hf_jxta_element_content_len, tvb, tree_offset, sizeof(guint32), FALSE); + proto_tree_add_item(jxta_elem_tree, hf_jxta_element_content_len, tvb, tree_offset, sizeof(guint32), ENC_BIG_ENDIAN); tree_offset += sizeof(guint32); } diff --git a/epan/dissectors/packet-kdp.c b/epan/dissectors/packet-kdp.c index 5b6bea318a..ca9e1fcb5a 100644 --- a/epan/dissectors/packet-kdp.c +++ b/epan/dissectors/packet-kdp.c @@ -106,7 +106,7 @@ static void dissect_kdp(tvbuff_t *tvb, version = tvb_get_guint8(tvb, 0); if (version != 2) { /* Version other than 2 is really SDDP in UDP */ - proto_tree_add_item(kdp_tree, hf_kdp_version, tvb, 0, 1, FALSE); + proto_tree_add_item(kdp_tree, hf_kdp_version, tvb, 0, 1, ENC_BIG_ENDIAN); proto_tree_add_item(kdp_tree, hf_kdp_xml_body, tvb, 0, -1, FALSE); } else { header_len = tvb_get_guint8(tvb, 1) * 4; @@ -118,9 +118,9 @@ static void dissect_kdp(tvbuff_t *tvb, } packet_flags = tvb_get_guint8(tvb, 2); packet_errors = tvb_get_guint8(tvb, 3); - proto_tree_add_item(kdp_tree, hf_kdp_version, tvb, 0, 1, FALSE); - proto_tree_add_item(kdp_tree, hf_kdp_headerlen, tvb, 1, 1, FALSE); - ti = proto_tree_add_item(kdp_tree, hf_kdp_flags, tvb, 2, 1, FALSE); + proto_tree_add_item(kdp_tree, hf_kdp_version, tvb, 0, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(kdp_tree, hf_kdp_headerlen, tvb, 1, 1, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(kdp_tree, hf_kdp_flags, tvb, 2, 1, ENC_BIG_ENDIAN); flags_tree = proto_item_add_subtree(ti, ett_kdp_flags); proto_tree_add_item(flags_tree, hf_kdp_drop_flag, tvb, 2, 1, FALSE); @@ -130,32 +130,32 @@ static void dissect_kdp(tvbuff_t *tvb, proto_tree_add_item(flags_tree, hf_kdp_bcst_flag, tvb, 2, 1, FALSE); proto_tree_add_item(flags_tree, hf_kdp_dup_flag, tvb, 2, 1, FALSE); - proto_tree_add_item(kdp_tree, hf_kdp_errors, tvb, 3, 1, FALSE); + proto_tree_add_item(kdp_tree, hf_kdp_errors, tvb, 3, 1, ENC_BIG_ENDIAN); if (header_len > 4) { offset = 4; if (packet_flags & KDP_ACK_FLAG) { - proto_tree_add_item(kdp_tree, hf_kdp_destflowid, tvb, offset, 4, FALSE); + proto_tree_add_item(kdp_tree, hf_kdp_destflowid, tvb, offset, 4, ENC_BIG_ENDIAN); offset = offset + 4; } if (packet_flags & (KDP_SYN_FLAG | KDP_BCST_FLAG)) { - proto_tree_add_item(kdp_tree, hf_kdp_srcflowid, tvb, offset, 4, FALSE); + proto_tree_add_item(kdp_tree, hf_kdp_srcflowid, tvb, offset, 4, ENC_BIG_ENDIAN); src_flowid = tvb_get_ntohl(tvb, offset); offset = offset + 4; } - proto_tree_add_item(kdp_tree, hf_kdp_sequence, tvb, offset, 4, FALSE); + proto_tree_add_item(kdp_tree, hf_kdp_sequence, tvb, offset, 4, ENC_BIG_ENDIAN); sequence_number = tvb_get_ntohl(tvb, offset); offset = offset + 4; if (packet_flags & KDP_ACK_FLAG) { - proto_tree_add_item(kdp_tree, hf_kdp_ack, tvb, offset, 4, FALSE); + proto_tree_add_item(kdp_tree, hf_kdp_ack, tvb, offset, 4, ENC_BIG_ENDIAN); ack_number = tvb_get_ntohl(tvb, offset); offset = offset + 4; } if (packet_flags & KDP_SYN_FLAG) { - proto_tree_add_item(kdp_tree, hf_kdp_maxsegmentsize, tvb, offset, 4, FALSE); + proto_tree_add_item(kdp_tree, hf_kdp_maxsegmentsize, tvb, offset, 4, ENC_BIG_ENDIAN); offset = offset + 4; } @@ -165,11 +165,11 @@ static void dissect_kdp(tvbuff_t *tvb, option_number = tvb_get_guint8(tvb, offset); - proto_tree_add_item(kdp_tree, hf_kdp_optionnumber, tvb, offset, 1, FALSE); + proto_tree_add_item(kdp_tree, hf_kdp_optionnumber, tvb, offset, 1, ENC_BIG_ENDIAN); offset = offset + 1; if (option_number > 0) { option_len = tvb_get_guint8(tvb, offset); - proto_tree_add_item(kdp_tree, hf_kdp_optionlen, tvb, offset, 1, FALSE); + proto_tree_add_item(kdp_tree, hf_kdp_optionlen, tvb, offset, 1, ENC_BIG_ENDIAN); offset = offset + 1; } @@ -177,15 +177,15 @@ static void dissect_kdp(tvbuff_t *tvb, case 0: break; case 1: - proto_tree_add_item(kdp_tree, hf_kdp_option1, tvb, offset, 2, FALSE); + proto_tree_add_item(kdp_tree, hf_kdp_option1, tvb, offset, 2, ENC_BIG_ENDIAN); offset = offset + 2; break; case 2: - proto_tree_add_item(kdp_tree, hf_kdp_option2, tvb, offset, 2, FALSE); + proto_tree_add_item(kdp_tree, hf_kdp_option2, tvb, offset, 2, ENC_BIG_ENDIAN); offset = offset + 2; break; case 3: - proto_tree_add_item(kdp_tree, hf_kdp_option3, tvb, offset, 2, FALSE); + proto_tree_add_item(kdp_tree, hf_kdp_option3, tvb, offset, 2, ENC_BIG_ENDIAN); offset = offset + 2; break; case 4: @@ -199,15 +199,15 @@ static void dissect_kdp(tvbuff_t *tvb, offset = offset + option_len - 2; break; case 7: - proto_tree_add_item(kdp_tree, hf_kdp_option7, tvb, offset, 2, FALSE); + proto_tree_add_item(kdp_tree, hf_kdp_option7, tvb, offset, 2, ENC_BIG_ENDIAN); offset = offset + 2; break; case 8: - proto_tree_add_item(kdp_tree, hf_kdp_option8, tvb, offset, 2, FALSE); + proto_tree_add_item(kdp_tree, hf_kdp_option8, tvb, offset, 2, ENC_BIG_ENDIAN); offset = offset + 2; break; case 9: - proto_tree_add_item(kdp_tree, hf_kdp_option9, tvb, offset, 2, FALSE); + proto_tree_add_item(kdp_tree, hf_kdp_option9, tvb, offset, 2, ENC_BIG_ENDIAN); offset = offset + 2; break; default: @@ -218,10 +218,10 @@ static void dissect_kdp(tvbuff_t *tvb, } if (body_len > 0) { - proto_tree_add_item(kdp_tree, hf_kdp_fragment, tvb, offset, 2, FALSE); + proto_tree_add_item(kdp_tree, hf_kdp_fragment, tvb, offset, 2, ENC_BIG_ENDIAN); offset = offset + 2; - proto_tree_add_item(kdp_tree, hf_kdp_fragtotal, tvb, offset, 2, FALSE); + proto_tree_add_item(kdp_tree, hf_kdp_fragtotal, tvb, offset, 2, ENC_BIG_ENDIAN); offset = offset + 2; proto_tree_add_item(kdp_tree, hf_kdp_body, tvb, offset, -1, ENC_NA); diff --git a/epan/dissectors/packet-kerberos.c b/epan/dissectors/packet-kerberos.c index c2b3977aec..d0edc358dc 100644 --- a/epan/dissectors/packet-kerberos.c +++ b/epan/dissectors/packet-kerberos.c @@ -2297,7 +2297,7 @@ dissect_krb5_PW_SALT(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *ac * else ever uses it or we learn how to tell whether this * is such an MS blob or not. */ - proto_tree_add_item(tree, hf_krb_smb_nt_status, tvb, offset, 4, TRUE); + proto_tree_add_item(tree, hf_krb_smb_nt_status, tvb, offset, 4, ENC_LITTLE_ENDIAN); nt_status=tvb_get_letohl(tvb, offset); if(nt_status && check_col(actx->pinfo->cinfo, COL_INFO)) { col_append_fstr(actx->pinfo->cinfo, COL_INFO, @@ -2307,10 +2307,10 @@ dissect_krb5_PW_SALT(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *ac } offset += 4; - proto_tree_add_item(tree, hf_krb_smb_unknown, tvb, offset, 4, TRUE); + proto_tree_add_item(tree, hf_krb_smb_unknown, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; - proto_tree_add_item(tree, hf_krb_smb_unknown, tvb, offset, 4, TRUE); + proto_tree_add_item(tree, hf_krb_smb_unknown, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; return offset; @@ -2599,20 +2599,20 @@ dissect_krb5_PAC_NDRHEADERBLOB(proto_tree *parent_tree, tvbuff_t *tvb, int offse /* modified DREP field that is used for stuff that is transporetd ontop of non dcerpc */ - proto_tree_add_item(tree, hf_krb_midl_version, tvb, offset, 1, TRUE); + proto_tree_add_item(tree, hf_krb_midl_version, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; offset = dissect_krb5_PAC_DREP(tree, tvb, offset, drep); - proto_tree_add_item(tree, hf_krb_midl_hdr_len, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_krb_midl_hdr_len, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset+=2; - proto_tree_add_item(tree, hf_krb_midl_fill_bytes, tvb, offset, 4, TRUE); + proto_tree_add_item(tree, hf_krb_midl_fill_bytes, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; /* length of blob that follows */ - proto_tree_add_item(tree, hf_krb_midl_blob_len, tvb, offset, 8, TRUE); + proto_tree_add_item(tree, hf_krb_midl_blob_len, tvb, offset, 8, ENC_LITTLE_ENDIAN); offset += 8; return offset; @@ -2709,22 +2709,22 @@ dissect_krb5_PAC_UPN_DNS_INFO(proto_tree *parent_tree, tvbuff_t *tvb, int offset /* upn */ upn_len = tvb_get_letohs(tvb, offset); - proto_tree_add_item(tree, hf_krb_pac_upn_upn_len, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_krb_pac_upn_upn_len, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset+=2; upn_offset = tvb_get_letohs(tvb, offset); - proto_tree_add_item(tree, hf_krb_pac_upn_upn_offset, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_krb_pac_upn_upn_offset, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset+=2; /* dns */ dns_len = tvb_get_letohs(tvb, offset); - proto_tree_add_item(tree, hf_krb_pac_upn_dns_len, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_krb_pac_upn_dns_len, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset+=2; dns_offset = tvb_get_letohs(tvb, offset); - proto_tree_add_item(tree, hf_krb_pac_upn_dns_offset, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_krb_pac_upn_dns_offset, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset+=2; /* flags */ - proto_tree_add_item(tree, hf_krb_pac_upn_flags, tvb, offset, 4, TRUE); + proto_tree_add_item(tree, hf_krb_pac_upn_flags, tvb, offset, 4, ENC_LITTLE_ENDIAN); /* upn */ offset = upn_offset; @@ -2766,7 +2766,7 @@ dissect_krb5_PAC_SERVER_CHECKSUM(proto_tree *parent_tree, tvbuff_t *tvb, int off } /* signature type */ - proto_tree_add_item(tree, hf_krb_pac_signature_type, tvb, offset, 4, TRUE); + proto_tree_add_item(tree, hf_krb_pac_signature_type, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset+=4; /* signature data */ @@ -2787,7 +2787,7 @@ dissect_krb5_PAC_PRIVSVR_CHECKSUM(proto_tree *parent_tree, tvbuff_t *tvb, int of } /* signature type */ - proto_tree_add_item(tree, hf_krb_pac_signature_type, tvb, offset, 4, TRUE); + proto_tree_add_item(tree, hf_krb_pac_signature_type, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset+=4; /* signature data */ @@ -3342,7 +3342,7 @@ dissect_krb5_rfc1964_checksum(asn1_ctx_t *actx _U_, proto_tree *tree, tvbuff_t * /* Length of Bnd field */ len=tvb_get_letohl(tvb, offset); - proto_tree_add_item(tree, hf_krb_gssapi_len, tvb, offset, 4, TRUE); + proto_tree_add_item(tree, hf_krb_gssapi_len, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; /* Bnd field */ @@ -3366,7 +3366,7 @@ dissect_krb5_rfc1964_checksum(asn1_ctx_t *actx _U_, proto_tree *tree, tvbuff_t * return offset; } /* dlgopt identifier */ - proto_tree_add_item(tree, hf_krb_gssapi_dlgopt, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_krb_gssapi_dlgopt, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; if(tvb_length_remaining(tvb, offset)<2){ @@ -3374,7 +3374,7 @@ dissect_krb5_rfc1964_checksum(asn1_ctx_t *actx _U_, proto_tree *tree, tvbuff_t * } /* dlglen identifier */ dlglen=tvb_get_letohs(tvb, offset); - proto_tree_add_item(tree, hf_krb_gssapi_dlglen, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_krb_gssapi_dlglen, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; if(dlglen!=tvb_length_remaining(tvb, offset)){ diff --git a/epan/dissectors/packet-kerberos4.c b/epan/dissectors/packet-kerberos4.c index f8657bf15b..5811d1d16a 100644 --- a/epan/dissectors/packet-kerberos4.c +++ b/epan/dissectors/packet-kerberos4.c @@ -182,7 +182,7 @@ dissect_krb4_kdc_reply(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset+=4; /* kvno */ - proto_tree_add_item(tree, hf_krb4_kvno, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_krb4_kvno, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; /* length2 */ @@ -206,7 +206,7 @@ dissect_krb4_appl_request(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, i guint8 lifetime; /* kvno */ - proto_tree_add_item(tree, hf_krb4_kvno, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_krb4_kvno, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; /* Realm */ @@ -214,12 +214,12 @@ dissect_krb4_appl_request(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, i /* ticket length */ tlen=tvb_get_guint8(tvb, offset); - proto_tree_add_item(tree, hf_krb4_ticket_length, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_krb4_ticket_length, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; /* request length */ rlen=tvb_get_guint8(tvb, offset); - proto_tree_add_item(tree, hf_krb4_request_length, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_krb4_request_length, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; /* ticket */ @@ -260,11 +260,11 @@ dissect_krb4_auth_msg_type(packet_info *pinfo, proto_tree *parent_tree, tvbuff_t guint8 auth_msg_type; auth_msg_type=tvb_get_guint8(tvb, offset); - item = proto_tree_add_item(parent_tree, hf_krb4_auth_msg_type, tvb, offset, 1, FALSE); + item = proto_tree_add_item(parent_tree, hf_krb4_auth_msg_type, tvb, offset, 1, ENC_BIG_ENDIAN); tree = proto_item_add_subtree(item, ett_krb4_auth_msg_type); /* m_type */ - proto_tree_add_item(tree, hf_krb4_m_type, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_krb4_m_type, tvb, offset, 1, ENC_BIG_ENDIAN); if (check_col(pinfo->cinfo, COL_INFO)) col_append_fstr(pinfo->cinfo, COL_INFO, "%s%s", (version==TRANSARC_SPECIAL_VERSION)?"TRANSARC-":"", @@ -274,7 +274,7 @@ dissect_krb4_auth_msg_type(packet_info *pinfo, proto_tree *parent_tree, tvbuff_t val_to_str(auth_msg_type>>1, m_type_vals, "Unknown (0x%04x)")); /* byte order */ - proto_tree_add_item(tree, hf_krb4_byte_order, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_krb4_byte_order, tvb, offset, 1, ENC_BIG_ENDIAN); proto_item_append_text(item, " (%s)", val_to_str(auth_msg_type&0x01, byte_order_vals, "Unknown (0x%04x)")); offset++; @@ -321,7 +321,7 @@ dissect_krb4(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) col_clear(pinfo->cinfo, COL_INFO); /* version */ - proto_tree_add_item(tree, hf_krb4_version, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_krb4_version, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; /* auth_msg_type */ diff --git a/epan/dissectors/packet-kink.c b/epan/dissectors/packet-kink.c index 56d9c95645..70eb0e7458 100644 --- a/epan/dissectors/packet-kink.c +++ b/epan/dissectors/packet-kink.c @@ -225,7 +225,7 @@ dissect_kink(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree){ proto_tree_add_text(kink_tree, tvb, offset, 1, "version: %u.%u", major_version, minor_version); offset++; - proto_tree_add_item(kink_tree, hf_kink_length, tvb, offset, 2, FALSE); + proto_tree_add_item(kink_tree, hf_kink_length, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; doi = tvb_get_ntohl(tvb, offset); @@ -238,11 +238,11 @@ dissect_kink(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree){ } offset += 4; - proto_tree_add_item(kink_tree, hf_kink_transactionId, tvb, offset, 4, FALSE); + proto_tree_add_item(kink_tree, hf_kink_transactionId, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; chsumlen = tvb_get_guint8(tvb, offset); - proto_tree_add_item(kink_tree, hf_kink_checkSumLength, tvb, offset, 1, FALSE); + proto_tree_add_item(kink_tree, hf_kink_checkSumLength, tvb, offset, 1, ENC_BIG_ENDIAN); offset ++; next_payload = tvb_get_guint8(tvb, offset); diff --git a/epan/dissectors/packet-l2tp.c b/epan/dissectors/packet-l2tp.c index 64f9426dd7..828430ac97 100644 --- a/epan/dissectors/packet-l2tp.c +++ b/epan/dissectors/packet-l2tp.c @@ -666,7 +666,7 @@ static void process_control_avps(tvbuff_t *tvb, if (avp_type == EXTENDED_VENDOR_ID) { idx += 2; proto_tree_add_item(l2tp_avp_tree, hf_l2tp_avp_vendor_id, - tvb, idx, 4, FALSE); + tvb, idx, 4, ENC_BIG_ENDIAN); idx += 4; @@ -674,7 +674,7 @@ static void process_control_avps(tvbuff_t *tvb, } else { proto_tree_add_item(l2tp_avp_tree, hf_l2tp_avp_vendor_id, - tvb, idx, 2, FALSE); + tvb, idx, 2, ENC_BIG_ENDIAN); idx += 2; avp_len -= 2; } @@ -749,7 +749,7 @@ static void process_control_avps(tvbuff_t *tvb, break; case CISCO_SESSION_TIE_BREAKER: proto_tree_add_item(l2tp_avp_tree, hf_l2tp_tie_breaker, - tvb, idx, 8, FALSE); + tvb, idx, 8, ENC_BIG_ENDIAN); break; case CISCO_DRAFT_AVP_VERSION: proto_tree_add_text(l2tp_avp_tree, tvb, idx, 2, @@ -879,7 +879,7 @@ static void process_control_avps(tvbuff_t *tvb, break; case TIE_BREAKER: - proto_tree_add_item(l2tp_avp_tree, hf_l2tp_tie_breaker, tvb, idx, 8, FALSE); + proto_tree_add_item(l2tp_avp_tree, hf_l2tp_tie_breaker, tvb, idx, 8, ENC_BIG_ENDIAN); break; case FIRMWARE_REVISION: @@ -1379,7 +1379,7 @@ process_l2tpv3_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, } if (tree) { - proto_tree_add_item(l2tp_tree, hf_l2tp_sid, tvb, idx-4, 4, FALSE); + proto_tree_add_item(l2tp_tree, hf_l2tp_sid, tvb, idx-4, 4, ENC_BIG_ENDIAN); proto_item_set_len(l2tp_item, idx); if (!(tvb_offset_exists(tvb, idx))) return; @@ -1397,7 +1397,7 @@ process_l2tpv3_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_tree_add_item(l2_specific, hf_l2tp_l2_spec_s, tvb, idx + l2tpv3_cookie, 1, FALSE); proto_tree_add_item(l2_specific, hf_l2tp_l2_spec_sequence, tvb, - idx + l2tpv3_cookie + 1, 3, FALSE); + idx + l2tpv3_cookie + 1, 3, ENC_BIG_ENDIAN); } next_tvb = tvb_new_subset_remaining(tvb, idx + l2tpv3_cookie + 4); break; @@ -1414,10 +1414,10 @@ process_l2tpv3_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, idx + l2tpv3_cookie,1, FALSE); proto_tree_add_item(l2_specific, hf_l2tp_l2_spec_flow_id, tvb, - idx + l2tpv3_cookie,1, FALSE); + idx + l2tpv3_cookie,1, ENC_BIG_ENDIAN); proto_tree_add_item(l2_specific, hf_l2tp_l2_spec_sequence, tvb, - idx + l2tpv3_cookie + 2,2, FALSE); + idx + l2tpv3_cookie + 2,2, ENC_BIG_ENDIAN); } next_tvb = tvb_new_subset_remaining(tvb, idx + l2tpv3_cookie + 4); break; @@ -1443,7 +1443,7 @@ process_l2tpv3_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_tree_add_item(l2_specific, hf_l2tp_l2_spec_u, tvb, idx + l2tpv3_cookie, 1, FALSE); proto_tree_add_item(l2_specific, hf_l2tp_l2_spec_sequence, tvb, - idx + l2tpv3_cookie + 1, 3, FALSE); + idx + l2tpv3_cookie + 1, 3, ENC_BIG_ENDIAN); } next_tvb = tvb_new_subset_remaining(tvb, idx + l2tpv3_cookie + 4); break; @@ -1535,7 +1535,7 @@ process_l2tpv3_data_udp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_boolean(ctrl_tree, hf_l2tp_seq_bit, tvb, 0, 2, control); proto_tree_add_uint(ctrl_tree, hf_l2tp_version, tvb, 0, 2, control); /* Data in v3 over UDP has this reserved */ - proto_tree_add_item(l2tp_tree, hf_l2tp_res, tvb, 2, 2, FALSE); + proto_tree_add_item(l2tp_tree, hf_l2tp_res, tvb, 2, 2, ENC_BIG_ENDIAN); } /* Call process_l2tpv3_data from Session ID (offset in idx of 4) */ @@ -1658,7 +1658,7 @@ process_l2tpv3_control(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int proto_item_append_text(l2tp_item, " version 3"); if (baseIdx) { - proto_tree_add_item(l2tp_tree, hf_l2tp_sid, tvb, 0, 4, FALSE); + proto_tree_add_item(l2tp_tree, hf_l2tp_sid, tvb, 0, 4, ENC_BIG_ENDIAN); } ti = proto_tree_add_text(l2tp_tree, tvb, baseIdx, 2, "Packet Type: %s Control Connection Id=%d", @@ -1673,23 +1673,23 @@ process_l2tpv3_control(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int idx = baseIdx + 2; if (LENGTH_BIT(control)) { if (tree) { - proto_tree_add_item(l2tp_tree, hf_l2tp_length, tvb, idx, 2, FALSE); + proto_tree_add_item(l2tp_tree, hf_l2tp_length, tvb, idx, 2, ENC_BIG_ENDIAN); } idx += 2; } if (tree) { - proto_tree_add_item(l2tp_tree, hf_l2tp_ccid, tvb, idx, 4, FALSE); + proto_tree_add_item(l2tp_tree, hf_l2tp_ccid, tvb, idx, 4, ENC_BIG_ENDIAN); } idx += 4; if (SEQUENCE_BIT(control)) { if (tree) { - proto_tree_add_item(l2tp_tree, hf_l2tp_Ns, tvb, idx, 2, FALSE); + proto_tree_add_item(l2tp_tree, hf_l2tp_Ns, tvb, idx, 2, ENC_BIG_ENDIAN); } idx += 2; if (tree) { - proto_tree_add_item(l2tp_tree, hf_l2tp_Nr, tvb, idx, 2, FALSE); + proto_tree_add_item(l2tp_tree, hf_l2tp_Nr, tvb, idx, 2, ENC_BIG_ENDIAN); } idx += 2; } @@ -1858,7 +1858,7 @@ dissect_l2tp_udp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) idx = 2; if (LENGTH_BIT(control)) { if (tree) { - proto_tree_add_item(l2tp_tree, hf_l2tp_length, tvb, idx, 2, FALSE); + proto_tree_add_item(l2tp_tree, hf_l2tp_length, tvb, idx, 2, ENC_BIG_ENDIAN); } idx += 2; } @@ -1874,11 +1874,11 @@ dissect_l2tp_udp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (SEQUENCE_BIT(control)) { if (tree) { - proto_tree_add_item(l2tp_tree, hf_l2tp_Ns, tvb, idx, 2, FALSE); + proto_tree_add_item(l2tp_tree, hf_l2tp_Ns, tvb, idx, 2, ENC_BIG_ENDIAN); } idx += 2; if (tree) { - proto_tree_add_item(l2tp_tree, hf_l2tp_Nr, tvb, idx, 2, FALSE); + proto_tree_add_item(l2tp_tree, hf_l2tp_Nr, tvb, idx, 2, ENC_BIG_ENDIAN); } idx += 2; } diff --git a/epan/dissectors/packet-lanforge.c b/epan/dissectors/packet-lanforge.c index dd13d95c68..af0068a00f 100644 --- a/epan/dissectors/packet-lanforge.c +++ b/epan/dissectors/packet-lanforge.c @@ -105,46 +105,46 @@ static gboolean dissect_lanforge(tvbuff_t *tvb, packet_info *pinfo, proto_tree * /* add items to the subtree */ - proto_tree_add_item(lanforge_tree, hf_lanforge_crc, tvb, offset, 4, FALSE); + proto_tree_add_item(lanforge_tree, hf_lanforge_crc, tvb, offset, 4, ENC_BIG_ENDIAN); offset+=4; - proto_tree_add_item(lanforge_tree, hf_lanforge_magic, tvb, offset, 4, FALSE); + proto_tree_add_item(lanforge_tree, hf_lanforge_magic, tvb, offset, 4, ENC_BIG_ENDIAN); offset+=4; - proto_tree_add_item(lanforge_tree, hf_lanforge_src_session, tvb, offset, 2, FALSE); + proto_tree_add_item(lanforge_tree, hf_lanforge_src_session, tvb, offset, 2, ENC_BIG_ENDIAN); offset+=2; - proto_tree_add_item(lanforge_tree, hf_lanforge_dst_session, tvb, offset, 2, FALSE); + proto_tree_add_item(lanforge_tree, hf_lanforge_dst_session, tvb, offset, 2, ENC_BIG_ENDIAN); offset+=2; pld_len = tvb_get_ntohs(tvb, offset); - tmp = proto_tree_add_item(lanforge_tree, hf_lanforge_pld_len_l, tvb, offset, 2, FALSE); + tmp = proto_tree_add_item(lanforge_tree, hf_lanforge_pld_len_l, tvb, offset, 2, ENC_BIG_ENDIAN); PROTO_ITEM_SET_GENERATED(tmp); offset+=2; tmpi = tvb_get_guint8(tvb, offset); - tmp = proto_tree_add_item(lanforge_tree, hf_lanforge_pld_len_h, tvb, offset, 1, FALSE); + tmp = proto_tree_add_item(lanforge_tree, hf_lanforge_pld_len_h, tvb, offset, 1, ENC_BIG_ENDIAN); PROTO_ITEM_SET_GENERATED(tmp); offset+=1; pld_len |= (tmpi << 16); proto_tree_add_uint(lanforge_tree, hf_lanforge_pld_len, tvb, offset-3, 3, pld_len); - proto_tree_add_item(lanforge_tree, hf_lanforge_pld_pattern, tvb, offset, 1, FALSE); + proto_tree_add_item(lanforge_tree, hf_lanforge_pld_pattern, tvb, offset, 1, ENC_BIG_ENDIAN); offset+=1; - proto_tree_add_item(lanforge_tree, hf_lanforge_seq, tvb, offset, 4, FALSE); + proto_tree_add_item(lanforge_tree, hf_lanforge_seq, tvb, offset, 4, ENC_BIG_ENDIAN); offset+=4; tss = tvb_get_ntohl(tvb, offset); tstamp.secs = tss; - tmp = proto_tree_add_item(lanforge_tree, hf_lanforge_tx_time_s, tvb, offset, 4, FALSE); + tmp = proto_tree_add_item(lanforge_tree, hf_lanforge_tx_time_s, tvb, offset, 4, ENC_BIG_ENDIAN); PROTO_ITEM_SET_GENERATED(tmp); offset+=4; tss = tvb_get_ntohl(tvb, offset); tstamp.nsecs = tss; - tmp = proto_tree_add_item(lanforge_tree, hf_lanforge_tx_time_ns, tvb, offset, 4, FALSE); + tmp = proto_tree_add_item(lanforge_tree, hf_lanforge_tx_time_ns, tvb, offset, 4, ENC_BIG_ENDIAN); PROTO_ITEM_SET_GENERATED(tmp); offset+=4; diff --git a/epan/dissectors/packet-laplink.c b/epan/dissectors/packet-laplink.c index 32898b34f9..0b28a59b93 100644 --- a/epan/dissectors/packet-laplink.c +++ b/epan/dissectors/packet-laplink.c @@ -137,11 +137,11 @@ dissect_laplink_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) laplink_tree = proto_item_add_subtree(ti, ett_laplink); - proto_tree_add_item(laplink_tree, hf_laplink_tcp_ident, tvb, offset, 4, FALSE); + proto_tree_add_item(laplink_tree, hf_laplink_tcp_ident, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; length = tvb_get_ntohs(tvb, offset); - proto_tree_add_item(laplink_tree, hf_laplink_tcp_length, tvb, offset, 2, FALSE); + proto_tree_add_item(laplink_tree, hf_laplink_tcp_length, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(laplink_tree, hf_laplink_tcp_data, tvb, offset, length, ENC_NA); diff --git a/epan/dissectors/packet-ldp.c b/epan/dissectors/packet-ldp.c index d2a1a4bf26..809ecc8300 100644 --- a/epan/dissectors/packet-ldp.c +++ b/epan/dissectors/packet-ldp.c @@ -888,7 +888,7 @@ dissect_tlv_fec(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem) case CRLSP_FEC: ti = proto_tree_add_text(val_tree, tvb, offset, 1, "FEC Element %u", ix); fec_tree = proto_item_add_subtree(ti, ett_ldp_fec); - proto_tree_add_item(fec_tree, hf_ldp_tlv_fec_wc,tvb, offset, 1, FALSE); + proto_tree_add_item(fec_tree, hf_ldp_tlv_fec_wc,tvb, offset, 1, ENC_BIG_ENDIAN); rem -= 1; offset += 1; break; @@ -935,13 +935,13 @@ dissect_tlv_fec(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem) /*Add a subtree for this*/ ti = proto_tree_add_text(val_tree, tvb, offset, 4+MIN(addr_size, prefix_len_octets), "FEC Element %u", ix); fec_tree = proto_item_add_subtree(ti, ett_ldp_fec); - proto_tree_add_item(fec_tree, hf_ldp_tlv_fec_wc, tvb, offset, 1, FALSE); + proto_tree_add_item(fec_tree, hf_ldp_tlv_fec_wc, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(fec_tree, hf_ldp_tlv_fec_af, tvb, offset, 2, FALSE); + proto_tree_add_item(fec_tree, hf_ldp_tlv_fec_af, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(fec_tree, hf_ldp_tlv_fec_len, tvb, offset, 1, FALSE); + proto_tree_add_item(fec_tree, hf_ldp_tlv_fec_len, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; @@ -1010,13 +1010,13 @@ dissect_tlv_fec(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem) /*Add a subtree for this*/ ti = proto_tree_add_text(val_tree, tvb, offset, 4+addr_size, "FEC Element %u", ix); fec_tree = proto_item_add_subtree(ti, ett_ldp_fec); - proto_tree_add_item(fec_tree, hf_ldp_tlv_fec_wc, tvb, offset, 1, FALSE); + proto_tree_add_item(fec_tree, hf_ldp_tlv_fec_wc, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(fec_tree, hf_ldp_tlv_fec_af, tvb, offset, 2, FALSE); + proto_tree_add_item(fec_tree, hf_ldp_tlv_fec_af, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(fec_tree, hf_ldp_tlv_fec_len, tvb, offset, 1, FALSE); + proto_tree_add_item(fec_tree, hf_ldp_tlv_fec_len, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; @@ -1052,16 +1052,16 @@ dissect_tlv_fec(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem) ti = proto_tree_add_text(val_tree, tvb, offset, 8+vc_len, "FEC Element %u", ix); fec_tree = proto_item_add_subtree(ti, ett_ldp_fec); - proto_tree_add_item(fec_tree, hf_ldp_tlv_fec_wc, tvb, offset, 1, FALSE); + proto_tree_add_item(fec_tree, hf_ldp_tlv_fec_wc, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(fec_tree, hf_ldp_tlv_fec_vc_controlword, tvb, offset+1, 1, FALSE); - proto_tree_add_item(fec_tree, hf_ldp_tlv_fec_vc_vctype, tvb, offset+1, 2, FALSE); - proto_tree_add_item(fec_tree, hf_ldp_tlv_fec_vc_infolength, tvb, offset+3,1,FALSE); - proto_tree_add_item(fec_tree, hf_ldp_tlv_fec_vc_groupid,tvb, offset +4, 4, FALSE); + proto_tree_add_item(fec_tree, hf_ldp_tlv_fec_vc_vctype, tvb, offset+1, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(fec_tree, hf_ldp_tlv_fec_vc_infolength, tvb, offset+3,1,ENC_BIG_ENDIAN); + proto_tree_add_item(fec_tree, hf_ldp_tlv_fec_vc_groupid,tvb, offset +4, 4, ENC_BIG_ENDIAN); rem -=8; offset +=8; if ( (vc_len > 3) && ( rem > 3 ) ) { /* there is enough room for vcid */ - proto_tree_add_item(fec_tree, hf_ldp_tlv_fec_vc_vcid,tvb, offset, 4, FALSE); + proto_tree_add_item(fec_tree, hf_ldp_tlv_fec_vc_vcid,tvb, offset, 4, ENC_BIG_ENDIAN); proto_item_append_text (ti," VCID: %u",tvb_get_ntohl(tvb,offset)); } else { @@ -1102,10 +1102,10 @@ dissect_tlv_fec(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem) /* Add the FEC to the tree */ ti = proto_tree_add_text(val_tree, tvb, offset, 8+vc_len, "FEC Element %u", ix); fec_tree = proto_item_add_subtree(ti, ett_ldp_fec); - proto_tree_add_item(fec_tree, hf_ldp_tlv_fec_wc, tvb, offset, 1, FALSE); + proto_tree_add_item(fec_tree, hf_ldp_tlv_fec_wc, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(fec_tree, hf_ldp_tlv_fec_vc_controlword, tvb, offset+1, 1, FALSE); - proto_tree_add_item(fec_tree, hf_ldp_tlv_fec_vc_vctype, tvb, offset+1, 2, FALSE); - proto_tree_add_item(fec_tree, hf_ldp_tlv_fec_vc_infolength, tvb, offset+3,1,FALSE); + proto_tree_add_item(fec_tree, hf_ldp_tlv_fec_vc_vctype, tvb, offset+1, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(fec_tree, hf_ldp_tlv_fec_vc_infolength, tvb, offset+3,1,ENC_BIG_ENDIAN); rem -= 4; offset += 4; @@ -1114,8 +1114,8 @@ dissect_tlv_fec(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem) /* Add AGI to the tree */ ti = proto_tree_add_text(fec_tree, tvb, offset, 2 + gen_fec_id_len, "AGI"); agi_tree = proto_item_add_subtree(ti, ett_ldp_gen_agi); - proto_tree_add_item(agi_tree, hf_ldp_tlv_fec_gen_agi_type,tvb, offset, 1, FALSE); - proto_tree_add_item(agi_tree, hf_ldp_tlv_fec_gen_agi_length,tvb, offset + 1, 1, FALSE); + proto_tree_add_item(agi_tree, hf_ldp_tlv_fec_gen_agi_type,tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(agi_tree, hf_ldp_tlv_fec_gen_agi_length,tvb, offset + 1, 1, ENC_BIG_ENDIAN); if ( gen_fec_id_len > 0) { proto_tree_add_item(agi_tree, hf_ldp_tlv_fec_gen_agi_value, tvb, offset+2, gen_fec_id_len , ENC_NA ); @@ -1142,8 +1142,8 @@ dissect_tlv_fec(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem) { ti = proto_tree_add_text(fec_tree, tvb, offset, 2 + gen_fec_id_len, "SAII"); saii_tree = proto_item_add_subtree(ti, ett_ldp_gen_saii); - proto_tree_add_item(saii_tree, hf_ldp_tlv_fec_gen_saii_type,tvb, offset, 1, FALSE); - proto_tree_add_item(saii_tree, hf_ldp_tlv_fec_gen_saii_length,tvb, offset + 1, 1, FALSE); + proto_tree_add_item(saii_tree, hf_ldp_tlv_fec_gen_saii_type,tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(saii_tree, hf_ldp_tlv_fec_gen_saii_length,tvb, offset + 1, 1, ENC_BIG_ENDIAN); if ( gen_fec_id_len > 0) { /* Get the AAI Type. */ @@ -1198,8 +1198,8 @@ dissect_tlv_fec(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem) { ti = proto_tree_add_text(fec_tree, tvb, offset, 2 + gen_fec_id_len, "TAII"); taii_tree = proto_item_add_subtree(ti, ett_ldp_gen_taii); - proto_tree_add_item(taii_tree, hf_ldp_tlv_fec_gen_taii_type,tvb, offset, 1, FALSE); - proto_tree_add_item(taii_tree, hf_ldp_tlv_fec_gen_taii_length,tvb, offset + 1, 1, FALSE); + proto_tree_add_item(taii_tree, hf_ldp_tlv_fec_gen_taii_type,tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(taii_tree, hf_ldp_tlv_fec_gen_taii_length,tvb, offset + 1, 1, ENC_BIG_ENDIAN); if ( gen_fec_id_len > 0) { /* Get the AAI Type. */ @@ -1272,7 +1272,7 @@ dissect_tlv_address_list(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem) family=tvb_get_ntohs(tvb, offset); proto_tree_add_item(tree, hf_ldp_tlv_addrl_addr_family, tvb, - offset, 2, FALSE); + offset, 2, ENC_BIG_ENDIAN); switch(family) { case AFNUM_INET: /*IPv4*/ addr_size=4; @@ -1351,7 +1351,7 @@ dissect_tlv_atm_label(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem) ti=proto_tree_add_text(tree, tvb, offset, rem, "ATM Label"); val_tree=proto_item_add_subtree(ti, ett_ldp_tlv_val); - proto_tree_add_item(val_tree, hf_ldp_tlv_atm_label_vbits, tvb, offset, 1, FALSE); + proto_tree_add_item(val_tree, hf_ldp_tlv_atm_label_vbits, tvb, offset, 1, ENC_BIG_ENDIAN); id=tvb_get_ntohs(tvb, offset)&0x0FFF; proto_tree_add_uint_format(val_tree, hf_ldp_tlv_atm_label_vpi, tvb, offset, 2, id, "VPI: %u", id); @@ -1412,8 +1412,8 @@ dissect_tlv_status(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem) proto_tree_add_uint_format(val_tree, hf_ldp_tlv_status_data, tvb, offset, 4, data, "Status Data: %s (0x%X)", val_to_str(data, tlv_status_data, "Unknown Status Data"), data); - proto_tree_add_item(val_tree, hf_ldp_tlv_status_msg_id, tvb, offset+4, 4, FALSE); - proto_tree_add_item(val_tree, hf_ldp_tlv_status_msg_type, tvb, offset+8, 2, FALSE); + proto_tree_add_item(val_tree, hf_ldp_tlv_status_msg_id, tvb, offset+4, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(val_tree, hf_ldp_tlv_status_msg_type, tvb, offset+8, 2, ENC_BIG_ENDIAN); } /* Dissect Returned PDU TLV */ @@ -1432,10 +1432,10 @@ dissect_tlv_returned_pdu(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem) ti=proto_tree_add_text(tree, tvb, offset, rem, "Returned PDU"); val_tree=proto_item_add_subtree(ti, ett_ldp_tlv_val); - proto_tree_add_item(val_tree, hf_ldp_tlv_returned_version, tvb, offset, 2, FALSE); - proto_tree_add_item(val_tree, hf_ldp_tlv_returned_pdu_len, tvb, offset+2, 2, FALSE); + proto_tree_add_item(val_tree, hf_ldp_tlv_returned_version, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(val_tree, hf_ldp_tlv_returned_pdu_len, tvb, offset+2, 2, ENC_BIG_ENDIAN); proto_tree_add_item(val_tree, hf_ldp_tlv_returned_lsr, tvb, offset+4, 4, FALSE); - proto_tree_add_item(val_tree, hf_ldp_tlv_returned_ls_id, tvb, offset+8, 2, FALSE); + proto_tree_add_item(val_tree, hf_ldp_tlv_returned_ls_id, tvb, offset+8, 2, ENC_BIG_ENDIAN); offset += 10; rem -= 10; @@ -1478,12 +1478,12 @@ dissect_tlv_returned_message(tvbuff_t *tvb, guint offset, proto_tree *tree, int type, "Message Type: %s (0x%X)", val_to_str(type, ldp_message_types,"Unknown Message Type"), type); } - proto_tree_add_item(val_tree, hf_ldp_tlv_returned_msg_len, tvb, offset+2, 2, FALSE); + proto_tree_add_item(val_tree, hf_ldp_tlv_returned_msg_len, tvb, offset+2, 2, ENC_BIG_ENDIAN); offset += 4; rem -= 4; if ( rem >= 4 ) { /*have msg_id*/ - proto_tree_add_item(val_tree, hf_ldp_tlv_returned_msg_id, tvb, offset, 4, FALSE); + proto_tree_add_item(val_tree, hf_ldp_tlv_returned_msg_id, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; rem -= 4; } @@ -1514,10 +1514,10 @@ dissect_tlv_common_hello_parms(tvbuff_t *tvb, guint offset, proto_tree *tree) #else val_tree=tree; #endif - proto_tree_add_item(val_tree, hf_ldp_tlv_val_hold, tvb, offset, 2, FALSE); + proto_tree_add_item(val_tree, hf_ldp_tlv_val_hold, tvb, offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(val_tree, hf_ldp_tlv_val_target, tvb, offset + 2, 2, FALSE); proto_tree_add_item(val_tree, hf_ldp_tlv_val_request, tvb, offset + 2, 2, FALSE); - proto_tree_add_item(val_tree, hf_ldp_tlv_val_res, tvb, offset + 2, 2, FALSE); + proto_tree_add_item(val_tree, hf_ldp_tlv_val_res, tvb, offset + 2, 2, ENC_BIG_ENDIAN); } /* Dissect MAC TLV */ @@ -1558,10 +1558,10 @@ dissect_tlv_common_session_parms(tvbuff_t *tvb, guint offset, proto_tree *tree, val_tree = proto_item_add_subtree(ti, ett_ldp_tlv_val); /*Protocol Version*/ - proto_tree_add_item(val_tree, hf_ldp_tlv_sess_ver, tvb,offset, 2, FALSE); + proto_tree_add_item(val_tree, hf_ldp_tlv_sess_ver, tvb,offset, 2, ENC_BIG_ENDIAN); /*KeepAlive Time*/ - proto_tree_add_item(val_tree, hf_ldp_tlv_sess_ka, tvb,offset + 2, 2, FALSE); + proto_tree_add_item(val_tree, hf_ldp_tlv_sess_ka, tvb,offset + 2, 2, ENC_BIG_ENDIAN); /*A bit*/ proto_tree_add_item(val_tree, hf_ldp_tlv_sess_advbit,tvb, offset + 4, 1, FALSE); @@ -1570,16 +1570,16 @@ dissect_tlv_common_session_parms(tvbuff_t *tvb, guint offset, proto_tree *tree, proto_tree_add_item(val_tree, hf_ldp_tlv_sess_ldetbit,tvb, offset + 4, 1, FALSE); /*Path Vector Limit*/ - proto_tree_add_item(val_tree, hf_ldp_tlv_sess_pvlim,tvb, offset + 5, 1, FALSE); + proto_tree_add_item(val_tree, hf_ldp_tlv_sess_pvlim,tvb, offset + 5, 1, ENC_BIG_ENDIAN); /*Max PDU Length*/ - proto_tree_add_item(val_tree, hf_ldp_tlv_sess_mxpdu,tvb, offset + 6, 2, FALSE); + proto_tree_add_item(val_tree, hf_ldp_tlv_sess_mxpdu,tvb, offset + 6, 2, ENC_BIG_ENDIAN); /*Rx LSR*/ proto_tree_add_item(val_tree, hf_ldp_tlv_sess_rxlsr,tvb, offset + 8, 4, FALSE); /*Rx LS*/ - proto_tree_add_item(val_tree, hf_ldp_tlv_sess_rxls,tvb, offset + 12, 2, FALSE); + proto_tree_add_item(val_tree, hf_ldp_tlv_sess_rxls,tvb, offset + 12, 2, ENC_BIG_ENDIAN); } /* Dissect the atm session params */ @@ -1601,7 +1601,7 @@ dissect_tlv_atm_session_parms(tvbuff_t *tvb, guint offset, proto_tree *tree, int ti = proto_tree_add_text(tree, tvb, offset, rem,"ATM Parameters"); val_tree = proto_item_add_subtree(ti, ett_ldp_tlv_val); - proto_tree_add_item(val_tree, hf_ldp_tlv_sess_atm_merge,tvb, offset, 1, FALSE); + proto_tree_add_item(val_tree, hf_ldp_tlv_sess_atm_merge,tvb, offset, 1, ENC_BIG_ENDIAN); /*get the number of label ranges*/ numlr=(tvb_get_guint8(tvb, offset)>>2) & 0x0F; @@ -1675,7 +1675,7 @@ dissect_tlv_frame_relay_session_parms(tvbuff_t *tvb, guint offset,proto_tree *tr val_tree = proto_item_add_subtree(ti, ett_ldp_tlv_val); proto_tree_add_item(val_tree, hf_ldp_tlv_sess_fr_merge, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); /*get the number of label ranges*/ numlr=(tvb_get_guint8(tvb, offset)>>2) & 0x0F; @@ -1743,29 +1743,29 @@ dissect_tlv_ft_session(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem) val_tree = proto_item_add_subtree(ti, ett_ldp_tlv_val); /* Flags */ - ti = proto_tree_add_item(val_tree, hf_ldp_tlv_ft_sess_flags, tvb, offset, 2, FALSE); + ti = proto_tree_add_item(val_tree, hf_ldp_tlv_ft_sess_flags, tvb, offset, 2, ENC_BIG_ENDIAN); flags_tree = proto_item_add_subtree(ti, ett_ldp_tlv_ft_flags); flags = tvb_get_ntohs(tvb, offset); proto_item_append_text(ti, " (%s%s)", (flags & 0x8000) ? "R, " : "", val_to_str(flags & 0xF, tlv_ft_flags, "Invalid")); proto_tree_add_item(flags_tree, hf_ldp_tlv_ft_sess_flag_r, tvb, offset, 2, FALSE); - proto_tree_add_item(flags_tree, hf_ldp_tlv_ft_sess_flag_res, tvb, offset, 2, FALSE); + proto_tree_add_item(flags_tree, hf_ldp_tlv_ft_sess_flag_res, tvb, offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(flags_tree, hf_ldp_tlv_ft_sess_flag_s, tvb, offset, 2, FALSE); proto_tree_add_item(flags_tree, hf_ldp_tlv_ft_sess_flag_a, tvb, offset, 2, FALSE); proto_tree_add_item(flags_tree, hf_ldp_tlv_ft_sess_flag_c, tvb, offset, 2, FALSE); proto_tree_add_item(flags_tree, hf_ldp_tlv_ft_sess_flag_l, tvb, offset, 2, FALSE); /* Reserved */ - proto_tree_add_item(val_tree, hf_ldp_tlv_ft_sess_res, tvb, offset + 2, 2, FALSE); + proto_tree_add_item(val_tree, hf_ldp_tlv_ft_sess_res, tvb, offset + 2, 2, ENC_BIG_ENDIAN); /* FT Reconnect TO */ proto_tree_add_item(val_tree, hf_ldp_tlv_ft_sess_reconn_to, tvb, offset + 4, - 4, FALSE); + 4, ENC_BIG_ENDIAN); /* Recovery Time */ proto_tree_add_item(val_tree, hf_ldp_tlv_ft_sess_recovery_time, tvb, offset + 8, - 4, FALSE); + 4, ENC_BIG_ENDIAN); } static void @@ -1784,10 +1784,10 @@ dissect_tlv_lspid(tvbuff_t *tvb, guint offset,proto_tree *tree, int rem) val_tree = proto_item_add_subtree(ti, ett_ldp_tlv_val); proto_tree_add_item(val_tree, hf_ldp_tlv_lspid_act_flg, - tvb, offset, 2, FALSE); + tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(val_tree, hf_ldp_tlv_lspid_cr_lsp, - tvb, offset, 2, FALSE); + tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(val_tree, hf_ldp_tlv_lspid_ldpid, tvb, offset, 4, FALSE); @@ -1809,10 +1809,10 @@ dissect_tlv_er_hop_ipv4(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem) if(val_tree != NULL) { proto_tree_add_item(val_tree, hf_ldp_tlv_er_hop_loose, - tvb, offset, 3, FALSE); + tvb, offset, 3, ENC_BIG_ENDIAN); offset += 3; proto_tree_add_item(val_tree, hf_ldp_tlv_er_hop_prelen, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); offset ++; proto_tree_add_item(val_tree, hf_ldp_tlv_er_hop_prefix4, tvb, offset, 4, FALSE); @@ -1835,10 +1835,10 @@ dissect_tlv_er_hop_ipv6(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem) if(val_tree != NULL) { proto_tree_add_item(val_tree, hf_ldp_tlv_er_hop_loose, - tvb, offset, 3, FALSE); + tvb, offset, 3, ENC_BIG_ENDIAN); offset += 3; proto_tree_add_item(val_tree, hf_ldp_tlv_er_hop_prelen, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); offset ++; proto_tree_add_item(val_tree, hf_ldp_tlv_er_hop_prefix6, tvb, offset, 16, FALSE); @@ -1861,10 +1861,10 @@ dissect_tlv_er_hop_as(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem) if(val_tree != NULL) { proto_tree_add_item(val_tree, hf_ldp_tlv_er_hop_loose, - tvb, offset, 2, FALSE); + tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(val_tree, hf_ldp_tlv_er_hop_as, - tvb, offset, 2, FALSE); + tvb, offset, 2, ENC_BIG_ENDIAN); } } @@ -1884,10 +1884,10 @@ dissect_tlv_er_hop_lspid(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem) if(val_tree != NULL) { proto_tree_add_item(val_tree, hf_ldp_tlv_er_hop_loose, - tvb, offset, 2, FALSE); + tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(val_tree, hf_ldp_tlv_er_hop_cr_lsp, - tvb, offset, 2, FALSE); + tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(val_tree, hf_ldp_tlv_er_hop_ldpid, tvb, offset, 4, FALSE); @@ -1913,7 +1913,7 @@ dissect_tlv_traffic(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem) if(val_tree != NULL) { /* flags */ - proto_tree_add_item(val_tree, hf_ldp_tlv_flags_reserv, tvb, offset, 1, FALSE); + proto_tree_add_item(val_tree, hf_ldp_tlv_flags_reserv, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(val_tree, hf_ldp_tlv_flags_weight, tvb, offset, 1, FALSE); proto_tree_add_item(val_tree, hf_ldp_tlv_flags_ebs, tvb, offset, 1, FALSE); proto_tree_add_item(val_tree, hf_ldp_tlv_flags_cbs, tvb, offset, 1, FALSE); @@ -1923,14 +1923,14 @@ dissect_tlv_traffic(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem) offset ++; /* frequency */ - proto_tree_add_item(val_tree, hf_ldp_tlv_frequency, tvb, offset, 1, FALSE); + proto_tree_add_item(val_tree, hf_ldp_tlv_frequency, tvb, offset, 1, ENC_BIG_ENDIAN); offset ++; /* reserver byte */ offset ++; /* weight */ - pi = proto_tree_add_item(val_tree, hf_ldp_tlv_weight, tvb, offset, 1, FALSE); + pi = proto_tree_add_item(val_tree, hf_ldp_tlv_weight, tvb, offset, 1, ENC_BIG_ENDIAN); val_8 = tvb_get_guint8(tvb, offset); if (val_8 == 0) proto_item_set_text(pi, "Weight: Not applicable"); @@ -1983,7 +1983,7 @@ dissect_tlv_route_pinning(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem if(val_tree != NULL) { proto_tree_add_item(val_tree, hf_ldp_tlv_route_pinning, - tvb, offset, 4, FALSE); + tvb, offset, 4, ENC_BIG_ENDIAN); } } @@ -2004,7 +2004,7 @@ dissect_tlv_resource_class(tvbuff_t *tvb, guint offset, proto_tree *tree, int re if(val_tree != NULL) { proto_tree_add_item(val_tree, hf_ldp_tlv_resource_class, - tvb, offset, 4, FALSE); + tvb, offset, 4, ENC_BIG_ENDIAN); } } @@ -2025,10 +2025,10 @@ dissect_tlv_preemption(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem) if(val_tree != NULL) { proto_tree_add_item(val_tree, hf_ldp_tlv_set_prio, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; proto_tree_add_item(val_tree, hf_ldp_tlv_hold_prio, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); } } @@ -2150,7 +2150,7 @@ dissect_tlv(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem) tlv_tree = proto_item_add_subtree(ti, ett_ldp_tlv); - proto_tree_add_item(tlv_tree, hf_ldp_tlv_unknown, tvb, offset, 1, FALSE); + proto_tree_add_item(tlv_tree, hf_ldp_tlv_unknown, tvb, offset, 1, ENC_BIG_ENDIAN); switch (type) { case TLV_VENDOR_PRIVATE_START: @@ -2166,7 +2166,7 @@ dissect_tlv(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem) type, "TLV Type: %s (0x%X)", val_to_str(type, tlv_type_names, "Unknown TLV type"), type ); } - proto_tree_add_item(tlv_tree, hf_ldp_tlv_len, tvb, offset + 2, 2, FALSE); + proto_tree_add_item(tlv_tree, hf_ldp_tlv_len, tvb, offset + 2, 2, ENC_BIG_ENDIAN); switch (type) { @@ -2184,7 +2184,7 @@ dissect_tlv(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem) "Error processing Hop Count TLV: length is %d, should be 1", length); else - proto_tree_add_item(tlv_tree, hf_ldp_tlv_hc_value, tvb,offset + 4, length, FALSE); + proto_tree_add_item(tlv_tree, hf_ldp_tlv_hc_value, tvb,offset + 4, length, ENC_BIG_ENDIAN); break; case TLV_PATH_VECTOR: @@ -2219,7 +2219,7 @@ dissect_tlv(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem) length); else proto_tree_add_item(tlv_tree, hf_ldp_tlv_ft_protect_sequence_num, tvb, - offset + 4,length, FALSE); + offset + 4,length, ENC_BIG_ENDIAN); break; case TLV_STATUS: @@ -2232,7 +2232,7 @@ dissect_tlv(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem) "Error processing Extended Status TLV: length is %d, should be 4", length); else { - proto_tree_add_item(tlv_tree, hf_ldp_tlv_extstatus_data, tvb, offset + 4, length, FALSE); + proto_tree_add_item(tlv_tree, hf_ldp_tlv_extstatus_data, tvb, offset + 4, length, ENC_BIG_ENDIAN); } break; @@ -2268,7 +2268,7 @@ dissect_tlv(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem) "Error processing Configuration Sequence Number TLV: length is %d, should be 4", length); else { - proto_tree_add_item(tlv_tree, hf_ldp_tlv_config_seqno, tvb, offset + 4, 4, FALSE); + proto_tree_add_item(tlv_tree, hf_ldp_tlv_config_seqno, tvb, offset + 4, 4, ENC_BIG_ENDIAN); } break; @@ -2310,7 +2310,7 @@ dissect_tlv(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem) length); else proto_tree_add_item(tlv_tree, hf_ldp_tlv_ft_ack_sequence_num, tvb, - offset + 4,length, FALSE); + offset + 4,length, ENC_BIG_ENDIAN); break; case TLV_FT_CORK: @@ -2326,7 +2326,7 @@ dissect_tlv(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem) "Error processing Label Request Message ID TLV: length is %d, should be 4", length); else - proto_tree_add_item(tlv_tree, hf_ldp_tlv_lbl_req_msg_id, tvb,offset + 4,length, FALSE); + proto_tree_add_item(tlv_tree, hf_ldp_tlv_lbl_req_msg_id, tvb,offset + 4,length, ENC_BIG_ENDIAN); break; case TLV_LSPID: @@ -2379,7 +2379,7 @@ dissect_tlv(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem) "Error processing Vendor Private Start TLV: length is %d, should be >= 4", length); else { - proto_tree_add_item(tlv_tree, hf_ldp_tlv_vendor_id, tvb,offset + 4, 4, FALSE); + proto_tree_add_item(tlv_tree, hf_ldp_tlv_vendor_id, tvb,offset + 4, 4, ENC_BIG_ENDIAN); if( length > 4 ) /*have data*/ proto_tree_add_text(tlv_tree, tvb, offset + 8, length-4,"Data"); } @@ -2391,7 +2391,7 @@ dissect_tlv(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem) "Error processing Experimental Start TLV: length is %d, should be >= 4", length); else { - proto_tree_add_item(tlv_tree, hf_ldp_tlv_experiment_id, tvb,offset + 4, 4, FALSE); + proto_tree_add_item(tlv_tree, hf_ldp_tlv_experiment_id, tvb,offset + 4, 4, ENC_BIG_ENDIAN); if( length > 4 ) /*have data*/ proto_tree_add_text(tlv_tree, tvb, offset + 8, length-4,"Data"); } @@ -2574,8 +2574,8 @@ dissect_msg(tvbuff_t *tvb, guint offset, packet_info *pinfo, proto_tree *tree) type, "Message Type: %s (0x%X)", val_to_str(type, ldp_message_types,"Unknown Message Type"), type); } - proto_tree_add_item(msg_tree, hf_ldp_msg_len, tvb, offset+2, 2, FALSE); - proto_tree_add_item(msg_tree, hf_ldp_msg_id, tvb, offset+4, 4, FALSE); + proto_tree_add_item(msg_tree, hf_ldp_msg_len, tvb, offset+2, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(msg_tree, hf_ldp_msg_id, tvb, offset+4, 4, ENC_BIG_ENDIAN); if(extra){ int hf_tmp; @@ -2623,7 +2623,7 @@ dissect_ldp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ti=proto_tree_add_item(tree, proto_ldp, tvb, 0, -1, FALSE); pdu_tree = proto_item_add_subtree(ti, ett_ldp); - proto_tree_add_item(pdu_tree, hf_ldp_version, tvb, offset, 2, FALSE); + proto_tree_add_item(pdu_tree, hf_ldp_version, tvb, offset, 2, ENC_BIG_ENDIAN); } length = tvb_get_ntohs(tvb, offset+2); @@ -2638,7 +2638,7 @@ dissect_ldp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { proto_tree_add_item(pdu_tree, hf_ldp_lsr, tvb, offset+4, 4, FALSE); - proto_tree_add_item(pdu_tree, hf_ldp_ls_id, tvb, offset+8, 2, FALSE); + proto_tree_add_item(pdu_tree, hf_ldp_ls_id, tvb, offset+8, 2, ENC_BIG_ENDIAN); } offset += 10; @@ -2707,7 +2707,7 @@ dissect_tlv_pw_status(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem) static void dissect_tlv_pw_grouping(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem _U_) { - proto_tree_add_item(tree,hf_ldp_tlv_pw_grouping_value,tvb,offset,4,FALSE); + proto_tree_add_item(tree,hf_ldp_tlv_pw_grouping_value,tvb,offset,4,ENC_BIG_ENDIAN); } static void @@ -2865,9 +2865,9 @@ dissect_genpwid_fec_aai_type2_parameter(tvbuff_t *tvb, guint offset, proto_tree } - proto_tree_add_item(aai_param_tree,hf_ldp_tlv_fec_gen_aai_globalid,tvb,offset,4,FALSE); - proto_tree_add_item(aai_param_tree,hf_ldp_tlv_fec_gen_aai_prefix,tvb, offset+4, 4, FALSE); - proto_tree_add_item(aai_param_tree,hf_ldp_tlv_fec_gen_aai_ac_id,tvb, offset+4, 4, FALSE); + proto_tree_add_item(aai_param_tree,hf_ldp_tlv_fec_gen_aai_globalid,tvb,offset,4,ENC_BIG_ENDIAN); + proto_tree_add_item(aai_param_tree,hf_ldp_tlv_fec_gen_aai_prefix,tvb, offset+4, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(aai_param_tree,hf_ldp_tlv_fec_gen_aai_ac_id,tvb, offset+4, 4, ENC_BIG_ENDIAN); } static int diff --git a/epan/dissectors/packet-ldss.c b/epan/dissectors/packet-ldss.c index cde1db52bf..d1aaf1bfb6 100644 --- a/epan/dissectors/packet-ldss.c +++ b/epan/dissectors/packet-ldss.c @@ -340,14 +340,14 @@ dissect_ldss_broadcast(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ldss_tree = proto_item_add_subtree(ti, ett_ldss_broadcast); proto_tree_add_item(ldss_tree, hf_ldss_message_id, - tvb, 0, 2, FALSE); + tvb, 0, 2, ENC_BIG_ENDIAN); ti = proto_tree_add_uint(ldss_tree, hf_ldss_message_detail, tvb, 0, 0, messageDetail); PROTO_ITEM_SET_GENERATED(ti); proto_tree_add_item(ldss_tree, hf_ldss_digest_type, - tvb, 2, 1, FALSE); + tvb, 2, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ldss_tree, hf_ldss_compression, - tvb, 3, 1, FALSE); + tvb, 3, 1, ENC_BIG_ENDIAN); proto_tree_add_uint_format_value(ldss_tree, hf_ldss_cookie, tvb, 4, 4, FALSE, "0x%x%s", @@ -358,9 +358,9 @@ dissect_ldss_broadcast(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(ldss_tree, hf_ldss_digest, tvb, 8, DIGEST_LEN, ENC_NA); proto_tree_add_item(ldss_tree, hf_ldss_size, - tvb, 40, 8, FALSE); + tvb, 40, 8, ENC_BIG_ENDIAN); proto_tree_add_item(ldss_tree, hf_ldss_offset, - tvb, 48, 8, FALSE); + tvb, 48, 8, ENC_BIG_ENDIAN); proto_tree_add_uint_format_value(ldss_tree, hf_ldss_target_time, tvb, 56, 4, FALSE, "%d:%02d:%02d", @@ -368,7 +368,7 @@ dissect_ldss_broadcast(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) (int)((targetTime / 60) % 60), (int)(targetTime % 60)); proto_tree_add_item(ldss_tree, hf_ldss_reserved_1, - tvb, 60, 4, FALSE); + tvb, 60, 4, ENC_BIG_ENDIAN); proto_tree_add_uint_format_value(ldss_tree, hf_ldss_port, tvb, 64, 2, FALSE, "%d%s", @@ -387,9 +387,9 @@ dissect_ldss_broadcast(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ? (long)floor(exp(rate * G_LN2 / 2048)) : 0); proto_tree_add_item(ldss_tree, hf_ldss_priority, - tvb, 68, 2, FALSE); + tvb, 68, 2, ENC_BIG_ENDIAN); proto_tree_add_item(ldss_tree, hf_ldss_property_count, - tvb, 70, 2, FALSE); + tvb, 70, 2, ENC_BIG_ENDIAN); if (tvb_length(tvb) > 72) { proto_tree_add_item(ldss_tree, hf_ldss_properties, tvb, 72, tvb_length(tvb) - 72, ENC_NA); diff --git a/epan/dissectors/packet-lge_monitor.c b/epan/dissectors/packet-lge_monitor.c index f96246e7ba..b218cfc712 100644 --- a/epan/dissectors/packet-lge_monitor.c +++ b/epan/dissectors/packet-lge_monitor.c @@ -84,12 +84,12 @@ dissect_lge_monitor(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) lge_monitor_tree = proto_item_add_subtree(ti, ett_lge_monitor); proto_tree_add_text(lge_monitor_tree, tvb, offset, LGEMON_PROTO_HEADER_LENGTH, "LGE Monitor PDU"); - proto_tree_add_item(lge_monitor_tree, hf_lge_monitor_dir, tvb, offset, 4, FALSE); + proto_tree_add_item(lge_monitor_tree, hf_lge_monitor_dir, tvb, offset, 4, ENC_BIG_ENDIAN); offset = offset +4; lge_monitor_proto_id = tvb_get_ntohl(tvb,offset); - proto_tree_add_item(lge_monitor_tree, hf_lge_monitor_prot, tvb, offset, 4, FALSE); + proto_tree_add_item(lge_monitor_tree, hf_lge_monitor_prot, tvb, offset, 4, ENC_BIG_ENDIAN); offset = offset +4; - proto_tree_add_item(lge_monitor_tree, hf_lge_monitor_length, tvb, offset, 4, FALSE); + proto_tree_add_item(lge_monitor_tree, hf_lge_monitor_length, tvb, offset, 4, ENC_BIG_ENDIAN); offset = offset +4; next_tvb = tvb_new_subset_remaining(tvb, offset); diff --git a/epan/dissectors/packet-linx.c b/epan/dissectors/packet-linx.c index aa0cd667b4..e87f02c61a 100644 --- a/epan/dissectors/packet-linx.c +++ b/epan/dissectors/packet-linx.c @@ -324,7 +324,7 @@ dissect_linx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) | Next | R | Dest Coreid | Source Coreid | R | +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ */ - proto_tree_add_item(multicore_header_tree, hf_linx_nexthdr, tvb, 0, 4, FALSE); + proto_tree_add_item(multicore_header_tree, hf_linx_nexthdr, tvb, 0, 4, ENC_BIG_ENDIAN); proto_tree_add_item(multicore_header_tree, hf_linx_multicore_reserved, tvb, 0, 4, FALSE); proto_tree_add_item(multicore_header_tree, hf_linx_multicore_dcoreid, tvb, 0, 4, FALSE); proto_tree_add_item(multicore_header_tree, hf_linx_multicore_scoreid, tvb, 0, 4, FALSE); @@ -359,7 +359,7 @@ dissect_linx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ */ - proto_tree_add_item(main_header_tree, hf_linx_nexthdr , linx_tvb, offset, 4, FALSE); + proto_tree_add_item(main_header_tree, hf_linx_nexthdr , linx_tvb, offset, 4, ENC_BIG_ENDIAN); proto_tree_add_item(main_header_tree, hf_linx_main_version , linx_tvb, offset, 4, FALSE); proto_tree_add_item(main_header_tree, hf_linx_main_reserved , linx_tvb, offset, 4, FALSE); proto_tree_add_item(main_header_tree, hf_linx_main_connection, linx_tvb, offset, 4, FALSE); @@ -403,7 +403,7 @@ dissect_linx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) size = (dword >>21) & 0x7; item = proto_tree_add_text(linx_tree, linx_tvb, offset, (4+2*size), "Connection Header"); conn_header_tree = proto_item_add_subtree(item, ett_linx_main); - proto_tree_add_item(conn_header_tree, hf_linx_nexthdr , linx_tvb, offset, 4, FALSE); + proto_tree_add_item(conn_header_tree, hf_linx_nexthdr , linx_tvb, offset, 4, ENC_BIG_ENDIAN); proto_tree_add_item(conn_header_tree, hf_linx_conn_cmd , linx_tvb, offset, 4, FALSE); proto_tree_add_item(conn_header_tree, hf_linx_conn_size , linx_tvb, offset, 4, FALSE); proto_tree_add_item(conn_header_tree, hf_linx_conn_winsize , linx_tvb, offset, 4, FALSE); @@ -444,7 +444,7 @@ dissect_linx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) item = proto_tree_add_text(linx_tree, linx_tvb, offset, 4, "NACK Header"); nack_header_tree = proto_item_add_subtree(item, ett_linx_main); - proto_tree_add_item(nack_header_tree, hf_linx_nexthdr , linx_tvb, offset, 4, FALSE); + proto_tree_add_item(nack_header_tree, hf_linx_nexthdr , linx_tvb, offset, 4, ENC_BIG_ENDIAN); proto_tree_add_item(nack_header_tree, hf_linx_nack_reserv1, linx_tvb, offset, 4, FALSE); proto_tree_add_item(nack_header_tree, hf_linx_nack_count , linx_tvb, offset, 4, FALSE); proto_tree_add_item(nack_header_tree, hf_linx_nack_reserv2, linx_tvb, offset, 4, FALSE); @@ -489,7 +489,7 @@ dissect_linx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) item = proto_tree_add_text(linx_tree, linx_tvb, offset, 12, "Udata Header"); udata_header_tree = proto_item_add_subtree(item, ett_linx_main); - proto_tree_add_item(udata_header_tree, hf_linx_nexthdr, linx_tvb, offset, 4, FALSE); + proto_tree_add_item(udata_header_tree, hf_linx_nexthdr, linx_tvb, offset, 4, ENC_BIG_ENDIAN); proto_tree_add_item(udata_header_tree, hf_linx_udata_reserved , linx_tvb, offset, 4, FALSE); proto_tree_add_item(udata_header_tree, hf_linx_udata_morefrags, linx_tvb, offset, 4, FALSE); proto_tree_add_item(udata_header_tree, hf_linx_udata_fragno , linx_tvb, offset, 4, FALSE); @@ -606,7 +606,7 @@ dissect_linx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) */ item = proto_tree_add_text(linx_tree, linx_tvb, offset, 4, "Ack Header"); ack_header_tree = proto_item_add_subtree(item, ett_linx_main); - proto_tree_add_item(ack_header_tree, hf_linx_nexthdr , linx_tvb, offset, 4, FALSE); + proto_tree_add_item(ack_header_tree, hf_linx_nexthdr , linx_tvb, offset, 4, ENC_BIG_ENDIAN); proto_tree_add_item(ack_header_tree, hf_linx_ack_request , linx_tvb, offset, 4, FALSE); proto_tree_add_item(ack_header_tree, hf_linx_ack_reserved, linx_tvb, offset, 4, FALSE); proto_tree_add_item(ack_header_tree, hf_linx_ack_ackno , linx_tvb, offset, 4, FALSE); @@ -627,7 +627,7 @@ dissect_linx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) item = proto_tree_add_text(linx_tree, linx_tvb, offset, 4, "Fragmentation Header"); frag_header_tree = proto_item_add_subtree(item, ett_linx_main); - proto_tree_add_item(frag_header_tree, hf_linx_nexthdr , linx_tvb, offset, 4, FALSE); + proto_tree_add_item(frag_header_tree, hf_linx_nexthdr , linx_tvb, offset, 4, ENC_BIG_ENDIAN); proto_tree_add_item(frag_header_tree, hf_linx_frag_reserved , linx_tvb, offset, 4, FALSE); proto_tree_add_item(frag_header_tree, hf_linx_frag_morefrags, linx_tvb, offset, 4, FALSE); proto_tree_add_item(frag_header_tree, hf_linx_frag_fragno , linx_tvb, offset, 4, FALSE); @@ -883,12 +883,12 @@ dissect_linx_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) item = proto_tree_add_text(linx_tcp_tree, linx_tcp_tvb, 0, 16, "TCP CM Header"); tcp_header_tree = proto_item_add_subtree(item, ett_linx_tcp); - proto_tree_add_item(tcp_header_tree, hf_linx_tcp_type, linx_tcp_tvb, 0, 4, FALSE); - proto_tree_add_item(tcp_header_tree, hf_linx_tcp_version, linx_tcp_tvb, 0, 4, FALSE); - proto_tree_add_item(tcp_header_tree, hf_linx_tcp_oob, linx_tcp_tvb, 0, 4, FALSE); - proto_tree_add_item(tcp_header_tree, hf_linx_tcp_src, linx_tcp_tvb, 4, 4, FALSE); - proto_tree_add_item(tcp_header_tree, hf_linx_tcp_dst, linx_tcp_tvb, 8, 4, FALSE); - proto_tree_add_item(tcp_header_tree, hf_linx_tcp_size, linx_tcp_tvb, 12, 4, FALSE); + proto_tree_add_item(tcp_header_tree, hf_linx_tcp_type, linx_tcp_tvb, 0, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(tcp_header_tree, hf_linx_tcp_version, linx_tcp_tvb, 0, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(tcp_header_tree, hf_linx_tcp_oob, linx_tcp_tvb, 0, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(tcp_header_tree, hf_linx_tcp_src, linx_tcp_tvb, 4, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(tcp_header_tree, hf_linx_tcp_dst, linx_tcp_tvb, 8, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(tcp_header_tree, hf_linx_tcp_size, linx_tcp_tvb, 12, 4, ENC_BIG_ENDIAN); offset += 16; @@ -906,15 +906,15 @@ dissect_linx_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) rlnh_header_tree = proto_item_add_subtree(item, ett_linx_tcp); if(version == 1) { - proto_tree_add_item(rlnh_header_tree, hf_linx_tcp_rlnh_msg_type32, linx_tcp_tvb, offset, 4, FALSE); + proto_tree_add_item(rlnh_header_tree, hf_linx_tcp_rlnh_msg_type32, linx_tcp_tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; } else { /* * In version 2 of the rlnh protocol the length of the message type is * restricted to 8 bits. */ - proto_tree_add_item(rlnh_header_tree, hf_linx_tcp_rlnh_msg_reserved, linx_tcp_tvb, offset, 4, FALSE); - proto_tree_add_item(rlnh_header_tree, hf_linx_tcp_rlnh_msg_type8, linx_tcp_tvb, offset, 4, FALSE); + proto_tree_add_item(rlnh_header_tree, hf_linx_tcp_rlnh_msg_reserved, linx_tcp_tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(rlnh_header_tree, hf_linx_tcp_rlnh_msg_type8, linx_tcp_tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; } @@ -922,32 +922,32 @@ dissect_linx_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case RLNH_LINK_ADDR: break; case RLNH_QUERY_NAME: - proto_tree_add_item(rlnh_header_tree, hf_linx_tcp_rlnh_src_linkaddr, linx_tcp_tvb, offset, 4, FALSE); + proto_tree_add_item(rlnh_header_tree, hf_linx_tcp_rlnh_src_linkaddr, linx_tcp_tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; proto_tree_add_item(rlnh_header_tree, hf_linx_tcp_rlnh_name, linx_tcp_tvb, offset, -1, FALSE); offset += tvb_strnlen(linx_tcp_tvb, offset, -1); break; case RLNH_PUBLISH: - proto_tree_add_item(rlnh_header_tree, hf_linx_tcp_rlnh_src_linkaddr, linx_tcp_tvb, offset, 4, FALSE); + proto_tree_add_item(rlnh_header_tree, hf_linx_tcp_rlnh_src_linkaddr, linx_tcp_tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; proto_tree_add_item(rlnh_header_tree, hf_linx_tcp_rlnh_name, linx_tcp_tvb, offset, -1, FALSE); offset += tvb_strnlen(linx_tcp_tvb, offset, -1); break; case RLNH_UNPUBLISH: - proto_tree_add_item(rlnh_header_tree, hf_linx_tcp_rlnh_src_linkaddr, linx_tcp_tvb, offset, 4, FALSE); + proto_tree_add_item(rlnh_header_tree, hf_linx_tcp_rlnh_src_linkaddr, linx_tcp_tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; break; case RLNH_UNPUBLISH_ACK: - proto_tree_add_item(rlnh_header_tree, hf_linx_tcp_rlnh_src_linkaddr, linx_tcp_tvb, offset, 4, FALSE); + proto_tree_add_item(rlnh_header_tree, hf_linx_tcp_rlnh_src_linkaddr, linx_tcp_tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; break; case RLNH_INIT: - proto_tree_add_item(rlnh_header_tree, hf_linx_tcp_rlnh_version, linx_tcp_tvb, offset, 4, FALSE); + proto_tree_add_item(rlnh_header_tree, hf_linx_tcp_rlnh_version, linx_tcp_tvb, offset, 4, ENC_BIG_ENDIAN); rlnh_version = tvb_get_ntohl(linx_tcp_tvb, offset); offset += 4; break; case RLNH_INIT_REPLY: - proto_tree_add_item(rlnh_header_tree, hf_linx_tcp_rlnh_status, linx_tcp_tvb, offset, 4, FALSE); + proto_tree_add_item(rlnh_header_tree, hf_linx_tcp_rlnh_status, linx_tcp_tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; if(rlnh_version > 1) { proto_tree_add_item(rlnh_header_tree, hf_linx_tcp_rlnh_feat_neg_str, linx_tcp_tvb, offset, -1, FALSE); @@ -955,9 +955,9 @@ dissect_linx_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } break; case RLNH_PUBLISH_PEER: - proto_tree_add_item(rlnh_header_tree, hf_linx_tcp_rlnh_src_linkaddr, linx_tcp_tvb, offset, 4, FALSE); + proto_tree_add_item(rlnh_header_tree, hf_linx_tcp_rlnh_src_linkaddr, linx_tcp_tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(rlnh_header_tree, hf_linx_tcp_rlnh_peer_linkaddr, linx_tcp_tvb, offset, -1, FALSE); + proto_tree_add_item(rlnh_header_tree, hf_linx_tcp_rlnh_peer_linkaddr, linx_tcp_tvb, offset, -1, ENC_BIG_ENDIAN); offset += tvb_strnlen(linx_tcp_tvb, offset, -1); break; default: diff --git a/epan/dissectors/packet-lisp-data.c b/epan/dissectors/packet-lisp-data.c index d45dbf133f..da1249090f 100644 --- a/epan/dissectors/packet-lisp-data.c +++ b/epan/dissectors/packet-lisp-data.c @@ -109,7 +109,7 @@ dissect_lisp_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) lisp_data_tree = proto_item_add_subtree(ti, ett_lisp_data); tif = proto_tree_add_item(lisp_data_tree, - hf_lisp_data_flags, tvb, offset, 1, FALSE); + hf_lisp_data_flags, tvb, offset, 1, ENC_BIG_ENDIAN); lisp_data_flags_tree = proto_item_add_subtree(tif, ett_lisp_data_flags); @@ -124,7 +124,7 @@ dissect_lisp_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(lisp_data_flags_tree, hf_lisp_data_flags_iid, tvb, offset, 1, FALSE); proto_tree_add_item(lisp_data_flags_tree, - hf_lisp_data_flags_res, tvb, offset, 1, FALSE); + hf_lisp_data_flags_res, tvb, offset, 1, ENC_BIG_ENDIAN); flags = tvb_get_guint8(tvb, offset); offset += 1; @@ -140,38 +140,38 @@ dissect_lisp_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) "Invalid flag combination: N and V can't be set both"); } proto_tree_add_item(lisp_data_tree, - hf_lisp_data_nonce, tvb, offset, 3, FALSE); + hf_lisp_data_nonce, tvb, offset, 3, ENC_BIG_ENDIAN); } else { if (flags&LISP_DATA_FLAG_V) { proto_item *tiv; proto_tree *lisp_data_mapver_tree; tiv = proto_tree_add_item(lisp_data_tree, - hf_lisp_data_mapver, tvb, offset, 3, FALSE); + hf_lisp_data_mapver, tvb, offset, 3, ENC_BIG_ENDIAN); lisp_data_mapver_tree = proto_item_add_subtree(tiv, ett_lisp_data_mapver); proto_tree_add_item(lisp_data_mapver_tree, - hf_lisp_data_srcmapver, tvb, offset, 3, FALSE); + hf_lisp_data_srcmapver, tvb, offset, 3, ENC_BIG_ENDIAN); proto_tree_add_item(lisp_data_mapver_tree, - hf_lisp_data_dstmapver, tvb, offset, 3, FALSE); + hf_lisp_data_dstmapver, tvb, offset, 3, ENC_BIG_ENDIAN); } } offset += 3; if (flags&LISP_DATA_FLAG_I) { proto_tree_add_item(lisp_data_tree, - hf_lisp_data_iid, tvb, offset, 3, FALSE); + hf_lisp_data_iid, tvb, offset, 3, ENC_BIG_ENDIAN); offset += 3; if (flags&LISP_DATA_FLAG_L) { proto_tree_add_item(lisp_data_tree, - hf_lisp_data_lsb8, tvb, offset, 1, FALSE); + hf_lisp_data_lsb8, tvb, offset, 1, ENC_BIG_ENDIAN); } offset +=1; } else { if (flags&LISP_DATA_FLAG_L) { proto_tree_add_item(lisp_data_tree, - hf_lisp_data_lsb, tvb, offset, 4, FALSE); + hf_lisp_data_lsb, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; } } diff --git a/epan/dissectors/packet-lisp.c b/epan/dissectors/packet-lisp.c index aeba4eaa50..39fa769fa8 100644 --- a/epan/dissectors/packet-lisp.c +++ b/epan/dissectors/packet-lisp.c @@ -296,10 +296,10 @@ dissect_lisp_mapping(tvbuff_t *tvb, packet_info *pinfo, proto_tree *lisp_tree, g lisp_mapping_tree = proto_item_add_subtree(tir, ett_lisp_mapping); /* Reserved (4 bits) */ - proto_tree_add_item(lisp_mapping_tree, hf_lisp_mapping_res, tvb, mapver_offset, 2, FALSE); + proto_tree_add_item(lisp_mapping_tree, hf_lisp_mapping_res, tvb, mapver_offset, 2, ENC_BIG_ENDIAN); /* Map-Version Number (12 bits) */ - proto_tree_add_item(lisp_mapping_tree, hf_lisp_mapping_ver, tvb, mapver_offset, 2, FALSE); + proto_tree_add_item(lisp_mapping_tree, hf_lisp_mapping_ver, tvb, mapver_offset, 2, ENC_BIG_ENDIAN); /* Locators */ for(i=0; i < loc_cnt; i++) { @@ -368,25 +368,25 @@ dissect_lisp_map_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *lisp_tre proto_tree_add_item(lisp_tree, hf_lisp_mreq_flags_smri, tvb, offset, 3, FALSE); /* Reserved bits (9 bits) */ - proto_tree_add_item(lisp_tree, hf_lisp_mreq_res, tvb, offset, 3, FALSE); + proto_tree_add_item(lisp_tree, hf_lisp_mreq_res, tvb, offset, 3, ENC_BIG_ENDIAN); /* ITR record count (5 bits) */ itr_rec_cnt = tvb_get_guint8(tvb, offset + 2) & 0x1F; - proto_tree_add_item(lisp_tree, hf_lisp_irc, tvb, offset, 3, FALSE); + proto_tree_add_item(lisp_tree, hf_lisp_irc, tvb, offset, 3, ENC_BIG_ENDIAN); offset += 3; /* Record count (8 bits) */ rec_cnt = tvb_get_guint8(tvb, offset); - proto_tree_add_item(lisp_tree, hf_lisp_records, tvb, offset, 1, FALSE); + proto_tree_add_item(lisp_tree, hf_lisp_records, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; /* Nonce (64 bits) */ - proto_tree_add_item(lisp_tree, hf_lisp_nonce, tvb, offset, 8, FALSE); + proto_tree_add_item(lisp_tree, hf_lisp_nonce, tvb, offset, 8, ENC_BIG_ENDIAN); offset += 8; /* Source EID AFI (16 bits) */ src_eid_afi = tvb_get_ntohs(tvb, offset); - proto_tree_add_item(lisp_tree, hf_lisp_mreq_srceid_afi, tvb, offset, 2, FALSE); + proto_tree_add_item(lisp_tree, hf_lisp_mreq_srceid_afi, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; /* Source EID */ @@ -578,16 +578,16 @@ dissect_lisp_map_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *lisp_tree) proto_tree_add_item(lisp_tree, hf_lisp_mrep_flags_enlr, tvb, offset, 3, FALSE); /* Reserved bits (18 bits) */ - proto_tree_add_item(lisp_tree, hf_lisp_mrep_res, tvb, offset, 3, FALSE); + proto_tree_add_item(lisp_tree, hf_lisp_mrep_res, tvb, offset, 3, ENC_BIG_ENDIAN); offset += 3; /* Record count (8 bits) */ rec_cnt = tvb_get_guint8(tvb, offset); - proto_tree_add_item(lisp_tree, hf_lisp_records, tvb, offset, 1, FALSE); + proto_tree_add_item(lisp_tree, hf_lisp_records, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; /* Nonce (64 bits) */ - proto_tree_add_item(lisp_tree, hf_lisp_nonce, tvb, offset, 8, FALSE); + proto_tree_add_item(lisp_tree, hf_lisp_nonce, tvb, offset, 8, ENC_BIG_ENDIAN); offset += 8; /* Reply records */ @@ -651,7 +651,7 @@ dissect_lisp_map_register(tvbuff_t *tvb, packet_info *pinfo, proto_tree *lisp_tr proto_tree_add_item(lisp_tree, hf_lisp_mreg_flags_pmr, tvb, offset, 3, FALSE); /* Reserved bits (18 bits) */ - proto_tree_add_item(lisp_tree, hf_lisp_mreg_res, tvb, offset, 3, FALSE); + proto_tree_add_item(lisp_tree, hf_lisp_mreg_res, tvb, offset, 3, ENC_BIG_ENDIAN); /* Flags (1 bit) */ proto_tree_add_item(lisp_tree, hf_lisp_mreg_flags_wmn, tvb, offset, 3, FALSE); @@ -659,20 +659,20 @@ dissect_lisp_map_register(tvbuff_t *tvb, packet_info *pinfo, proto_tree *lisp_tr /* Record count (8 bits) */ rec_cnt = tvb_get_guint8(tvb, offset); - proto_tree_add_item(lisp_tree, hf_lisp_records, tvb, offset, 1, FALSE); + proto_tree_add_item(lisp_tree, hf_lisp_records, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; /* Nonce (64 bits) */ - proto_tree_add_item(lisp_tree, hf_lisp_nonce, tvb, offset, 8, FALSE); + proto_tree_add_item(lisp_tree, hf_lisp_nonce, tvb, offset, 8, ENC_BIG_ENDIAN); offset += 8; /* Key ID (16 bits) */ - proto_tree_add_item(lisp_tree, hf_lisp_mreg_keyid, tvb, offset, 2, FALSE); + proto_tree_add_item(lisp_tree, hf_lisp_mreg_keyid, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; /* Authentication Data Length (16 bits) */ authlen = tvb_get_ntohs(tvb, offset); - proto_tree_add_item(lisp_tree, hf_lisp_mreg_authlen, tvb, offset, 2, FALSE); + proto_tree_add_item(lisp_tree, hf_lisp_mreg_authlen, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; /* Authentication Data */ @@ -737,25 +737,25 @@ dissect_lisp_map_notify(tvbuff_t *tvb, packet_info *pinfo, proto_tree *lisp_tree guint16 authlen = 0; /* Reserved bits (20 bits) */ - proto_tree_add_item(lisp_tree, hf_lisp_mnot_res, tvb, offset, 3, FALSE); + proto_tree_add_item(lisp_tree, hf_lisp_mnot_res, tvb, offset, 3, ENC_BIG_ENDIAN); offset += 3; /* Record count (8 bits) */ rec_cnt = tvb_get_guint8(tvb, offset); - proto_tree_add_item(lisp_tree, hf_lisp_records, tvb, offset, 1, FALSE); + proto_tree_add_item(lisp_tree, hf_lisp_records, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; /* Nonce (64 bits) */ - proto_tree_add_item(lisp_tree, hf_lisp_nonce, tvb, offset, 8, FALSE); + proto_tree_add_item(lisp_tree, hf_lisp_nonce, tvb, offset, 8, ENC_BIG_ENDIAN); offset += 8; /* Key ID (16 bits) */ - proto_tree_add_item(lisp_tree, hf_lisp_mnot_keyid, tvb, offset, 2, FALSE); + proto_tree_add_item(lisp_tree, hf_lisp_mnot_keyid, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; /* Authentication Data Length (16 bits) */ authlen = tvb_get_ntohs(tvb, offset); - proto_tree_add_item(lisp_tree, hf_lisp_mnot_authlen, tvb, offset, 2, FALSE); + proto_tree_add_item(lisp_tree, hf_lisp_mnot_authlen, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; /* Authentication Data */ @@ -795,7 +795,7 @@ dissect_lisp_ecm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_tree tvbuff_t *next_tvb; guint8 ip_ver; - proto_tree_add_item(lisp_tree, hf_lisp_ecm_res, tvb, 0, 4, FALSE); + proto_tree_add_item(lisp_tree, hf_lisp_ecm_res, tvb, 0, 4, ENC_BIG_ENDIAN); /* Determine if encapsulated packet is IPv4 or IPv6, and call dissector */ next_tvb = tvb_new_subset(tvb, LISP_ECM_HEADER_LEN, -1, -1); @@ -853,7 +853,7 @@ dissect_lisp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) lisp_tree = proto_item_add_subtree(ti, ett_lisp); proto_tree_add_item(lisp_tree, - hf_lisp_type, tvb, 0, 3, FALSE); + hf_lisp_type, tvb, 0, 3, ENC_BIG_ENDIAN); } /* Sub-dissectors are indirectly called by the following and thus diff --git a/epan/dissectors/packet-lldp.c b/epan/dissectors/packet-lldp.c index 04302393b4..d9e3c4257b 100644 --- a/epan/dissectors/packet-lldp.c +++ b/epan/dissectors/packet-lldp.c @@ -606,7 +606,7 @@ dissect_lldp_chassis_id(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gui { tf = proto_tree_add_text(tree, tvb, offset, 2, "Invalid Chassis ID Length (%u)", tempLen); chassis_tree = proto_item_add_subtree(tf, ett_chassis_id); - proto_tree_add_item(chassis_tree, hf_lldp_tlv_type, tvb, offset, 2, FALSE); + proto_tree_add_item(chassis_tree, hf_lldp_tlv_type, tvb, offset, 2, ENC_BIG_ENDIAN); proto_tree_add_text(chassis_tree, tvb, offset, 2, "%s Invalid Length: %u", decode_boolean_bitfield(tempLen, TLV_INFO_LEN_MASK, 16, "", ""), tempLen); } @@ -705,11 +705,11 @@ dissect_lldp_chassis_id(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gui { tf = proto_tree_add_text(tree, tvb, offset, 2, "Invalid Chassis ID Length (%u)", tempLen); chassis_tree = proto_item_add_subtree(tf, ett_chassis_id); - proto_tree_add_item(chassis_tree, hf_lldp_tlv_type, tvb, offset, 2, FALSE); + proto_tree_add_item(chassis_tree, hf_lldp_tlv_type, tvb, offset, 2, ENC_BIG_ENDIAN); proto_tree_add_text(chassis_tree, tvb, offset, 2, "%s Invalid Length: %u", decode_boolean_bitfield(tempLen, TLV_INFO_LEN_MASK, 16, "", ""), tempLen); /* Get chassis id subtype */ - proto_tree_add_item(chassis_tree, hf_chassis_id_subtype, tvb, (offset+2), 1, FALSE); + proto_tree_add_item(chassis_tree, hf_chassis_id_subtype, tvb, (offset+2), 1, ENC_BIG_ENDIAN); } @@ -726,11 +726,11 @@ dissect_lldp_chassis_id(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gui val_to_str(tempType, chassis_id_subtypes, "Reserved" )); chassis_tree = proto_item_add_subtree(tf, ett_chassis_id); - proto_tree_add_item(chassis_tree, hf_lldp_tlv_type, tvb, offset, 2, FALSE); - proto_tree_add_item(chassis_tree, hf_lldp_tlv_len, tvb, offset, 2, FALSE); + proto_tree_add_item(chassis_tree, hf_lldp_tlv_type, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(chassis_tree, hf_lldp_tlv_len, tvb, offset, 2, ENC_BIG_ENDIAN); /* Get chassis id subtype */ - proto_tree_add_item(chassis_tree, hf_chassis_id_subtype, tvb, (offset+2), 1, FALSE); + proto_tree_add_item(chassis_tree, hf_chassis_id_subtype, tvb, (offset+2), 1, ENC_BIG_ENDIAN); /* Get chassis id */ switch (tempType) @@ -740,7 +740,7 @@ dissect_lldp_chassis_id(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gui proto_item_append_text(tf, ", Id: %s", strPtr); break; case 5: /* Network address */ - proto_tree_add_item(chassis_tree, hf_lldp_network_address_family, tvb, offset+3, 1, FALSE); + proto_tree_add_item(chassis_tree, hf_lldp_network_address_family, tvb, offset+3, 1, ENC_BIG_ENDIAN); switch(addr_family){ case AFNUM_INET: proto_tree_add_ipv4(chassis_tree, hf_chassis_id_ip4, tvb, (offset+4), 4, ip_addr); @@ -852,11 +852,11 @@ dissect_lldp_port_id(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint3 val_to_str(tempType, port_id_subtypes, "Unknown" )); port_tree = proto_item_add_subtree(tf, ett_port_id); - proto_tree_add_item(port_tree, hf_lldp_tlv_type, tvb, offset, 2, FALSE); - proto_tree_add_item(port_tree, hf_lldp_tlv_len, tvb, offset, 2, FALSE); + proto_tree_add_item(port_tree, hf_lldp_tlv_type, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(port_tree, hf_lldp_tlv_len, tvb, offset, 2, ENC_BIG_ENDIAN); /* Get port id subtype */ - proto_tree_add_item(port_tree, hf_port_id_subtype, tvb, (offset+2), 1, FALSE); + proto_tree_add_item(port_tree, hf_port_id_subtype, tvb, (offset+2), 1, ENC_BIG_ENDIAN); /* Get port id */ /*proto_tree_add_text(port_tree, tvb, (offset+3), (tempLen-1), "Port Id: %s", strPtr);*/ @@ -871,7 +871,7 @@ dissect_lldp_port_id(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint3 * and an associated network address that are encoded in network octet order. */ /* Network address family */ - proto_tree_add_item(port_tree, hf_lldp_network_address_family, tvb, offset+3, 1, FALSE); + proto_tree_add_item(port_tree, hf_lldp_network_address_family, tvb, offset+3, 1, ENC_BIG_ENDIAN); switch(addr_family){ case AFNUM_INET: proto_tree_add_ipv4(port_tree, hf_port_id_ip4, tvb, (offset+4), 4, ip_addr); @@ -925,11 +925,11 @@ dissect_lldp_time_to_live(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, g tf = proto_tree_add_text(tree, tvb, offset, (tempLen + 2), "Time To Live = %u sec", tempShort); time_to_live_tree = proto_item_add_subtree(tf, ett_time_to_live); - proto_tree_add_item(time_to_live_tree, hf_lldp_tlv_type, tvb, offset, 2, FALSE); - proto_tree_add_item(time_to_live_tree, hf_lldp_tlv_len, tvb, offset, 2, FALSE); + proto_tree_add_item(time_to_live_tree, hf_lldp_tlv_type, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(time_to_live_tree, hf_lldp_tlv_len, tvb, offset, 2, ENC_BIG_ENDIAN); /* Display time to live information */ - proto_tree_add_item(time_to_live_tree, hf_time_to_live, tvb, (offset+2), 2, FALSE); + proto_tree_add_item(time_to_live_tree, hf_time_to_live, tvb, (offset+2), 2, ENC_BIG_ENDIAN); } return (tempLen + 2); @@ -957,8 +957,8 @@ dissect_lldp_end_of_lldpdu(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr tf = proto_tree_add_text(tree, tvb, offset, (tempLen + 2), "End of LLDPDU"); end_of_lldpdu_tree = proto_item_add_subtree(tf, ett_end_of_lldpdu); - proto_tree_add_item(end_of_lldpdu_tree, hf_lldp_tlv_type, tvb, offset, 2, FALSE); - proto_tree_add_item(end_of_lldpdu_tree, hf_lldp_tlv_len, tvb, offset, 2, FALSE); + proto_tree_add_item(end_of_lldpdu_tree, hf_lldp_tlv_type, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(end_of_lldpdu_tree, hf_lldp_tlv_len, tvb, offset, 2, ENC_BIG_ENDIAN); } return -1; /* Force the lldp dissector to terminate */ @@ -989,8 +989,8 @@ dissect_lldp_port_desc(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, tf = proto_tree_add_text(tree, tvb, offset, (tempLen + 2), "Port Description = %s", strPtr); port_desc_tree = proto_item_add_subtree(tf, ett_port_description); - proto_tree_add_item(port_desc_tree, hf_lldp_tlv_type, tvb, offset, 2, FALSE); - proto_tree_add_item(port_desc_tree, hf_lldp_tlv_len, tvb, offset, 2, FALSE); + proto_tree_add_item(port_desc_tree, hf_lldp_tlv_type, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(port_desc_tree, hf_lldp_tlv_len, tvb, offset, 2, ENC_BIG_ENDIAN); /* Display port description information */ proto_tree_add_text(port_desc_tree, tvb, (offset+2), tempLen, "Port Description: %s", @@ -1032,8 +1032,8 @@ dissect_lldp_system_name(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree tf = proto_tree_add_text(tree, tvb, offset, (tempLen + 2), "System Description = %s", strPtr); system_name_tree = proto_item_add_subtree(tf, ett_system_name); - proto_tree_add_item(system_name_tree, hf_lldp_tlv_type, tvb, offset, 2, FALSE); - proto_tree_add_item(system_name_tree, hf_lldp_tlv_len, tvb, offset, 2, FALSE); + proto_tree_add_item(system_name_tree, hf_lldp_tlv_type, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(system_name_tree, hf_lldp_tlv_len, tvb, offset, 2, ENC_BIG_ENDIAN); /* Display system name information */ proto_tree_add_text(system_name_tree, tvb, (offset+2), tempLen, "%s = %s", @@ -1072,8 +1072,8 @@ dissect_lldp_system_capabilities(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tr tf = proto_tree_add_text(tree, tvb, offset, (tempLen + 2), "Capabilities"); system_capabilities_tree = proto_item_add_subtree(tf, ett_system_cap); - proto_tree_add_item(system_capabilities_tree, hf_lldp_tlv_type, tvb, offset, 2, FALSE); - proto_tree_add_item(system_capabilities_tree, hf_lldp_tlv_len, tvb, offset, 2, FALSE); + proto_tree_add_item(system_capabilities_tree, hf_lldp_tlv_type, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(system_capabilities_tree, hf_lldp_tlv_len, tvb, offset, 2, ENC_BIG_ENDIAN); /* Display system capability information */ tf = proto_tree_add_text(system_capabilities_tree, tvb, (offset+2), 2, "Capabilities: 0x%04x", tempCapability); @@ -1182,8 +1182,8 @@ dissect_lldp_management_address(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre tf = proto_tree_add_text(tree, tvb, tempOffset, (tempLen + 2), "Management Address"); system_mgm_addr = proto_item_add_subtree(tf, ett_management_address); - proto_tree_add_item(system_mgm_addr, hf_lldp_tlv_type, tvb, tempOffset, 2, FALSE); - proto_tree_add_item(system_mgm_addr, hf_lldp_tlv_len, tvb, tempOffset, 2, FALSE); + proto_tree_add_item(system_mgm_addr, hf_lldp_tlv_type, tvb, tempOffset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(system_mgm_addr, hf_lldp_tlv_len, tvb, tempOffset, 2, ENC_BIG_ENDIAN); tempOffset += 2; @@ -1264,7 +1264,7 @@ dissect_ieee_802_1_tlv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, subType = tvb_get_guint8(tvb, tempOffset); if (tree) - proto_tree_add_item(tree, hf_ieee_802_1_subtype, tvb, tempOffset, 1, FALSE); + proto_tree_add_item(tree, hf_ieee_802_1_subtype, tvb, tempOffset, 1, ENC_BIG_ENDIAN); tempOffset++; @@ -1372,7 +1372,7 @@ dissect_ieee_802_1qbg_tlv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tre subType = tvb_get_guint8(tvb, tempOffset); if (tree) - proto_tree_add_item(tree, hf_ieee_802_1qbg_subtype, tvb, tempOffset, 1, FALSE); + proto_tree_add_item(tree, hf_ieee_802_1qbg_subtype, tvb, tempOffset, 1, ENC_BIG_ENDIAN); tempOffset++; @@ -1490,7 +1490,7 @@ dissect_ieee_802_3_tlv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, subType = tvb_get_guint8(tvb, tempOffset); if (tree) - proto_tree_add_item(tree, hf_ieee_802_3_subtype, tvb, tempOffset, 1, FALSE); + proto_tree_add_item(tree, hf_ieee_802_3_subtype, tvb, tempOffset, 1, ENC_BIG_ENDIAN); tempOffset++; @@ -1887,7 +1887,7 @@ dissect_media_tlv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint /* Get subtype */ subType = tvb_get_guint8(tvb, tempOffset); if (tree) - proto_tree_add_item(tree, hf_media_tlv_subtype, tvb, tempOffset, 1, FALSE); + proto_tree_add_item(tree, hf_media_tlv_subtype, tvb, tempOffset, 1, ENC_BIG_ENDIAN); tempOffset++; tlvLen--; @@ -2556,7 +2556,7 @@ dissect_cisco_tlv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint /* Get subtype */ subType = tvb_get_guint8(tvb, tempOffset); - proto_tree_add_item(tree, hf_cisco_subtype, tvb, tempOffset, 1, FALSE); + proto_tree_add_item(tree, hf_cisco_subtype, tvb, tempOffset, 1, ENC_BIG_ENDIAN); tempOffset++; @@ -2651,7 +2651,7 @@ dissect_organizational_specific_tlv(tvbuff_t *tvb, packet_info *pinfo, proto_tre ouiStr, subTypeStr); org_tlv_tree = proto_item_add_subtree(tf, ett_org_spc_tlv); - proto_tree_add_item(org_tlv_tree, hf_lldp_tlv_type, tvb, offset, 2, FALSE); + proto_tree_add_item(org_tlv_tree, hf_lldp_tlv_type, tvb, offset, 2, ENC_BIG_ENDIAN); } if (tempLen < 4) { @@ -2663,7 +2663,7 @@ dissect_organizational_specific_tlv(tvbuff_t *tvb, packet_info *pinfo, proto_tre } if (tree) { - proto_tree_add_item(org_tlv_tree, hf_lldp_tlv_len, tvb, offset, 2, FALSE); + proto_tree_add_item(org_tlv_tree, hf_lldp_tlv_len, tvb, offset, 2, ENC_BIG_ENDIAN); /* Display organizational unique id */ proto_tree_add_uint(org_tlv_tree, hf_org_spc_oui, tvb, (offset+2), 3, oui); @@ -2717,8 +2717,8 @@ dissect_lldp_unknown_tlv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree tf = proto_tree_add_text(tree, tvb, offset, (tempLen + 2), "Unknown TLV"); unknown_tlv_tree = proto_item_add_subtree(tf, ett_unknown_tlv); - proto_tree_add_item(unknown_tlv_tree, hf_lldp_tlv_type, tvb, offset, 2, FALSE); - proto_tree_add_item(unknown_tlv_tree, hf_lldp_tlv_len, tvb, offset, 2, FALSE); + proto_tree_add_item(unknown_tlv_tree, hf_lldp_tlv_type, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(unknown_tlv_tree, hf_lldp_tlv_len, tvb, offset, 2, ENC_BIG_ENDIAN); } return (tempLen + 2); diff --git a/epan/dissectors/packet-llt.c b/epan/dissectors/packet-llt.c index 9fd9117f4f..dbf43c3b2a 100644 --- a/epan/dissectors/packet-llt.c +++ b/epan/dissectors/packet-llt.c @@ -81,11 +81,11 @@ dissect_llt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) llt_tree = proto_item_add_subtree(ti, ett_llt); } - proto_tree_add_item(llt_tree, hf_llt_cluster_num, tvb, 2, 1, FALSE); - proto_tree_add_item(llt_tree, hf_llt_message_type, tvb, 3, 1, FALSE); - proto_tree_add_item(llt_tree, hf_llt_node_id, tvb, 7, 1, FALSE); - proto_tree_add_item(llt_tree, hf_llt_sequence_num, tvb, 24, 4, FALSE); - proto_tree_add_item(llt_tree, hf_llt_message_time, tvb, 40, 4, FALSE); + proto_tree_add_item(llt_tree, hf_llt_cluster_num, tvb, 2, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(llt_tree, hf_llt_message_type, tvb, 3, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(llt_tree, hf_llt_node_id, tvb, 7, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(llt_tree, hf_llt_sequence_num, tvb, 24, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(llt_tree, hf_llt_message_time, tvb, 40, 4, ENC_BIG_ENDIAN); } diff --git a/epan/dissectors/packet-lmi.c b/epan/dissectors/packet-lmi.c index 95d6cb195c..b088693db8 100644 --- a/epan/dissectors/packet-lmi.c +++ b/epan/dissectors/packet-lmi.c @@ -150,7 +150,7 @@ dissect_lmi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ti = proto_tree_add_item(tree, proto_lmi, tvb, 0, 3, FALSE); lmi_tree = proto_item_add_subtree(ti, ett_lmi_ele); - proto_tree_add_item(lmi_tree, hf_lmi_call_ref, tvb, 0, 1, FALSE); + proto_tree_add_item(lmi_tree, hf_lmi_call_ref, tvb, 0, 1, ENC_BIG_ENDIAN); } msg_type = tvb_get_guint8( tvb, 1); if (check_col(pinfo->cinfo, COL_INFO)) { diff --git a/epan/dissectors/packet-loop.c b/epan/dissectors/packet-loop.c index eda993140b..81907b7bec 100644 --- a/epan/dissectors/packet-loop.c +++ b/epan/dissectors/packet-loop.c @@ -72,7 +72,7 @@ dissect_loop(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ti = proto_tree_add_item(tree, proto_loop, tvb, offset, -1, FALSE); loop_tree = proto_item_add_subtree(ti, ett_loop); - proto_tree_add_item(loop_tree, hf_loop_skipcount, tvb, offset, 2, TRUE); + proto_tree_add_item(loop_tree, hf_loop_skipcount, tvb, offset, 2, ENC_LITTLE_ENDIAN); } skip_offset = 2 + tvb_get_letohs(tvb, offset); offset += 2; @@ -96,7 +96,7 @@ dissect_loop(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case FUNC_REPLY: if (tree) proto_tree_add_item(loop_tree, hf_loop_receipt_number, tvb, offset, 2, - TRUE); + ENC_LITTLE_ENDIAN); offset += 2; more_function = FALSE; break; diff --git a/epan/dissectors/packet-lwres.c b/epan/dissectors/packet-lwres.c index cd3c94325b..55c29cbb0f 100644 --- a/epan/dissectors/packet-lwres.c +++ b/epan/dissectors/packet-lwres.c @@ -265,20 +265,20 @@ static void dissect_getnamebyaddr_response(tvbuff_t* tvb, proto_tree* lwres_tree tvb, LWRES_LWPACKET_LENGTH, 4, - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item(nba_resp_tree, hf_adn_naliases, tvb, LWRES_LWPACKET_LENGTH + 4, 2, - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item(nba_resp_tree, hf_adn_namelen, tvb, LWRES_LWPACKET_LENGTH + 6, 2, - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item(nba_resp_tree, hf_adn_realname, @@ -304,7 +304,7 @@ static void dissect_getnamebyaddr_response(tvbuff_t* tvb, proto_tree* lwres_tree tvb, offset, 2, - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item(alias_tree, hf_adn_aliasname, @@ -343,21 +343,21 @@ static void dissect_getaddrsbyname_request(tvbuff_t* tvb, proto_tree* lwres_tree tvb, LWRES_LWPACKET_LENGTH+0, sizeof(guint32), - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item(adn_request_tree, hf_adn_addrtype, tvb, LWRES_LWPACKET_LENGTH+4, sizeof(guint32), - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item(adn_request_tree, hf_adn_namelen, tvb, LWRES_LWPACKET_LENGTH+8, sizeof(guint16), - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item(adn_request_tree, hf_adn_name, @@ -399,16 +399,16 @@ static void dissect_getaddrsbyname_response(tvbuff_t* tvb, proto_tree* lwres_tre proto_tree_add_item(adn_resp_tree, hf_adn_flags, tvb, - LWRES_LWPACKET_LENGTH, 4, FALSE); + LWRES_LWPACKET_LENGTH, 4, ENC_BIG_ENDIAN); proto_tree_add_item(adn_resp_tree, hf_adn_naliases, tvb, - LWRES_LWPACKET_LENGTH + 4, 2, FALSE); + LWRES_LWPACKET_LENGTH + 4, 2, ENC_BIG_ENDIAN); proto_tree_add_item(adn_resp_tree, hf_adn_naddrs, tvb, - LWRES_LWPACKET_LENGTH + 6, 2, FALSE); + LWRES_LWPACKET_LENGTH + 6, 2, ENC_BIG_ENDIAN); proto_tree_add_item(adn_resp_tree, hf_adn_namelen, tvb, - LWRES_LWPACKET_LENGTH + 8, 2, FALSE); + LWRES_LWPACKET_LENGTH + 8, 2, ENC_BIG_ENDIAN); proto_tree_add_item(adn_resp_tree, hf_adn_realname, tvb, LWRES_LWPACKET_LENGTH + 10, realnamelen, FALSE); @@ -709,28 +709,28 @@ static void dissect_rdata_request(tvbuff_t* tvb, proto_tree* lwres_tree) tvb, LWRES_LWPACKET_LENGTH+0, sizeof(guint32), - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item(rdata_request_tree, hf_rdclass, tvb, LWRES_LWPACKET_LENGTH+4, sizeof(guint16), - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item(rdata_request_tree, hf_rdtype, tvb, LWRES_LWPACKET_LENGTH+6, sizeof(guint16), - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item(rdata_request_tree, hf_namelen, tvb, LWRES_LWPACKET_LENGTH+8, sizeof(guint16), - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item(rdata_request_tree, hf_req_name, @@ -768,49 +768,49 @@ static void dissect_rdata_response(tvbuff_t* tvb, proto_tree* lwres_tree) tvb, LWRES_LWPACKET_LENGTH+0, sizeof(guint32), - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item(rdata_resp_tree, hf_rdclass, tvb, LWRES_LWPACKET_LENGTH+4, sizeof(guint16), - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item(rdata_resp_tree, hf_rdtype, tvb, LWRES_LWPACKET_LENGTH+6, sizeof(guint16), - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item(rdata_resp_tree, hf_ttl, tvb, LWRES_LWPACKET_LENGTH+8, sizeof(guint32), - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item(rdata_resp_tree, hf_nrdatas, tvb, LWRES_LWPACKET_LENGTH+12, sizeof(guint16), - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item(rdata_resp_tree, hf_nsigs, tvb, LWRES_LWPACKET_LENGTH+14, sizeof(guint16), - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item(rdata_resp_tree, hf_realnamelen, tvb, LWRES_LWPACKET_LENGTH+16, sizeof(guint16), - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item(rdata_resp_tree, hf_realname, diff --git a/epan/dissectors/packet-mac-lte.c b/epan/dissectors/packet-mac-lte.c index ab31e34be4..df014a2814 100644 --- a/epan/dissectors/packet-mac-lte.c +++ b/epan/dissectors/packet-mac-lte.c @@ -1228,7 +1228,7 @@ static gint dissect_rar_entry(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre /* Check reserved bit */ reserved = (tvb_get_guint8(tvb, offset) & 0x80) >> 7; - ti = proto_tree_add_item(rar_body_tree, hf_mac_lte_rar_reserved2, tvb, offset, 1, FALSE); + ti = proto_tree_add_item(rar_body_tree, hf_mac_lte_rar_reserved2, tvb, offset, 1, ENC_BIG_ENDIAN); if (reserved != 0) { expert_add_info_format(pinfo, ti, PI_MALFORMED, PI_ERROR, "RAR body Reserved bit not zero (found 0x%x)", reserved); @@ -1236,7 +1236,7 @@ static gint dissect_rar_entry(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre /* Timing Advance */ timing_advance = (tvb_get_ntohs(tvb, offset) & 0x7ff0) >> 4; - ti = proto_tree_add_item(rar_body_tree, hf_mac_lte_rar_ta, tvb, offset, 2, FALSE); + ti = proto_tree_add_item(rar_body_tree, hf_mac_lte_rar_ta, tvb, offset, 2, ENC_BIG_ENDIAN); if (timing_advance != 0) { expert_add_info_format(pinfo, ti, PI_SEQUENCE, (timing_advance <= 31) ? PI_NOTE : PI_WARN, "RAR Timing advance not zero (%u)", timing_advance); @@ -1245,7 +1245,7 @@ static gint dissect_rar_entry(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre /* UL Grant */ ul_grant = (tvb_get_ntohl(tvb, offset) & 0x0fffff00) >> 8; - ul_grant_ti = proto_tree_add_item(rar_body_tree, hf_mac_lte_rar_ul_grant, tvb, offset, 3, FALSE); + ul_grant_ti = proto_tree_add_item(rar_body_tree, hf_mac_lte_rar_ul_grant, tvb, offset, 3, ENC_BIG_ENDIAN); /* Break these 20 bits down as described in 36.213, section 6.2 */ /* Create subtree for UL grant break-down */ @@ -1253,33 +1253,33 @@ static gint dissect_rar_entry(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre /* Hopping flag (1 bit) */ proto_tree_add_item(ul_grant_tree, hf_mac_lte_rar_ul_grant_hopping, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); /* Fixed sized resource block assignment (10 bits) */ proto_tree_add_item(ul_grant_tree, hf_mac_lte_rar_ul_grant_fsrba, - tvb, offset, 2, FALSE); + tvb, offset, 2, ENC_BIG_ENDIAN); /* Truncated Modulation and coding scheme (4 bits) */ proto_tree_add_item(ul_grant_tree, hf_mac_lte_rar_ul_grant_tmcs, - tvb, offset+1, 2, FALSE); + tvb, offset+1, 2, ENC_BIG_ENDIAN); /* TPC command for scheduled PUSCH (3 bits) */ proto_tree_add_item(ul_grant_tree, hf_mac_lte_rar_ul_grant_tcsp, - tvb, offset+2, 1, FALSE); + tvb, offset+2, 1, ENC_BIG_ENDIAN); /* UL delay (1 bit) */ proto_tree_add_item(ul_grant_tree, hf_mac_lte_rar_ul_grant_ul_delay, - tvb, offset+2, 1, FALSE); + tvb, offset+2, 1, ENC_BIG_ENDIAN); /* CQI request (1 bit) */ proto_tree_add_item(ul_grant_tree, hf_mac_lte_rar_ul_grant_cqi_request, - tvb, offset+2, 1, FALSE); + tvb, offset+2, 1, ENC_BIG_ENDIAN); offset += 3; /* Temporary C-RNTI */ temp_crnti = tvb_get_ntohs(tvb, offset); - proto_tree_add_item(rar_body_tree, hf_mac_lte_rar_temporary_crnti, tvb, offset, 2, FALSE); + proto_tree_add_item(rar_body_tree, hf_mac_lte_rar_temporary_crnti, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; write_pdu_label_and_info(pdu_ti, rar_body_ti, pinfo, @@ -1341,11 +1341,11 @@ static void dissect_rar(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, pro /* Extension */ extension = (first_byte & 0x80) >> 7; - proto_tree_add_item(rar_header_tree, hf_mac_lte_rar_extension, tvb, offset, 1, FALSE); + proto_tree_add_item(rar_header_tree, hf_mac_lte_rar_extension, tvb, offset, 1, ENC_BIG_ENDIAN); /* Type */ type_value = (first_byte & 0x40) >> 6; - proto_tree_add_item(rar_header_tree, hf_mac_lte_rar_t, tvb, offset, 1, FALSE); + proto_tree_add_item(rar_header_tree, hf_mac_lte_rar_t, tvb, offset, 1, ENC_BIG_ENDIAN); if (type_value == 0) { /* Backoff Indicator (BI) case */ @@ -1356,7 +1356,7 @@ static void dissect_rar(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, pro /* 2 Reserved bits */ reserved = (tvb_get_guint8(tvb, offset) & 0x30) >> 4; - tii = proto_tree_add_item(rar_header_tree, hf_mac_lte_rar_reserved, tvb, offset, 1, FALSE); + tii = proto_tree_add_item(rar_header_tree, hf_mac_lte_rar_reserved, tvb, offset, 1, ENC_BIG_ENDIAN); if (reserved != 0) { expert_add_info_format(pinfo, tii, PI_MALFORMED, PI_ERROR, "RAR header Reserved bits not zero (found 0x%x)", reserved); @@ -1364,7 +1364,7 @@ static void dissect_rar(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, pro /* Backoff Indicator */ backoff_indicator = tvb_get_guint8(tvb, offset) & 0x0f; - bi_ti = proto_tree_add_item(rar_header_tree, hf_mac_lte_rar_bi, tvb, offset, 1, FALSE); + bi_ti = proto_tree_add_item(rar_header_tree, hf_mac_lte_rar_bi, tvb, offset, 1, ENC_BIG_ENDIAN); /* As of March 2009 spec, it must be first, and may only appear once */ if (backoff_indicator_seen) { @@ -1388,7 +1388,7 @@ static void dissect_rar(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, pro /* RAPID case */ /* TODO: complain if the same RAPID appears twice in same frame? */ rapids[number_of_rars] = tvb_get_guint8(tvb, offset) & 0x3f; - proto_tree_add_item(rar_header_tree, hf_mac_lte_rar_rapid, tvb, offset, 1, FALSE); + proto_tree_add_item(rar_header_tree, hf_mac_lte_rar_rapid, tvb, offset, 1, ENC_BIG_ENDIAN); proto_item_append_text(rar_header_ti, "(RAPID=%u)", rapids[number_of_rars]); @@ -2420,7 +2420,7 @@ static void dissect_ulsch_or_dlsch(tvbuff_t *tvb, packet_info *pinfo, proto_tree /* Check 1st 2 reserved bits */ reserved = (first_byte & 0xc0) >> 6; ti = proto_tree_add_item(pdu_subheader_tree, hf_mac_lte_sch_reserved, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); if (reserved != 0) { expert_add_info_format(pinfo, ti, PI_MALFORMED, PI_ERROR, "%cL-SCH header Reserved bits not zero", @@ -2430,14 +2430,14 @@ static void dissect_ulsch_or_dlsch(tvbuff_t *tvb, packet_info *pinfo, proto_tree /* Extended bit */ extension = (first_byte & 0x20) >> 5; proto_tree_add_item(pdu_subheader_tree, hf_mac_lte_sch_extended, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); /* LCID. Has different meaning depending upon direction. */ lcids[number_of_headers] = first_byte & 0x1f; if (direction == DIRECTION_UPLINK) { lcid_ti = proto_tree_add_item(pdu_subheader_tree, hf_mac_lte_ulsch_lcid, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); write_pdu_label_and_info(pdu_ti, NULL, pinfo, "(%s", val_to_str_const(lcids[number_of_headers], @@ -2446,7 +2446,7 @@ static void dissect_ulsch_or_dlsch(tvbuff_t *tvb, packet_info *pinfo, proto_tree else { /* Downlink */ lcid_ti = proto_tree_add_item(pdu_subheader_tree, hf_mac_lte_dlsch_lcid, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); write_pdu_label_and_info(pdu_ti, NULL, pinfo, "(%s", val_to_str_const(lcids[number_of_headers], @@ -2533,7 +2533,7 @@ static void dissect_ulsch_or_dlsch(tvbuff_t *tvb, packet_info *pinfo, proto_tree /* F(ormat) bit tells us how long the length field is */ format = (tvb_get_guint8(tvb, offset) & 0x80) >> 7; proto_tree_add_item(pdu_subheader_tree, hf_mac_lte_sch_format, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); /* Now read length field itself */ if (format) { @@ -2754,7 +2754,7 @@ static void dissect_ulsch_or_dlsch(tvbuff_t *tvb, packet_info *pinfo, proto_tree /* Check 2 reserved bits */ reserved = (tvb_get_guint8(tvb, offset) & 0xc0) >> 6; - reserved_ti = proto_tree_add_item(tree, hf_mac_lte_control_timing_advance_reserved, tvb, offset, 1, FALSE); + reserved_ti = proto_tree_add_item(tree, hf_mac_lte_control_timing_advance_reserved, tvb, offset, 1, ENC_BIG_ENDIAN); if (reserved != 0) { expert_add_info_format(pinfo, reserved_ti, PI_MALFORMED, PI_ERROR, "Timing Advance Reserved bits not zero (found 0x%x)", reserved); @@ -2825,7 +2825,7 @@ static void dissect_ulsch_or_dlsch(tvbuff_t *tvb, packet_info *pinfo, proto_tree /* Level */ level = tvb_get_guint8(tvb, offset) & 0x3f; proto_tree_add_item(phr_tree, hf_mac_lte_control_power_headroom_level, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); /* Show value in root label */ proto_item_append_text(phr_ti, " (%s)", @@ -2837,7 +2837,7 @@ static void dissect_ulsch_or_dlsch(tvbuff_t *tvb, packet_info *pinfo, proto_tree break; case CRNTI_LCID: proto_tree_add_item(tree, hf_mac_lte_control_crnti, - tvb, offset, 2, FALSE); + tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; break; case TRUNCATED_BSR_LCID: @@ -2859,11 +2859,11 @@ static void dissect_ulsch_or_dlsch(tvbuff_t *tvb, packet_info *pinfo, proto_tree /* LCG ID */ lcgid = (tvb_get_guint8(tvb, offset) & 0xc0) >> 6; proto_tree_add_item(bsr_tree, hf_mac_lte_control_bsr_lcg_id, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); /* Buffer Size */ buffer_size = tvb_get_guint8(tvb, offset) & 0x3f; buffer_size_ti = proto_tree_add_item(bsr_tree, hf_mac_lte_control_short_bsr_buffer_size, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); offset++; if (buffer_size >= global_mac_lte_bsr_warn_threshold) { expert_add_info_format(pinfo, buffer_size_ti, PI_SEQUENCE, PI_WARN, @@ -2894,7 +2894,7 @@ static void dissect_ulsch_or_dlsch(tvbuff_t *tvb, packet_info *pinfo, proto_tree /* LCID Group 0 */ buffer_size_ti = proto_tree_add_item(bsr_tree, hf_mac_lte_control_long_bsr_buffer_size_0, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); buffer_size[0] = (tvb_get_guint8(tvb, offset) & 0xfc) >> 2; if (buffer_size[0] >= global_mac_lte_bsr_warn_threshold) { expert_add_info_format(pinfo, buffer_size_ti, PI_SEQUENCE, PI_WARN, @@ -2905,7 +2905,7 @@ static void dissect_ulsch_or_dlsch(tvbuff_t *tvb, packet_info *pinfo, proto_tree /* LCID Group 1 */ buffer_size_ti = proto_tree_add_item(bsr_tree, hf_mac_lte_control_long_bsr_buffer_size_1, - tvb, offset, 2, FALSE); + tvb, offset, 2, ENC_BIG_ENDIAN); buffer_size[1] = ((tvb_get_guint8(tvb, offset) & 0x03) << 4) | ((tvb_get_guint8(tvb, offset+1) & 0xf0) >> 4); offset++; if (buffer_size[1] >= global_mac_lte_bsr_warn_threshold) { @@ -2917,7 +2917,7 @@ static void dissect_ulsch_or_dlsch(tvbuff_t *tvb, packet_info *pinfo, proto_tree /* LCID Group 2 */ buffer_size_ti = proto_tree_add_item(bsr_tree, hf_mac_lte_control_long_bsr_buffer_size_2, - tvb, offset, 2, FALSE); + tvb, offset, 2, ENC_BIG_ENDIAN); buffer_size[2] = ((tvb_get_guint8(tvb, offset) & 0x0f) << 2) | ((tvb_get_guint8(tvb, offset+1) & 0xc0) >> 6); offset++; @@ -2930,7 +2930,7 @@ static void dissect_ulsch_or_dlsch(tvbuff_t *tvb, packet_info *pinfo, proto_tree /* LCID Group 3 */ buffer_size_ti = proto_tree_add_item(bsr_tree, hf_mac_lte_control_long_bsr_buffer_size_3, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); buffer_size[3] = tvb_get_guint8(tvb, offset) & 0x3f; offset++; if (buffer_size[3] >= global_mac_lte_bsr_warn_threshold) { diff --git a/epan/dissectors/packet-mbtcp.c b/epan/dissectors/packet-mbtcp.c index 283a07dad1..4de9c64471 100644 --- a/epan/dissectors/packet-mbtcp.c +++ b/epan/dissectors/packet-mbtcp.c @@ -512,8 +512,8 @@ dissect_modbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case READ_COILS: case READ_INPUT_DISCRETES: if (packet_type == QUERY_PACKET) { - proto_tree_add_item(modbus_tree, hf_modbus_reference, tvb, payload_start, 2, FALSE); - proto_tree_add_item(modbus_tree, hf_modbus_bitcnt, tvb, payload_start + 2, 2, FALSE); + proto_tree_add_item(modbus_tree, hf_modbus_reference, tvb, payload_start, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(modbus_tree, hf_modbus_bitcnt, tvb, payload_start + 2, 2, ENC_BIG_ENDIAN); } else if (packet_type == RESPONSE_PACKET) { byte_cnt = (guint32)tvb_get_guint8(tvb, payload_start); @@ -525,8 +525,8 @@ dissect_modbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case READ_MULT_REGS: case READ_INPUT_REGS: if (packet_type == QUERY_PACKET) { - proto_tree_add_item(modbus_tree, hf_modbus_reference, tvb, payload_start, 2, FALSE); - proto_tree_add_item(modbus_tree, hf_modbus_wordcnt, tvb, payload_start + 2, 2, FALSE); + proto_tree_add_item(modbus_tree, hf_modbus_reference, tvb, payload_start, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(modbus_tree, hf_modbus_wordcnt, tvb, payload_start + 2, 2, ENC_BIG_ENDIAN); } else if (packet_type == RESPONSE_PACKET) { byte_cnt = (guint32)tvb_get_guint8(tvb, payload_start); @@ -537,12 +537,12 @@ dissect_modbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case WRITE_COIL: if (packet_type == QUERY_PACKET) { - proto_tree_add_item(modbus_tree, hf_modbus_reference, tvb, payload_start, 2, FALSE); + proto_tree_add_item(modbus_tree, hf_modbus_reference, tvb, payload_start, 2, ENC_BIG_ENDIAN); dissect_mbtcp_data(tvb, pinfo, modbus_tree, function_code, payload_start + 2, 1); proto_tree_add_text(modbus_tree, tvb, payload_start + 3, 1, "Padding"); } else if (packet_type == RESPONSE_PACKET) { - proto_tree_add_item(modbus_tree, hf_modbus_reference, tvb, payload_start, 2, FALSE); + proto_tree_add_item(modbus_tree, hf_modbus_reference, tvb, payload_start, 2, ENC_BIG_ENDIAN); dissect_mbtcp_data(tvb, pinfo, modbus_tree, function_code, payload_start + 2, 1); proto_tree_add_text(modbus_tree, tvb, payload_start + 3, 1, "Padding"); } @@ -550,11 +550,11 @@ dissect_modbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case WRITE_SINGLE_REG: if (packet_type == QUERY_PACKET) { - proto_tree_add_item(modbus_tree, hf_modbus_reference, tvb, payload_start, 2, FALSE); + proto_tree_add_item(modbus_tree, hf_modbus_reference, tvb, payload_start, 2, ENC_BIG_ENDIAN); dissect_mbtcp_data(tvb, pinfo, modbus_tree, function_code, payload_start + 2, 2); } else if (packet_type == RESPONSE_PACKET) { - proto_tree_add_item(modbus_tree, hf_modbus_reference, tvb, payload_start, 2, FALSE); + proto_tree_add_item(modbus_tree, hf_modbus_reference, tvb, payload_start, 2, ENC_BIG_ENDIAN); dissect_mbtcp_data(tvb, pinfo, modbus_tree, function_code, payload_start + 2, 2); } break; @@ -699,8 +699,8 @@ dissect_modbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case GET_COMM_EVENT_CTRS: if (packet_type == RESPONSE_PACKET) { - proto_tree_add_item(modbus_tree, hf_modbus_status, tvb, payload_start, 2, FALSE); - proto_tree_add_item(modbus_tree, hf_modbus_event_count, tvb, payload_start+2, 2, FALSE); + proto_tree_add_item(modbus_tree, hf_modbus_status, tvb, payload_start, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(modbus_tree, hf_modbus_event_count, tvb, payload_start+2, 2, ENC_BIG_ENDIAN); } break; @@ -708,9 +708,9 @@ dissect_modbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (packet_type == RESPONSE_PACKET) { byte_cnt = (guint32)tvb_get_guint8(tvb, payload_start); proto_tree_add_uint(modbus_tree, hf_modbus_bytecnt, tvb, payload_start, 1, byte_cnt); - proto_tree_add_item(modbus_tree, hf_modbus_status, tvb, payload_start+1, 2, FALSE); - proto_tree_add_item(modbus_tree, hf_modbus_event_count, tvb, payload_start+3, 2, FALSE); - proto_tree_add_item(modbus_tree, hf_modbus_message_count, tvb, payload_start+5, 2, FALSE); + proto_tree_add_item(modbus_tree, hf_modbus_status, tvb, payload_start+1, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(modbus_tree, hf_modbus_event_count, tvb, payload_start+3, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(modbus_tree, hf_modbus_message_count, tvb, payload_start+5, 2, ENC_BIG_ENDIAN); if (byte_cnt-6 > 0) { byte_cnt -= 6; event_index = 0; @@ -730,13 +730,13 @@ dissect_modbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* add subtrees to describe each event bit */ proto_tree_add_item(event_item_tree, hf_modbus_event_recv_comm_err, - tvb, payload_start+7+event_index, 1, TRUE ); + tvb, payload_start+7+event_index, 1, ENC_LITTLE_ENDIAN ); proto_tree_add_item(event_item_tree, hf_modbus_event_recv_char_over, - tvb, payload_start+7+event_index, 1, TRUE ); + tvb, payload_start+7+event_index, 1, ENC_LITTLE_ENDIAN ); proto_tree_add_item(event_item_tree, hf_modbus_event_recv_lo_mode, - tvb, payload_start+7+event_index, 1, TRUE ); + tvb, payload_start+7+event_index, 1, ENC_LITTLE_ENDIAN ); proto_tree_add_item(event_item_tree, hf_modbus_event_recv_broadcast, - tvb, payload_start+7+event_index, 1, TRUE ); + tvb, payload_start+7+event_index, 1, ENC_LITTLE_ENDIAN ); } else if ((event_code & REMOTE_DEVICE_SEND_EVENT_MASK) == REMOTE_DEVICE_SEND_EVENT_VALUE) { mei = proto_tree_add_text(event_tree, tvb, payload_start+7+event_index, 1, "Send Event: 0x%02X", event_code); @@ -744,17 +744,17 @@ dissect_modbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* add subtrees to describe each event bit */ proto_tree_add_item(event_item_tree, hf_modbus_event_send_read_ex, - tvb, payload_start+7+event_index, 1, TRUE ); + tvb, payload_start+7+event_index, 1, ENC_LITTLE_ENDIAN ); proto_tree_add_item(event_item_tree, hf_modbus_event_send_slave_abort_ex, - tvb, payload_start+7+event_index, 1, TRUE ); + tvb, payload_start+7+event_index, 1, ENC_LITTLE_ENDIAN ); proto_tree_add_item(event_item_tree, hf_modbus_event_send_slave_busy_ex, - tvb, payload_start+7+event_index, 1, TRUE ); + tvb, payload_start+7+event_index, 1, ENC_LITTLE_ENDIAN ); proto_tree_add_item(event_item_tree, hf_modbus_event_send_slave_nak_ex, - tvb, payload_start+7+event_index, 1, TRUE ); + tvb, payload_start+7+event_index, 1, ENC_LITTLE_ENDIAN ); proto_tree_add_item(event_item_tree, hf_modbus_event_send_write_timeout, - tvb, payload_start+7+event_index, 1, TRUE ); + tvb, payload_start+7+event_index, 1, ENC_LITTLE_ENDIAN ); proto_tree_add_item(event_item_tree, hf_modbus_event_send_lo_mode, - tvb, payload_start+7+event_index, 1, TRUE ); + tvb, payload_start+7+event_index, 1, ENC_LITTLE_ENDIAN ); } else { proto_tree_add_text(event_tree, tvb, payload_start+7+event_index, 1, "Unknown Event"); @@ -769,31 +769,31 @@ dissect_modbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case WRITE_MULT_COILS: if (packet_type == QUERY_PACKET) { - proto_tree_add_item(modbus_tree, hf_modbus_reference, tvb, payload_start, 2, FALSE); - proto_tree_add_item(modbus_tree, hf_modbus_bitcnt, tvb, payload_start + 2, 2, FALSE); + proto_tree_add_item(modbus_tree, hf_modbus_reference, tvb, payload_start, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(modbus_tree, hf_modbus_bitcnt, tvb, payload_start + 2, 2, ENC_BIG_ENDIAN); byte_cnt = (guint32)tvb_get_guint8(tvb, payload_start + 4); proto_tree_add_uint(modbus_tree, hf_modbus_bytecnt, tvb, payload_start + 4, 1, byte_cnt); dissect_mbtcp_data(tvb, pinfo, modbus_tree, function_code, payload_start + 5, byte_cnt); } else if (packet_type == RESPONSE_PACKET) { - proto_tree_add_item(modbus_tree, hf_modbus_reference, tvb, payload_start, 2, FALSE); - proto_tree_add_item(modbus_tree, hf_modbus_bitcnt, tvb, payload_start + 2, 2, FALSE); + proto_tree_add_item(modbus_tree, hf_modbus_reference, tvb, payload_start, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(modbus_tree, hf_modbus_bitcnt, tvb, payload_start + 2, 2, ENC_BIG_ENDIAN); } break; case WRITE_MULT_REGS: if (packet_type == QUERY_PACKET) { - proto_tree_add_item(modbus_tree, hf_modbus_reference, tvb, payload_start, 2, FALSE); - proto_tree_add_item(modbus_tree, hf_modbus_wordcnt, tvb, payload_start + 2, 2, FALSE); + proto_tree_add_item(modbus_tree, hf_modbus_reference, tvb, payload_start, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(modbus_tree, hf_modbus_wordcnt, tvb, payload_start + 2, 2, ENC_BIG_ENDIAN); byte_cnt = (guint32)tvb_get_guint8(tvb, payload_start + 4); proto_tree_add_uint(modbus_tree, hf_modbus_bytecnt, tvb, payload_start + 4, 1, byte_cnt); dissect_mbtcp_data(tvb, pinfo, modbus_tree, function_code, payload_start + 5, byte_cnt); } else if (packet_type == RESPONSE_PACKET) { - proto_tree_add_item(modbus_tree, hf_modbus_reference, tvb, payload_start, 2, FALSE); - proto_tree_add_item(modbus_tree, hf_modbus_wordcnt, tvb, payload_start + 2, 2, FALSE); + proto_tree_add_item(modbus_tree, hf_modbus_reference, tvb, payload_start, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(modbus_tree, hf_modbus_wordcnt, tvb, payload_start + 2, 2, ENC_BIG_ENDIAN); } break; @@ -809,9 +809,9 @@ dissect_modbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) mi = proto_tree_add_text( modbus_tree, tvb, group_offset, 7, "Group %u", i); group_tree = proto_item_add_subtree(mi, ett_group_hdr); - proto_tree_add_item(group_tree, hf_modbus_reftype, tvb, group_offset, 1, FALSE); - proto_tree_add_item(group_tree, hf_modbus_lreference, tvb, group_offset + 1, 4, FALSE); - proto_tree_add_item(group_tree, hf_modbus_wordcnt, tvb, group_offset + 5, 2, FALSE); + proto_tree_add_item(group_tree, hf_modbus_reftype, tvb, group_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(group_tree, hf_modbus_lreference, tvb, group_offset + 1, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(group_tree, hf_modbus_wordcnt, tvb, group_offset + 5, 2, ENC_BIG_ENDIAN); group_offset += 7; } } @@ -830,7 +830,7 @@ dissect_modbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) group_tree = proto_item_add_subtree(mi, ett_group_hdr); proto_tree_add_uint(group_tree, hf_modbus_bytecnt, tvb, group_offset, 1, group_byte_cnt); - proto_tree_add_item(group_tree, hf_modbus_reftype, tvb, group_offset + 1, 1, FALSE); + proto_tree_add_item(group_tree, hf_modbus_reftype, tvb, group_offset + 1, 1, ENC_BIG_ENDIAN); dissect_mbtcp_data(tvb, pinfo, group_tree, function_code, group_offset + 2, group_byte_cnt - 1); group_offset += (group_byte_cnt + 1); byte_cnt -= (group_byte_cnt + 1); @@ -854,8 +854,8 @@ dissect_modbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) mi = proto_tree_add_text( modbus_tree, tvb, group_offset, group_byte_cnt, "Group %u", i); group_tree = proto_item_add_subtree(mi, ett_group_hdr); - proto_tree_add_item(group_tree, hf_modbus_reftype, tvb, group_offset, 1, FALSE); - proto_tree_add_item(group_tree, hf_modbus_lreference, tvb, group_offset + 1, 4, FALSE); + proto_tree_add_item(group_tree, hf_modbus_reftype, tvb, group_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(group_tree, hf_modbus_lreference, tvb, group_offset + 1, 4, ENC_BIG_ENDIAN); proto_tree_add_uint(group_tree, hf_modbus_wordcnt, tvb, group_offset + 5, 2, group_word_cnt); dissect_mbtcp_data(tvb, pinfo, group_tree, function_code, group_offset + 7, group_byte_cnt - 7); @@ -868,18 +868,18 @@ dissect_modbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case MASK_WRITE_REG: if ((packet_type == QUERY_PACKET) || (packet_type == RESPONSE_PACKET)) { - proto_tree_add_item(modbus_tree, hf_modbus_reference, tvb, payload_start, 2, FALSE); - proto_tree_add_item(modbus_tree, hf_modbus_andmask, tvb, payload_start + 2, 2, FALSE); - proto_tree_add_item(modbus_tree, hf_modbus_ormask, tvb, payload_start + 4, 2, FALSE); + proto_tree_add_item(modbus_tree, hf_modbus_reference, tvb, payload_start, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(modbus_tree, hf_modbus_andmask, tvb, payload_start + 2, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(modbus_tree, hf_modbus_ormask, tvb, payload_start + 4, 2, ENC_BIG_ENDIAN); } break; case READ_WRITE_REG: if (packet_type == QUERY_PACKET) { - proto_tree_add_item(modbus_tree, hf_modbus_readref, tvb, payload_start, 2, FALSE); - proto_tree_add_item(modbus_tree, hf_modbus_readwordcnt, tvb, payload_start + 2, 2, FALSE); - proto_tree_add_item(modbus_tree, hf_modbus_writeref, tvb, payload_start + 4, 2, FALSE); - proto_tree_add_item(modbus_tree, hf_modbus_writewordcnt, tvb, payload_start + 6, 2, FALSE); + proto_tree_add_item(modbus_tree, hf_modbus_readref, tvb, payload_start, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(modbus_tree, hf_modbus_readwordcnt, tvb, payload_start + 2, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(modbus_tree, hf_modbus_writeref, tvb, payload_start + 4, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(modbus_tree, hf_modbus_writewordcnt, tvb, payload_start + 6, 2, ENC_BIG_ENDIAN); byte_cnt = (guint32)tvb_get_guint8(tvb, payload_start + 8); proto_tree_add_uint(modbus_tree, hf_modbus_bytecnt, tvb, payload_start + 8, 1, byte_cnt); @@ -895,25 +895,25 @@ dissect_modbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case READ_FIFO_QUEUE: if (packet_type == QUERY_PACKET) - proto_tree_add_item(modbus_tree, hf_modbus_reference, tvb, payload_start, 2, FALSE); + proto_tree_add_item(modbus_tree, hf_modbus_reference, tvb, payload_start, 2, ENC_BIG_ENDIAN); else if (packet_type == RESPONSE_PACKET) { byte_cnt = (guint32)tvb_get_ntohs(tvb, payload_start); proto_tree_add_uint(modbus_tree, hf_modbus_lbytecnt, tvb, payload_start, 2, byte_cnt); - proto_tree_add_item(modbus_tree, hf_modbus_wordcnt, tvb, payload_start + 2, 2, FALSE); + proto_tree_add_item(modbus_tree, hf_modbus_wordcnt, tvb, payload_start + 2, 2, ENC_BIG_ENDIAN); dissect_mbtcp_data(tvb, pinfo, modbus_tree, function_code, payload_start + 4, byte_cnt - 2); } break; case ENCAP_INTERFACE_TRANSP: if (packet_type == QUERY_PACKET) { - proto_tree_add_item(modbus_tree, hf_modbus_mei, tvb, payload_start, 1, FALSE); + proto_tree_add_item(modbus_tree, hf_modbus_mei, tvb, payload_start, 1, ENC_BIG_ENDIAN); mei_code = tvb_get_guint8(tvb, payload_start); switch (mei_code) { case READ_DEVICE_ID: - proto_tree_add_item(modbus_tree, hf_modbus_read_device_id, tvb, payload_start+1, 1, FALSE); - proto_tree_add_item(modbus_tree, hf_modbus_object_id, tvb, payload_start+2, 1, FALSE); + proto_tree_add_item(modbus_tree, hf_modbus_read_device_id, tvb, payload_start+1, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(modbus_tree, hf_modbus_object_id, tvb, payload_start+2, 1, ENC_BIG_ENDIAN); break; case CANOPEN_REQ_RESP: @@ -925,15 +925,15 @@ dissect_modbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } } else if (packet_type == RESPONSE_PACKET) { - proto_tree_add_item(modbus_tree, hf_modbus_mei, tvb, payload_start, 1, FALSE); + proto_tree_add_item(modbus_tree, hf_modbus_mei, tvb, payload_start, 1, ENC_BIG_ENDIAN); mei_code = tvb_get_guint8(tvb, payload_start); switch (mei_code) { case READ_DEVICE_ID: - proto_tree_add_item(modbus_tree, hf_modbus_read_device_id, tvb, payload_start+1, 1, FALSE); - proto_tree_add_item(modbus_tree, hf_modbus_conformity_level, tvb, payload_start+2, 1, FALSE); - proto_tree_add_item(modbus_tree, hf_modbus_more_follows, tvb, payload_start+3, 1, FALSE); - proto_tree_add_item(modbus_tree, hf_modbus_next_object_id, tvb, payload_start+4, 1, FALSE); + proto_tree_add_item(modbus_tree, hf_modbus_read_device_id, tvb, payload_start+1, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(modbus_tree, hf_modbus_conformity_level, tvb, payload_start+2, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(modbus_tree, hf_modbus_more_follows, tvb, payload_start+3, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(modbus_tree, hf_modbus_next_object_id, tvb, payload_start+4, 1, ENC_BIG_ENDIAN); num_objects = tvb_get_guint8(tvb, payload_start+5); proto_tree_add_uint(modbus_tree, hf_modbus_num_objects, tvb, payload_start+5, 1, num_objects); doe = proto_tree_add_text(modbus_tree, tvb, payload_start+6, payload_len-6, "Objects"); @@ -952,7 +952,7 @@ dissect_modbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) doie = proto_tree_add_text(device_objects_tree, tvb, payload_start+6+object_index, 2+object_len, "Object #%d", i); device_objects_item_tree = proto_item_add_subtree(doie, ett_device_id_object_items); - proto_tree_add_item(device_objects_item_tree, hf_modbus_object_id, tvb, payload_start+6+object_index, 1, FALSE); + proto_tree_add_item(device_objects_item_tree, hf_modbus_object_id, tvb, payload_start+6+object_index, 1, ENC_BIG_ENDIAN); object_index++; proto_tree_add_uint(device_objects_item_tree, hf_modbus_list_object_len, tvb, payload_start+6+object_index, 1, object_len); diff --git a/epan/dissectors/packet-mdshdr.c b/epan/dissectors/packet-mdshdr.c index 0038899e18..8807d3af7a 100644 --- a/epan/dissectors/packet-mdshdr.c +++ b/epan/dissectors/packet-mdshdr.c @@ -225,16 +225,16 @@ dissect_mdshdr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) mdshdr_tree_hdr = proto_item_add_subtree (ti_hdr, ett_mdshdr_hdr); hidden_item = proto_tree_add_item (mdshdr_tree_hdr, hf_mdshdr_sof, tvb, MDSHDR_SOF_OFFSET, - MDSHDR_SIZE_BYTE, 0); + MDSHDR_SIZE_BYTE, ENC_BIG_ENDIAN); PROTO_ITEM_SET_HIDDEN(hidden_item); proto_tree_add_item (mdshdr_tree_hdr, hf_mdshdr_pkt_len, tvb, MDSHDR_PKTLEN_OFFSET, - MDSHDR_SIZE_INT16, 0); + MDSHDR_SIZE_INT16, ENC_BIG_ENDIAN); proto_tree_add_item (mdshdr_tree_hdr, hf_mdshdr_dstidx, tvb, MDSHDR_DIDX_OFFSET, - MDSHDR_SIZE_INT16, 0); + MDSHDR_SIZE_INT16, ENC_BIG_ENDIAN); proto_tree_add_item (mdshdr_tree_hdr, hf_mdshdr_srcidx, tvb, MDSHDR_SIDX_OFFSET, - MDSHDR_SIZE_INT16, 0); + MDSHDR_SIZE_INT16, ENC_BIG_ENDIAN); proto_tree_add_item (mdshdr_tree_hdr, hf_mdshdr_vsan, tvb, MDSHDR_VSAN_OFFSET, - MDSHDR_SIZE_INT16, 0); + MDSHDR_SIZE_INT16, ENC_BIG_ENDIAN); hidden_item = proto_tree_add_uint(mdshdr_tree_hdr, hf_mdshdr_span, tvb, MDSHDR_VSAN_OFFSET, MDSHDR_SIZE_BYTE, span_id); @@ -249,9 +249,9 @@ dissect_mdshdr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) mdshdr_tree_trlr = proto_item_add_subtree (ti_trlr, ett_mdshdr_trlr); proto_tree_add_item (mdshdr_tree_trlr, hf_mdshdr_eof, tvb, - trailer_start, MDSHDR_SIZE_BYTE, 0); + trailer_start, MDSHDR_SIZE_BYTE, ENC_BIG_ENDIAN); proto_tree_add_item (mdshdr_tree_trlr, hf_mdshdr_fccrc, tvb, - trailer_start+2, MDSHDR_SIZE_INT32, 0); + trailer_start+2, MDSHDR_SIZE_INT32, ENC_BIG_ENDIAN); } else { proto_tree_add_text (mdshdr_tree_main, tvb, 0, 0, "MDS Trailer: Not Found"); diff --git a/epan/dissectors/packet-mip.c b/epan/dissectors/packet-mip.c index 6999310cfc..71d08e3c20 100644 --- a/epan/dissectors/packet-mip.c +++ b/epan/dissectors/packet-mip.c @@ -474,7 +474,7 @@ dissect_mip_extensions( tvbuff_t *tvb, int offset, proto_tree *tree) case MF_AUTH_EXT: case FH_AUTH_EXT: /* All these extensions look the same. 4 byte SPI followed by a key */ - proto_tree_add_item(ext_tree, hf_mip_aext_spi, tvb, offset, 4, FALSE); + proto_tree_add_item(ext_tree, hf_mip_aext_spi, tvb, offset, 4, ENC_BIG_ENDIAN); proto_tree_add_item(ext_tree, hf_mip_aext_auth, tvb, offset+4, ext_len-4, ENC_NA); break; @@ -493,7 +493,7 @@ dissect_mip_extensions( tvbuff_t *tvb, int offset, proto_tree *tree) proto_tree_add_uint(ext_tree, hf_mip_ext_len, tvb, offset, 2, ext_len); offset+=2; /* SPI */ - proto_tree_add_item(ext_tree, hf_mip_aext_spi, tvb, offset, 4, FALSE); + proto_tree_add_item(ext_tree, hf_mip_aext_spi, tvb, offset, 4, ENC_BIG_ENDIAN); /* Key */ proto_tree_add_item(ext_tree, hf_mip_aext_auth, tvb, offset + 4, ext_len - 4, ENC_NA); @@ -509,27 +509,27 @@ dissect_mip_extensions( tvbuff_t *tvb, int offset, proto_tree *tree) /* reserved */ proto_tree_add_uint(ext_flags_tree, hf_mip_rext_reserved, tvb, offset, 2, flags); /* registration revocation timestamp */ - proto_tree_add_item(ext_tree, hf_mip_rext_tstamp, tvb, offset + 2, 4, FALSE); + proto_tree_add_item(ext_tree, hf_mip_rext_tstamp, tvb, offset + 2, 4, ENC_BIG_ENDIAN); break; case DYN_HA_EXT: /* RFC 4433 */ /* subtype */ - proto_tree_add_item(ext_tree, hf_mip_dhaext_stype, tvb, offset, 1, FALSE); + proto_tree_add_item(ext_tree, hf_mip_dhaext_stype, tvb, offset, 1, ENC_BIG_ENDIAN); /* Home Agent */ proto_tree_add_item(ext_tree, hf_mip_dhaext_addr, tvb, offset + 1, 4, FALSE); break; case MSG_STR_EXT: /* sub-type */ - proto_tree_add_item(ext_tree, hf_mip_mstrext_stype, tvb, offset, 1, FALSE); + proto_tree_add_item(ext_tree, hf_mip_mstrext_stype, tvb, offset, 1, ENC_BIG_ENDIAN); /* text */ proto_tree_add_item(ext_tree, hf_mip_mstrext_text, tvb, offset + 1, ext_len-1, FALSE); break; case UDP_TUN_REQ_EXT: /* RFC 3519 */ /* sub-type */ - proto_tree_add_item(ext_tree, hf_mip_utrqext_stype, tvb, offset, 1, FALSE); + proto_tree_add_item(ext_tree, hf_mip_utrqext_stype, tvb, offset, 1, ENC_BIG_ENDIAN); /* reserved 1 */ - proto_tree_add_item(ext_tree, hf_mip_utrqext_reserved1, tvb, offset + 1, 1, FALSE); + proto_tree_add_item(ext_tree, hf_mip_utrqext_reserved1, tvb, offset + 1, 1, ENC_BIG_ENDIAN); /* flags */ flags = tvb_get_guint8(tvb, offset + 2); @@ -541,17 +541,17 @@ dissect_mip_extensions( tvbuff_t *tvb, int offset, proto_tree *tree) /* reserved 2 */ proto_tree_add_uint(ext_flags_tree, hf_mip_utrqext_reserved2, tvb, offset + 2, 1, flags); /* encapsulation */ - proto_tree_add_item(ext_tree, hf_mip_utrqext_encap_type, tvb, offset + 3, 1, FALSE); + proto_tree_add_item(ext_tree, hf_mip_utrqext_encap_type, tvb, offset + 3, 1, ENC_BIG_ENDIAN); /* reserved 3 */ - proto_tree_add_item(ext_tree, hf_mip_utrqext_reserved3, tvb, offset + 4, 2, FALSE); + proto_tree_add_item(ext_tree, hf_mip_utrqext_reserved3, tvb, offset + 4, 2, ENC_BIG_ENDIAN); break; case UDP_TUN_REP_EXT: /* RFC 3519 */ /* sub-type */ - proto_tree_add_item(ext_tree, hf_mip_utrpext_stype, tvb, offset, 1, FALSE); + proto_tree_add_item(ext_tree, hf_mip_utrpext_stype, tvb, offset, 1, ENC_BIG_ENDIAN); /* code */ - proto_tree_add_item(ext_tree, hf_mip_utrpext_code, tvb, offset + 1, 1, FALSE); + proto_tree_add_item(ext_tree, hf_mip_utrpext_code, tvb, offset + 1, 1, ENC_BIG_ENDIAN); /* flags */ flags = tvb_get_ntohs(tvb, offset+2); @@ -563,7 +563,7 @@ dissect_mip_extensions( tvbuff_t *tvb, int offset, proto_tree *tree) proto_tree_add_uint(ext_flags_tree, hf_mip_utrpext_reserved, tvb, offset + 2, 2, flags); /* keepalive interval */ - proto_tree_add_item(ext_tree, hf_mip_utrpext_keepalive, tvb, offset + 4, 2, FALSE); + proto_tree_add_item(ext_tree, hf_mip_utrpext_keepalive, tvb, offset + 4, 2, ENC_BIG_ENDIAN); break; case PMIPv4_NON_SKIP_EXT: /* draft-leung-mip4-proxy-mode */ /* sub-type */ @@ -574,7 +574,7 @@ dissect_mip_extensions( tvbuff_t *tvb, int offset, proto_tree *tree) offset+=2; if(ext_subtype == 1){ /* Sub-type == 1 : PMIPv4 Per-Node Authentication Method */ - proto_tree_add_item(ext_tree, hf_mip_pmipv4nonskipext_pernodeauthmethod, tvb, offset, 1, FALSE); + proto_tree_add_item(ext_tree, hf_mip_pmipv4nonskipext_pernodeauthmethod, tvb, offset, 1, ENC_BIG_ENDIAN); } break; case PMIPv4_SKIP_EXT: /* draft-leung-mip4-proxy-mode */ @@ -609,20 +609,20 @@ dissect_mip_extensions( tvbuff_t *tvb, int offset, proto_tree *tree) * Very nasty . . breaks normal extensions, since the length is * in the wrong place :( */ - proto_tree_add_item(ext_tree, hf_mip_cvse_reserved, tvb, offset, 1, FALSE); + proto_tree_add_item(ext_tree, hf_mip_cvse_reserved, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; proto_tree_add_uint(ext_tree, hf_mip_ext_len, tvb, offset, 2, ext_len); offset+=2; /* Vendor/Org ID */ /*Vendor ID & cvse type & cvse value are included in ext_len, so do not increment offset for them here.*/ cvse_local_offset = offset; - proto_tree_add_item(ext_tree, hf_mip_cvse_vendor_org_id, tvb, cvse_local_offset, 4, FALSE); + proto_tree_add_item(ext_tree, hf_mip_cvse_vendor_org_id, tvb, cvse_local_offset, 4, ENC_BIG_ENDIAN); cvse_vendor_id = tvb_get_ntohl(tvb, cvse_local_offset); cvse_local_offset+=4; /*Vendor CVSE Type*/ if( cvse_vendor_id == VENDOR_VERIZON ){ /*Verizon CVSE type*/ - proto_tree_add_item(ext_tree, hf_mip_cvse_verizon_cvse_type, tvb, cvse_local_offset, 2, FALSE); + proto_tree_add_item(ext_tree, hf_mip_cvse_verizon_cvse_type, tvb, cvse_local_offset, 2, ENC_BIG_ENDIAN); } else{ /*CVSE Type of Other vendor, just show raw numbers currently*/ @@ -701,7 +701,7 @@ dissect_mip( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset++; /* lifetime */ - proto_tree_add_item(mip_tree, hf_mip_life, tvb, offset, 2, FALSE); + proto_tree_add_item(mip_tree, hf_mip_life, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; /* home address */ @@ -739,11 +739,11 @@ dissect_mip( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset++; /* Reply Code */ - proto_tree_add_item(mip_tree, hf_mip_code, tvb, offset, 1, FALSE); + proto_tree_add_item(mip_tree, hf_mip_code, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; /* Registration Lifetime */ - proto_tree_add_item(mip_tree, hf_mip_life, tvb, offset, 2, FALSE); + proto_tree_add_item(mip_tree, hf_mip_life, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; /* Home address */ @@ -773,11 +773,11 @@ dissect_mip( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset++; /* Next Header */ - proto_tree_add_item(mip_tree, hf_mip_nattt_nexthdr, tvb, offset, 1, FALSE); + proto_tree_add_item(mip_tree, hf_mip_nattt_nexthdr, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; /* reserved */ - proto_tree_add_item(mip_tree, hf_mip_nattt_reserved, tvb, offset, 2, FALSE); + proto_tree_add_item(mip_tree, hf_mip_nattt_reserved, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; } /* if tree */ else { @@ -804,7 +804,7 @@ dissect_mip( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset++; /* reserved */ - proto_tree_add_item(mip_tree, hf_mip_rev_reserved, tvb, offset, 1, FALSE); + proto_tree_add_item(mip_tree, hf_mip_rev_reserved, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; /* flags */ @@ -831,7 +831,7 @@ dissect_mip( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset += 4; /* revocation identifier */ - proto_tree_add_item(mip_tree, hf_mip_revid, tvb, offset, 4, FALSE); + proto_tree_add_item(mip_tree, hf_mip_revid, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; } /* if tree */ break; @@ -848,7 +848,7 @@ dissect_mip( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset++; /* reserved */ - proto_tree_add_item(mip_tree, hf_mip_ack_reserved, tvb, offset, 1, FALSE); + proto_tree_add_item(mip_tree, hf_mip_ack_reserved, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; /* flags */ @@ -866,7 +866,7 @@ dissect_mip( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset += 4; /* revocation identifier */ - proto_tree_add_item(mip_tree, hf_mip_revid, tvb, offset, 4, FALSE); + proto_tree_add_item(mip_tree, hf_mip_revid, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; } /* if tree */ break; diff --git a/epan/dissectors/packet-mip6.c b/epan/dissectors/packet-mip6.c index 3c2f55ccd3..6692b0476f 100644 --- a/epan/dissectors/packet-mip6.c +++ b/epan/dissectors/packet-mip6.c @@ -908,7 +908,7 @@ dissect_mip6_hoti(tvbuff_t *tvb, proto_tree *mip6_tree, packet_info *pinfo) data_tree = proto_item_add_subtree(ti, ett_mip6); proto_tree_add_item(data_tree, hf_mip6_hoti_cookie, tvb, - MIP6_HOTI_COOKIE_OFF, MIP6_HOTI_COOKIE_LEN, FALSE); + MIP6_HOTI_COOKIE_OFF, MIP6_HOTI_COOKIE_LEN, ENC_BIG_ENDIAN); } return MIP6_DATA_OFF + MIP6_HOTI_LEN; @@ -928,7 +928,7 @@ dissect_mip6_coti(tvbuff_t *tvb, proto_tree *mip6_tree, packet_info *pinfo) data_tree = proto_item_add_subtree(ti, ett_mip6); proto_tree_add_item(data_tree, hf_mip6_coti_cookie, tvb, - MIP6_COTI_COOKIE_OFF, MIP6_COTI_COOKIE_LEN, FALSE); + MIP6_COTI_COOKIE_OFF, MIP6_COTI_COOKIE_LEN, ENC_BIG_ENDIAN); } return MIP6_DATA_OFF + MIP6_COTI_LEN; @@ -948,11 +948,11 @@ dissect_mip6_hot(tvbuff_t *tvb, proto_tree *mip6_tree, packet_info *pinfo) data_tree = proto_item_add_subtree(ti, ett_mip6); proto_tree_add_item(data_tree, hf_mip6_hot_nindex, tvb, - MIP6_HOT_INDEX_OFF, MIP6_HOT_INDEX_LEN, FALSE); + MIP6_HOT_INDEX_OFF, MIP6_HOT_INDEX_LEN, ENC_BIG_ENDIAN); proto_tree_add_item(data_tree, hf_mip6_hot_cookie, tvb, - MIP6_HOT_COOKIE_OFF, MIP6_HOT_COOKIE_LEN, FALSE); + MIP6_HOT_COOKIE_OFF, MIP6_HOT_COOKIE_LEN, ENC_BIG_ENDIAN); proto_tree_add_item(data_tree, hf_mip6_hot_token, tvb, - MIP6_HOT_TOKEN_OFF, MIP6_HOT_TOKEN_LEN, FALSE); + MIP6_HOT_TOKEN_OFF, MIP6_HOT_TOKEN_LEN, ENC_BIG_ENDIAN); } return MIP6_DATA_OFF + MIP6_HOT_LEN; @@ -972,11 +972,11 @@ dissect_mip6_cot(tvbuff_t *tvb, proto_tree *mip6_tree, packet_info *pinfo) data_tree = proto_item_add_subtree(ti, ett_mip6); proto_tree_add_item(data_tree, hf_mip6_cot_nindex, tvb, - MIP6_COT_INDEX_OFF, MIP6_COT_INDEX_LEN, FALSE); + MIP6_COT_INDEX_OFF, MIP6_COT_INDEX_LEN, ENC_BIG_ENDIAN); proto_tree_add_item(data_tree, hf_mip6_cot_cookie, tvb, - MIP6_COT_COOKIE_OFF, MIP6_COT_COOKIE_LEN, FALSE); + MIP6_COT_COOKIE_OFF, MIP6_COT_COOKIE_LEN, ENC_BIG_ENDIAN); proto_tree_add_item(data_tree, hf_mip6_hot_token, tvb, - MIP6_COT_TOKEN_OFF, MIP6_COT_TOKEN_LEN, FALSE); + MIP6_COT_TOKEN_OFF, MIP6_COT_TOKEN_LEN, ENC_BIG_ENDIAN); } return MIP6_DATA_OFF + MIP6_COT_LEN; @@ -998,7 +998,7 @@ dissect_mip6_bu(tvbuff_t *tvb, proto_tree *mip6_tree, packet_info *pinfo) data_tree = proto_item_add_subtree(ti, ett_mip6); proto_tree_add_item(data_tree, hf_mip6_bu_seqnr, tvb, - MIP6_BU_SEQNR_OFF, MIP6_BU_SEQNR_LEN, FALSE); + MIP6_BU_SEQNR_OFF, MIP6_BU_SEQNR_LEN, ENC_BIG_ENDIAN); proto_tree_add_item(data_tree, hf_mip6_bu_a_flag, tvb, MIP6_BU_FLAGS_OFF, MIP6_BU_FLAGS_LEN, FALSE); @@ -1048,7 +1048,7 @@ dissect_mip6_ba(tvbuff_t *tvb, proto_tree *mip6_tree, packet_info *pinfo) data_tree = proto_item_add_subtree(ti, ett_mip6); proto_tree_add_item(data_tree, hf_mip6_ba_status, tvb, - MIP6_BA_STATUS_OFF, MIP6_BA_STATUS_LEN, FALSE); + MIP6_BA_STATUS_OFF, MIP6_BA_STATUS_LEN, ENC_BIG_ENDIAN); proto_tree_add_item(data_tree, hf_mip6_ba_k_flag, tvb, MIP6_BA_FLAGS_OFF, MIP6_BA_FLAGS_LEN, FALSE); proto_tree_add_item(data_tree, hf_mip6_nemo_ba_r_flag, tvb, @@ -1061,7 +1061,7 @@ dissect_mip6_ba(tvbuff_t *tvb, proto_tree *mip6_tree, packet_info *pinfo) proto_nemo = 1; proto_tree_add_item(data_tree, hf_mip6_ba_seqnr, tvb, - MIP6_BA_SEQNR_OFF, MIP6_BA_SEQNR_LEN, FALSE); + MIP6_BA_SEQNR_OFF, MIP6_BA_SEQNR_LEN, ENC_BIG_ENDIAN); lifetime = tvb_get_ntohs(tvb, MIP6_BA_LIFETIME_OFF); proto_tree_add_uint_format(data_tree, hf_mip6_ba_lifetime, tvb, @@ -1088,7 +1088,7 @@ dissect_mip6_be(tvbuff_t *tvb, proto_tree *mip6_tree, packet_info *pinfo) data_tree = proto_item_add_subtree(ti, ett_mip6); proto_tree_add_item(data_tree, hf_mip6_be_status, tvb, - MIP6_BE_STATUS_OFF, MIP6_BE_STATUS_LEN, FALSE); + MIP6_BE_STATUS_OFF, MIP6_BE_STATUS_LEN, ENC_BIG_ENDIAN); proto_tree_add_item(data_tree, hf_mip6_be_haddr, tvb, MIP6_BE_HOA_OFF, MIP6_BE_HOA_LEN, FALSE); } @@ -1115,7 +1115,7 @@ dissect_mip6_hb(tvbuff_t *tvb, proto_tree *mip6_tree, packet_info *pinfo) MIP6_HB_FLAGS_OFF, MIP6_HB_FLAGS_LEN, FALSE); proto_tree_add_item(data_tree, hf_mip6_hb_seqnr, tvb, - MIP6_HB_SEQNR_OFF, MIP6_HB_SEQNR_LEN, FALSE); + MIP6_HB_SEQNR_OFF, MIP6_HB_SEQNR_LEN, ENC_BIG_ENDIAN); } @@ -1154,7 +1154,7 @@ dissect_fmip6_fbu(tvbuff_t *tvb, proto_tree *mip6_tree, packet_info *pinfo) data_tree = proto_item_add_subtree(ti, ett_mip6); proto_tree_add_item(data_tree, hf_fmip6_fbu_seqnr, tvb, - FMIP6_FBU_SEQNR_OFF, FMIP6_FBU_SEQNR_LEN, FALSE); + FMIP6_FBU_SEQNR_OFF, FMIP6_FBU_SEQNR_LEN, ENC_BIG_ENDIAN); proto_tree_add_item(data_tree, hf_fmip6_fbu_a_flag, tvb, FMIP6_FBU_FLAGS_OFF, FMIP6_FBU_FLAGS_LEN, FALSE); @@ -1191,11 +1191,11 @@ dissect_fmip6_fback(tvbuff_t *tvb, proto_tree *mip6_tree, packet_info *pinfo) data_tree = proto_item_add_subtree(ti, ett_mip6); proto_tree_add_item(data_tree, hf_fmip6_fback_status, tvb, - FMIP6_FBACK_STATUS_OFF, FMIP6_FBACK_STATUS_LEN, FALSE); + FMIP6_FBACK_STATUS_OFF, FMIP6_FBACK_STATUS_LEN, ENC_BIG_ENDIAN); proto_tree_add_item(data_tree, hf_fmip6_fback_k_flag, tvb, FMIP6_FBACK_FLAGS_OFF, FMIP6_FBACK_FLAGS_LEN, FALSE); proto_tree_add_item(data_tree, hf_fmip6_fback_seqnr, tvb, - FMIP6_FBACK_SEQNR_OFF, FMIP6_FBACK_SEQNR_LEN, FALSE); + FMIP6_FBACK_SEQNR_OFF, FMIP6_FBACK_SEQNR_LEN, ENC_BIG_ENDIAN); lifetime = tvb_get_ntohs(tvb, FMIP6_FBACK_LIFETIME_OFF); proto_tree_add_uint_format(data_tree, hf_fmip6_fback_lifetime, tvb, FMIP6_FBACK_LIFETIME_OFF, @@ -1250,13 +1250,13 @@ dissect_pmip6_bri(tvbuff_t *tvb, proto_tree *mip6_tree, packet_info *pinfo) field_tree = proto_item_add_subtree(ti, ett_mip6); proto_tree_add_item(field_tree, hf_pmip6_bri_brtype, tvb, - PMIP6_BRI_BRTYPE_OFF, PMIP6_BRI_BRTYPE_LEN, FALSE); + PMIP6_BRI_BRTYPE_OFF, PMIP6_BRI_BRTYPE_LEN, ENC_BIG_ENDIAN); proto_tree_add_item(field_tree, hf_pmip6_bri_rtrigger, tvb, - PMIP6_BRI_RTRIGGER_OFF, PMIP6_BRI_RTRIGGER_LEN, FALSE); + PMIP6_BRI_RTRIGGER_OFF, PMIP6_BRI_RTRIGGER_LEN, ENC_BIG_ENDIAN); proto_tree_add_item(field_tree, hf_pmip6_bri_seqnr, tvb, - PMIP6_BRI_SEQNR_OFF, PMIP6_BRI_SEQNR_LEN, FALSE); + PMIP6_BRI_SEQNR_OFF, PMIP6_BRI_SEQNR_LEN, ENC_BIG_ENDIAN); proto_tree_add_item(field_tree, hf_pmip6_bri_ip_flag, tvb, PMIP6_BRI_FLAGS_OFF, PMIP6_BRI_FLAGS_LEN, FALSE); @@ -1268,7 +1268,7 @@ dissect_pmip6_bri(tvbuff_t *tvb, proto_tree *mip6_tree, packet_info *pinfo) PMIP6_BRI_FLAGS_OFF, PMIP6_BRI_FLAGS_LEN, FALSE); proto_tree_add_item(field_tree, hf_pmip6_bri_res, tvb, - PMIP6_BRI_RES_OFF, PMIP6_BRI_RES_LEN, FALSE); + PMIP6_BRI_RES_OFF, PMIP6_BRI_RES_LEN, ENC_BIG_ENDIAN); } } else if ( br_type == ACKNOWLEDGE ) { if (check_col(pinfo->cinfo, COL_INFO)) @@ -1282,13 +1282,13 @@ dissect_pmip6_bri(tvbuff_t *tvb, proto_tree *mip6_tree, packet_info *pinfo) field_tree = proto_item_add_subtree(ti, ett_mip6); proto_tree_add_item(field_tree, hf_pmip6_bri_brtype, tvb, - PMIP6_BRI_BRTYPE_OFF, PMIP6_BRI_BRTYPE_LEN, FALSE); + PMIP6_BRI_BRTYPE_OFF, PMIP6_BRI_BRTYPE_LEN, ENC_BIG_ENDIAN); proto_tree_add_item(field_tree, hf_pmip6_bri_status, tvb, - PMIP6_BRI_STATUS_OFF, PMIP6_BRI_STATUS_LEN, FALSE); + PMIP6_BRI_STATUS_OFF, PMIP6_BRI_STATUS_LEN, ENC_BIG_ENDIAN); proto_tree_add_item(field_tree, hf_pmip6_bri_seqnr, tvb, - PMIP6_BRI_SEQNR_OFF, PMIP6_BRI_SEQNR_LEN, FALSE); + PMIP6_BRI_SEQNR_OFF, PMIP6_BRI_SEQNR_LEN, ENC_BIG_ENDIAN); proto_tree_add_item(field_tree, hf_pmip6_bri_ap_flag, tvb, PMIP6_BRI_FLAGS_OFF, PMIP6_BRI_FLAGS_LEN, FALSE); @@ -1297,7 +1297,7 @@ dissect_pmip6_bri(tvbuff_t *tvb, proto_tree *mip6_tree, packet_info *pinfo) PMIP6_BRI_FLAGS_OFF, PMIP6_BRI_FLAGS_LEN, FALSE); proto_tree_add_item(field_tree, hf_pmip6_bri_res, tvb, - PMIP6_BRI_RES_OFF, PMIP6_BRI_RES_LEN, FALSE); + PMIP6_BRI_RES_OFF, PMIP6_BRI_RES_LEN, ENC_BIG_ENDIAN); } } @@ -1347,7 +1347,7 @@ dissect_mip6_nemo_opt_mnp(const ip_tcp_opt *optp _U_, tvbuff_t *tvb, int offset, tf = proto_tree_add_text(opt_tree, tvb, offset, optlen, "%s", optp->name); field_tree = proto_item_add_subtree(tf, *optp->subtree_index); proto_tree_add_item(field_tree, hf_mip6_nemo_mnp_pfl, tvb, - offset + MIP6_NEMO_MNP_PL_OFF, 1, FALSE); + offset + MIP6_NEMO_MNP_PL_OFF, 1, ENC_BIG_ENDIAN); proto_tree_add_item(field_tree, hf_mip6_nemo_mnp_mnp, tvb, offset + MIP6_NEMO_MNP_MNP_OFF, MIP6_NEMO_MNP_MNP_LEN, FALSE); @@ -1365,9 +1365,9 @@ dissect_mip6_opt_ni(const ip_tcp_opt *optp, tvbuff_t *tvb, int offset, field_tree = proto_item_add_subtree(tf, *optp->subtree_index); proto_tree_add_item(field_tree, hf_mip6_ni_hni, tvb, - offset + MIP6_NI_HNI_OFF, MIP6_NI_HNI_LEN, FALSE); + offset + MIP6_NI_HNI_OFF, MIP6_NI_HNI_LEN, ENC_BIG_ENDIAN); proto_tree_add_item(field_tree, hf_mip6_ni_cni, tvb, - offset + MIP6_NI_CNI_OFF, MIP6_NI_CNI_LEN, FALSE); + offset + MIP6_NI_CNI_OFF, MIP6_NI_CNI_LEN, ENC_BIG_ENDIAN); } /* 5 Authorization Data */ @@ -1401,7 +1401,7 @@ dissect_fmip6_opt_lla(const ip_tcp_opt *optp _U_, tvbuff_t *tvb, int offset, field_tree = proto_item_add_subtree(tf, *optp->subtree_index); proto_tree_add_item(field_tree, hf_fmip6_lla_optcode, tvb, - offset + FMIP6_LLA_OPTCODE_OFF, FMIP6_LLA_OPTCODE_LEN, FALSE); + offset + FMIP6_LLA_OPTCODE_OFF, FMIP6_LLA_OPTCODE_LEN, ENC_BIG_ENDIAN); p = offset + FMIP6_LLA_LLA_OFF; len = optlen - FMIP6_LLA_LLA_OFF; @@ -1451,7 +1451,7 @@ dissect_mip6_opt_mnid(const ip_tcp_opt *optp _U_, tvbuff_t *tvb, int offset, field_tree = proto_item_add_subtree(tf, *optp->subtree_index); proto_tree_add_item(field_tree, hf_mip6_mnid_subtype, tvb, - offset + MIP6_MNID_SUBTYPE_OFF, MIP6_MNID_SUBTYPE_LEN, FALSE); + offset + MIP6_MNID_SUBTYPE_OFF, MIP6_MNID_SUBTYPE_LEN, ENC_BIG_ENDIAN); p = offset + MIP6_MNID_MNID_OFF; len = optlen - MIP6_MNID_MNID_OFF; @@ -1475,7 +1475,7 @@ dissect_mip6_opt_vsm(const ip_tcp_opt *optp _U_, tvbuff_t *tvb, int offset, field_tree = proto_item_add_subtree(tf, *optp->subtree_index); proto_tree_add_item(field_tree, hf_mip6_vsm_vid, tvb, - offset + MIP6_VSM_VID_OFF, MIP6_VSM_VID_LEN, FALSE); + offset + MIP6_VSM_VID_OFF, MIP6_VSM_VID_LEN, ENC_BIG_ENDIAN); vendorid = tvb_get_ntohl(tvb, offset+MIP6_VSM_VID_OFF); switch (vendorid) { @@ -1517,7 +1517,7 @@ dissect_pmip6_opt_hi(const ip_tcp_opt *optp _U_, tvbuff_t *tvb, int offset, { proto_tree_add_item(opt_tree, hf_pmip6_hi_opttype, tvb, - offset + PMIP6_HI_HI_OFF, PMIP6_HI_HI_LEN, FALSE); + offset + PMIP6_HI_HI_OFF, PMIP6_HI_HI_LEN, ENC_BIG_ENDIAN); } /* 24 Access Technology Type Option [RFC5213] */ @@ -1527,7 +1527,7 @@ dissect_pmip6_opt_att(const ip_tcp_opt *optp _U_, tvbuff_t *tvb, int offset, { proto_tree_add_item(opt_tree, hf_pmip6_att_opttype, tvb, - offset + PMIP6_ATT_ATT_OFF, PMIP6_ATT_ATT_LEN, FALSE); + offset + PMIP6_ATT_ATT_OFF, PMIP6_ATT_ATT_LEN, ENC_BIG_ENDIAN); } /* 26 Link-local Address Option [RFC5213 */ @@ -1560,7 +1560,7 @@ dissect_pmip6_opt_rc(const ip_tcp_opt *optp _U_, tvbuff_t *tvb, int offset, guint optlen _U_, packet_info *pinfo _U_, proto_tree *opt_tree) { proto_tree_add_item(opt_tree, hf_pmip6_rc, tvb, - offset + PMIP6_RC_RC_OFF, PMIP6_RC_RC_LEN, FALSE); + offset + PMIP6_RC_RC_OFF, PMIP6_RC_RC_LEN, ENC_BIG_ENDIAN); } @@ -1579,7 +1579,7 @@ dissect_pmip6_opt_ipv4ha(const ip_tcp_opt *optp _U_, tvbuff_t *tvb, int offset, p = offset + MIP6_IPV4HA_PREFIXL_OFF; len = MIP6_IPV4HA_PREFIXL_LEN; - proto_tree_add_item(field_tree, hf_mip6_ipv4ha_preflen, tvb, p, len, FALSE); + proto_tree_add_item(field_tree, hf_mip6_ipv4ha_preflen, tvb, p, len, ENC_BIG_ENDIAN); proto_tree_add_item(field_tree, hf_mip6_ipv4ha_p_flag, tvb, p, len+1, FALSE); proto_tree_add_item(field_tree, hf_mip6_ipv4ha_ha, tvb, @@ -1599,10 +1599,10 @@ dissect_pmip6_opt_ipv4aa(const ip_tcp_opt *optp _U_, tvbuff_t *tvb, int offset, field_tree = proto_item_add_subtree(tf, *optp->subtree_index); proto_tree_add_item(field_tree, hf_mip6_ipv4aa_status, tvb, - offset + MIP6_IPV4AA_STATUS_OFF, MIP6_IPV4AA_STATUS_LEN, FALSE); + offset + MIP6_IPV4AA_STATUS_OFF, MIP6_IPV4AA_STATUS_LEN, ENC_BIG_ENDIAN); proto_tree_add_item(field_tree, hf_mip6_ipv4ha_preflen, tvb, - offset + MIP6_IPV4AA_PREFIXL_OFF, MIP6_IPV4AA_PREFIXL_LEN, FALSE); + offset + MIP6_IPV4AA_PREFIXL_OFF, MIP6_IPV4AA_PREFIXL_LEN, ENC_BIG_ENDIAN); proto_tree_add_item(field_tree, hf_mip6_ipv4ha_ha, tvb, offset + MIP6_IPV4AA_HA_OFF, MIP6_IPV4AA_HA_LEN, FALSE); @@ -1615,7 +1615,7 @@ dissect_pmip6_opt_grek(const ip_tcp_opt *optp _U_, tvbuff_t *tvb, int offset, guint optlen _U_, packet_info *pinfo _U_, proto_tree *opt_tree) { proto_tree_add_item(opt_tree, hf_pmip6_gre_key, tvb, - offset + PMIP6_GREK_ID_OFF, PMIP6_GREK_ID_LEN, FALSE); + offset + PMIP6_GREK_ID_OFF, PMIP6_GREK_ID_LEN, ENC_BIG_ENDIAN); } @@ -1631,7 +1631,7 @@ dissect_pmip6_opt_ipv4hareq(const ip_tcp_opt *optp _U_, tvbuff_t *tvb, int offse field_tree = proto_item_add_subtree(tf, *optp->subtree_index); proto_tree_add_item(field_tree, hf_mip6_ipv4ha_preflen, tvb, - offset + MIP6_IPV4HAREQ_PREFIXL_OFF, MIP6_IPV4HAREQ_PREFIXL_LEN, FALSE); + offset + MIP6_IPV4HAREQ_PREFIXL_OFF, MIP6_IPV4HAREQ_PREFIXL_LEN, ENC_BIG_ENDIAN); proto_tree_add_item(field_tree, hf_mip6_ipv4ha_ha, tvb, offset + MIP6_IPV4HAREQ_HA_OFF, MIP6_IPV4HAREQ_HA_LEN, FALSE); @@ -1650,10 +1650,10 @@ dissect_pmip6_opt_ipv4harep(const ip_tcp_opt *optp _U_, tvbuff_t *tvb, int offse field_tree = proto_item_add_subtree(tf, *optp->subtree_index); proto_tree_add_item(field_tree, hf_mip6_ipv4aa_status, tvb, - offset + MIP6_IPV4HAREP_STATUS_OFF, MIP6_IPV4HAREP_STATUS_LEN, FALSE); + offset + MIP6_IPV4HAREP_STATUS_OFF, MIP6_IPV4HAREP_STATUS_LEN, ENC_BIG_ENDIAN); proto_tree_add_item(field_tree, hf_mip6_ipv4ha_preflen, tvb, - offset + MIP6_IPV4HAREP_PREFIXL_OFF, MIP6_IPV4HAREP_PREFIXL_LEN, FALSE); + offset + MIP6_IPV4HAREP_PREFIXL_OFF, MIP6_IPV4HAREP_PREFIXL_LEN, ENC_BIG_ENDIAN); proto_tree_add_item(field_tree, hf_mip6_ipv4ha_ha, tvb, offset + MIP6_IPV4HAREP_HA_OFF, MIP6_IPV4HAREP_HA_LEN, FALSE); @@ -1945,7 +1945,7 @@ dissect_mipv6_options(tvbuff_t *tvb, int offset, guint length, len, plurality(len, "", "s"), optlen); return; } else { - ti = proto_tree_add_item(opt_tree, hf_mip6_mobility_opt, tvb, offset, 1, FALSE); + ti = proto_tree_add_item(opt_tree, hf_mip6_mobility_opt, tvb, offset, 1, ENC_BIG_ENDIAN); if (optp == NULL) { proto_item *expert_item; proto_item_append_text(ti, "(%u byte%s)",len, plurality(len, "", "s")); @@ -2039,13 +2039,13 @@ dissect_mip6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) len); proto_tree_add_item(mip6_tree, hf_mip6_mhtype, tvb, - MIP6_TYPE_OFF, 1, FALSE); + MIP6_TYPE_OFF, 1, ENC_BIG_ENDIAN); proto_tree_add_item(mip6_tree, hf_mip6_reserved, tvb, - MIP6_RES_OFF, 1, FALSE); + MIP6_RES_OFF, 1, ENC_BIG_ENDIAN); proto_tree_add_item(mip6_tree, hf_mip6_csum, tvb, - MIP6_CSUM_OFF, 2, FALSE); + MIP6_CSUM_OFF, 2, ENC_BIG_ENDIAN); } /* Process mobility header */ diff --git a/epan/dissectors/packet-mount.c b/epan/dissectors/packet-mount.c index 7a1ebe3260..df584f39b5 100644 --- a/epan/dissectors/packet-mount.c +++ b/epan/dissectors/packet-mount.c @@ -493,7 +493,7 @@ dissect_mount_pathconf_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, if (tree) { lock_item = proto_tree_add_item(tree, hf_mount_pathconf_mask, tvb, - offset+2, 2, FALSE); + offset+2, 2, ENC_BIG_ENDIAN); lock_tree = proto_item_add_subtree(lock_item, ett_mount_pathconf_mask); proto_tree_add_boolean(lock_tree, hf_mount_pathconf_error_all, tvb, @@ -718,7 +718,7 @@ dissect_mount_statvfs_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, p if (tree) { flag_item = proto_tree_add_item(tree, hf_mount_statvfs_flag, - tvb, offset, 4, FALSE); + tvb, offset, 4, ENC_BIG_ENDIAN); if (flag_item) { flag_tree = proto_item_add_subtree(flag_item, ett_mount_statvfs_flag); diff --git a/epan/dissectors/packet-mp2t.c b/epan/dissectors/packet-mp2t.c index 7b0bbc840f..4b03533395 100644 --- a/epan/dissectors/packet-mp2t.c +++ b/epan/dissectors/packet-mp2t.c @@ -785,17 +785,17 @@ dissect_tsp(tvbuff_t *tvb, volatile gint offset, packet_info *pinfo, cc = (header & MP2T_CC_MASK) >> MP2T_CC_SHIFT; proto_item_append_text(ti, " PID=0x%x CC=%d", pid, cc); - hi = proto_tree_add_item( mp2t_tree, hf_mp2t_header, tvb, offset, 4, FALSE); + hi = proto_tree_add_item( mp2t_tree, hf_mp2t_header, tvb, offset, 4, ENC_BIG_ENDIAN); mp2t_header_tree = proto_item_add_subtree( hi, ett_mp2t_header ); - proto_tree_add_item( mp2t_header_tree, hf_mp2t_sync_byte, tvb, offset, 4, FALSE); - proto_tree_add_item( mp2t_header_tree, hf_mp2t_tei, tvb, offset, 4, FALSE); - proto_tree_add_item( mp2t_header_tree, hf_mp2t_pusi, tvb, offset, 4, FALSE); - proto_tree_add_item( mp2t_header_tree, hf_mp2t_tp, tvb, offset, 4, FALSE); - proto_tree_add_item( mp2t_header_tree, hf_mp2t_pid, tvb, offset, 4, FALSE); - proto_tree_add_item( mp2t_header_tree, hf_mp2t_tsc, tvb, offset, 4, FALSE); - proto_tree_add_item( mp2t_header_tree, hf_mp2t_afc, tvb, offset, 4, FALSE); - proto_tree_add_item( mp2t_header_tree, hf_mp2t_cc, tvb, offset, 4, FALSE); + proto_tree_add_item( mp2t_header_tree, hf_mp2t_sync_byte, tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item( mp2t_header_tree, hf_mp2t_tei, tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item( mp2t_header_tree, hf_mp2t_pusi, tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item( mp2t_header_tree, hf_mp2t_tp, tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item( mp2t_header_tree, hf_mp2t_pid, tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item( mp2t_header_tree, hf_mp2t_tsc, tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item( mp2t_header_tree, hf_mp2t_afc, tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item( mp2t_header_tree, hf_mp2t_cc, tvb, offset, 4, ENC_BIG_ENDIAN); /* If this is a DOCSIS packet - reassemble MPEG frames and call DOCSIS dissector */ if (((header & MP2T_PID_MASK) >> MP2T_PID_SHIFT) == 0x1FFE) { @@ -827,7 +827,7 @@ dissect_tsp(tvbuff_t *tvb, volatile gint offset, packet_info *pinfo, af_length = tvb_get_guint8(tvb, offset); - proto_tree_add_item( mp2t_tree, hf_mp2t_af_length, tvb, offset, 1, FALSE); + proto_tree_add_item( mp2t_tree, hf_mp2t_af_length, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; /* fix issues where afc==3 but af_length==0 * Adaptaion field...spec section 2.4.3.5: The value 0 is for inserting a single @@ -840,14 +840,14 @@ dissect_tsp(tvbuff_t *tvb, volatile gint offset, packet_info *pinfo, af_flags = tvb_get_guint8(tvb, offset); - proto_tree_add_item( mp2t_af_tree, hf_mp2t_af_di, tvb, offset, 1, FALSE); - proto_tree_add_item( mp2t_af_tree, hf_mp2t_af_rai, tvb, offset, 1, FALSE); - proto_tree_add_item( mp2t_af_tree, hf_mp2t_af_espi, tvb, offset, 1, FALSE); - proto_tree_add_item( mp2t_af_tree, hf_mp2t_af_pcr_flag, tvb, offset, 1, FALSE); - proto_tree_add_item( mp2t_af_tree, hf_mp2t_af_opcr_flag, tvb, offset, 1, FALSE); - proto_tree_add_item( mp2t_af_tree, hf_mp2t_af_sp_flag, tvb, offset, 1, FALSE); - proto_tree_add_item( mp2t_af_tree, hf_mp2t_af_tpd_flag, tvb, offset, 1, FALSE); - proto_tree_add_item( mp2t_af_tree, hf_mp2t_af_afe_flag, tvb, offset, 1, FALSE); + proto_tree_add_item( mp2t_af_tree, hf_mp2t_af_di, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item( mp2t_af_tree, hf_mp2t_af_rai, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item( mp2t_af_tree, hf_mp2t_af_espi, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item( mp2t_af_tree, hf_mp2t_af_pcr_flag, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item( mp2t_af_tree, hf_mp2t_af_opcr_flag, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item( mp2t_af_tree, hf_mp2t_af_sp_flag, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item( mp2t_af_tree, hf_mp2t_af_tpd_flag, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item( mp2t_af_tree, hf_mp2t_af_afe_flag, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; @@ -924,7 +924,7 @@ dissect_tsp(tvbuff_t *tvb, volatile gint offset, packet_info *pinfo, } if (af_flags & MP2T_AF_SP_MASK) { - proto_tree_add_item( mp2t_af_tree, hf_mp2t_af_sc, tvb, offset, 1, FALSE); + proto_tree_add_item( mp2t_af_tree, hf_mp2t_af_sc, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; } @@ -932,7 +932,7 @@ dissect_tsp(tvbuff_t *tvb, volatile gint offset, packet_info *pinfo, guint8 tpd_len; tpd_len = tvb_get_guint8(tvb, offset); - proto_tree_add_item( mp2t_af_tree, hf_mp2t_af_tpd_length, tvb, offset, 1, FALSE); + proto_tree_add_item( mp2t_af_tree, hf_mp2t_af_tpd_length, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; proto_tree_add_item( mp2t_af_tree, hf_mp2t_af_tpd, tvb, offset, tpd_len, ENC_NA); @@ -946,38 +946,38 @@ dissect_tsp(tvbuff_t *tvb, volatile gint offset, packet_info *pinfo, gint reserved_len = 0; e_len = tvb_get_guint8(tvb, offset); - proto_tree_add_item( mp2t_af_tree, hf_mp2t_af_e_length, tvb, offset, 1, FALSE); + proto_tree_add_item( mp2t_af_tree, hf_mp2t_af_e_length, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; e_flags = tvb_get_guint8(tvb, offset); - proto_tree_add_item( mp2t_af_tree, hf_mp2t_af_e_ltw_flag, tvb, offset, 1, FALSE); - proto_tree_add_item( mp2t_af_tree, hf_mp2t_af_e_pr_flag, tvb, offset, 1, FALSE); - proto_tree_add_item( mp2t_af_tree, hf_mp2t_af_e_ss_flag, tvb, offset, 1, FALSE); - proto_tree_add_item( mp2t_af_tree, hf_mp2t_af_e_reserved, tvb, offset, 1, FALSE); + proto_tree_add_item( mp2t_af_tree, hf_mp2t_af_e_ltw_flag, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item( mp2t_af_tree, hf_mp2t_af_e_pr_flag, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item( mp2t_af_tree, hf_mp2t_af_e_ss_flag, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item( mp2t_af_tree, hf_mp2t_af_e_reserved, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; if (e_flags & MP2T_AF_E_LTW_FLAG_MASK) { - proto_tree_add_item( mp2t_af_tree, hf_mp2t_af_e_ltwv_flag, tvb, offset, 2, FALSE); - proto_tree_add_item( mp2t_af_tree, hf_mp2t_af_e_ltwo, tvb, offset, 2, FALSE); + proto_tree_add_item( mp2t_af_tree, hf_mp2t_af_e_ltwv_flag, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item( mp2t_af_tree, hf_mp2t_af_e_ltwo, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; } if (e_flags & MP2T_AF_E_PR_FLAG_MASK) { - proto_tree_add_item( mp2t_af_tree, hf_mp2t_af_e_pr_reserved, tvb, offset, 3, FALSE); - proto_tree_add_item( mp2t_af_tree, hf_mp2t_af_e_pr, tvb, offset, 3, FALSE); + proto_tree_add_item( mp2t_af_tree, hf_mp2t_af_e_pr_reserved, tvb, offset, 3, ENC_BIG_ENDIAN); + proto_tree_add_item( mp2t_af_tree, hf_mp2t_af_e_pr, tvb, offset, 3, ENC_BIG_ENDIAN); offset += 3; } if (e_flags & MP2T_AF_E_SS_FLAG_MASK) { - proto_tree_add_item( mp2t_af_tree, hf_mp2t_af_e_st, tvb, offset, 1, FALSE); + proto_tree_add_item( mp2t_af_tree, hf_mp2t_af_e_st, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item( mp2t_af_tree, hf_mp2t_af_e_dnau_32_30, tvb, offset, 1, FALSE); - proto_tree_add_item( mp2t_af_tree, hf_mp2t_af_e_m_1, tvb, offset, 1, FALSE); + proto_tree_add_item( mp2t_af_tree, hf_mp2t_af_e_m_1, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; proto_tree_add_item( mp2t_af_tree, hf_mp2t_af_e_dnau_29_15, tvb, offset, 2, FALSE); - proto_tree_add_item( mp2t_af_tree, hf_mp2t_af_e_m_2, tvb, offset, 2, FALSE); + proto_tree_add_item( mp2t_af_tree, hf_mp2t_af_e_m_2, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item( mp2t_af_tree, hf_mp2t_af_e_dnau_14_0, tvb, offset, 2, FALSE); - proto_tree_add_item( mp2t_af_tree, hf_mp2t_af_e_m_3, tvb, offset, 2, FALSE); + proto_tree_add_item( mp2t_af_tree, hf_mp2t_af_e_m_3, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; } diff --git a/epan/dissectors/packet-mpls-echo.c b/epan/dissectors/packet-mpls-echo.c index b2e258cf36..27b74ead5c 100644 --- a/epan/dissectors/packet-mpls-echo.c +++ b/epan/dissectors/packet-mpls-echo.c @@ -334,7 +334,7 @@ dissect_mpls_echo_tlv_fec(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem val_to_str(type, mpls_echo_tlv_fec_names, "Unknown sub-TLV type"), saved_type); proto_tree_add_item(tlv_fec_tree, hf_mpls_echo_tlv_fec_len, tvb, offset + 2, - 2, FALSE); + 2, ENC_BIG_ENDIAN); if (length + 4 > rem){ proto_tree_add_text(tlv_fec_tree, tvb, offset, rem, @@ -349,7 +349,7 @@ dissect_mpls_echo_tlv_fec(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem proto_tree_add_item(tlv_fec_tree, hf_mpls_echo_tlv_fec_ldp_ipv4, tvb, offset + 4, 4, FALSE); proto_tree_add_item(tlv_fec_tree, hf_mpls_echo_tlv_fec_ldp_ipv4_mask, - tvb, offset + 8, 1, FALSE); + tvb, offset + 8, 1, ENC_BIG_ENDIAN); if (length == 8) proto_tree_add_text(tlv_fec_tree, tvb, offset + 9, 3, "Padding"); break; @@ -357,7 +357,7 @@ dissect_mpls_echo_tlv_fec(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem proto_tree_add_item(tlv_fec_tree, hf_mpls_echo_tlv_fec_ldp_ipv6, tvb, offset + 4, 16, FALSE); proto_tree_add_item(tlv_fec_tree, hf_mpls_echo_tlv_fec_ldp_ipv6_mask, - tvb, offset + 20, 1, FALSE); + tvb, offset + 20, 1, ENC_BIG_ENDIAN); if (length == 20) proto_tree_add_text(tlv_fec_tree, tvb, offset + 21, 3, "Padding"); break; @@ -370,21 +370,21 @@ dissect_mpls_echo_tlv_fec(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem proto_tree_add_item(tlv_fec_tree, hf_mpls_echo_tlv_fec_rsvp_ipv4_ipv4_endpoint, tvb, offset + 4, 4, FALSE); proto_tree_add_item(tlv_fec_tree, hf_mpls_echo_tlv_fec_rsvp_ip_mbz1, - tvb, offset + 8, 2, FALSE); + tvb, offset + 8, 2, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_fec_tree, hf_mpls_echo_tlv_fec_rsvp_ip_tunnel_id, - tvb, offset + 10, 2, FALSE); + tvb, offset + 10, 2, ENC_BIG_ENDIAN); proto_tree_add_text(tlv_fec_tree, tvb, offset + 12, 4, "Extended Tunnel ID: 0x%08X (%s)", tvb_get_ntohl(tvb, offset + 12), tvb_ip_to_str(tvb, offset + 12)); hidden_item = proto_tree_add_item(tlv_fec_tree, hf_mpls_echo_tlv_fec_rsvp_ipv4_ext_tunnel_id, - tvb, offset + 12, 4, FALSE); + tvb, offset + 12, 4, ENC_BIG_ENDIAN); PROTO_ITEM_SET_HIDDEN(hidden_item); proto_tree_add_item(tlv_fec_tree, hf_mpls_echo_tlv_fec_rsvp_ipv4_ipv4_sender, tvb, offset + 16, 4, FALSE); proto_tree_add_item(tlv_fec_tree, hf_mpls_echo_tlv_fec_rsvp_ip_mbz2, - tvb, offset + 20, 2, FALSE); + tvb, offset + 20, 2, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_fec_tree, hf_mpls_echo_tlv_fec_rsvp_ip_lsp_id, - tvb, offset + 22, 2, FALSE); + tvb, offset + 22, 2, ENC_BIG_ENDIAN); break; case TLV_FEC_STACK_RSVP_IPv6: if (length != 56){ @@ -395,9 +395,9 @@ dissect_mpls_echo_tlv_fec(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem proto_tree_add_item(tlv_fec_tree, hf_mpls_echo_tlv_fec_rsvp_ipv6_ipv6_endpoint, tvb, offset + 4, 16, FALSE); proto_tree_add_item(tlv_fec_tree, hf_mpls_echo_tlv_fec_rsvp_ip_mbz1, - tvb, offset + 20, 2, FALSE); + tvb, offset + 20, 2, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_fec_tree, hf_mpls_echo_tlv_fec_rsvp_ip_tunnel_id, - tvb, offset + 22, 2, FALSE); + tvb, offset + 22, 2, ENC_BIG_ENDIAN); proto_tree_add_text(tlv_fec_tree, tvb, offset + 24, 16, "Extended Tunnel ID: 0x%s (%s)", tvb_bytes_to_str(tvb, offset + 24, 16), @@ -408,19 +408,19 @@ dissect_mpls_echo_tlv_fec(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem proto_tree_add_item(tlv_fec_tree, hf_mpls_echo_tlv_fec_rsvp_ipv6_ipv6_sender, tvb, offset + 40, 16, FALSE); proto_tree_add_item(tlv_fec_tree, hf_mpls_echo_tlv_fec_rsvp_ip_mbz2, - tvb, offset + 56, 2, FALSE); + tvb, offset + 56, 2, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_fec_tree, hf_mpls_echo_tlv_fec_rsvp_ip_lsp_id, - tvb, offset + 58, 2, FALSE); + tvb, offset + 58, 2, ENC_BIG_ENDIAN); break; case TLV_FEC_STACK_L2_CID_OLD: proto_tree_add_item(tlv_fec_tree, hf_mpls_echo_tlv_fec_l2cid_remote, tvb, offset + 4, 4, FALSE); proto_tree_add_item(tlv_fec_tree, hf_mpls_echo_tlv_fec_l2cid_vcid, - tvb, offset + 8, 4, FALSE); + tvb, offset + 8, 4, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_fec_tree, hf_mpls_echo_tlv_fec_l2cid_encap, - tvb, offset + 12, 2, FALSE); + tvb, offset + 12, 2, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_fec_tree, hf_mpls_echo_tlv_fec_l2cid_mbz, - tvb, offset + 14, 2, FALSE); + tvb, offset + 14, 2, ENC_BIG_ENDIAN); break; case TLV_FEC_STACK_L2_CID_NEW: if (length < 14){ @@ -433,11 +433,11 @@ dissect_mpls_echo_tlv_fec(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem proto_tree_add_item(tlv_fec_tree, hf_mpls_echo_tlv_fec_l2cid_remote, tvb, offset + 8, 4, FALSE); proto_tree_add_item(tlv_fec_tree, hf_mpls_echo_tlv_fec_l2cid_vcid, - tvb, offset + 12, 4, FALSE); + tvb, offset + 12, 4, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_fec_tree, hf_mpls_echo_tlv_fec_l2cid_encap, - tvb, offset + 16, 2, FALSE); + tvb, offset + 16, 2, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_fec_tree, hf_mpls_echo_tlv_fec_l2cid_mbz, - tvb, offset + 18, 2, FALSE); + tvb, offset + 18, 2, ENC_BIG_ENDIAN); break; case TLV_FEC_VENDOR_PRIVATE_START: if (length < 4) { /* SMI Enterprise code */ @@ -446,7 +446,7 @@ dissect_mpls_echo_tlv_fec(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem length); } else { proto_tree_add_item(tlv_fec_tree, hf_mpls_echo_tlv_vendor, tvb, - offset + 4, 4, FALSE); + offset + 4, 4, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_fec_tree, hf_mpls_echo_tlv_value, tvb, offset + 8, length - 4, ENC_NA); } @@ -457,7 +457,7 @@ dissect_mpls_echo_tlv_fec(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem proto_tree_add_item(tlv_fec_tree, hf_mpls_echo_tlv_fec_bgp_ipv4, tvb, offset + 8, 4, FALSE); proto_tree_add_item(tlv_fec_tree, hf_mpls_echo_tlv_fec_bgp_len, - tvb, offset + 12, 1, FALSE); + tvb, offset + 12, 1, ENC_BIG_ENDIAN); if (length == 12) proto_tree_add_text(tlv_fec_tree, tvb, offset + 13, 3, "Padding"); break; @@ -465,7 +465,7 @@ dissect_mpls_echo_tlv_fec(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem proto_tree_add_item(tlv_fec_tree, hf_mpls_echo_tlv_fec_gen_ipv4, tvb, offset + 4, 4, FALSE); proto_tree_add_item(tlv_fec_tree, hf_mpls_echo_tlv_fec_gen_ipv4_mask, - tvb, offset + 8, 1, FALSE); + tvb, offset + 8, 1, ENC_BIG_ENDIAN); if (length == 8) proto_tree_add_text(tlv_fec_tree, tvb, offset + 9, 3, "Padding"); break; @@ -473,7 +473,7 @@ dissect_mpls_echo_tlv_fec(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem proto_tree_add_item(tlv_fec_tree, hf_mpls_echo_tlv_fec_gen_ipv6, tvb, offset + 4, 16, FALSE); proto_tree_add_item(tlv_fec_tree, hf_mpls_echo_tlv_fec_gen_ipv6_mask, - tvb, offset + 20, 1, FALSE); + tvb, offset + 20, 1, ENC_BIG_ENDIAN); if (length == 20) proto_tree_add_text(tlv_fec_tree, tvb, offset + 21, 3, "Padding"); break; @@ -543,15 +543,15 @@ dissect_mpls_echo_tlv_ds_map(tvbuff_t *tvb, guint offset, proto_tree *tree, int guint8 hash_type, addr_type; proto_tree_add_item(tree, hf_mpls_echo_tlv_ds_map_mtu, tvb, - offset, 2, FALSE); + offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_mpls_echo_tlv_ds_map_addr_type, tvb, - offset + 2, 1, FALSE); + offset + 2, 1, ENC_BIG_ENDIAN); ti = proto_tree_add_item(tree, hf_mpls_echo_tlv_ds_map_res, tvb, - offset + 3, 1, FALSE); + offset + 3, 1, ENC_BIG_ENDIAN); tlv_ds_map_tree = proto_item_add_subtree(ti, ett_mpls_echo_tlv_ds_map); proto_tree_add_item(tlv_ds_map_tree, hf_mpls_echo_tlv_ds_map_flag_res, tvb, - offset + 3, 1, FALSE); + offset + 3, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_ds_map_tree, hf_mpls_echo_tlv_ds_map_flag_i, tvb, offset + 3, 1, FALSE); proto_tree_add_item(tlv_ds_map_tree, hf_mpls_echo_tlv_ds_map_flag_n, tvb, @@ -570,7 +570,7 @@ dissect_mpls_echo_tlv_ds_map(tvbuff_t *tvb, guint offset, proto_tree *tree, int proto_tree_add_item(tree, hf_mpls_echo_tlv_ds_map_ds_ip, tvb, offset + 4, 4, FALSE); proto_tree_add_item(tree, hf_mpls_echo_tlv_ds_map_if_index, tvb, - offset + 8, 4, FALSE); + offset + 8, 4, ENC_BIG_ENDIAN); break; case TLV_ADDR_IPv6: proto_tree_add_item(tree, hf_mpls_echo_tlv_ds_map_ds_ipv6, tvb, @@ -587,11 +587,11 @@ dissect_mpls_echo_tlv_ds_map(tvbuff_t *tvb, guint offset, proto_tree *tree, int break; } proto_tree_add_item(tree, hf_mpls_echo_tlv_ds_map_hash_type, tvb, - offset + 12, 1, FALSE); + offset + 12, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_mpls_echo_tlv_ds_map_depth, tvb, - offset + 13, 1, FALSE); + offset + 13, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_mpls_echo_tlv_ds_map_muti_len, tvb, - offset + 14, 2, FALSE); + offset + 14, 2, ENC_BIG_ENDIAN); /* Get the Multipath Length and Hash Type */ mplen = tvb_get_ntohs(tvb, offset + 14); @@ -687,7 +687,7 @@ dissect_mpls_echo_tlv_ds_map(tvbuff_t *tvb, guint offset, proto_tree *tree, int proto_tree_add_uint_format(tlv_ds_map_tree, hf_mpls_echo_tlv_ds_map_mp_bos, tvb, offset + 2, 1, bos, "Downstream BOS: %u", bos); proto_tree_add_item(tlv_ds_map_tree, hf_mpls_echo_tlv_ds_map_mp_proto, - tvb, offset + 3, 1, FALSE); + tvb, offset + 3, 1, ENC_BIG_ENDIAN); proto_item_append_text(ti, ", Protocol: %u (%s)", proto, val_to_str(proto, mpls_echo_tlv_ds_map_mp_proto, "Unknown")); rem -= 4; @@ -708,12 +708,12 @@ dissect_mpls_echo_tlv_ilso(tvbuff_t *tvb, guint offset, proto_tree *tree, int re guint32 label; guint8 exp, bos, ttl; - proto_tree_add_item(tree, hf_mpls_echo_tlv_ilso_addr_type, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_mpls_echo_tlv_ilso_addr_type, tvb, offset, 1, ENC_BIG_ENDIAN); type = tvb_get_guint8(tvb, offset); offset += 1; rem -= 1; - proto_tree_add_item(tree, hf_mpls_echo_tlv_ilso_mbz, tvb, offset, 3, FALSE); + proto_tree_add_item(tree, hf_mpls_echo_tlv_ilso_mbz, tvb, offset, 3, ENC_BIG_ENDIAN); offset += 3; rem -= 3; @@ -728,7 +728,7 @@ dissect_mpls_echo_tlv_ilso(tvbuff_t *tvb, guint offset, proto_tree *tree, int re offset + 4, 4, FALSE); } else { proto_tree_add_item(tree, hf_mpls_echo_tlv_ilso_int_index, tvb, - offset + 4, 4, FALSE); + offset + 4, 4, ENC_BIG_ENDIAN); } offset += 8; rem -= 8; @@ -746,7 +746,7 @@ dissect_mpls_echo_tlv_ilso(tvbuff_t *tvb, guint offset, proto_tree *tree, int re rem -= 32; } else { proto_tree_add_item(tree, hf_mpls_echo_tlv_ilso_int_index, tvb, - offset + 16, 4, FALSE); + offset + 16, 4, ENC_BIG_ENDIAN); offset += 20; rem -= 20; } @@ -779,7 +779,7 @@ dissect_mpls_echo_tlv_ilso(tvbuff_t *tvb, guint offset, proto_tree *tree, int re proto_tree_add_uint_format(tlv_ilso, hf_mpls_echo_tlv_ilso_bos, tvb, offset + 2, 1, bos, "BOS: %u", bos); proto_tree_add_item(tlv_ilso, hf_mpls_echo_tlv_ilso_ttl, - tvb, offset + 3, 1, FALSE); + tvb, offset + 3, 1, ENC_BIG_ENDIAN); rem -= 4; offset += 4; idx++; @@ -851,7 +851,7 @@ dissect_mpls_echo_tlv(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem, gb offset, 2, saved_type, "Type: %s (%u)", val_to_str(type, mpls_echo_tlv_type_names, "Unknown TLV type"), saved_type); } - proto_tree_add_item(mpls_echo_tlv_tree, hf_mpls_echo_tlv_len, tvb, offset + 2, 2, FALSE); + proto_tree_add_item(mpls_echo_tlv_tree, hf_mpls_echo_tlv_len, tvb, offset + 2, 2, ENC_BIG_ENDIAN); /* MPLS Echo TLV Value */ if (length == 0) @@ -863,14 +863,14 @@ dissect_mpls_echo_tlv(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem, gb break; case TLV_PAD: proto_tree_add_item(mpls_echo_tlv_tree, hf_mpls_echo_tlv_padaction, tvb, - offset + 4, 1, FALSE); + offset + 4, 1, ENC_BIG_ENDIAN); if (length > 1) proto_tree_add_item(mpls_echo_tlv_tree, hf_mpls_echo_tlv_padding, tvb, offset + 5, length - 1, ENC_NA); break; case TLV_VENDOR_CODE: proto_tree_add_item(mpls_echo_tlv_tree, hf_mpls_echo_tlv_vendor, tvb, - offset + 4, 4, FALSE); + offset + 4, 4, ENC_BIG_ENDIAN); break; case TLV_ILSO_IPv4: if(length < 12) { @@ -917,7 +917,7 @@ dissect_mpls_echo_tlv(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem, gb length); } else { proto_tree_add_item(mpls_echo_tlv_tree, hf_mpls_echo_tlv_vendor, tvb, - offset + 4, 4, FALSE); + offset + 4, 4, ENC_BIG_ENDIAN); proto_tree_add_item(mpls_echo_tlv_tree, hf_mpls_echo_tlv_value, tvb, offset + 8, length - 4, ENC_NA); } @@ -946,9 +946,9 @@ dissect_mpls_echo_tlv(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem, gb break; } proto_tree_add_item(mpls_echo_tlv_tree, hf_mpls_echo_tlv_reply_tos, tvb, - offset + 4, 1, FALSE); + offset + 4, 1, ENC_BIG_ENDIAN); proto_tree_add_item(mpls_echo_tlv_tree, hf_mpls_echo_tlv_reply_tos_mbz, tvb, - offset + 5, 3, FALSE); + offset + 5, 3, ENC_BIG_ENDIAN); break; case TLV_ERROR_CODE: default: @@ -1015,33 +1015,33 @@ dissect_mpls_echo(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) mpls_echo_tree = proto_item_add_subtree(ti, ett_mpls_echo); proto_tree_add_item(mpls_echo_tree, - hf_mpls_echo_version, tvb, offset, 2, FALSE); + hf_mpls_echo_version, tvb, offset, 2, ENC_BIG_ENDIAN); if(MSGTYPE_MPLS_ECHO(msgtype)){ ti = proto_tree_add_item(mpls_echo_tree, - hf_mpls_echo_gflags, tvb, offset + 2, 2, FALSE); + hf_mpls_echo_gflags, tvb, offset + 2, 2, ENC_BIG_ENDIAN); mpls_echo_gflags = proto_item_add_subtree(ti, ett_mpls_echo_gflags); proto_tree_add_item(mpls_echo_gflags, - hf_mpls_echo_flag_sbz, tvb, offset + 2, 2, FALSE); + hf_mpls_echo_flag_sbz, tvb, offset + 2, 2, ENC_BIG_ENDIAN); proto_tree_add_item(mpls_echo_gflags, hf_mpls_echo_flag_v, tvb, offset + 2, 2, FALSE); } else { proto_tree_add_item(mpls_echo_tree, - hf_mpls_echo_mbz, tvb, offset + 2, 2, FALSE); + hf_mpls_echo_mbz, tvb, offset + 2, 2, ENC_BIG_ENDIAN); } proto_tree_add_item(mpls_echo_tree, - hf_mpls_echo_msgtype, tvb, offset + 4, 1, FALSE); + hf_mpls_echo_msgtype, tvb, offset + 4, 1, ENC_BIG_ENDIAN); proto_tree_add_item(mpls_echo_tree, - hf_mpls_echo_replymode, tvb, offset + 5, 1, FALSE); + hf_mpls_echo_replymode, tvb, offset + 5, 1, ENC_BIG_ENDIAN); proto_tree_add_item(mpls_echo_tree, - hf_mpls_echo_returncode, tvb, offset + 6, 1, FALSE); + hf_mpls_echo_returncode, tvb, offset + 6, 1, ENC_BIG_ENDIAN); proto_tree_add_item(mpls_echo_tree, - hf_mpls_echo_returnsubcode, tvb, offset + 7, 1, FALSE); + hf_mpls_echo_returnsubcode, tvb, offset + 7, 1, ENC_BIG_ENDIAN); proto_tree_add_item(mpls_echo_tree, - hf_mpls_echo_handle, tvb, offset + 8, 4, FALSE); + hf_mpls_echo_handle, tvb, offset + 8, 4, ENC_BIG_ENDIAN); proto_tree_add_item(mpls_echo_tree, - hf_mpls_echo_sequence, tvb, offset + 12, 4, FALSE); + hf_mpls_echo_sequence, tvb, offset + 12, 4, ENC_BIG_ENDIAN); if(MSGTYPE_MPLS_ECHO(msgtype)){ proto_tree_add_item(mpls_echo_tree, hf_mpls_echo_ts_sent, tvb, diff --git a/epan/dissectors/packet-mpls.c b/epan/dissectors/packet-mpls.c index c48da69418..594f2ab999 100644 --- a/epan/dissectors/packet-mpls.c +++ b/epan/dissectors/packet-mpls.c @@ -545,7 +545,7 @@ dissect_mpls_oam_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_ /* starting dissection */ functype = tvb_get_guint8(tvb, offset); - proto_tree_add_item(mpls_oam_tree, hf_mpls_oam_function_type, tvb, offset, 1, TRUE); + proto_tree_add_item(mpls_oam_tree, hf_mpls_oam_function_type, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; switch(functype) { @@ -601,7 +601,7 @@ dissect_mpls_oam_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_ } offset++; - proto_tree_add_item(mpls_oam_tree, hf_mpls_oam_defect_type, tvb, offset, 2, TRUE); + proto_tree_add_item(mpls_oam_tree, hf_mpls_oam_defect_type, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset+=2; /* ttsi (ipv4 flavor as in RFC 2373) is optional if not used must be set to all 0x00 */ @@ -630,7 +630,7 @@ dissect_mpls_oam_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_ } /* defect location */ - proto_tree_add_item(mpls_oam_tree, hf_mpls_oam_defect_location, tvb, offset, 4, TRUE); + proto_tree_add_item(mpls_oam_tree, hf_mpls_oam_defect_location, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset+=4; /* 14 octets of padding (all 0x00) */ @@ -673,7 +673,7 @@ dissect_mpls_oam_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_ proto_tree_add_text(mpls_oam_tree, tvb, offset, 4, "LSP ID: %d", tvb_get_ntohl(tvb, offset)); offset+=4; - proto_tree_add_item(mpls_oam_tree, hf_mpls_oam_frequency, tvb, offset, 1, TRUE); + proto_tree_add_item(mpls_oam_tree, hf_mpls_oam_frequency, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; /* 17 octets of padding (all 0x00) */ @@ -691,7 +691,7 @@ dissect_mpls_oam_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_ } /* BIP16 */ - proto_tree_add_item(mpls_oam_tree, hf_mpls_oam_bip16, tvb, offset, 2, TRUE); + proto_tree_add_item(mpls_oam_tree, hf_mpls_oam_bip16, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset+=2; } diff --git a/epan/dissectors/packet-mq.c b/epan/dissectors/packet-mq.c index 9501aa7284..f86b6d0f2c 100644 --- a/epan/dissectors/packet-mq.c +++ b/epan/dissectors/packet-mq.c @@ -1084,11 +1084,11 @@ dissect_mq_gmo(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint int_rep if (iVersionGMO >= 2) { - proto_tree_add_item(mq_tree, hf_mq_gmo_matchoptions, tvb, offset + 72, 4, FALSE); - proto_tree_add_item(mq_tree, hf_mq_gmo_groupstatus, tvb, offset + 76, 1, FALSE); - proto_tree_add_item(mq_tree, hf_mq_gmo_segmentstatus, tvb, offset + 77, 1, FALSE); - proto_tree_add_item(mq_tree, hf_mq_gmo_segmentation, tvb, offset + 78, 1, FALSE); - proto_tree_add_item(mq_tree, hf_mq_gmo_reserved, tvb, offset + 79, 1, FALSE); + proto_tree_add_item(mq_tree, hf_mq_gmo_matchoptions, tvb, offset + 72, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(mq_tree, hf_mq_gmo_groupstatus, tvb, offset + 76, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(mq_tree, hf_mq_gmo_segmentstatus, tvb, offset + 77, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(mq_tree, hf_mq_gmo_segmentation, tvb, offset + 78, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(mq_tree, hf_mq_gmo_reserved, tvb, offset + 79, 1, ENC_BIG_ENDIAN); } if (iVersionGMO >= 3) @@ -1289,17 +1289,17 @@ dissect_mq_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) mq_tree = proto_item_add_subtree(ti, ett_mq_tsh); proto_tree_add_item(mq_tree, hf_mq_tsh_structid, tvb, offset + 0, 4, string_rep); - proto_tree_add_item(mq_tree, hf_mq_tsh_packetlength, tvb, offset + 4, 4, FALSE); + proto_tree_add_item(mq_tree, hf_mq_tsh_packetlength, tvb, offset + 4, 4, ENC_BIG_ENDIAN); - proto_tree_add_item(mq_tree, hf_mq_tsh_byteorder, tvb, offset + 8, 1, FALSE); + proto_tree_add_item(mq_tree, hf_mq_tsh_byteorder, tvb, offset + 8, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(mq_tree, hf_mq_tsh_opcode, tvb, offset + 9, 1, FALSE); + proto_tree_add_item(mq_tree, hf_mq_tsh_opcode, tvb, offset + 9, 1, ENC_BIG_ENDIAN); /* Control flags */ { proto_tree *mq_tree_sub = NULL; - ti = proto_tree_add_item(mq_tree, hf_mq_tsh_controlflags, tvb, offset + 10, 1, FALSE); + ti = proto_tree_add_item(mq_tree, hf_mq_tsh_controlflags, tvb, offset + 10, 1, ENC_BIG_ENDIAN); mq_tree_sub = proto_item_add_subtree(ti, ett_mq_tsh_tcf); proto_tree_add_boolean(mq_tree_sub, hf_mq_tsh_tcf_dlq, tvb, offset + 10, 1, iControlFlags); @@ -1312,11 +1312,11 @@ dissect_mq_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_boolean(mq_tree_sub, hf_mq_tsh_tcf_confirmreq, tvb, offset + 10, 1, iControlFlags); } - proto_tree_add_item(mq_tree, hf_mq_tsh_reserved, tvb, offset + 11, 1, FALSE); + proto_tree_add_item(mq_tree, hf_mq_tsh_reserved, tvb, offset + 11, 1, ENC_BIG_ENDIAN); proto_tree_add_item(mq_tree, hf_mq_tsh_luwid, tvb, offset + 12, 8, ENC_NA); proto_tree_add_item(mq_tree, hf_mq_tsh_encoding, tvb, offset + 20, 4, int_rep); proto_tree_add_item(mq_tree, hf_mq_tsh_ccsid, tvb, offset + 24, 2, int_rep); - proto_tree_add_item(mq_tree, hf_mq_tsh_padding, tvb, offset + 26, 2, FALSE); + proto_tree_add_item(mq_tree, hf_mq_tsh_padding, tvb, offset + 26, 2, ENC_BIG_ENDIAN); } offset += iSizeTSH; @@ -1343,7 +1343,7 @@ dissect_mq_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ti = proto_tree_add_text(mqroot_tree, tvb, offset, iSizeAPI, MQ_TEXT_API); mq_tree = proto_item_add_subtree(ti, ett_mq_api); - proto_tree_add_item(mq_tree, hf_mq_api_replylength, tvb, offset, 4, FALSE); + proto_tree_add_item(mq_tree, hf_mq_api_replylength, tvb, offset, 4, ENC_BIG_ENDIAN); proto_tree_add_item(mq_tree, hf_mq_api_completioncode, tvb, offset + 4, 4, int_rep); proto_tree_add_item(mq_tree, hf_mq_api_reasoncode, tvb, offset + 8, 4, int_rep); proto_tree_add_item(mq_tree, hf_mq_api_objecthandle, tvb, offset + 12, 4, int_rep); @@ -1699,7 +1699,7 @@ dissect_mq_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ti = proto_tree_add_text(mqroot_tree, tvb, offset, 16, "%s (%s)", MQ_TEXT_XA, val_to_str(opcode, mq_opcode_vals, "Unknown (0x%02x)")); mq_tree = proto_item_add_subtree(ti, ett_mq_xa); - proto_tree_add_item(mq_tree, hf_mq_xa_length, tvb, offset, 4, FALSE); + proto_tree_add_item(mq_tree, hf_mq_xa_length, tvb, offset, 4, ENC_BIG_ENDIAN); proto_tree_add_item(mq_tree, hf_mq_xa_returnvalue, tvb, offset + 4, 4, int_rep); /* Transaction Manager flags */ @@ -1744,7 +1744,7 @@ dissect_mq_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ti = proto_tree_add_text(mqroot_tree, tvb, offset, iXAInfoLength + 1, MQ_TEXT_XINF); mq_tree = proto_item_add_subtree(ti, ett_mq_xa_info); - proto_tree_add_item(mq_tree, hf_mq_xa_xainfo_length, tvb, offset, 1, FALSE); + proto_tree_add_item(mq_tree, hf_mq_xa_xainfo_length, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(mq_tree, hf_mq_xa_xainfo_value, tvb, offset + 1, iXAInfoLength, string_rep); } } @@ -1800,14 +1800,14 @@ dissect_mq_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) mq_tree = proto_item_add_subtree(ti, ett_mq_id); proto_tree_add_item(mq_tree, hf_mq_id_structid, tvb, offset, 4, string_rep); - proto_tree_add_item(mq_tree, hf_mq_id_level, tvb, offset + 4, 1, FALSE); + proto_tree_add_item(mq_tree, hf_mq_id_level, tvb, offset + 4, 1, ENC_BIG_ENDIAN); /* ID flags */ { proto_tree *mq_tree_sub = NULL; guint8 iIDFlags; - ti = proto_tree_add_item(mq_tree, hf_mq_id_flags, tvb, offset + 5, 1, FALSE); + ti = proto_tree_add_item(mq_tree, hf_mq_id_flags, tvb, offset + 5, 1, ENC_BIG_ENDIAN); mq_tree_sub = proto_item_add_subtree(ti, ett_mq_id_icf); iIDFlags = tvb_get_guint8(tvb, offset + 5); @@ -1819,14 +1819,14 @@ dissect_mq_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_boolean(mq_tree_sub, hf_mq_id_icf_msgseq, tvb, offset + 5, 1, iIDFlags); } - proto_tree_add_item(mq_tree, hf_mq_id_unknown2, tvb, offset + 6, 1, FALSE); + proto_tree_add_item(mq_tree, hf_mq_id_unknown2, tvb, offset + 6, 1, ENC_BIG_ENDIAN); /* Error flags */ { proto_tree *mq_tree_sub = NULL; guint8 iErrorFlags; - ti = proto_tree_add_item(mq_tree, hf_mq_id_ieflags, tvb, offset + 7, 1, FALSE); + ti = proto_tree_add_item(mq_tree, hf_mq_id_ieflags, tvb, offset + 7, 1, ENC_BIG_ENDIAN); mq_tree_sub = proto_item_add_subtree(ti, ett_mq_id_ief); iErrorFlags = tvb_get_guint8(tvb, offset + 7); @@ -1840,7 +1840,7 @@ dissect_mq_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_boolean(mq_tree_sub, hf_mq_id_ief_ccsid, tvb, offset + 7, 1, iErrorFlags); } - proto_tree_add_item(mq_tree, hf_mq_id_unknown4, tvb, offset + 8, 2, FALSE); + proto_tree_add_item(mq_tree, hf_mq_id_unknown4, tvb, offset + 8, 2, ENC_BIG_ENDIAN); proto_tree_add_item(mq_tree, hf_mq_id_maxmsgperbatch, tvb, offset + 10, 2, int_rep); proto_tree_add_item(mq_tree, hf_mq_id_maxtransmissionsize, tvb, offset + 12, 4, int_rep); proto_tree_add_item(mq_tree, hf_mq_id_maxmsgsize, tvb, offset + 16, 4, int_rep); @@ -1862,8 +1862,8 @@ dissect_mq_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { - proto_tree_add_item(mq_tree, hf_mq_id_capflags, tvb, offset + 44, 1, FALSE); - proto_tree_add_item(mq_tree, hf_mq_id_unknown5, tvb, offset + 45, 1, FALSE); + proto_tree_add_item(mq_tree, hf_mq_id_capflags, tvb, offset + 44, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(mq_tree, hf_mq_id_unknown5, tvb, offset + 45, 1, ENC_BIG_ENDIAN); proto_tree_add_item(mq_tree, hf_mq_id_ccsid, tvb, offset + 46, 2, int_rep); proto_tree_add_item(mq_tree, hf_mq_id_queuemanager, tvb, offset + 48, 48, string_rep); proto_tree_add_item(mq_tree, hf_mq_id_heartbeatinterval, tvb, offset + 96, 4, int_rep); diff --git a/epan/dissectors/packet-mrdisc.c b/epan/dissectors/packet-mrdisc.c index 458f2a584c..4aec2b79fc 100644 --- a/epan/dissectors/packet-mrdisc.c +++ b/epan/dissectors/packet-mrdisc.c @@ -88,7 +88,7 @@ dissect_mrdisc_mra(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, i guint16 num; /* Advertising Interval */ - proto_tree_add_item(parent_tree, hf_advint, tvb, offset, 1, FALSE); + proto_tree_add_item(parent_tree, hf_advint, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; /* checksum */ @@ -134,7 +134,7 @@ dissect_mrdisc_mra(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, i if (len != 2) THROW(ReportedBoundsError); proto_tree_add_item(tree, hf_qi, tvb, offset, len, - FALSE); + ENC_BIG_ENDIAN); offset += len; break; case MRDISC_RV: @@ -147,7 +147,7 @@ dissect_mrdisc_mra(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, i if (len != 2) THROW(ReportedBoundsError); proto_tree_add_item(tree, hf_rv, tvb, offset, len, - FALSE); + ENC_BIG_ENDIAN); offset += len; break; default: diff --git a/epan/dissectors/packet-mrp-msrp.c b/epan/dissectors/packet-mrp-msrp.c index 04792a1f9b..fb0c151fbc 100644 --- a/epan/dissectors/packet-mrp-msrp.c +++ b/epan/dissectors/packet-mrp-msrp.c @@ -288,11 +288,11 @@ static void dissect_msrp_common1(proto_tree *msg_tree, tvbuff_t *tvb, int msg_offset) { proto_tree_add_item(msg_tree, hf_msrp_attribute_type, tvb, - MSRP_ATTRIBUTE_TYPE_OFFSET + msg_offset, 1, FALSE); + MSRP_ATTRIBUTE_TYPE_OFFSET + msg_offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(msg_tree, hf_msrp_attribute_length, tvb, - MSRP_ATTRIBUTE_LENGTH_OFFSET + msg_offset, 1, FALSE); + MSRP_ATTRIBUTE_LENGTH_OFFSET + msg_offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(msg_tree, hf_msrp_attribute_list_length, tvb, - MSRP_ATTRIBUTE_LIST_LENGTH_OFFSET + msg_offset, 2, FALSE); + MSRP_ATTRIBUTE_LIST_LENGTH_OFFSET + msg_offset, 2, ENC_BIG_ENDIAN); } @@ -328,15 +328,15 @@ dissect_msrp_talker_common(proto_tree *first_value_tree, tvbuff_t *tvb, int msg_ proto_tree_add_item(first_value_tree, hf_msrp_stream_da, tvb, MSRP_STREAM_DA_OFFSET + msg_offset, 6, FALSE); proto_tree_add_item(first_value_tree, hf_msrp_vlan_id, tvb, - MSRP_VLAN_ID_OFFSET + msg_offset, 2, FALSE); + MSRP_VLAN_ID_OFFSET + msg_offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(first_value_tree, hf_msrp_tspec_max_frame_size, tvb, - MSRP_TSPEC_MAX_FRAME_SIZE_OFFSET + msg_offset, 2, FALSE); + MSRP_TSPEC_MAX_FRAME_SIZE_OFFSET + msg_offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(first_value_tree, hf_msrp_tspec_max_interval_frames, tvb, - MSRP_TSPEC_MAX_INTERVAL_FRAMES_OFFSET + msg_offset, 2, FALSE); + 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); proto_tree_add_item(first_value_tree, hf_msrp_accumulated_latency, tvb, - MSRP_ACCUMULATED_LATENCY_OFFSET + msg_offset, 4, FALSE); + MSRP_ACCUMULATED_LATENCY_OFFSET + msg_offset, 4, ENC_BIG_ENDIAN); } @@ -351,9 +351,9 @@ dissect_msrp_talker_failed(proto_tree *first_value_tree, tvbuff_t *tvb, int msg_ { proto_tree_add_item(first_value_tree, hf_msrp_failure_bridge_id, tvb, - MSRP_FAILURE_BRIDGE_ID_OFFSET + msg_offset, 8, FALSE); + MSRP_FAILURE_BRIDGE_ID_OFFSET + msg_offset, 8, ENC_BIG_ENDIAN); proto_tree_add_item(first_value_tree, hf_msrp_failure_code, tvb, - MSRP_FAILURE_CODE_OFFSET + msg_offset, 1, FALSE); + MSRP_FAILURE_CODE_OFFSET + msg_offset, 1, ENC_BIG_ENDIAN); } @@ -471,7 +471,7 @@ dissect_msrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ti = proto_tree_add_item(tree, proto_msrp, tvb, 0, -1, FALSE); msrp_tree = proto_item_add_subtree(ti, ett_msrp); - proto_tree_add_item(msrp_tree, hf_msrp_proto_id, tvb, MSRP_PROTOCOL_VERSION_OFFSET, 1, FALSE); + proto_tree_add_item(msrp_tree, hf_msrp_proto_id, tvb, MSRP_PROTOCOL_VERSION_OFFSET, 1, ENC_BIG_ENDIAN); /* MSRP supports multiple MRP Messages per frame. Handle those Messages in * the following while() loop. You will know you are at the end of the list @@ -560,11 +560,11 @@ dissect_msrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Add Domain components to First Value tree */ proto_tree_add_item(first_value_tree, hf_msrp_sr_class_id, tvb, - MSRP_FIRST_VALUE_GROUP_OFFSET + msg_offset, 1, FALSE); + MSRP_FIRST_VALUE_GROUP_OFFSET + msg_offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(first_value_tree, hf_msrp_sr_class_priority, tvb, - MSRP_FIRST_VALUE_GROUP_OFFSET + msg_offset + 1, 1, FALSE); + MSRP_FIRST_VALUE_GROUP_OFFSET + msg_offset + 1, 1, ENC_BIG_ENDIAN); proto_tree_add_item(first_value_tree, hf_msrp_sr_class_vid, tvb, - MSRP_FIRST_VALUE_GROUP_OFFSET + msg_offset + 2, 2, FALSE); + MSRP_FIRST_VALUE_GROUP_OFFSET + msg_offset + 2, 2, ENC_BIG_ENDIAN); /* Decode three packed events. */ offset = dissect_msrp_three_packed_event(vect_attr_tree, tvb, @@ -590,7 +590,7 @@ dissect_msrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Decode StreamID */ proto_tree_add_item(first_value_tree, hf_msrp_stream_id, tvb, - MSRP_STREAM_ID_OFFSET + msg_offset + vect_offset, 8, FALSE); + MSRP_STREAM_ID_OFFSET + msg_offset + vect_offset, 8, ENC_BIG_ENDIAN); switch ( attribute_type ) { case MSRP_ATTRIBUTE_TYPE_LISTENER: @@ -620,11 +620,11 @@ dissect_msrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) vect_offset += vect_attr_len; /* Move to next Vector Attribute, if there is one */ } /* Multiple VectorAttribute while() */ - proto_tree_add_item(attr_list_tree, hf_msrp_end_mark, tvb, offset, 2, FALSE); /* VectorAttribute EndMark */ + proto_tree_add_item(attr_list_tree, hf_msrp_end_mark, tvb, offset, 2, ENC_BIG_ENDIAN); /* VectorAttribute EndMark */ msg_offset += msg_length; /* Move to next Message, if there is one */ } /* Multiple Message while() */ - proto_tree_add_item(msrp_tree, hf_msrp_end_mark, tvb, offset+2, 2, FALSE); /* Message EndMark */ + proto_tree_add_item(msrp_tree, hf_msrp_end_mark, tvb, offset+2, 2, ENC_BIG_ENDIAN); /* Message EndMark */ } } diff --git a/epan/dissectors/packet-ms-mms.c b/epan/dissectors/packet-ms-mms.c index ed4b3bbd51..7ed3d368e2 100644 --- a/epan/dissectors/packet-ms-mms.c +++ b/epan/dissectors/packet-ms-mms.c @@ -431,11 +431,11 @@ static gint dissect_msmms_command(tvbuff_t *tvb, packet_info *pinfo, proto_tree offset += 4; /* Signature (already verified by main dissection function) */ - proto_tree_add_item(msmms_common_command_tree, hf_msmms_command_signature, tvb, offset, 4, TRUE); + proto_tree_add_item(msmms_common_command_tree, hf_msmms_command_signature, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; /* Length of command */ - proto_tree_add_item(msmms_common_command_tree, hf_msmms_command_length, tvb, offset, 4, TRUE); + proto_tree_add_item(msmms_common_command_tree, hf_msmms_command_length, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; /* Protocol name. Must be "MMS"... */ @@ -447,21 +447,21 @@ static gint dissect_msmms_command(tvbuff_t *tvb, packet_info *pinfo, proto_tree offset += 4; /* Remaining length in multiples of 8 bytes */ - proto_tree_add_item(msmms_common_command_tree, hf_msmms_command_length_remaining, tvb, offset, 4, TRUE); + proto_tree_add_item(msmms_common_command_tree, hf_msmms_command_length_remaining, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; /* Sequence number */ sequence_number = tvb_get_letohl(tvb, offset); - proto_tree_add_item(msmms_common_command_tree, hf_msmms_command_sequence_number, tvb, offset, 4, TRUE); + proto_tree_add_item(msmms_common_command_tree, hf_msmms_command_sequence_number, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; /* Timestamp */ - proto_tree_add_item(msmms_common_command_tree, hf_msmms_command_timestamp, tvb, offset, 8, TRUE); + proto_tree_add_item(msmms_common_command_tree, hf_msmms_command_timestamp, tvb, offset, 8, ENC_LITTLE_ENDIAN); offset += 8; /* Another length remaining field... */ length_remaining = tvb_get_letohl(tvb, offset); - proto_tree_add_item(msmms_common_command_tree, hf_msmms_command_length_remaining2, tvb, offset, 4, TRUE); + proto_tree_add_item(msmms_common_command_tree, hf_msmms_command_length_remaining2, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; /* Command depends up on direction */ @@ -473,7 +473,7 @@ static gint dissect_msmms_command(tvbuff_t *tvb, packet_info *pinfo, proto_tree offset += 2; /* Direction */ - proto_tree_add_item(msmms_common_command_tree, hf_msmms_command_direction, tvb, offset, 2, TRUE); + proto_tree_add_item(msmms_common_command_tree, hf_msmms_command_direction, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; /* This is the end of the common command header */ @@ -587,15 +587,15 @@ static gint dissect_msmms_data_udp_command(tvbuff_t *tvb, packet_info *pinfo, pr } /* Header ID */ - proto_tree_add_item(msmms_tree, hf_msmms_data_header_id, tvb, offset, 4, TRUE); + proto_tree_add_item(msmms_tree, hf_msmms_data_header_id, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; /* Client ID */ - proto_tree_add_item(msmms_tree, hf_msmms_data_client_id, tvb, offset, 4, TRUE); + proto_tree_add_item(msmms_tree, hf_msmms_data_client_id, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; /* Command ID */ - proto_tree_add_item(msmms_tree, hf_msmms_data_command_id, tvb, offset, 2, TRUE); + proto_tree_add_item(msmms_tree, hf_msmms_data_command_id, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 4; col_set_str(pinfo->cinfo, COL_INFO, "Request to resend packet(s):"); @@ -604,7 +604,7 @@ static gint dissect_msmms_data_udp_command(tvbuff_t *tvb, packet_info *pinfo, pr while (tvb_reported_length_remaining(tvb, offset) >= 4) { guint32 packet_number = tvb_get_letohl(tvb, offset); - proto_tree_add_item(msmms_tree, hf_msmms_data_packet_to_resend, tvb, offset, 4, TRUE); + proto_tree_add_item(msmms_tree, hf_msmms_data_packet_to_resend, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; col_append_fstr(pinfo->cinfo, COL_INFO, " %u", packet_number); @@ -675,11 +675,11 @@ static gint dissect_msmms_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr /* Sequence number */ sequence_number = tvb_get_letohl(tvb, offset); - proto_tree_add_item(msmms_tree, hf_msmms_data_sequence_number, tvb, offset, 4, TRUE); + proto_tree_add_item(msmms_tree, hf_msmms_data_sequence_number, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; /* Packet ID type */ - proto_tree_add_item(msmms_tree, hf_msmms_data_packet_id_type, tvb, offset, 1, TRUE); + proto_tree_add_item(msmms_tree, hf_msmms_data_packet_id_type, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; /* Next byte depends upon whether UDP or TCP */ @@ -687,19 +687,19 @@ static gint dissect_msmms_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr { /* UDP */ proto_tree_add_item(msmms_tree, hf_msmms_data_udp_sequence, tvb, - offset, 1, TRUE); + offset, 1, ENC_LITTLE_ENDIAN); } else { /* TCP */ proto_tree_add_item(msmms_tree, hf_msmms_data_tcp_flags, tvb, - offset, 1, TRUE); + offset, 1, ENC_LITTLE_ENDIAN); } offset++; /* Packet Length */ packet_length = tvb_get_letohs(tvb, offset); - proto_tree_add_item(msmms_tree, hf_msmms_data_packet_length, tvb, offset, 2, TRUE); + proto_tree_add_item(msmms_tree, hf_msmms_data_packet_length, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; /* Parse UDP Timing packet pair headers if present */ @@ -711,15 +711,15 @@ static gint dissect_msmms_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr msmms_data_timing_pair = proto_item_add_subtree(ti, ett_msmms_data_timing_packet_pair); } - proto_tree_add_item(msmms_data_timing_pair, hf_msmms_data_timing_pair_seqno, tvb, offset, 1, TRUE); + proto_tree_add_item(msmms_data_timing_pair, hf_msmms_data_timing_pair_seqno, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; - proto_tree_add_item(msmms_data_timing_pair, hf_msmms_data_timing_pair_flags, tvb, offset, 3, TRUE); + proto_tree_add_item(msmms_data_timing_pair, hf_msmms_data_timing_pair_flags, tvb, offset, 3, ENC_LITTLE_ENDIAN); offset += 3; - proto_tree_add_item(msmms_data_timing_pair, hf_msmms_data_timing_pair_id, tvb, offset, 1, TRUE); + proto_tree_add_item(msmms_data_timing_pair, hf_msmms_data_timing_pair_id, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; - proto_tree_add_item(msmms_data_timing_pair, hf_msmms_data_timing_pair_flag, tvb, offset, 1, TRUE); + proto_tree_add_item(msmms_data_timing_pair, hf_msmms_data_timing_pair_flag, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; - proto_tree_add_item(msmms_data_timing_pair, hf_msmms_data_timing_pair_packet_length, tvb, offset, 2, TRUE); + proto_tree_add_item(msmms_data_timing_pair, hf_msmms_data_timing_pair_packet_length, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; } @@ -752,9 +752,9 @@ static void dissect_client_transport_info(tvbuff_t *tvb, packet_info *pinfo, pro int fields_matched; /* Flags */ - proto_tree_add_item(tree, hf_msmms_command_prefix1, tvb, offset, 4, TRUE); + proto_tree_add_item(tree, hf_msmms_command_prefix1, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; - proto_tree_add_item(tree, hf_msmms_command_prefix2, tvb, offset, 4, TRUE); + proto_tree_add_item(tree, hf_msmms_command_prefix2, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; /* These 12 bytes are not understood */ @@ -825,9 +825,9 @@ static void dissect_server_info(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t char *password_encryption_type; /* ErrorCode */ - proto_tree_add_item(tree, hf_msmms_command_prefix1_error, tvb, offset, 4, TRUE); + proto_tree_add_item(tree, hf_msmms_command_prefix1_error, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; - proto_tree_add_item(tree, hf_msmms_command_prefix2, tvb, offset, 4, TRUE); + proto_tree_add_item(tree, hf_msmms_command_prefix2, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; /* Next 8 words are not understood */ @@ -843,22 +843,22 @@ static void dissect_server_info(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t /* Length of server version */ server_version_length = tvb_get_letohl(tvb, offset); - proto_tree_add_item(tree, hf_msmms_command_server_version_length, tvb, offset, 4, TRUE); + proto_tree_add_item(tree, hf_msmms_command_server_version_length, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; /* Length of tool version */ tool_version_length = tvb_get_letohl(tvb, offset); - proto_tree_add_item(tree, hf_msmms_command_tool_version_length, tvb, offset, 4, TRUE); + proto_tree_add_item(tree, hf_msmms_command_tool_version_length, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; /* Length of download update player URL */ download_update_player_length = tvb_get_letohl(tvb, offset); - proto_tree_add_item(tree, hf_msmms_command_update_url_length, tvb, offset, 4, TRUE); + proto_tree_add_item(tree, hf_msmms_command_update_url_length, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; /* Length of password encryption type */ password_encryption_type_length = tvb_get_letohl(tvb, offset); - proto_tree_add_item(tree, hf_msmms_command_password_type_length, tvb, offset, 4, TRUE); + proto_tree_add_item(tree, hf_msmms_command_password_type_length, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; /* Server version string */ @@ -920,9 +920,9 @@ static void dissect_client_player_info(tvbuff_t *tvb, packet_info *pinfo, proto_ char *player_info; /* Flags */ - proto_tree_add_item(tree, hf_msmms_command_prefix1, tvb, offset, 4, TRUE); + proto_tree_add_item(tree, hf_msmms_command_prefix1, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; - proto_tree_add_item(tree, hf_msmms_command_prefix2, tvb, offset, 4, TRUE); + proto_tree_add_item(tree, hf_msmms_command_prefix2, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; /* These 4 bytes are not understood */ @@ -943,9 +943,9 @@ static void dissect_client_player_info(tvbuff_t *tvb, packet_info *pinfo, proto_ static void dissect_start_sending_from_info(tvbuff_t *tvb, proto_tree *tree, guint offset) { /* Command Level */ - proto_tree_add_item(tree, hf_msmms_command_prefix1_command_level, tvb, offset, 4, TRUE); + proto_tree_add_item(tree, hf_msmms_command_prefix1_command_level, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; - proto_tree_add_item(tree, hf_msmms_command_prefix2, tvb, offset, 4, TRUE); + proto_tree_add_item(tree, hf_msmms_command_prefix2, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; /* 40 bytes follow the prefixes... */ @@ -965,9 +965,9 @@ static void dissect_start_sending_from_info(tvbuff_t *tvb, proto_tree *tree, gui static void dissect_cancel_info(tvbuff_t *tvb, proto_tree *tree, guint offset) { /* Command Level */ - proto_tree_add_item(tree, hf_msmms_command_prefix1_command_level, tvb, offset, 4, TRUE); + proto_tree_add_item(tree, hf_msmms_command_prefix1_command_level, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; - proto_tree_add_item(tree, hf_msmms_command_prefix2, tvb, offset, 4, TRUE); + proto_tree_add_item(tree, hf_msmms_command_prefix2, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; } @@ -975,9 +975,9 @@ static void dissect_cancel_info(tvbuff_t *tvb, proto_tree *tree, guint offset) static void dissect_timing_test_request(tvbuff_t *tvb, proto_tree *tree, guint offset) { /* Flags */ - proto_tree_add_item(tree, hf_msmms_command_prefix1, tvb, offset, 4, TRUE); + proto_tree_add_item(tree, hf_msmms_command_prefix1, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; - proto_tree_add_item(tree, hf_msmms_command_prefix2, tvb, offset, 4, TRUE); + proto_tree_add_item(tree, hf_msmms_command_prefix2, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; } @@ -985,20 +985,20 @@ static void dissect_timing_test_request(tvbuff_t *tvb, proto_tree *tree, guint o static void dissect_timing_test_response(tvbuff_t *tvb, proto_tree *tree, guint offset) { /* ErrorCode */ - proto_tree_add_item(tree, hf_msmms_command_prefix1_error, tvb, offset, 4, TRUE); + proto_tree_add_item(tree, hf_msmms_command_prefix1_error, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; /* Flags */ - proto_tree_add_item(tree, hf_msmms_command_prefix2, tvb, offset, 4, TRUE); + proto_tree_add_item(tree, hf_msmms_command_prefix2, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; /* Number of 4 byte fields in structure */ - proto_tree_add_item(tree, hf_msmms_command_number_of_words, tvb, offset, 4, TRUE); + proto_tree_add_item(tree, hf_msmms_command_number_of_words, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; offset += 4; offset += 4; /* Client ID */ - proto_tree_add_item(tree, hf_msmms_command_client_id, tvb, offset, 4, TRUE); + proto_tree_add_item(tree, hf_msmms_command_client_id, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; offset += 4; offset += 4; @@ -1013,9 +1013,9 @@ static void dissect_request_server_file(tvbuff_t *tvb, packet_info *pinfo, proto char *server_file; /* Command Level */ - proto_tree_add_item(tree, hf_msmms_command_prefix1_command_level, tvb, offset, 4, TRUE); + proto_tree_add_item(tree, hf_msmms_command_prefix1_command_level, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; - proto_tree_add_item(tree, hf_msmms_command_prefix2, tvb, offset, 4, TRUE); + proto_tree_add_item(tree, hf_msmms_command_prefix2, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; offset += 4; @@ -1036,21 +1036,21 @@ static void dissect_request_server_file(tvbuff_t *tvb, packet_info *pinfo, proto static void dissect_media_details(tvbuff_t *tvb, proto_tree *tree, guint offset) { /* ErrorCode */ - proto_tree_add_item(tree, hf_msmms_command_prefix1_error, tvb, offset, 4, TRUE); + proto_tree_add_item(tree, hf_msmms_command_prefix1_error, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; - proto_tree_add_item(tree, hf_msmms_command_prefix2, tvb, offset, 4, TRUE); + proto_tree_add_item(tree, hf_msmms_command_prefix2, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; /* Result flags */ - proto_tree_add_item(tree, hf_msmms_command_result_flags, tvb, offset, 4, TRUE); + proto_tree_add_item(tree, hf_msmms_command_result_flags, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; offset += 4; offset += 4; /* Broadcast flags. */ - proto_tree_add_item(tree, hf_msmms_command_broadcast_indexing, tvb, offset+2, 1, TRUE); - proto_tree_add_item(tree, hf_msmms_command_broadcast_liveness, tvb, offset+3, 1, TRUE); + proto_tree_add_item(tree, hf_msmms_command_broadcast_indexing, tvb, offset+2, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_msmms_command_broadcast_liveness, tvb, offset+3, 1, ENC_LITTLE_ENDIAN); offset += 4; /* These 8 bytes may be a time field... */ @@ -1058,7 +1058,7 @@ static void dissect_media_details(tvbuff_t *tvb, proto_tree *tree, guint offset) offset += 4; /* Media length in seconds */ - proto_tree_add_item(tree, hf_msmms_command_recorded_media_length, tvb, offset, 4, TRUE); + proto_tree_add_item(tree, hf_msmms_command_recorded_media_length, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; offset += 4; @@ -1067,7 +1067,7 @@ static void dissect_media_details(tvbuff_t *tvb, proto_tree *tree, guint offset) offset += 4; /* Packet length in bytes */ - proto_tree_add_item(tree, hf_msmms_command_media_packet_length, tvb, offset, 4, TRUE); + proto_tree_add_item(tree, hf_msmms_command_media_packet_length, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; } @@ -1075,10 +1075,10 @@ static void dissect_media_details(tvbuff_t *tvb, proto_tree *tree, guint offset) static void dissect_header_response(tvbuff_t *tvb, proto_tree *tree, guint offset) { /* ErrorCode */ - proto_tree_add_item(tree, hf_msmms_command_prefix1_error, tvb, offset, 4, TRUE); + proto_tree_add_item(tree, hf_msmms_command_prefix1_error, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; /* Packet ID type */ - proto_tree_add_item(tree, hf_msmms_command_prefix2, tvb, offset, 4, TRUE); + proto_tree_add_item(tree, hf_msmms_command_prefix2, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; offset += 4; @@ -1089,9 +1089,9 @@ static void dissect_header_response(tvbuff_t *tvb, proto_tree *tree, guint offse static void dissect_network_timer_test_response(tvbuff_t *tvb, proto_tree *tree, guint offset) { /* Command Level */ - proto_tree_add_item(tree, hf_msmms_command_prefix1_command_level, tvb, offset, 4, TRUE); + proto_tree_add_item(tree, hf_msmms_command_prefix1_command_level, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; - proto_tree_add_item(tree, hf_msmms_command_prefix2, tvb, offset, 4, TRUE); + proto_tree_add_item(tree, hf_msmms_command_prefix2, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; } @@ -1102,13 +1102,13 @@ static void dissect_transport_info_response(tvbuff_t *tvb, proto_tree *tree, char *strange_string; /* Command Level */ - proto_tree_add_item(tree, hf_msmms_command_prefix1_command_level, tvb, offset, 4, TRUE); + proto_tree_add_item(tree, hf_msmms_command_prefix1_command_level, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; - proto_tree_add_item(tree, hf_msmms_command_prefix2, tvb, offset, 4, TRUE); + proto_tree_add_item(tree, hf_msmms_command_prefix2, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; /* Length */ - proto_tree_add_item(tree, hf_msmms_command_number_of_words, tvb, offset, 4, TRUE); + proto_tree_add_item(tree, hf_msmms_command_number_of_words, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; /* Read this strange string */ @@ -1123,15 +1123,15 @@ static void dissect_transport_info_response(tvbuff_t *tvb, proto_tree *tree, static void dissect_media_stream_mbr_selector(tvbuff_t *tvb, proto_tree *tree, guint offset) { /* Stream structure count (always 1) */ - proto_tree_add_item(tree, hf_msmms_command_stream_structure_count, tvb, offset, 4, TRUE); + proto_tree_add_item(tree, hf_msmms_command_stream_structure_count, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; /* Stream selection structure */ - proto_tree_add_item(tree, hf_msmms_stream_selection_flags, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_msmms_stream_selection_flags, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; - proto_tree_add_item(tree, hf_msmms_stream_selection_stream_id, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_msmms_stream_selection_stream_id, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; - proto_tree_add_item(tree, hf_msmms_stream_selection_action, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_msmms_stream_selection_action, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; } @@ -1141,9 +1141,9 @@ static void dissect_header_request(tvbuff_t *tvb, proto_tree *tree, guint offset gint n = 0; /* Command Level */ - proto_tree_add_item(tree, hf_msmms_command_prefix1_command_level, tvb, offset, 4, TRUE); + proto_tree_add_item(tree, hf_msmms_command_prefix1_command_level, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; - proto_tree_add_item(tree, hf_msmms_command_prefix2, tvb, offset, 4, TRUE); + proto_tree_add_item(tree, hf_msmms_command_prefix2, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; /* Skip 8 unknown words */ @@ -1153,7 +1153,7 @@ static void dissect_header_request(tvbuff_t *tvb, proto_tree *tree, guint offset } /* Header packet ID type */ - proto_tree_add_item(tree, hf_msmms_command_header_packet_id_type, tvb, offset, 4, TRUE); + proto_tree_add_item(tree, hf_msmms_command_header_packet_id_type, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; } @@ -1161,9 +1161,9 @@ static void dissect_header_request(tvbuff_t *tvb, proto_tree *tree, guint offset static void dissect_stop_button_pressed(tvbuff_t *tvb, proto_tree *tree, guint offset) { /* Command Level */ - proto_tree_add_item(tree, hf_msmms_command_prefix1_command_level, tvb, offset, 4, TRUE); + proto_tree_add_item(tree, hf_msmms_command_prefix1_command_level, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; - proto_tree_add_item(tree, hf_msmms_command_prefix2, tvb, offset, 4, TRUE); + proto_tree_add_item(tree, hf_msmms_command_prefix2, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; } diff --git a/epan/dissectors/packet-msdp.c b/epan/dissectors/packet-msdp.c index 1a08423e4b..67ec55081c 100644 --- a/epan/dissectors/packet-msdp.c +++ b/epan/dissectors/packet-msdp.c @@ -212,7 +212,7 @@ dissect_msdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) length); break; case MSDP_SA_REQ: - proto_tree_add_item(msdp_tree, hf_msdp_sa_req_res, tvb, offset, 1, FALSE); + proto_tree_add_item(msdp_tree, hf_msdp_sa_req_res, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(msdp_tree, hf_msdp_sa_req_group, tvb, offset + 1, 4, FALSE); offset += 5; break; @@ -276,10 +276,10 @@ static void dissect_msdp_sa(tvbuff_t *tvb, packet_info *pinfo, tvb_ip_to_str(tvb, *offset + 4)); entry_tree = proto_item_add_subtree(ei, ett_msdp_sa_entry); - proto_tree_add_item(entry_tree, hf_msdp_sa_reserved, tvb, *offset, 3, FALSE); + proto_tree_add_item(entry_tree, hf_msdp_sa_reserved, tvb, *offset, 3, ENC_BIG_ENDIAN); *offset += 3; length -= 3; - proto_tree_add_item(entry_tree, hf_msdp_sa_sprefix_len, tvb, *offset, 1, FALSE); + proto_tree_add_item(entry_tree, hf_msdp_sa_sprefix_len, tvb, *offset, 1, ENC_BIG_ENDIAN); *offset += 1; length -= 1; proto_tree_add_item(entry_tree, hf_msdp_sa_group_addr, tvb, *offset, 4, FALSE); @@ -334,7 +334,7 @@ static void add_notification_data_ipv4addr(tvbuff_t *tvb, proto_tree *tree, int { guint32 ipaddr; - proto_tree_add_item(tree, hf_msdp_not_res, tvb, *offset, 3, FALSE); + proto_tree_add_item(tree, hf_msdp_not_res, tvb, *offset, 3, ENC_BIG_ENDIAN); *offset += 3; ipaddr = tvb_get_ipv4(tvb, *offset); proto_tree_add_ipv4_format(tree, hf_msdp_not_ipv4, tvb, *offset, 4, ipaddr, @@ -350,7 +350,7 @@ static void dissect_msdp_notification(tvbuff_t *tvb, packet_info *pinfo, proto_t const value_string *vals; proto_tree_add_item(tree, hf_msdp_not_o, tvb, *offset, 1, FALSE); - proto_tree_add_item(tree, hf_msdp_not_error, tvb, *offset, 1, FALSE); + proto_tree_add_item(tree, hf_msdp_not_error, tvb, *offset, 1, ENC_BIG_ENDIAN); error = tvb_get_guint8(tvb, *offset); error &= 0x7F; /* Error is 7-bit field. O-bit is bit 8 */ *offset += 1; @@ -400,7 +400,7 @@ static void dissect_msdp_notification(tvbuff_t *tvb, packet_info *pinfo, proto_t if (error_sub == 0) { break; } else if (error_sub == 1) { - proto_tree_add_item(tree, hf_msdp_not_entry_count, tvb, *offset, 1, FALSE); + proto_tree_add_item(tree, hf_msdp_not_entry_count, tvb, *offset, 1, ENC_BIG_ENDIAN); *offset += 1; break; } else if (error_sub == 2) { @@ -413,7 +413,7 @@ static void dissect_msdp_notification(tvbuff_t *tvb, packet_info *pinfo, proto_t add_notification_data_ipv4addr(tvb, tree, offset, "Source address"); break; } else if (error_sub == 5) { - proto_tree_add_item(tree, hf_msdp_not_sprefix_len, tvb, *offset, 1, FALSE); + proto_tree_add_item(tree, hf_msdp_not_sprefix_len, tvb, *offset, 1, ENC_BIG_ENDIAN); *offset += 1; break; } else if (error_sub == 6) { diff --git a/epan/dissectors/packet-msnlb.c b/epan/dissectors/packet-msnlb.c index 118bd5b473..4be17a0afb 100644 --- a/epan/dissectors/packet-msnlb.c +++ b/epan/dissectors/packet-msnlb.c @@ -70,7 +70,7 @@ dissect_msnlb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(msnlb_tree, hf_msnlb_unknown, tvb, offset, 4, ENC_NA); offset += 4; - proto_tree_add_item(msnlb_tree, hf_msnlb_hpn, tvb, offset, 4, TRUE); + proto_tree_add_item(msnlb_tree, hf_msnlb_hpn, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; proto_tree_add_item(msnlb_tree, hf_msnlb_cls_virt_ip, tvb, offset, 4, FALSE); @@ -94,7 +94,7 @@ dissect_msnlb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(msnlb_tree, hf_msnlb_unknown, tvb, offset, 4, ENC_NA); offset += 4; - proto_tree_add_item(msnlb_tree, hf_msnlb_count, tvb, offset, 4, TRUE); + proto_tree_add_item(msnlb_tree, hf_msnlb_count, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; proto_tree_add_item(msnlb_tree, hf_msnlb_unknown, tvb, offset, 4, ENC_NA); diff --git a/epan/dissectors/packet-msproxy.c b/epan/dissectors/packet-msproxy.c index bfbe8d2435..003e9a72c8 100644 --- a/epan/dissectors/packet-msproxy.c +++ b/epan/dissectors/packet-msproxy.c @@ -417,12 +417,12 @@ static void dissect_bind(tvbuff_t *tvb, int offset, if ( tree) proto_tree_add_item( tree, hf_msproxy_bindport, tvb, offset, 2, - FALSE); + ENC_BIG_ENDIAN); offset += 6; if ( tree) proto_tree_add_item( tree, hf_msproxy_clntport, tvb, offset, 2, - FALSE); + ENC_BIG_ENDIAN); offset += 2; conv_info->clnt_port = tvb_get_ntohs( tvb, offset); @@ -430,7 +430,7 @@ static void dissect_bind(tvbuff_t *tvb, int offset, if ( tree){ proto_tree_add_item( tree, hf_msproxy_boundport, tvb, offset, 2, - FALSE); + ENC_BIG_ENDIAN); offset += 82; display_application_name( tvb, offset, tree); @@ -469,11 +469,11 @@ static void dissect_tcp_bind(tvbuff_t *tvb, int offset, offset += 6; proto_tree_add_item( tree, hf_msproxy_bind_id, tvb, offset, 4, - FALSE); + ENC_BIG_ENDIAN); offset += 16; proto_tree_add_item( tree, hf_msproxy_boundport, tvb, offset, 2, - FALSE); + ENC_BIG_ENDIAN); offset += 96; display_application_name( tvb, offset, tree); @@ -492,7 +492,7 @@ static void dissect_request_connect(tvbuff_t *tvb, int offset, if ( tree) proto_tree_add_item( tree, hf_msproxy_dstport, tvb, offset, 2, - FALSE); + ENC_BIG_ENDIAN); conv_info->dst_port = tvb_get_ntohs( tvb, offset); offset += 2; @@ -527,11 +527,11 @@ static void dissect_bind_info_ack(tvbuff_t *tvb, int offset, proto_tree *tree) { offset += 6; proto_tree_add_item( tree, hf_msproxy_bind_id, tvb, offset, 4, - FALSE); + ENC_BIG_ENDIAN); offset += 14; proto_tree_add_item( tree, hf_msproxy_dstport, tvb, offset, 2, - FALSE); + ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item( tree, hf_msproxy_dstaddr, tvb, offset, 4, @@ -539,11 +539,11 @@ static void dissect_bind_info_ack(tvbuff_t *tvb, int offset, proto_tree *tree) { offset += 12; proto_tree_add_item( tree, hf_msproxy_server_int_port, tvb, - offset, 2, FALSE); + offset, 2, ENC_BIG_ENDIAN); offset += 4; proto_tree_add_item( tree, hf_msproxy_server_ext_port, tvb, - offset, 2, FALSE); + offset, 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item( tree, hf_msproxy_server_ext_addr, tvb, @@ -602,13 +602,13 @@ static void dissect_udp_bind(tvbuff_t *tvb, int offset, if ( tree) proto_tree_add_item( tree, hf_msproxy_bind_id, tvb, offset, 4, - FALSE); + ENC_BIG_ENDIAN); offset += 12; if ( tree) proto_tree_add_item( tree, hf_msproxy_dstport, tvb, offset, 2, - FALSE); + ENC_BIG_ENDIAN); offset += 2; if ( tree) @@ -633,7 +633,7 @@ static void dissect_udp_assoc(tvbuff_t *tvb, int offset, if ( tree) proto_tree_add_item( tree, hf_msproxy_clntport, tvb, offset, 2, - FALSE); + ENC_BIG_ENDIAN); conv_info->clnt_port = tvb_get_ntohs( tvb, offset); @@ -744,7 +744,7 @@ static void dissect_hello_ack(tvbuff_t *tvb, int offset, proto_tree *tree) { if ( tree) { proto_tree_add_item( tree, hf_msproxy_serverport, tvb, offset, 2, - FALSE); + ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item( tree, hf_msproxy_serveraddr, tvb, offset, 4, @@ -776,11 +776,11 @@ static void dissect_udpassociate_ack(tvbuff_t *tvb, int offset, if ( tree) { proto_tree_add_item( tree, hf_msproxy_bind_id, tvb, offset, 4, - FALSE); + ENC_BIG_ENDIAN); offset += 14; proto_tree_add_item( tree, hf_msproxy_server_ext_port, tvb, - offset, 2, FALSE); + offset, 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item( tree, hf_msproxy_server_ext_addr, tvb, @@ -829,7 +829,7 @@ static void dissect_connect_ack( tvbuff_t *tvb, int offset, packet_info *pinfo, if ( tree) proto_tree_add_item( tree, hf_msproxy_server_int_port, tvb, - offset, 2, FALSE); + offset, 2, ENC_BIG_ENDIAN); conv_info->proto = PT_TCP; @@ -842,7 +842,7 @@ static void dissect_connect_ack( tvbuff_t *tvb, int offset, packet_info *pinfo, offset += 14; proto_tree_add_item( tree, hf_msproxy_server_ext_port, tvb, - offset, 2, FALSE); + offset, 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item( tree, hf_msproxy_server_ext_addr, tvb, @@ -865,7 +865,7 @@ static void dissect_tcp_bind_ack( tvbuff_t *tvb, int offset, proto_tree *tree) { offset += 6; proto_tree_add_item( tree, hf_msproxy_bind_id, tvb, offset, 4, - FALSE); + ENC_BIG_ENDIAN); offset += 16; proto_tree_add_uint( tree, hf_msproxy_server_int_port, tvb, @@ -873,7 +873,7 @@ static void dissect_tcp_bind_ack( tvbuff_t *tvb, int offset, proto_tree *tree) { offset += 6; proto_tree_add_item( tree, hf_msproxy_server_ext_port, tvb, - offset, 2, FALSE); + offset, 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item( tree, hf_msproxy_server_ext_addr, tvb, @@ -896,7 +896,7 @@ static void dissect_bind_info( tvbuff_t *tvb, int offset, packet_info *pinfo, if ( tree) proto_tree_add_item( tree, hf_msproxy_bind_id, tvb, offset, 4, - FALSE); + ENC_BIG_ENDIAN); offset += 14; @@ -920,7 +920,7 @@ static void dissect_bind_info( tvbuff_t *tvb, int offset, packet_info *pinfo, if ( tree) { proto_tree_add_item( tree, hf_msproxy_server_ext_port, tvb, - offset, 2, FALSE); + offset, 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item( tree, hf_msproxy_server_ext_addr, tvb, diff --git a/epan/dissectors/packet-mstp.c b/epan/dissectors/packet-mstp.c index f7603e3ad0..eac9947512 100644 --- a/epan/dissectors/packet-mstp.c +++ b/epan/dissectors/packet-mstp.c @@ -173,13 +173,13 @@ dissect_mstp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, } /* Add the items to the tree */ proto_tree_add_item(subtree, hf_mstp_frame_type, tvb, - offset, 1, TRUE); + offset, 1, ENC_LITTLE_ENDIAN); proto_tree_add_item(subtree, hf_mstp_frame_destination, tvb, - offset+1, 1, TRUE); + offset+1, 1, ENC_LITTLE_ENDIAN); proto_tree_add_item(subtree, hf_mstp_frame_source, tvb, - offset+2, 1, TRUE); + offset+2, 1, ENC_LITTLE_ENDIAN); item = proto_tree_add_item(subtree, hf_mstp_frame_pdu_len, tvb, - offset+3, 2, FALSE); + offset+3, 2, ENC_BIG_ENDIAN); mstp_tvb_pdu_len = tvb_length_remaining(tvb, offset+6); /* check the length - which does not include the crc16 checksum */ if (mstp_tvb_pdu_len > 2) { @@ -228,7 +228,7 @@ dissect_mstp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, } #else proto_tree_add_item(subtree, hf_mstp_frame_crc8, - tvb, offset+5, 1, TRUE); + tvb, offset+5, 1, ENC_LITTLE_ENDIAN); #endif /* dissect BACnet PDU if there is one */ @@ -246,7 +246,7 @@ dissect_mstp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, /* Write Vendor ID as tree */ proto_tree_add_item(subtree, hf_mstp_frame_vendor_id, tvb, - offset, 2, FALSE); + offset, 2, ENC_BIG_ENDIAN); /* NPDU - call the Vendor specific dissector */ next_tvb = tvb_new_subset(tvb, offset+2, @@ -304,7 +304,7 @@ dissect_mstp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, } #else proto_tree_add_item(subtree, hf_mstp_frame_crc16, - tvb, offset+mstp_frame_pdu_len, 2, TRUE); + tvb, offset+mstp_frame_pdu_len, 2, ENC_LITTLE_ENDIAN); #endif } } @@ -341,9 +341,9 @@ dissect_mstp_wtap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) #endif subtree = proto_item_add_subtree(ti, ett_bacnet_mstp); proto_tree_add_item(subtree, hf_mstp_preamble_55, tvb, - offset, 1, TRUE); + offset, 1, ENC_LITTLE_ENDIAN); proto_tree_add_item(subtree, hf_mstp_preamble_FF, tvb, - offset+1, 1, TRUE); + offset+1, 1, ENC_LITTLE_ENDIAN); dissect_mstp(tvb, pinfo, tree, subtree, offset+2); } diff --git a/epan/dissectors/packet-mux27010.c b/epan/dissectors/packet-mux27010.c index af9f4a90ac..22b7f04d33 100644 --- a/epan/dissectors/packet-mux27010.c +++ b/epan/dissectors/packet-mux27010.c @@ -300,7 +300,7 @@ static void getExtendedHeader(tvbuff_t *tvb, proto_tree *field_tree){ sizeMuxPPPHeader = tvb_get_guint8(tvb, offset); - proto_tree_add_item(field_tree, hf_mux27010_extended_header_size, tvb, offset, 1, FALSE); + proto_tree_add_item(field_tree, hf_mux27010_extended_header_size, tvb, offset, 1, ENC_BIG_ENDIAN); if (sizeMuxPPPHeader > 0){ int tmpOffset = 1; guint16 tmpStartByte = 0; @@ -308,23 +308,23 @@ getExtendedHeader(tvbuff_t *tvb, proto_tree *field_tree){ for (i=0; i < sizeMuxPPPHeader/7; i++){ switch(i){ case(0) : - proto_tree_add_item(field_tree, hf_mux27010_extended_header_msg_number_I, tvb, offset+tmpOffset, 2, FALSE); + proto_tree_add_item(field_tree, hf_mux27010_extended_header_msg_number_I, tvb, offset+tmpOffset, 2, ENC_BIG_ENDIAN); tmpOffset+=2; - proto_tree_add_item(field_tree, hf_mux27010_extended_header_freq_number_I, tvb, offset+tmpOffset, 2, FALSE); + proto_tree_add_item(field_tree, hf_mux27010_extended_header_freq_number_I, tvb, offset+tmpOffset, 2, ENC_BIG_ENDIAN); tmpOffset+=2; tmpStartByte = tvb_get_guint8(tvb, tmpOffset) + sizeMuxPPPHeader + 1; - proto_tree_add_item(field_tree, hf_mux27010_extended_header_start_pos_I, tvb, offset+tmpOffset, 1, FALSE); - proto_tree_add_item(field_tree, hf_mux27010_extended_header_start_byte_I, tvb, tmpStartByte, 1, FALSE); + proto_tree_add_item(field_tree, hf_mux27010_extended_header_start_pos_I, tvb, offset+tmpOffset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(field_tree, hf_mux27010_extended_header_start_byte_I, tvb, tmpStartByte, 1, ENC_BIG_ENDIAN); tmpOffset+=1; tmpLastByte = tvb_get_guint8(tvb, tmpOffset) + sizeMuxPPPHeader + 1; - proto_tree_add_item(field_tree, hf_mux27010_extended_header_end_pos_I, tvb, offset+tmpOffset, 1, FALSE); - proto_tree_add_item(field_tree, hf_mux27010_extended_header_end_byte_I, tvb, tmpLastByte, 1, FALSE); + proto_tree_add_item(field_tree, hf_mux27010_extended_header_end_pos_I, tvb, offset+tmpOffset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(field_tree, hf_mux27010_extended_header_end_byte_I, tvb, tmpLastByte, 1, ENC_BIG_ENDIAN); tmpOffset+=1; - proto_tree_add_item(field_tree, hf_mux27010_extended_header_flag_ended_I, tvb, offset+tmpOffset, 1, FALSE); + proto_tree_add_item(field_tree, hf_mux27010_extended_header_flag_ended_I, tvb, offset+tmpOffset, 1, ENC_BIG_ENDIAN); if ((tvb_get_guint8(tvb, tmpOffset) & MUX27010_EXTENDED_HEADER_NOT_ENDED) == MUX27010_EXTENDED_HEADER_NOT_ENDED) proto_tree_add_uint_format(field_tree, hf_mux27010_extended_header_flag_ended_I, tvb, offset+tmpOffset, 1, 1, "Not Last Packet in Frequence"); else @@ -333,23 +333,23 @@ getExtendedHeader(tvbuff_t *tvb, proto_tree *field_tree){ case(1) : tmpOffset+=1; - proto_tree_add_item(field_tree, hf_mux27010_extended_header_msg_number_II, tvb, offset+tmpOffset, 2, FALSE); + proto_tree_add_item(field_tree, hf_mux27010_extended_header_msg_number_II, tvb, offset+tmpOffset, 2, ENC_BIG_ENDIAN); tmpOffset+=2; - proto_tree_add_item(field_tree, hf_mux27010_extended_header_freq_number_II, tvb, offset+tmpOffset, 2, FALSE); + proto_tree_add_item(field_tree, hf_mux27010_extended_header_freq_number_II, tvb, offset+tmpOffset, 2, ENC_BIG_ENDIAN); tmpOffset+=2; tmpStartByte = tvb_get_guint8(tvb, tmpOffset) + sizeMuxPPPHeader + 1; - proto_tree_add_item(field_tree, hf_mux27010_extended_header_start_pos_II, tvb, offset+tmpOffset, 1, FALSE); - proto_tree_add_item(field_tree, hf_mux27010_extended_header_start_byte_II, tvb, tmpStartByte, 1, FALSE); + proto_tree_add_item(field_tree, hf_mux27010_extended_header_start_pos_II, tvb, offset+tmpOffset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(field_tree, hf_mux27010_extended_header_start_byte_II, tvb, tmpStartByte, 1, ENC_BIG_ENDIAN); tmpOffset+=1; tmpLastByte = tvb_get_guint8(tvb, tmpOffset) + sizeMuxPPPHeader + 1; - proto_tree_add_item(field_tree, hf_mux27010_extended_header_end_pos_II, tvb, offset+tmpOffset, 1, FALSE); - proto_tree_add_item(field_tree, hf_mux27010_extended_header_end_byte_II, tvb, tmpLastByte, 1, FALSE); + proto_tree_add_item(field_tree, hf_mux27010_extended_header_end_pos_II, tvb, offset+tmpOffset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(field_tree, hf_mux27010_extended_header_end_byte_II, tvb, tmpLastByte, 1, ENC_BIG_ENDIAN); tmpOffset+=1; - proto_tree_add_item(field_tree, hf_mux27010_extended_header_flag_ended_II, tvb, offset+tmpOffset, 1, FALSE); + proto_tree_add_item(field_tree, hf_mux27010_extended_header_flag_ended_II, tvb, offset+tmpOffset, 1, ENC_BIG_ENDIAN); if ((tvb_get_guint8(tvb, tmpOffset) & MUX27010_EXTENDED_HEADER_NOT_ENDED) == MUX27010_EXTENDED_HEADER_NOT_ENDED) proto_tree_add_uint_format(field_tree, hf_mux27010_extended_header_flag_ended_II, tvb, offset+tmpOffset, 1, 1, "Not Last Packet in Frequence"); else @@ -358,23 +358,23 @@ getExtendedHeader(tvbuff_t *tvb, proto_tree *field_tree){ case(2) : tmpOffset+=1; - proto_tree_add_item(field_tree, hf_mux27010_extended_header_msg_number_III, tvb, offset+tmpOffset, 2, FALSE); + proto_tree_add_item(field_tree, hf_mux27010_extended_header_msg_number_III, tvb, offset+tmpOffset, 2, ENC_BIG_ENDIAN); tmpOffset+=2; - proto_tree_add_item(field_tree, hf_mux27010_extended_header_freq_number_III, tvb, offset+tmpOffset, 2, FALSE); + proto_tree_add_item(field_tree, hf_mux27010_extended_header_freq_number_III, tvb, offset+tmpOffset, 2, ENC_BIG_ENDIAN); tmpOffset+=2; tmpStartByte = tvb_get_guint8(tvb, tmpOffset) + sizeMuxPPPHeader + 1; - proto_tree_add_item(field_tree, hf_mux27010_extended_header_start_pos_III, tvb, offset+tmpOffset, 1, FALSE); - proto_tree_add_item(field_tree, hf_mux27010_extended_header_start_byte_III, tvb, tmpStartByte, 1, FALSE); + proto_tree_add_item(field_tree, hf_mux27010_extended_header_start_pos_III, tvb, offset+tmpOffset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(field_tree, hf_mux27010_extended_header_start_byte_III, tvb, tmpStartByte, 1, ENC_BIG_ENDIAN); tmpOffset+=1; tmpLastByte = tvb_get_guint8(tvb, tmpOffset) + sizeMuxPPPHeader + 1; - proto_tree_add_item(field_tree, hf_mux27010_extended_header_end_pos_III, tvb, offset+tmpOffset, 1, FALSE); - proto_tree_add_item(field_tree, hf_mux27010_extended_header_end_byte_III, tvb, tmpLastByte, 1, FALSE); + proto_tree_add_item(field_tree, hf_mux27010_extended_header_end_pos_III, tvb, offset+tmpOffset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(field_tree, hf_mux27010_extended_header_end_byte_III, tvb, tmpLastByte, 1, ENC_BIG_ENDIAN); tmpOffset+=1; - proto_tree_add_item(field_tree, hf_mux27010_extended_header_flag_ended_III, tvb, offset+tmpOffset, 1, FALSE); + proto_tree_add_item(field_tree, hf_mux27010_extended_header_flag_ended_III, tvb, offset+tmpOffset, 1, ENC_BIG_ENDIAN); if ((tvb_get_guint8(tvb, tmpOffset) & MUX27010_EXTENDED_HEADER_NOT_ENDED) == MUX27010_EXTENDED_HEADER_NOT_ENDED) proto_tree_add_uint_format(field_tree, hf_mux27010_extended_header_flag_ended_III, tvb, offset+tmpOffset, 1, 1, "Not Last Packet in Frequence"); else @@ -444,7 +444,7 @@ getFrameAddress(tvbuff_t *tvb, proto_tree *field_tree_addr){ /*Add items to subtree to display the details*/ proto_tree_add_item(field_tree_addr, hf_mux27010_eaaddressflag, tvb, offset, 1, FALSE); proto_tree_add_item(field_tree_addr, hf_mux27010_craddressflag, tvb, offset, 1, FALSE); - proto_tree_add_item(field_tree_addr, hf_mux27010_dlciaddressflag, tvb, offset, 1, FALSE); + proto_tree_add_item(field_tree_addr, hf_mux27010_dlciaddressflag, tvb, offset, 1, ENC_BIG_ENDIAN); /*Get info if frame is command or response*/ command_or_response = tvb_get_guint8(tvb, offset); @@ -502,8 +502,8 @@ getFrameControlData(tvbuff_t *tvb, proto_tree *field_tree){ /*Add frame type to column*/ proto_tree_add_uint_format(field_tree, hf_mux27010_controlframetype, tvb, offset, 1, MUX27010_FRAMETYPE_CONTROL_FLAG_UIH_E, "Frame Type= UIH_E"); /*Add info about sequence numbers to column*/ - proto_tree_add_item(field_tree, hf_mux27010_controlframetypens, tvb, offset, 1, FALSE); - proto_tree_add_item(field_tree, hf_mux27010_controlframetypenr, tvb, offset, 1, FALSE); + proto_tree_add_item(field_tree, hf_mux27010_controlframetypens, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(field_tree, hf_mux27010_controlframetypenr, tvb, offset, 1, ENC_BIG_ENDIAN); /*Copy frame name to string for info column*/ g_snprintf(frameTypeText,sizeof(frameTypeText),"UIH_E"); @@ -515,7 +515,7 @@ getFrameControlData(tvbuff_t *tvb, proto_tree *field_tree){ /*Add frame type to column*/ proto_tree_add_uint_format(field_tree, hf_mux27010_controlframetype, tvb, offset, 1, MUX27010_FRAMETYPE_CONTROL_FLAG_RR, "Frame Type= Receive Ready"); /*Add info about sequence number to column*/ - proto_tree_add_item(field_tree, hf_mux27010_controlframetypenr, tvb, offset, 1, FALSE); + proto_tree_add_item(field_tree, hf_mux27010_controlframetypenr, tvb, offset, 1, ENC_BIG_ENDIAN); /*Copy frame name to string for info column*/ g_snprintf(frameTypeText,sizeof(frameTypeText),"RR"); @@ -526,7 +526,7 @@ getFrameControlData(tvbuff_t *tvb, proto_tree *field_tree){ /*Add frame type to column*/ proto_tree_add_uint_format(field_tree, hf_mux27010_controlframetype, tvb, offset, 1, MUX27010_FRAMETYPE_CONTROL_FLAG_RNR, "Frame Type= Receive Not Ready"); /*Add info about sequence number to column*/ - proto_tree_add_item(field_tree, hf_mux27010_controlframetypenr, tvb, offset, 1, FALSE); + proto_tree_add_item(field_tree, hf_mux27010_controlframetypenr, tvb, offset, 1, ENC_BIG_ENDIAN); /*Copy frame name to string for info column*/ g_snprintf(frameTypeText,sizeof(frameTypeText),"RNR"); @@ -537,7 +537,7 @@ getFrameControlData(tvbuff_t *tvb, proto_tree *field_tree){ /*Add frame type to column*/ proto_tree_add_uint_format(field_tree, hf_mux27010_controlframetype, tvb, offset, 1, MUX27010_FRAMETYPE_CONTROL_FLAG_REJ, "Frame Type= Reject"); /*Add info about sequence number to column*/ - proto_tree_add_item(field_tree, hf_mux27010_controlframetypenr, tvb, offset, 1, FALSE); + proto_tree_add_item(field_tree, hf_mux27010_controlframetypenr, tvb, offset, 1, ENC_BIG_ENDIAN); /*Copy frame name to string for info column*/ g_snprintf(frameTypeText,sizeof(frameTypeText),"REJ"); @@ -559,8 +559,8 @@ getFrameControlData(tvbuff_t *tvb, proto_tree *field_tree){ g_snprintf(colInfoText,sizeof(colInfoText),"%s%s", colInfoText, frameTypeText); g_snprintf(colInfoText,sizeof(colInfoText),"%s)", colInfoText); /*Add Frame type value and PF bit to column*/ - proto_tree_add_item(field_tree, hf_mux27010_controlframetype, tvb, offset, 1, FALSE); - proto_tree_add_item(field_tree, hf_mux27010_pfcontrolflag, tvb, offset, 1, FALSE); + proto_tree_add_item(field_tree, hf_mux27010_controlframetype, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(field_tree, hf_mux27010_pfcontrolflag, tvb, offset, 1, ENC_BIG_ENDIAN); /*Increment offset*/ offset += 1; @@ -645,7 +645,7 @@ getControlChannelFrameType(tvbuff_t *tvb, proto_tree *field_tree_ctr){ /*Add info to subtree*/ proto_tree_add_item(field_tree_ctr, hf_mux27010_controlchanneleaframetype, tvb, offset, 1, FALSE); proto_tree_add_item(field_tree_ctr, hf_mux27010_controlchannelcrframetype, tvb, offset, 1, FALSE); - proto_tree_add_item(field_tree_ctr, hf_mux27010_controlchannelframetypecommand, tvb, offset, 1, FALSE); + proto_tree_add_item(field_tree_ctr, hf_mux27010_controlchannelframetypecommand, tvb, offset, 1, ENC_BIG_ENDIAN); /*Check the control channel frame types and add the name to the subtree and strcat the name to the info column*/ /*Command pattern for Multiplexer Close Down (C/R is set to 1)*/ @@ -719,7 +719,7 @@ getControlChannelLength(tvbuff_t *tvb, proto_tree *field_tree_ctr) { /*Add data to subtree*/ proto_tree_add_item(field_tree_ctr, hf_mux27010_controlchannelealength, tvb, offset, 1, FALSE); - proto_tree_add_item(field_tree_ctr, hf_mux27010_controlchannellengthfield, tvb, offset, 1, FALSE); + proto_tree_add_item(field_tree_ctr, hf_mux27010_controlchannellengthfield, tvb, offset, 1, ENC_BIG_ENDIAN); /*Increment the offset by the number of info octets*/ offset +=number_of_length_frames; @@ -733,7 +733,7 @@ getControlChannelValues(tvbuff_t *tvb, proto_tree *field_tree_ctr){ /*Command pattern for Test Command (C/R is set to 1)*/ if ((controlchannel_type_command | MUX27010_EA_CONTROLCHANNEL_FRAMETYPE_FLAG | MUX27010_CR_CONTROLCHANNEL_FRAMETYPE_FLAG) == MUX27010_COMMAND_TEST_COMMAND){ - proto_tree_add_item(field_tree_ctr, hf_mux27010_controlchanneldetailedvaluetestcommandversion, tvb, offset, 1, FALSE); + proto_tree_add_item(field_tree_ctr, hf_mux27010_controlchanneldetailedvaluetestcommandversion, tvb, offset, 1, ENC_BIG_ENDIAN); controlchannel_iei = tvb_get_guint8(tvb, offset); if (controlchannel_iei == MUX27010_VALUE_CONTROLCHANNEL_TEST_IEI_TE) { proto_tree_add_uint_format(field_tree_ctr, hf_mux27010_controlchannelvalue, tvb, offset, 1, controlchannel_value, "IEI coding: TEMUX_VERSION"); @@ -746,7 +746,7 @@ getControlChannelValues(tvbuff_t *tvb, proto_tree *field_tree_ctr){ /*Command pattern for Power saving control (C/R is set to 1)*/ if ((controlchannel_type_command | MUX27010_EA_CONTROLCHANNEL_FRAMETYPE_FLAG | MUX27010_CR_CONTROLCHANNEL_FRAMETYPE_FLAG) == MUX27010_COMMAND_POWER_SAVING_CONTROL){ - proto_tree_add_item(field_tree_ctr, hf_mux27010_controlchanneldetailedvalue, tvb, offset, 1, FALSE); + proto_tree_add_item(field_tree_ctr, hf_mux27010_controlchanneldetailedvalue, tvb, offset, 1, ENC_BIG_ENDIAN); controlchannel_psc = tvb_get_guint8(tvb, offset); if (controlchannel_type_cr == 0 && controlchannel_psc == 0) /*Response Failure*/ proto_tree_add_uint_format(field_tree_ctr, hf_mux27010_controlchanneldetailedvalue, tvb, offset, controlchannel_length_value, controlchannel_value, "Response: Failure"); @@ -756,12 +756,12 @@ getControlChannelValues(tvbuff_t *tvb, proto_tree *field_tree_ctr){ /*Command pattern for non-supported command response (C/R is set to 1)*/ if ((controlchannel_type_command | MUX27010_EA_CONTROLCHANNEL_FRAMETYPE_FLAG | MUX27010_CR_CONTROLCHANNEL_FRAMETYPE_FLAG) == MUX27010_COMMAND_NON_SUPPORTED_COMMAND_REPSONSE){ - proto_tree_add_item(field_tree_ctr, hf_mux27010_controlchanneldetailedvalue, tvb, offset, 1, FALSE); + proto_tree_add_item(field_tree_ctr, hf_mux27010_controlchanneldetailedvalue, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_uint_format(field_tree_ctr, hf_mux27010_controlchanneldetailedvalue, tvb, offset, controlchannel_length_value, controlchannel_value, "Non-supported Command"); } /*Command pattern for Modem Status Command (C/R is set to 1)*/ if ((controlchannel_type_command | MUX27010_EA_CONTROLCHANNEL_FRAMETYPE_FLAG | MUX27010_CR_CONTROLCHANNEL_FRAMETYPE_FLAG) == MUX27010_COMMAND_MODEM_STATUS_COMMAND){ - proto_tree_add_item(field_tree_ctr, hf_mux27010_controlchanneldetailedvaluemscdlci, tvb, offset, 1, FALSE); + proto_tree_add_item(field_tree_ctr, hf_mux27010_controlchanneldetailedvaluemscdlci, tvb, offset, 1, ENC_BIG_ENDIAN); /*Add bits of Flow Control*/ proto_tree_add_item(field_tree_ctr, hf_mux27010_controlchanneldetailedvaluemscv24fc, tvb, offset+1, 1, FALSE); @@ -772,21 +772,21 @@ getControlChannelValues(tvbuff_t *tvb, proto_tree *field_tree_ctr){ /**/ if (controlchannel_length_value == 3) { - proto_tree_add_item(field_tree_ctr, hf_mux27010_controlchanneldetailedvaluemscbreak, tvb, offset+2, 1, FALSE); + proto_tree_add_item(field_tree_ctr, hf_mux27010_controlchanneldetailedvaluemscbreak, tvb, offset+2, 1, ENC_BIG_ENDIAN); } } /*Command pattern for Parameter Negotiation (EA + C/R is set to 1)*/ if ((controlchannel_type_command | MUX27010_EA_CONTROLCHANNEL_FRAMETYPE_FLAG | MUX27010_CR_CONTROLCHANNEL_FRAMETYPE_FLAG) == MUX27010_COMMAND_PARAMETER_NEGOTIATION){ - proto_tree_add_item(field_tree_ctr, hf_mux27010_controlchanneldetailedvaluepndlci, tvb, offset, 1, FALSE); - proto_tree_add_item(field_tree_ctr, hf_mux27010_controlchanneldetailedvaluepnframetype, tvb, offset+1, 1, FALSE); - proto_tree_add_item(field_tree_ctr, hf_mux27010_controlchanneldetailedvaluepncl, tvb, offset+1, 1, FALSE); + proto_tree_add_item(field_tree_ctr, hf_mux27010_controlchanneldetailedvaluepndlci, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(field_tree_ctr, hf_mux27010_controlchanneldetailedvaluepnframetype, tvb, offset+1, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(field_tree_ctr, hf_mux27010_controlchanneldetailedvaluepncl, tvb, offset+1, 1, ENC_BIG_ENDIAN); controlchannel_cl = tvb_get_guint8(tvb, offset+1); controlchannel_cl = controlchannel_cl & MUX27010_VALUE_CONTROLCHANNEL_PN_CL; - proto_tree_add_item(field_tree_ctr, hf_mux27010_controlchanneldetailedvaluepnprio, tvb, offset+2, 1, FALSE); - proto_tree_add_item(field_tree_ctr, hf_mux27010_controlchanneldetailedvaluepntimer, tvb, offset+3, 1, FALSE); - proto_tree_add_item(field_tree_ctr, hf_mux27010_controlchanneldetailedvaluepnframesize, tvb, offset+4, 2, FALSE); - proto_tree_add_item(field_tree_ctr, hf_mux27010_controlchanneldetailedvaluepnna, tvb, offset+6, 1, FALSE); - proto_tree_add_item(field_tree_ctr, hf_mux27010_controlchanneldetailedvaluepnwinsize, tvb, offset+7, 1, FALSE); + proto_tree_add_item(field_tree_ctr, hf_mux27010_controlchanneldetailedvaluepnprio, tvb, offset+2, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(field_tree_ctr, hf_mux27010_controlchanneldetailedvaluepntimer, tvb, offset+3, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(field_tree_ctr, hf_mux27010_controlchanneldetailedvaluepnframesize, tvb, offset+4, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(field_tree_ctr, hf_mux27010_controlchanneldetailedvaluepnna, tvb, offset+6, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(field_tree_ctr, hf_mux27010_controlchanneldetailedvaluepnwinsize, tvb, offset+7, 1, ENC_BIG_ENDIAN); } @@ -881,7 +881,7 @@ dissect_mux27010(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) sizeOfOneMuxPPPHeader = 7; /*Add a subtree (=item) to the child node => in this subtree the details of extended header will be displayed*/ - tf_extended_header = proto_tree_add_item(mux27010_tree, hf_mux27010_extended_header, tvb, offset, 1, FALSE); + tf_extended_header = proto_tree_add_item(mux27010_tree, hf_mux27010_extended_header, tvb, offset, 1, ENC_BIG_ENDIAN); /*Create the subtree*/ field_tree_extended_header = proto_item_add_subtree(tf_extended_header, ett_mux27010_extended_header); @@ -900,7 +900,7 @@ dissect_mux27010(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /*~~~~~~~~Flag~~~~~~~~*/ /*(Insert data into the child node)*/ /*Create item to show/highlight flag sequence*/ - proto_tree_add_item(mux27010_tree, hf_mux27010, tvb, offset, 1, FALSE); + proto_tree_add_item(mux27010_tree, hf_mux27010, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; /*~~~~~~~~/Flag~~~~~~~~*/ @@ -908,7 +908,7 @@ dissect_mux27010(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /*~~~~~~~~Address~~~~~~~~*/ /*Add a subtree (=item) to the child node => in this subtree the details of address data will be displayed*/ - tf_addr = proto_tree_add_item(mux27010_tree, hf_mux27010_address, tvb, offset, 1, FALSE); + tf_addr = proto_tree_add_item(mux27010_tree, hf_mux27010_address, tvb, offset, 1, ENC_BIG_ENDIAN); /*Create the subtree*/ field_tree_addr = proto_item_add_subtree(tf_addr, ett_mux27010_address); @@ -920,7 +920,7 @@ dissect_mux27010(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /*~~~~~~~~Control Data~~~~~~~~*/ /*Add a subtree (=item) to the child node => in this subtree the details of control data will be displayed*/ - tf = proto_tree_add_item(mux27010_tree, hf_mux27010_control, tvb, offset, 1, FALSE); + tf = proto_tree_add_item(mux27010_tree, hf_mux27010_control, tvb, offset, 1, ENC_BIG_ENDIAN); /*Create the subtree*/ field_tree = proto_item_add_subtree(tf, ett_mux27010_control); @@ -938,7 +938,7 @@ dissect_mux27010(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /*Check the frame type because in RR, RNR and REJ are no info and no lenght fields*/ if (strcmp(frameTypeText,"RR")!= 0 && strcmp(frameTypeText,"RNR")!= 0 && strcmp(frameTypeText,"REJ")!= 0){ /*Add a subtree (=item) to the child node => in this subtree will be the details of length field*/ - tf = proto_tree_add_item(mux27010_tree, hf_mux27010_length, tvb, offset, 1, FALSE); + tf = proto_tree_add_item(mux27010_tree, hf_mux27010_length, tvb, offset, 1, ENC_BIG_ENDIAN); /*Create the subtree*/ field_tree = proto_item_add_subtree(tf, ett_mux27010_length); @@ -960,12 +960,12 @@ dissect_mux27010(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /*Get and display data of frame type*/ /*Add a subtree (=item) to the child node => in this subtree the details of control channel will be displayed*/ - tf = proto_tree_add_item(mux27010_tree, hf_mux27010_controlchannel, tvb, offset, 1, FALSE); + tf = proto_tree_add_item(mux27010_tree, hf_mux27010_controlchannel, tvb, offset, 1, ENC_BIG_ENDIAN); /*Create the subtree*/ field_tree = proto_item_add_subtree(tf, ett_mux27010_controlchannel); /*Add another subtree to the control channel subtree => in this subtree the details of control channel frame type will be displayed*/ - tf_ctr = proto_tree_add_item(field_tree, hf_mux27010_controlchannelframetype, tvb, offset, number_of_type_frames, FALSE); + tf_ctr = proto_tree_add_item(field_tree, hf_mux27010_controlchannelframetype, tvb, offset, number_of_type_frames, ENC_BIG_ENDIAN); /*Create the subtree*/ field_tree_ctr = proto_item_add_subtree(tf_ctr, ett_mux27010_controlchannelframetype); @@ -976,7 +976,7 @@ dissect_mux27010(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /*--------Length Field--------*/ /*Add another subtree to the control channel subtree => in this subtree the details of control channel length field will be displayed*/ - tf_ctr = proto_tree_add_item(field_tree, hf_mux27010_controlchannellength, tvb, offset, number_of_length_frames, FALSE); + tf_ctr = proto_tree_add_item(field_tree, hf_mux27010_controlchannellength, tvb, offset, number_of_length_frames, ENC_BIG_ENDIAN); /*Create the subtree*/ field_tree_ctr = proto_item_add_subtree(tf_ctr, ett_mux27010_controlchannellength); @@ -1008,7 +1008,7 @@ dissect_mux27010(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /*Display "normal" data/values (not control channel) if exists ==> length_info > 0*/ if (dlci_number != 0 && length_info > 0) { /*Add a subtree (=item) to the child node => in this subtree will be the data*/ - tf = proto_tree_add_item(mux27010_tree, hf_mux27010_information, tvb, offset, 1, FALSE); + tf = proto_tree_add_item(mux27010_tree, hf_mux27010_information, tvb, offset, 1, ENC_BIG_ENDIAN); /*Create the subtree*/ field_tree = proto_item_add_subtree(tf, ett_mux27010_information); @@ -1095,7 +1095,7 @@ dissect_mux27010(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /*~~~~~~~~Checksum~~~~~~~~*/ /*Validate checksum of frame*/ /*Add a subtree (=item) to the child node => in this subtree will be the checksum*/ - tf = proto_tree_add_item(mux27010_tree, hf_mux27010_checksum, tvb, offset, 1, FALSE); + tf = proto_tree_add_item(mux27010_tree, hf_mux27010_checksum, tvb, offset, 1, ENC_BIG_ENDIAN); /*Create the subtree*/ field_tree = proto_item_add_subtree(tf, ett_mux27010_checksum); diff --git a/epan/dissectors/packet-nasdaq-itch.c b/epan/dissectors/packet-nasdaq-itch.c index 2ade00f750..0a260f8778 100644 --- a/epan/dissectors/packet-nasdaq-itch.c +++ b/epan/dissectors/packet-nasdaq-itch.c @@ -335,7 +335,7 @@ dissect_nasdaq_itch(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = time_stamp (tvb, nasdaq_itch_tree, hf_nasdaq_itch_millisecond, offset, 8); } - proto_tree_add_item(nasdaq_itch_tree, hf_nasdaq_itch_message_type, tvb, offset, 1, FALSE); + proto_tree_add_item(nasdaq_itch_tree, hf_nasdaq_itch_message_type, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; if (version == 3) { @@ -352,20 +352,20 @@ dissect_nasdaq_itch(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) switch (nasdaq_itch_type) { case 'S': /* system event */ - proto_tree_add_item(nasdaq_itch_tree, hf_nasdaq_itch_system_event, tvb, offset, 1, FALSE); + proto_tree_add_item(nasdaq_itch_tree, hf_nasdaq_itch_system_event, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; break; case 'R': /* Stock Directory */ offset = stock(tvb, pinfo, nasdaq_itch_tree, offset); - proto_tree_add_item(nasdaq_itch_tree, hf_nasdaq_itch_market_category, tvb, offset, 1, FALSE); + proto_tree_add_item(nasdaq_itch_tree, hf_nasdaq_itch_market_category, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(nasdaq_itch_tree, hf_nasdaq_itch_financial_status, tvb, offset, 1, FALSE); + proto_tree_add_item(nasdaq_itch_tree, hf_nasdaq_itch_financial_status, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; proto_tree_add_item(nasdaq_itch_tree, hf_nasdaq_itch_round_lot_size, tvb, offset, 6, FALSE); offset += 6; - proto_tree_add_item(nasdaq_itch_tree, hf_nasdaq_itch_round_lots_only, tvb, offset, 1, FALSE); + proto_tree_add_item(nasdaq_itch_tree, hf_nasdaq_itch_round_lots_only, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; break; diff --git a/epan/dissectors/packet-nasdaq-soup.c b/epan/dissectors/packet-nasdaq-soup.c index 420ada0ba9..5d64996a5a 100644 --- a/epan/dissectors/packet-nasdaq-soup.c +++ b/epan/dissectors/packet-nasdaq-soup.c @@ -86,7 +86,7 @@ dissect_nasdaq_soup_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent tvbuff_t *new_tvb = NULL; nasdaq_soup_type = tvb_get_guint8(tvb, offset); - proto_tree_add_item(tree, hf_nasdaq_soup_packet_type, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_nasdaq_soup_packet_type, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; switch (nasdaq_soup_type) { @@ -102,7 +102,7 @@ dissect_nasdaq_soup_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent offset += 10; break; case 'J': /* login reject */ - proto_tree_add_item(tree, hf_nasdaq_soup_reject_code, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_nasdaq_soup_reject_code, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; break; diff --git a/epan/dissectors/packet-nb_rtpmux.c b/epan/dissectors/packet-nb_rtpmux.c index 36f59434c6..1d7003a359 100644 --- a/epan/dissectors/packet-nb_rtpmux.c +++ b/epan/dissectors/packet-nb_rtpmux.c @@ -117,16 +117,16 @@ dissect_nb_rtpmux(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) dstport = (tvb_get_ntohs(tvb, offset) & 0x7fff) << 1; proto_tree_add_uint(nb_rtpmux_tree, hf_nb_rtpmux_dstport, tvb, offset, 2, dstport ); proto_tree_add_item(nb_rtpmux_tree, - hf_nb_rtpmux_length, tvb, offset+2, 1, FALSE); + hf_nb_rtpmux_length, tvb, offset+2, 1, ENC_BIG_ENDIAN); proto_tree_add_item(nb_rtpmux_tree, hf_nb_r_bit, tvb, offset, 1, FALSE); srcport = (tvb_get_ntohs(tvb, offset+3) & 0x7fff) << 1; proto_tree_add_uint(nb_rtpmux_tree, hf_nb_rtpmux_srcport, tvb, offset+3, 2, srcport ); cmp_rtp_item = proto_tree_add_text( nb_rtpmux_tree, tvb, offset+5, 3, "Compressed RTP header" ); nb_rtpmux_cmp_rtp_tree = proto_item_add_subtree(cmp_rtp_item, ett_nb_rtpmux_cmp_rtp_hdr); /* Sequence Number (SN) */ - proto_tree_add_item(nb_rtpmux_cmp_rtp_tree, hf_nb_rtpmux_cmp_rtp_sequence_no, tvb, offset+5, 1, FALSE); + proto_tree_add_item(nb_rtpmux_cmp_rtp_tree, hf_nb_rtpmux_cmp_rtp_sequence_no, tvb, offset+5, 1, ENC_BIG_ENDIAN); /* Timestamp (TS) */ - proto_tree_add_item(nb_rtpmux_cmp_rtp_tree, hf_nb_rtpmux_cmp_rtp_timestamp, tvb, offset+6, 2, FALSE); + proto_tree_add_item(nb_rtpmux_cmp_rtp_tree, hf_nb_rtpmux_cmp_rtp_timestamp, tvb, offset+6, 2, ENC_BIG_ENDIAN); if (length != 0) proto_tree_add_item(nb_rtpmux_cmp_rtp_tree, hf_nb_rtpmux_cmp_rtp_data,tvb, offset+8, length-3, ENC_NA); @@ -135,7 +135,7 @@ dissect_nb_rtpmux(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) dstport = (tvb_get_ntohs(tvb, offset) & 0x7fff) << 1; proto_tree_add_uint(nb_rtpmux_tree, hf_nb_rtpmux_dstport, tvb, offset, 2, dstport ); proto_tree_add_item(nb_rtpmux_tree, - hf_nb_rtpmux_length, tvb, offset+2, 1, FALSE); + hf_nb_rtpmux_length, tvb, offset+2, 1, ENC_BIG_ENDIAN); proto_tree_add_item(nb_rtpmux_tree, hf_nb_r_bit, tvb, offset, 1, FALSE); srcport = (tvb_get_ntohs(tvb, offset+3) & 0x7fff) << 1; proto_tree_add_uint(nb_rtpmux_tree, hf_nb_rtpmux_srcport, tvb, offset+3, 2, srcport ); diff --git a/epan/dissectors/packet-nbd.c b/epan/dissectors/packet-nbd.c index 581dbda748..4bd3096630 100644 --- a/epan/dissectors/packet-nbd.c +++ b/epan/dissectors/packet-nbd.c @@ -198,7 +198,7 @@ dissect_nbd_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) magic=tvb_get_ntohl(tvb, offset); - proto_tree_add_item(tree, hf_nbd_magic, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_nbd_magic, tvb, offset, 4, ENC_BIG_ENDIAN); offset+=4; @@ -324,17 +324,17 @@ dissect_nbd_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) switch(magic){ case NBD_REQUEST_MAGIC: - proto_tree_add_item(tree, hf_nbd_type, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_nbd_type, tvb, offset, 4, ENC_BIG_ENDIAN); offset+=4; - proto_tree_add_item(tree, hf_nbd_handle, tvb, offset, 8, FALSE); + proto_tree_add_item(tree, hf_nbd_handle, tvb, offset, 8, ENC_BIG_ENDIAN); offset+=8; from=tvb_get_ntoh64(tvb, offset); - proto_tree_add_item(tree, hf_nbd_from, tvb, offset, 8, FALSE); + proto_tree_add_item(tree, hf_nbd_from, tvb, offset, 8, ENC_BIG_ENDIAN); offset+=8; - proto_tree_add_item(tree, hf_nbd_len, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_nbd_len, tvb, offset, 4, ENC_BIG_ENDIAN); offset+=4; if(check_col(pinfo->cinfo, COL_INFO)){ @@ -360,10 +360,10 @@ dissect_nbd_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) PROTO_ITEM_SET_GENERATED(item); error=tvb_get_ntohl(tvb, offset); - proto_tree_add_item(tree, hf_nbd_error, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_nbd_error, tvb, offset, 4, ENC_BIG_ENDIAN); offset+=4; - proto_tree_add_item(tree, hf_nbd_handle, tvb, offset, 8, FALSE); + proto_tree_add_item(tree, hf_nbd_handle, tvb, offset, 8, ENC_BIG_ENDIAN); offset+=8; if(check_col(pinfo->cinfo, COL_INFO)){ diff --git a/epan/dissectors/packet-nbns.c b/epan/dissectors/packet-nbns.c index fb27ba07ed..e04a6c19bd 100644 --- a/epan/dissectors/packet-nbns.c +++ b/epan/dissectors/packet-nbns.c @@ -485,7 +485,7 @@ nbns_add_nbns_flags(column_info *cinfo, proto_tree *nbns_tree, tvbuff_t *tvb, in proto_tree_add_item(field_tree, hf_nbns_flags_response, tvb, offset, 2, FALSE); proto_tree_add_item(field_tree, hf_nbns_flags_opcode, - tvb, offset, 2, FALSE); + tvb, offset, 2, ENC_BIG_ENDIAN); if (flags & F_RESPONSE) { proto_tree_add_item(field_tree, hf_nbns_flags_authoritative, tvb, offset, 2, FALSE); @@ -502,7 +502,7 @@ nbns_add_nbns_flags(column_info *cinfo, proto_tree *nbns_tree, tvbuff_t *tvb, in tvb, offset, 2, FALSE); if (flags & F_RESPONSE && !is_wack) { proto_tree_add_item(field_tree, hf_nbns_flags_rcode, - tvb, offset, 2, FALSE); + tvb, offset, 2, ENC_BIG_ENDIAN); } } @@ -1499,7 +1499,7 @@ dissect_nbss_packet(tvbuff_t *tvb, int offset, packet_info *pinfo, if (is_cifs) { if (tree) { - proto_tree_add_item(nbss_tree, hf_nbss_cifs_length, tvb, offset, 3, FALSE); + proto_tree_add_item(nbss_tree, hf_nbss_cifs_length, tvb, offset, 3, ENC_BIG_ENDIAN); } offset += 3; } else { diff --git a/epan/dissectors/packet-ncp-nmas.c b/epan/dissectors/packet-ncp-nmas.c index c80b863535..cc24d3bd26 100644 --- a/epan/dissectors/packet-ncp-nmas.c +++ b/epan/dissectors/packet-ncp-nmas.c @@ -308,25 +308,25 @@ dissect_nmas_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ncp_tree, nc atree = proto_item_add_subtree(aitem, ett_nmas); switch (subfunc) { case 1: - proto_tree_add_item(atree, hf_ping_version, tvb, foffset, 4, TRUE); + proto_tree_add_item(atree, hf_ping_version, tvb, foffset, 4, ENC_LITTLE_ENDIAN); foffset += 4; - proto_tree_add_item(atree, hf_ping_flags, tvb, foffset, 4, TRUE); + proto_tree_add_item(atree, hf_ping_flags, tvb, foffset, 4, ENC_LITTLE_ENDIAN); foffset += 4; break; case 2: - proto_tree_add_item(atree, hf_frag_handle, tvb, foffset, 4, TRUE); + proto_tree_add_item(atree, hf_frag_handle, tvb, foffset, 4, ENC_LITTLE_ENDIAN); /* Check for Fragment packet */ if (tvb_get_letohl(tvb, foffset)!=0xffffffff) { break; } foffset += 4; foffset += 4; /* Dont know what this is */ - proto_tree_add_item(atree, hf_length, tvb, foffset, 4, TRUE); + proto_tree_add_item(atree, hf_length, tvb, foffset, 4, ENC_LITTLE_ENDIAN); msg_length = tvb_get_letohl(tvb, foffset); foffset += 4; foffset += 12; msg_length -= 16; - proto_tree_add_item(atree, hf_subverb, tvb, foffset, 4, TRUE); + proto_tree_add_item(atree, hf_subverb, tvb, foffset, 4, ENC_LITTLE_ENDIAN); subverb = tvb_get_letohl(tvb, foffset); if (request_value) { request_value->req_nds_flags=subverb; /* Store the NMAS fragment verb */ @@ -339,9 +339,9 @@ dissect_nmas_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ncp_tree, nc } switch (subverb) { case 0: /* Fragmented Ping */ - proto_tree_add_item(atree, hf_ping_version, tvb, foffset, 4, TRUE); + proto_tree_add_item(atree, hf_ping_version, tvb, foffset, 4, ENC_LITTLE_ENDIAN); foffset += 4; - proto_tree_add_item(atree, hf_ping_flags, tvb, foffset, 4, TRUE); + proto_tree_add_item(atree, hf_ping_flags, tvb, foffset, 4, ENC_LITTLE_ENDIAN); foffset += 4; break; case 2: /* Client Put Data */ @@ -353,13 +353,13 @@ dissect_nmas_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ncp_tree, nc /* No Op */ break; case 8: /* Login Store Management */ - proto_tree_add_item(atree, hf_reply_buffer_size, tvb, foffset, 1, TRUE); + proto_tree_add_item(atree, hf_reply_buffer_size, tvb, foffset, 1, ENC_LITTLE_ENDIAN); foffset += 4; msgverb = tvb_get_guint8(tvb, foffset); if (request_value) { request_value->nds_request_verb=msgverb; /* Use nds_request_verb for passed subverb */ } - proto_tree_add_item(atree, hf_lsm_verb, tvb, foffset, 1, TRUE); + proto_tree_add_item(atree, hf_lsm_verb, tvb, foffset, 1, ENC_LITTLE_ENDIAN); foffset += 4; if (check_col(pinfo->cinfo, COL_INFO)) { col_append_fstr(pinfo->cinfo, COL_INFO, ", %s", @@ -391,16 +391,16 @@ dissect_nmas_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ncp_tree, nc break; case 1242: /* Message Handler */ foffset += 4; - proto_tree_add_item(atree, hf_msg_version, tvb, foffset, 4, FALSE); + proto_tree_add_item(atree, hf_msg_version, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; - proto_tree_add_item(atree, hf_session_ident, tvb, foffset, 4, FALSE); + proto_tree_add_item(atree, hf_session_ident, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; foffset += 3; msgverb = tvb_get_guint8(tvb, foffset); if (request_value) { request_value->nds_request_verb=msgverb; /* Use nds_request_verb for passed verb */ } - proto_tree_add_item(atree, hf_msg_verb, tvb, foffset, 1, FALSE); + proto_tree_add_item(atree, hf_msg_verb, tvb, foffset, 1, ENC_BIG_ENDIAN); foffset += 1; msg_length -= 12; if (check_col(pinfo->cinfo, COL_INFO)) { @@ -411,7 +411,7 @@ dissect_nmas_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ncp_tree, nc { case 1: msg_length = tvb_get_ntohl(tvb, foffset); - proto_tree_add_item(atree, hf_length, tvb, foffset, 4, FALSE); + proto_tree_add_item(atree, hf_length, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; proto_tree_add_item(atree, hf_data, tvb, foffset, msg_length, ENC_NA); foffset += msg_length; @@ -419,7 +419,7 @@ dissect_nmas_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ncp_tree, nc case 3: msg_length = tvb_get_ntohl(tvb, foffset); msg_length -= 4; - proto_tree_add_item(atree, hf_length, tvb, foffset, 4, FALSE); + proto_tree_add_item(atree, hf_length, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; while (msg_length > 0) { @@ -502,18 +502,18 @@ dissect_nmas_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ncp_tree, guin atree = proto_item_add_subtree(aitem, ett_nmas); switch (subfunc) { case 1: - proto_tree_add_item(atree, hf_ping_flags, tvb, foffset, 4, TRUE); + proto_tree_add_item(atree, hf_ping_flags, tvb, foffset, 4, ENC_LITTLE_ENDIAN); foffset += 4; - proto_tree_add_item(atree, hf_nmas_version, tvb, foffset, 4, TRUE); + proto_tree_add_item(atree, hf_nmas_version, tvb, foffset, 4, ENC_LITTLE_ENDIAN); foffset += 4; break; case 2: proto_tree_add_text(atree, tvb, foffset, -1, "Verb: %s", val_to_str(subverb, nmas_subverb_enum, "Unknown (%u)")); - proto_tree_add_item(atree, hf_length, tvb, foffset, 4, TRUE); + proto_tree_add_item(atree, hf_length, tvb, foffset, 4, ENC_LITTLE_ENDIAN); msg_length = tvb_get_letohl(tvb, foffset); foffset +=4; - proto_tree_add_item(atree, hf_frag_handle, tvb, foffset, 4, TRUE); + proto_tree_add_item(atree, hf_frag_handle, tvb, foffset, 4, ENC_LITTLE_ENDIAN); /* Check for a fragment packet */ if (tvb_get_letohl(tvb, foffset)!=0xffffffff) { break; @@ -527,15 +527,15 @@ dissect_nmas_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ncp_tree, guin { switch (subverb) { case 0: /* Fragmented Ping */ - proto_tree_add_item(atree, hf_ping_flags, tvb, foffset, 4, TRUE); + proto_tree_add_item(atree, hf_ping_flags, tvb, foffset, 4, ENC_LITTLE_ENDIAN); foffset += 4; - proto_tree_add_item(atree, hf_nmas_version, tvb, foffset, 4, TRUE); + proto_tree_add_item(atree, hf_nmas_version, tvb, foffset, 4, ENC_LITTLE_ENDIAN); foffset += 4; break; case 2: /* Client Put Data */ - proto_tree_add_item(atree, hf_squeue_bytes, tvb, foffset, 4, TRUE); + proto_tree_add_item(atree, hf_squeue_bytes, tvb, foffset, 4, ENC_LITTLE_ENDIAN); foffset += 4; - proto_tree_add_item(atree, hf_cqueue_bytes, tvb, foffset, 4, TRUE); + proto_tree_add_item(atree, hf_cqueue_bytes, tvb, foffset, 4, ENC_LITTLE_ENDIAN); foffset += 4; break; case 4: /* Client Get Data */ @@ -543,11 +543,11 @@ dissect_nmas_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ncp_tree, guin foffset += msg_length; break; case 6: /* Client Get User NDS Credentials */ - proto_tree_add_item(atree, hf_num_creds, tvb, foffset, 4, TRUE); + proto_tree_add_item(atree, hf_num_creds, tvb, foffset, 4, ENC_LITTLE_ENDIAN); foffset += 4; - proto_tree_add_item(atree, hf_cred_type, tvb, foffset, 4, TRUE); + proto_tree_add_item(atree, hf_cred_type, tvb, foffset, 4, ENC_LITTLE_ENDIAN); foffset += 4; - proto_tree_add_item(atree, hf_login_state, tvb, foffset, 4, TRUE); + proto_tree_add_item(atree, hf_login_state, tvb, foffset, 4, ENC_LITTLE_ENDIAN); foffset += 4; msg_length -= 12; proto_tree_add_item(atree, hf_enc_cred, tvb, foffset, msg_length, ENC_NA); @@ -572,7 +572,7 @@ dissect_nmas_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ncp_tree, guin } break; case 10: /* Writable Object Check */ - proto_tree_add_item(atree, hf_nmas_version, tvb, foffset, 4, TRUE); + proto_tree_add_item(atree, hf_nmas_version, tvb, foffset, 4, ENC_LITTLE_ENDIAN); foffset += 4; break; case 1242: /* Message Handler */ @@ -582,13 +582,13 @@ dissect_nmas_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ncp_tree, guin { case 1: msg_length = tvb_get_ntohl(tvb, foffset); - proto_tree_add_item(atree, hf_length, tvb, foffset, 4, FALSE); + proto_tree_add_item(atree, hf_length, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; proto_tree_add_item(atree, hf_data, tvb, foffset, msg_length, ENC_NA); foffset += msg_length; break; case 3: - proto_tree_add_item(atree, hf_session_ident, tvb, foffset, 4, FALSE); + proto_tree_add_item(atree, hf_session_ident, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; break; case 5: @@ -600,7 +600,7 @@ dissect_nmas_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ncp_tree, guin if (str) { col_add_fstr(pinfo->cinfo, COL_INFO, "R Payload Error - %s", str); - expert_item = proto_tree_add_item(atree, hf_encrypt_error, tvb, foffset, 4, FALSE); + expert_item = proto_tree_add_item(atree, hf_encrypt_error, tvb, foffset, 4, ENC_BIG_ENDIAN); expert_add_info_format(pinfo, expert_item, PI_RESPONSE_CODE, PI_ERROR, "NMAS Payload Error: %s", str); } else @@ -623,7 +623,7 @@ dissect_nmas_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ncp_tree, guin str = match_strval(return_code, nmas_errors_enum); if (str) { - expert_item = proto_tree_add_item(atree, hf_return_code, tvb, roffset, 4, TRUE); + expert_item = proto_tree_add_item(atree, hf_return_code, tvb, roffset, 4, ENC_LITTLE_ENDIAN); expert_add_info_format(pinfo, expert_item, PI_RESPONSE_CODE, PI_ERROR, "NMAS Error: 0x%08x %s", return_code, str); col_add_fstr(pinfo->cinfo, COL_INFO, "R Error - %s", str); } @@ -631,7 +631,7 @@ dissect_nmas_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ncp_tree, guin { if (return_code!=0) { - expert_item = proto_tree_add_item(atree, hf_return_code, tvb, roffset, 4, TRUE); + expert_item = proto_tree_add_item(atree, hf_return_code, tvb, roffset, 4, ENC_LITTLE_ENDIAN); expert_add_info_format(pinfo, expert_item, PI_RESPONSE_CODE, PI_ERROR, "NMAS Error: 0x%08x is unknown", return_code); if (check_col(pinfo->cinfo, COL_INFO)) { col_add_fstr(pinfo->cinfo, COL_INFO, "R Unknown NMAS Error - 0x%08x", return_code); diff --git a/epan/dissectors/packet-ncp-sss.c b/epan/dissectors/packet-ncp-sss.c index 4c39fd75d5..25bf38e639 100644 --- a/epan/dissectors/packet-ncp-sss.c +++ b/epan/dissectors/packet-ncp-sss.c @@ -547,26 +547,26 @@ dissect_sss_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ncp_tree, ncp case 1: aitem = proto_tree_add_text(ncp_tree, tvb, foffset, tvb_length_remaining(tvb, foffset), "Packet Type: %s", val_to_str(subfunc, sss_func_enum, "Unknown (%d)")); atree = proto_item_add_subtree(aitem, ett_sss); - proto_tree_add_item(atree, hf_ping_version, tvb, foffset, 4, TRUE); + proto_tree_add_item(atree, hf_ping_version, tvb, foffset, 4, ENC_LITTLE_ENDIAN); foffset += 4; - proto_tree_add_item(atree, hf_flags, tvb, foffset, 4, TRUE); + proto_tree_add_item(atree, hf_flags, tvb, foffset, 4, ENC_LITTLE_ENDIAN); foffset += 4; break; case 2: - proto_tree_add_item(ncp_tree, hf_frag_handle, tvb, foffset, 4, TRUE); + proto_tree_add_item(ncp_tree, hf_frag_handle, tvb, foffset, 4, ENC_LITTLE_ENDIAN); if (tvb_get_letohl(tvb, foffset)==0xffffffff) /* Fragment handle of -1 means no fragment. So process packet */ { foffset += 4; - proto_tree_add_item(ncp_tree, hf_buffer_size, tvb, foffset, 4, TRUE); + proto_tree_add_item(ncp_tree, hf_buffer_size, tvb, foffset, 4, ENC_LITTLE_ENDIAN); foffset += 4; - proto_tree_add_item(ncp_tree, hf_length, tvb, foffset, 4, TRUE); + proto_tree_add_item(ncp_tree, hf_length, tvb, foffset, 4, ENC_LITTLE_ENDIAN); foffset += 4; foffset += 12; /* Blank Context */ subverb = tvb_get_letohl(tvb, foffset); if (check_col(pinfo->cinfo, COL_INFO)) { col_append_fstr(pinfo->cinfo, COL_INFO, ", %s", val_to_str(subverb, sss_verb_enum, "Unknown (%d)")); } - aitem = proto_tree_add_item(ncp_tree, hf_verb, tvb, foffset, 4, TRUE); + aitem = proto_tree_add_item(ncp_tree, hf_verb, tvb, foffset, 4, ENC_LITTLE_ENDIAN); atree = proto_item_add_subtree(aitem, ett_sss); if (request_value) { request_value->req_nds_flags=subverb; @@ -574,7 +574,7 @@ dissect_sss_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ncp_tree, ncp foffset += 4; process_flags(atree, tvb, foffset); foffset += 4; - proto_tree_add_item(atree, hf_context, tvb, foffset, 4, FALSE); + proto_tree_add_item(atree, hf_context, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; switch (subverb) { case 0: @@ -691,9 +691,9 @@ dissect_sss_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ncp_tree, guint atree = proto_item_add_subtree(aitem, ett_sss); switch (subfunc) { case 1: - proto_tree_add_item(atree, hf_flags, tvb, foffset, 4, TRUE); + proto_tree_add_item(atree, hf_flags, tvb, foffset, 4, ENC_LITTLE_ENDIAN); foffset += 4; - proto_tree_add_item(atree, hf_sss_version, tvb, foffset, 4, TRUE); + proto_tree_add_item(atree, hf_sss_version, tvb, foffset, 4, ENC_LITTLE_ENDIAN); foffset += 4; break; case 2: @@ -704,11 +704,11 @@ dissect_sss_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ncp_tree, guint proto_tree_add_text(atree, tvb, foffset, tvb_length_remaining(tvb, foffset), "Verb: %s", str); } } - proto_tree_add_item(atree, hf_length, tvb, foffset, 4, TRUE); + proto_tree_add_item(atree, hf_length, tvb, foffset, 4, ENC_LITTLE_ENDIAN); msg_length = tvb_get_letohl(tvb, foffset); return_code = tvb_get_ntohl(tvb, foffset+msg_length); foffset += 4; - proto_tree_add_item(atree, hf_frag_handle, tvb, foffset, 4, TRUE); + proto_tree_add_item(atree, hf_frag_handle, tvb, foffset, 4, ENC_LITTLE_ENDIAN); foffset += 4; msg_length -= 4; if ((tvb_get_letohl(tvb, foffset-4)==0xffffffff) && (msg_length > 4)) @@ -718,7 +718,7 @@ dissect_sss_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ncp_tree, guint str = match_strval(return_code, sss_errors_enum); if (str) { - expert_item = proto_tree_add_item(atree, hf_return_code, tvb, foffset, 4, TRUE); + expert_item = proto_tree_add_item(atree, hf_return_code, tvb, foffset, 4, ENC_LITTLE_ENDIAN); expert_add_info_format(pinfo, expert_item, PI_RESPONSE_CODE, PI_ERROR, "SSS Error: %s", str); if (check_col(pinfo->cinfo, COL_INFO)) { col_add_fstr(pinfo->cinfo, COL_INFO, "R Error - %s", val_to_str(return_code, sss_errors_enum, "Unknown (%d)")); diff --git a/epan/dissectors/packet-ncp.c b/epan/dissectors/packet-ncp.c index 18f0754e95..2e48e7a8d5 100644 --- a/epan/dissectors/packet-ncp.c +++ b/epan/dissectors/packet-ncp.c @@ -484,9 +484,9 @@ dissect_ncp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, case NCP_BROADCAST_SLOT: /* Server Broadcast */ proto_tree_add_uint(ncp_tree, hf_ncp_seq, tvb, commhdr + 2, 1, header.sequence); proto_tree_add_uint(ncp_tree, hf_ncp_connection,tvb, commhdr + 3, 3, nw_connection); - proto_tree_add_item(ncp_tree, hf_ncp_task, tvb, commhdr + 4, 1, FALSE); + proto_tree_add_item(ncp_tree, hf_ncp_task, tvb, commhdr + 4, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ncp_tree, hf_ncp_oplock_flag, tvb, commhdr + 9, 1, tvb_get_guint8(tvb, commhdr+9)); - proto_tree_add_item(ncp_tree, hf_ncp_oplock_handle, tvb, commhdr + 10, 4, FALSE); + proto_tree_add_item(ncp_tree, hf_ncp_oplock_handle, tvb, commhdr + 10, 4, ENC_BIG_ENDIAN); if ((tvb_get_guint8(tvb, commhdr+9)==0x24) && ncp_echo_file) { expert_add_info_format(pinfo, NULL, PI_RESPONSE_CODE, PI_CHAT, "Server requesting station to clear oplock on handle - %08x", tvb_get_ntohl(tvb, commhdr+10)); @@ -579,23 +579,23 @@ dissect_ncp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_tree_add_item(ncp_tree, hf_ncp_stream_type, - tvb, commhdr + 3, 1, FALSE); + tvb, commhdr + 3, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ncp_tree, hf_ncp_src_connection, - tvb, commhdr + 4, 4, FALSE); + tvb, commhdr + 4, 4, ENC_BIG_ENDIAN); proto_tree_add_item(ncp_tree, hf_ncp_dst_connection, - tvb, commhdr + 8, 4, FALSE); + tvb, commhdr + 8, 4, ENC_BIG_ENDIAN); proto_tree_add_item(ncp_tree, hf_ncp_packet_seqno, - tvb, commhdr + 12, 4, FALSE); + tvb, commhdr + 12, 4, ENC_BIG_ENDIAN); proto_tree_add_item(ncp_tree, hf_ncp_delay_time, tvb, commhdr + 16, 4, FALSE); ncp_burst_seqno = tvb_get_ntohs(tvb, commhdr+20); proto_tree_add_item(ncp_tree, hf_ncp_burst_seqno, - tvb, commhdr + 20, 2, FALSE); + tvb, commhdr + 20, 2, ENC_BIG_ENDIAN); ncp_ack_seqno = tvb_get_ntohs(tvb, commhdr+22); proto_tree_add_item(ncp_tree, hf_ncp_ack_seqno, - tvb, commhdr + 22, 2, FALSE); + tvb, commhdr + 22, 2, ENC_BIG_ENDIAN); proto_tree_add_item(ncp_tree, hf_ncp_burst_len, - tvb, commhdr + 24, 4, FALSE); + tvb, commhdr + 24, 4, ENC_BIG_ENDIAN); data_offset = tvb_get_ntohl(tvb, commhdr + 28); proto_tree_add_uint(ncp_tree, hf_ncp_data_offset, tvb, commhdr + 28, 4, data_offset); @@ -604,7 +604,7 @@ dissect_ncp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, tvb, commhdr + 32, 2, data_len); missing_fraglist_count = tvb_get_ntohs(tvb, commhdr + 34); proto_tree_add_item(ncp_tree, hf_ncp_missing_fraglist_count, - tvb, commhdr + 34, 2, FALSE); + tvb, commhdr + 34, 2, ENC_BIG_ENDIAN); offset = commhdr + 36; if (!(flags & SYS) && ncp_burst_seqno == ncp_ack_seqno && data_offset == 0) { @@ -619,7 +619,7 @@ dissect_ncp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, return; ncp_burst_command = tvb_get_ntohl(tvb, offset); proto_tree_add_item(ncp_tree, hf_ncp_burst_command, - tvb, offset, 4, FALSE); + tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; data_len -= 4; @@ -627,7 +627,7 @@ dissect_ncp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, return; burst_file = tvb_get_ntohl(tvb, offset); proto_tree_add_item(ncp_tree, hf_ncp_burst_file_handle, - tvb, offset, 4, FALSE); + tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; data_len -= 4; @@ -688,7 +688,7 @@ dissect_ncp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, default: proto_tree_add_uint(ncp_tree, hf_ncp_seq, tvb, commhdr + 2, 1, header.sequence); proto_tree_add_uint(ncp_tree, hf_ncp_connection,tvb, commhdr + 3, 3, nw_connection); - proto_tree_add_item(ncp_tree, hf_ncp_task, tvb, commhdr + 4, 1, FALSE); + proto_tree_add_item(ncp_tree, hf_ncp_task, tvb, commhdr + 4, 1, ENC_BIG_ENDIAN); break; } @@ -773,13 +773,13 @@ dissect_ncp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, * packet should be handled by "dissect_ncp_reply()". */ proto_tree_add_item(ncp_tree, hf_ncp_completion_code, - tvb, commhdr + 6, 1, TRUE); + tvb, commhdr + 6, 1, ENC_LITTLE_ENDIAN); proto_tree_add_item(ncp_tree, hf_ncp_connection_status, - tvb, commhdr + 7, 1, TRUE); + tvb, commhdr + 7, 1, ENC_LITTLE_ENDIAN); proto_tree_add_item(ncp_tree, hf_ncp_slot, - tvb, commhdr + 8, 1, TRUE); + tvb, commhdr + 8, 1, ENC_LITTLE_ENDIAN); proto_tree_add_item(ncp_tree, hf_ncp_control_code, - tvb, commhdr + 9, 1, TRUE); + tvb, commhdr + 9, 1, ENC_LITTLE_ENDIAN); /* * Display the rest of the packet as data. */ @@ -798,10 +798,10 @@ dissect_ncp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, */ while (missing_fraglist_count != 0) { proto_tree_add_item(ncp_tree, hf_ncp_missing_data_offset, - tvb, offset, 4, FALSE); + tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; proto_tree_add_item(ncp_tree, hf_ncp_missing_data_count, - tvb, offset, 2, FALSE); + tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; missing_fraglist_count--; } diff --git a/epan/dissectors/packet-ncs.c b/epan/dissectors/packet-ncs.c index c57af89f3b..1f190ebb4b 100644 --- a/epan/dissectors/packet-ncs.c +++ b/epan/dissectors/packet-ncs.c @@ -54,8 +54,8 @@ dissect_ncs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, "NCS"); col_set_str(pinfo->cinfo, COL_INFO, "Novell Cluster Services Heartbeat"); - proto_tree_add_item(ncs_tree, hf_panning_id, tvb, 4, 4, FALSE); - proto_tree_add_item(ncs_tree, hf_incarnation, tvb, 8, 4, FALSE); + proto_tree_add_item(ncs_tree, hf_panning_id, tvb, 4, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(ncs_tree, hf_incarnation, tvb, 8, 4, ENC_BIG_ENDIAN); } void diff --git a/epan/dissectors/packet-ndmp.c b/epan/dissectors/packet-ndmp.c index 7e78d4b8a6..d8ddb55049 100644 --- a/epan/dissectors/packet-ndmp.c +++ b/epan/dissectors/packet-ndmp.c @@ -646,7 +646,7 @@ dissect_connect_open_request(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, guint32 version; /* version number */ - proto_tree_add_item(tree, hf_ndmp_version, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_ndmp_version, tvb, offset, 4, ENC_BIG_ENDIAN); version=tvb_get_ntohl(tvb, offset); ndmp_conv_data->version=version; offset += 4; @@ -662,7 +662,7 @@ dissect_error(tvbuff_t *tvb, int offset, packet_info *pinfo, /* error */ err=tvb_get_ntohl(tvb, offset); - proto_tree_add_item(tree, hf_ndmp_error, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_ndmp_error, tvb, offset, 4, ENC_BIG_ENDIAN); if(err && check_col(pinfo->cinfo, COL_INFO)) { col_append_fstr(pinfo->cinfo, COL_INFO, " NDMP Error:%s ", @@ -717,7 +717,7 @@ static int dissect_ndmp_addr_type(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item(tree, hf_ndmp_addr_type, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_ndmp_addr_type, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; return offset; @@ -758,7 +758,7 @@ static int dissect_auth_type(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item(tree, hf_ndmp_auth_type, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_ndmp_auth_type, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; return offset; @@ -781,7 +781,7 @@ dissect_auth_attr_msg(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, type=tvb_get_ntohl(tvb,offset); /* auth type */ - proto_tree_add_item(tree, hf_ndmp_auth_type, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_ndmp_auth_type, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; switch(type){ @@ -1212,7 +1212,7 @@ dissect_ext_version(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { /* extension version */ - proto_tree_add_item(tree, hf_ndmp_ext_version, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_ndmp_ext_version, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; return offset; @@ -1224,7 +1224,7 @@ dissect_class_list(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { /* class id */ - proto_tree_add_item(tree, hf_ndmp_ex_class_id, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_ndmp_ex_class_id, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; /* ext version */ @@ -1254,11 +1254,11 @@ dissect_class_version(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { /* class id */ - proto_tree_add_item(tree, hf_ndmp_ex_class_id, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_ndmp_ex_class_id, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; /* ext version */ - proto_tree_add_item(tree, hf_ndmp_ex_class_version, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_ndmp_ex_class_version, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; return offset; @@ -1311,15 +1311,15 @@ dissect_scsi_get_state_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, offset=dissect_error(tvb, offset, pinfo, tree, seq); /* controller */ - proto_tree_add_item(tree, hf_ndmp_scsi_controller, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_ndmp_scsi_controller, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; /* id */ - proto_tree_add_item(tree, hf_ndmp_scsi_id, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_ndmp_scsi_id, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; /* lun */ - proto_tree_add_item(tree, hf_ndmp_scsi_lun, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_ndmp_scsi_lun, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; return offset; @@ -1334,15 +1334,15 @@ dissect_scsi_set_state_request(tvbuff_t *tvb, int offset, hf_ndmp_scsi_device, offset, NULL); /* controller */ - proto_tree_add_item(tree, hf_ndmp_scsi_controller, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_ndmp_scsi_controller, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; /* id */ - proto_tree_add_item(tree, hf_ndmp_scsi_id, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_ndmp_scsi_id, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; /* lun */ - proto_tree_add_item(tree, hf_ndmp_scsi_lun, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_ndmp_scsi_lun, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; return offset; @@ -1508,7 +1508,7 @@ dissect_execute_cdb_request(tvbuff_t *tvb, int offset, packet_info *pinfo, offset += 4; /* datain_len */ - proto_tree_add_item(tree, hf_ndmp_execute_cdb_datain_len, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_ndmp_execute_cdb_datain_len, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; /* CDB */ @@ -1578,7 +1578,7 @@ dissect_execute_cdb_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, offset=dissect_error(tvb, offset, pinfo, tree, seq); /* status */ - proto_tree_add_item(tree, hf_ndmp_execute_cdb_status, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_ndmp_execute_cdb_status, tvb, offset, 4, ENC_BIG_ENDIAN); status=tvb_get_ntohl(tvb, offset); if(ndmp_conv_data->task && ndmp_conv_data->task->itlq){ dissect_scsi_rsp(tvb, pinfo, top_tree, ndmp_conv_data->task->itlq, get_itl_nexus(pinfo, FALSE), (guint8)status); @@ -1587,7 +1587,7 @@ dissect_execute_cdb_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, /* dataout_len */ - proto_tree_add_item(tree, hf_ndmp_execute_cdb_dataout_len, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_ndmp_execute_cdb_dataout_len, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; /* datain */ @@ -1617,7 +1617,7 @@ dissect_tape_open_request(tvbuff_t *tvb, int offset, packet_info *pinfo, hf_ndmp_tape_device, offset, NULL); /* open mode */ - proto_tree_add_item(tree, hf_ndmp_tape_open_mode, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_ndmp_tape_open_mode, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; if(!pinfo->fd->flags.visited){ @@ -1750,19 +1750,19 @@ dissect_tape_get_state_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, offset=dissect_tape_flags(tvb, offset, pinfo, tree); /* file_num */ - proto_tree_add_item(tree, hf_ndmp_tape_file_num, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_ndmp_tape_file_num, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; /* soft_errors */ - proto_tree_add_item(tree, hf_ndmp_tape_soft_errors, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_ndmp_tape_soft_errors, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; /* block_size */ - proto_tree_add_item(tree, hf_ndmp_tape_block_size, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_ndmp_tape_block_size, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; /* block_no */ - proto_tree_add_item(tree, hf_ndmp_tape_block_no, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_ndmp_tape_block_no, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; /* total_space */ @@ -1778,7 +1778,7 @@ dissect_tape_get_state_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, return offset; /* partition */ - proto_tree_add_item(tree, hf_ndmp_tape_partition, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_ndmp_tape_partition, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; return offset; @@ -1807,11 +1807,11 @@ dissect_tape_mtio_request(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, guint32 seq _U_) { /* op */ - proto_tree_add_item(tree, hf_ndmp_tape_mtio_op, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_ndmp_tape_mtio_op, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; /* count */ - proto_tree_add_item(tree, hf_ndmp_count, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_ndmp_count, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; return offset; @@ -1825,7 +1825,7 @@ dissect_tape_mtio_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, offset=dissect_error(tvb, offset, pinfo, tree, seq); /* resid count */ - proto_tree_add_item(tree, hf_ndmp_resid_count, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_ndmp_resid_count, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; return offset; @@ -1898,7 +1898,7 @@ dissect_ndmp_v4_tcp_addr(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tr offset+=4; /* TCP port */ - proto_tree_add_item(tree, hf_ndmp_addr_tcp, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_ndmp_addr_tcp, tvb, offset, 4, ENC_BIG_ENDIAN); offset+=4; /* addr_env */ @@ -1924,7 +1924,7 @@ dissect_ndmp_addr(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, } /*address type*/ - proto_tree_add_item(tree, hf_ndmp_addr_type, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_ndmp_addr_type, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; @@ -1939,7 +1939,7 @@ dissect_ndmp_addr(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, offset+=4; /* TCP port */ - proto_tree_add_item(tree, hf_ndmp_addr_tcp, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_ndmp_addr_tcp, tvb, offset, 4, ENC_BIG_ENDIAN); offset+=4; } else { offset = dissect_rpc_array(tvb, pinfo, tree, offset, @@ -1950,7 +1950,7 @@ dissect_ndmp_addr(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, break; case NDMP_ADDR_FC: /* FCAL loop id */ - proto_tree_add_item(tree, hf_ndmp_addr_fcal_loop_id, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_ndmp_addr_fcal_loop_id, tvb, offset, 4, ENC_BIG_ENDIAN); offset+=4; break; @@ -1982,48 +1982,48 @@ dissect_mover_get_state_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, /* mode is only present in version 4 and beyond */ if(get_ndmp_protocol_version()>=NDMP_PROTOCOL_V4){ - proto_tree_add_item(tree, hf_ndmp_mover_mode, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_ndmp_mover_mode, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; } /* mover state */ - proto_tree_add_item(tree, hf_ndmp_mover_state, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_ndmp_mover_state, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; /* mover pause */ - proto_tree_add_item(tree, hf_ndmp_mover_pause, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_ndmp_mover_pause, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; /* halt */ - proto_tree_add_item(tree, hf_ndmp_halt, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_ndmp_halt, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; /* record size */ - proto_tree_add_item(tree, hf_ndmp_record_size, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_ndmp_record_size, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; /* record num */ - proto_tree_add_item(tree, hf_ndmp_record_num, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_ndmp_record_num, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; /* data written */ - proto_tree_add_item(tree, hf_ndmp_data_written, tvb, offset, 8, FALSE); + proto_tree_add_item(tree, hf_ndmp_data_written, tvb, offset, 8, ENC_BIG_ENDIAN); offset += 8; /* seek position */ - proto_tree_add_item(tree, hf_ndmp_seek_position, tvb, offset, 8, FALSE); + proto_tree_add_item(tree, hf_ndmp_seek_position, tvb, offset, 8, ENC_BIG_ENDIAN); offset += 8; /* bytes left to read */ - proto_tree_add_item(tree, hf_ndmp_bytes_left_to_read, tvb, offset, 8, FALSE); + proto_tree_add_item(tree, hf_ndmp_bytes_left_to_read, tvb, offset, 8, ENC_BIG_ENDIAN); offset += 8; /* window offset */ - proto_tree_add_item(tree, hf_ndmp_window_offset, tvb, offset, 8, FALSE); + proto_tree_add_item(tree, hf_ndmp_window_offset, tvb, offset, 8, ENC_BIG_ENDIAN); offset += 8; /* window length */ - proto_tree_add_item(tree, hf_ndmp_window_length, tvb, offset, 8, FALSE); + proto_tree_add_item(tree, hf_ndmp_window_length, tvb, offset, 8, ENC_BIG_ENDIAN); offset += 8; /* this is where v2 ends */ @@ -2053,11 +2053,11 @@ dissect_mover_listen_request(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, guint32 seq _U_) { /* mode */ - proto_tree_add_item(tree, hf_ndmp_mover_mode, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_ndmp_mover_mode, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; /*address type*/ - proto_tree_add_item(tree, hf_ndmp_addr_type, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_ndmp_addr_type, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; return offset; @@ -2081,11 +2081,11 @@ dissect_mover_set_window_request(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, guint32 seq _U_) { /* window offset */ - proto_tree_add_item(tree, hf_ndmp_window_offset, tvb, offset, 8, FALSE); + proto_tree_add_item(tree, hf_ndmp_window_offset, tvb, offset, 8, ENC_BIG_ENDIAN); offset += 8; /* window length */ - proto_tree_add_item(tree, hf_ndmp_window_length, tvb, offset, 8, FALSE); + proto_tree_add_item(tree, hf_ndmp_window_length, tvb, offset, 8, ENC_BIG_ENDIAN); offset += 8; return offset; @@ -2096,7 +2096,7 @@ dissect_mover_set_record_size_request(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, guint32 seq _U_) { /* record size */ - proto_tree_add_item(tree, hf_ndmp_record_size, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_ndmp_record_size, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; return offset; @@ -2107,7 +2107,7 @@ dissect_mover_connect_request(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, guint32 seq _U_) { /* mode */ - proto_tree_add_item(tree, hf_ndmp_mover_mode, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_ndmp_mover_mode, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; /* ndmp addr */ @@ -2147,11 +2147,11 @@ dissect_log_message_request(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, guint32 seq _U_) { /* type */ - proto_tree_add_item(tree, hf_ndmp_log_type, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_ndmp_log_type, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; /* message id */ - proto_tree_add_item(tree, hf_ndmp_log_message_id, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_ndmp_log_message_id, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; /* message */ @@ -2166,7 +2166,7 @@ dissect_notify_data_halted_request(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, guint32 seq _U_) { /* halt */ - proto_tree_add_item(tree, hf_ndmp_halt, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_ndmp_halt, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; switch(get_ndmp_protocol_version()){ @@ -2186,7 +2186,7 @@ dissect_notify_mover_halted_request(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, guint32 seq _U_) { /* halt */ - proto_tree_add_item(tree, hf_ndmp_halt, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_ndmp_halt, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; switch(get_ndmp_protocol_version()){ @@ -2216,11 +2216,11 @@ dissect_notify_connected_request(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, guint32 seq _U_) { /* connected */ - proto_tree_add_item(tree, hf_ndmp_connected, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_ndmp_connected, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; /* version number */ - proto_tree_add_item(tree, hf_ndmp_version, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_ndmp_version, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; /* reason */ @@ -2236,11 +2236,11 @@ dissect_notify_mover_paused_request(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, guint32 seq _U_) { /* mover pause */ - proto_tree_add_item(tree, hf_ndmp_mover_pause, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_ndmp_mover_pause, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; /* seek position */ - proto_tree_add_item(tree, hf_ndmp_seek_position, tvb, offset, 8, FALSE); + proto_tree_add_item(tree, hf_ndmp_seek_position, tvb, offset, 8, ENC_BIG_ENDIAN); offset += 8; return offset; @@ -2255,7 +2255,7 @@ dissect_auth_data(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, type=tvb_get_ntohl(tvb,offset); /* auth type */ - proto_tree_add_item(tree, hf_ndmp_auth_type, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_ndmp_auth_type, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; switch(type){ @@ -2324,7 +2324,7 @@ dissect_tape_write_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, offset=dissect_error(tvb, offset, pinfo, tree, seq); /* count */ - proto_tree_add_item(tree, hf_ndmp_count, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_ndmp_count, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; return offset; @@ -2335,7 +2335,7 @@ dissect_tape_read_request(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, guint32 seq _U_) { /* count */ - proto_tree_add_item(tree, hf_ndmp_count, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_ndmp_count, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; return offset; @@ -2381,7 +2381,7 @@ dissect_file_name(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *par /* file type */ type=tvb_get_ntohl(tvb, offset); - proto_tree_add_item(tree, hf_ndmp_file_fs_type, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_ndmp_file_fs_type, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; switch(type){ @@ -2502,11 +2502,11 @@ dissect_file_stats(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *pa offset = dissect_file_invalids(tvb, offset, pinfo, tree); /* file fs type */ - proto_tree_add_item(tree, hf_ndmp_file_fs_type, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_ndmp_file_fs_type, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; /* file type */ - proto_tree_add_item(tree, hf_ndmp_file_type, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_ndmp_file_type, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; /* mtime */ @@ -2546,7 +2546,7 @@ dissect_file_stats(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *pa offset); /* links */ - proto_tree_add_item(tree, hf_ndmp_file_links, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_ndmp_file_links, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; proto_item_set_len(item, offset-old_offset); @@ -2576,11 +2576,11 @@ dissect_file(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_t dissect_file_stats, hf_ndmp_file_stats); /* node */ - proto_tree_add_item(tree, hf_ndmp_file_node, tvb, offset, 8, FALSE); + proto_tree_add_item(tree, hf_ndmp_file_node, tvb, offset, 8, ENC_BIG_ENDIAN); offset += 8; /* fh_info */ - proto_tree_add_item(tree, hf_ndmp_file_fh_info, tvb, offset, 8, FALSE); + proto_tree_add_item(tree, hf_ndmp_file_fh_info, tvb, offset, 8, ENC_BIG_ENDIAN); offset += 8; proto_item_set_len(item, offset-old_offset); @@ -2606,11 +2606,11 @@ dissect_dir(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) dissect_file_name, hf_ndmp_file_names); /* node */ - proto_tree_add_item(tree, hf_ndmp_file_node, tvb, offset, 8, FALSE); + proto_tree_add_item(tree, hf_ndmp_file_node, tvb, offset, 8, ENC_BIG_ENDIAN); offset += 8; /* parent */ - proto_tree_add_item(tree, hf_ndmp_file_parent, tvb, offset, 8, FALSE); + proto_tree_add_item(tree, hf_ndmp_file_parent, tvb, offset, 8, ENC_BIG_ENDIAN); offset += 8; return offset; @@ -2635,11 +2635,11 @@ dissect_node(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) dissect_file_stats, hf_ndmp_file_stats); /* node */ - proto_tree_add_item(tree, hf_ndmp_file_node, tvb, offset, 8, FALSE); + proto_tree_add_item(tree, hf_ndmp_file_node, tvb, offset, 8, ENC_BIG_ENDIAN); offset += 8; /* fh_info */ - proto_tree_add_item(tree, hf_ndmp_file_fh_info, tvb, offset, 8, FALSE); + proto_tree_add_item(tree, hf_ndmp_file_fh_info, tvb, offset, 8, ENC_BIG_ENDIAN); offset += 8; return offset; @@ -2697,12 +2697,12 @@ dissect_nlist(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, hf_ndmp_bu_other_name, offset, NULL); /* node */ - proto_tree_add_item(tree, hf_ndmp_file_node, tvb, offset, 8, FALSE); + proto_tree_add_item(tree, hf_ndmp_file_node, tvb, offset, 8, ENC_BIG_ENDIAN); offset += 8; } /* fh_info */ - proto_tree_add_item(tree, hf_ndmp_file_fh_info, tvb, offset, 8, FALSE); + proto_tree_add_item(tree, hf_ndmp_file_fh_info, tvb, offset, 8, ENC_BIG_ENDIAN); offset += 8; return offset; @@ -2831,15 +2831,15 @@ dissect_data_get_state_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, offset=dissect_error(tvb, offset, pinfo, tree, seq); /* operation */ - proto_tree_add_item(tree, hf_ndmp_bu_operation, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_ndmp_bu_operation, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; /* state */ - proto_tree_add_item(tree, hf_ndmp_data_state, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_ndmp_data_state, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; /* halted reason */ - proto_tree_add_item(tree, hf_ndmp_data_halted, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_ndmp_data_halted, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; /*bytes processed*/ @@ -2860,11 +2860,11 @@ dissect_data_get_state_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, offset=dissect_ndmp_addr(tvb, offset, pinfo, tree); /* window offset */ - proto_tree_add_item(tree, hf_ndmp_window_offset, tvb, offset, 8, FALSE); + proto_tree_add_item(tree, hf_ndmp_window_offset, tvb, offset, 8, ENC_BIG_ENDIAN); offset += 8; /* window length */ - proto_tree_add_item(tree, hf_ndmp_window_length, tvb, offset, 8, FALSE); + proto_tree_add_item(tree, hf_ndmp_window_length, tvb, offset, 8, ENC_BIG_ENDIAN); offset += 8; return offset; diff --git a/epan/dissectors/packet-ndp.c b/epan/dissectors/packet-ndp.c index ca39246f75..5e34be56e4 100644 --- a/epan/dissectors/packet-ndp.c +++ b/epan/dissectors/packet-ndp.c @@ -312,21 +312,21 @@ dissect_ndp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(ndp_tree, hf_ndp_segment_identifier, tvb, - NDP_SEGMENT_IDENTIFIER, 3, FALSE); + NDP_SEGMENT_IDENTIFIER, 3, ENC_BIG_ENDIAN); proto_tree_add_item(ndp_tree, hf_ndp_chassis_type, tvb, - NDP_CHASSIS_TYPE, 1, FALSE); + NDP_CHASSIS_TYPE, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ndp_tree, hf_ndp_backplane_type, tvb, - NDP_BACKPLANE_TYPE, 1, FALSE); + NDP_BACKPLANE_TYPE, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ndp_tree, hf_ndp_state, tvb, - NDP_STATE, 1, FALSE); + NDP_STATE, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ndp_tree, hf_ndp_number_of_links, tvb, - NDP_NUMBER_OF_LINKS, 1, FALSE); + NDP_NUMBER_OF_LINKS, 1, ENC_BIG_ENDIAN); } diff --git a/epan/dissectors/packet-ndps.c b/epan/dissectors/packet-ndps.c index c04ddacd26..9ac80e1610 100644 --- a/epan/dissectors/packet-ndps.c +++ b/epan/dissectors/packet-ndps.c @@ -2189,7 +2189,7 @@ objectidentifier(tvbuff_t* tvb, proto_tree *ndps_tree, int foffset) if (ndps_show_oids) { atree = proto_item_add_subtree(aitem, ett_ndps); - proto_tree_add_item(atree, hf_oid_asn1_type, tvb, foffset, 1, FALSE); + proto_tree_add_item(atree, hf_oid_asn1_type, tvb, foffset, 1, ENC_BIG_ENDIAN); foffset += 1; length = tvb_get_guint8(tvb, foffset); foffset += 1; @@ -2272,7 +2272,7 @@ objectidentification(tvbuff_t* tvb, proto_tree *ndps_tree, int foffset) proto_item *aitem; object_type = tvb_get_ntohl(tvb, foffset); - aitem = proto_tree_add_item(ndps_tree, hf_obj_id_type, tvb, foffset, 4, FALSE); + aitem = proto_tree_add_item(ndps_tree, hf_obj_id_type, tvb, foffset, 4, ENC_BIG_ENDIAN); atree = proto_item_add_subtree(aitem, ett_ndps); foffset += 4; switch(object_type) @@ -2280,13 +2280,13 @@ objectidentification(tvbuff_t* tvb, proto_tree *ndps_tree, int foffset) case 0: /* Printer Contained Object ID */ foffset = ndps_string(tvb, hf_ndps_printer_name, atree, foffset, NULL); proto_tree_add_item(atree, hf_ndps_object, tvb, foffset, - 4, FALSE); + 4, ENC_BIG_ENDIAN); foffset += 4; break; case 1: /* Document Identifier */ foffset = ndps_string(tvb, hf_ndps_printer_name, atree, foffset, NULL); proto_tree_add_item(atree, hf_ndps_document_number, tvb, foffset, - 4, FALSE); + 4, ENC_BIG_ENDIAN); foffset += 4; break; case 2: /* Object Identifier */ @@ -2315,7 +2315,7 @@ objectidentification(tvbuff_t* tvb, proto_tree *ndps_tree, int foffset) foffset = ndps_string(tvb, hf_object_name, atree, foffset, NULL); foffset = objectidentifier(tvb, atree, foffset); proto_tree_add_item(atree, hf_ndps_event_type, tvb, foffset, - 4, FALSE); + 4, ENC_BIG_ENDIAN); foffset += 4; default: break; @@ -2333,7 +2333,7 @@ print_address(tvbuff_t* tvb, proto_tree *ndps_tree, int foffset) proto_tree_add_uint(ndps_tree, hf_ndps_address, tvb, foffset, 4, addr_type); foffset += 4; addr_len = tvb_get_ntohl(tvb, foffset); - proto_tree_add_item(ndps_tree, hf_address_len, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_address_len, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; /* * XXX - are these address types the same as the NDS_PTYPE_ #defines @@ -2347,10 +2347,10 @@ print_address(tvbuff_t* tvb, proto_tree *ndps_tree, int foffset) case 0x00000000: proto_tree_add_item(ndps_tree, hf_ndps_net, tvb, foffset, 4, ENC_NA); proto_tree_add_item(ndps_tree, hf_ndps_node, tvb, foffset+4, 6, FALSE); - proto_tree_add_item(ndps_tree, hf_ndps_socket, tvb, foffset+10, 2, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_socket, tvb, foffset+10, 2, ENC_BIG_ENDIAN); break; case 0x00000001: - proto_tree_add_item(ndps_tree, hf_ndps_port, tvb, foffset, 2, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_port, tvb, foffset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(ndps_tree, hf_ndps_ip, tvb, foffset+2, 4, FALSE); break; default: @@ -2393,7 +2393,7 @@ address_item(tvbuff_t* tvb, proto_tree *ndps_tree, int foffset) foffset += 4; break; case 14: - proto_tree_add_item(ndps_tree, hf_ndps_attribute_value, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_attribute_value, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; break; case 15: @@ -2419,7 +2419,7 @@ credentials(tvbuff_t* tvb, proto_tree *ndps_tree, int foffset) proto_item *aitem; cred_type = tvb_get_ntohl(tvb, foffset); - proto_tree_add_item(ndps_tree, hf_ndps_cred_type, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_cred_type, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; switch (cred_type) { @@ -2460,7 +2460,7 @@ credentials(tvbuff_t* tvb, proto_tree *ndps_tree, int foffset) case 2: foffset = ndps_string(tvb, hf_ndps_server_name, ndps_tree, foffset, NULL); foffset += 2; - proto_tree_add_item(ndps_tree, hf_ndps_connection, tvb, foffset, 2, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_connection, tvb, foffset, 2, ENC_BIG_ENDIAN); foffset += 2; break; case 3: @@ -2478,18 +2478,18 @@ credentials(tvbuff_t* tvb, proto_tree *ndps_tree, int foffset) foffset += 2; } } - proto_tree_add_item(ndps_tree, hf_ndps_connection, tvb, foffset, 2, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_connection, tvb, foffset, 2, ENC_BIG_ENDIAN); foffset += 2; foffset = ndps_string(tvb, hf_ndps_user_name, ndps_tree, foffset, NULL); break; case 4: foffset = ndps_string(tvb, hf_ndps_server_name, ndps_tree, foffset, NULL); foffset += 2; - proto_tree_add_item(ndps_tree, hf_ndps_connection, tvb, foffset, 2, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_connection, tvb, foffset, 2, ENC_BIG_ENDIAN); foffset += 2; foffset = ndps_string(tvb, hf_ndps_user_name, ndps_tree, foffset, NULL); foffset += 8; /* Don't know what these 8 bytes signify */ - proto_tree_add_item(ndps_tree, hf_ndps_item_count, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_item_count, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; /* XXX - what does this count? */ foffset = ndps_string(tvb, hf_ndps_pa_name, ndps_tree, foffset, NULL); foffset = ndps_string(tvb, hf_ndps_tree, ndps_tree, foffset, NULL); @@ -2529,13 +2529,13 @@ event_object_set(tvbuff_t* tvb, proto_tree *ndps_tree, int foffset) } bitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Event %u", i); btree = proto_item_add_subtree(bitem, ett_ndps); - proto_tree_add_item(btree, hf_ndps_event_type, tvb, foffset, 4, FALSE); + proto_tree_add_item(btree, hf_ndps_event_type, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; foffset = objectidentifier(tvb, btree, foffset); foffset += align_4(tvb, foffset); foffset = objectidentification(tvb, btree, foffset); foffset += align_4(tvb, foffset); - proto_tree_add_item(btree, hf_ndps_object_op, tvb, foffset, 4, FALSE); + proto_tree_add_item(btree, hf_ndps_object_op, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; object_identifier = tvb_get_ntohl(tvb, foffset); proto_tree_add_uint(btree, hf_ndps_event_object_identifier, tvb, foffset, 4, object_identifier); @@ -2596,7 +2596,7 @@ cardinal_seq(tvbuff_t* tvb, proto_tree *ndps_tree, int foffset) foffset += 4; if (length==4) { - proto_tree_add_item(atree, hf_ndps_attribute_value, tvb, foffset, length, FALSE); + proto_tree_add_item(atree, hf_ndps_attribute_value, tvb, foffset, length, ENC_BIG_ENDIAN); } tvb_ensure_bytes_exist(tvb, foffset, length); foffset += length; @@ -2625,7 +2625,7 @@ server_entry(tvbuff_t* tvb, proto_tree *ndps_tree, int foffset) atree = proto_item_add_subtree(aitem, ett_ndps); foffset = ndps_string(tvb, hf_ndps_server_name, ndps_tree, foffset, &server_name); proto_item_append_text(aitem, ": %s", format_text(server_name, strlen(server_name))); - proto_tree_add_item(atree, hf_ndps_server_type, tvb, foffset, 4, FALSE); + proto_tree_add_item(atree, hf_ndps_server_type, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; foffset = print_address(tvb, atree, foffset); number_of_items = tvb_get_ntohl(tvb, foffset); @@ -2640,20 +2640,20 @@ server_entry(tvbuff_t* tvb, proto_tree *ndps_tree, int foffset) bitem = proto_tree_add_text(atree, tvb, foffset, -1, "Info %u", i); btree = proto_item_add_subtree(bitem, ett_ndps); data_type = tvb_get_ntohl(tvb, foffset); - proto_tree_add_item(btree, hf_ndps_data_item_type, tvb, foffset, 4, FALSE); + proto_tree_add_item(btree, hf_ndps_data_item_type, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; switch (data_type) { case 0: /* Int8 */ - proto_tree_add_item(btree, hf_info_int, tvb, foffset, 1, FALSE); + proto_tree_add_item(btree, hf_info_int, tvb, foffset, 1, ENC_BIG_ENDIAN); foffset++; break; case 1: /* Int16 */ - proto_tree_add_item(btree, hf_info_int16, tvb, foffset, 2, FALSE); + proto_tree_add_item(btree, hf_info_int16, tvb, foffset, 2, ENC_BIG_ENDIAN); foffset += 2; break; case 2: /* Int32 */ - proto_tree_add_item(btree, hf_info_int32, tvb, foffset, 4, FALSE); + proto_tree_add_item(btree, hf_info_int32, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; break; case 3: /* Boolean */ @@ -2715,7 +2715,7 @@ attribute_value(tvbuff_t* tvb, proto_tree *ndps_tree, int foffset) attribute_type = tvb_get_ntohl(tvb, foffset); if (ndps_show_oids) { - proto_tree_add_item(ndps_tree, hf_ndps_obj_attribute_type, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_obj_attribute_type, tvb, foffset, 4, ENC_BIG_ENDIAN); } foffset += 4; switch(attribute_type) @@ -2792,12 +2792,12 @@ attribute_value(tvbuff_t* tvb, proto_tree *ndps_tree, int foffset) if (global_attribute_name != NULL && strcmp(global_attribute_name,"(Novell) Attribute PRINTER SECURITY LEVEL")==0) { - proto_tree_add_item(ndps_tree, hf_print_security, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_print_security, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; } else { - proto_tree_add_item(ndps_tree, hf_ndps_attribute_value, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_attribute_value, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; } break; @@ -2807,16 +2807,16 @@ attribute_value(tvbuff_t* tvb, proto_tree *ndps_tree, int foffset) foffset += 4; if (length==4) { - proto_tree_add_item(ndps_tree, hf_info_int32, tvb, foffset, length, FALSE); + proto_tree_add_item(ndps_tree, hf_info_int32, tvb, foffset, length, ENC_BIG_ENDIAN); } tvb_ensure_bytes_exist(tvb, foffset, length); foffset += length; break; case 16: /* Integer Range */ case 17: /* Cardinal Range */ - proto_tree_add_item(ndps_tree, hf_ndps_lower_range, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_lower_range, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; - proto_tree_add_item(ndps_tree, hf_ndps_upper_range, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_upper_range, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; break; case 20: /* Integer 64 */ @@ -2903,7 +2903,7 @@ attribute_value(tvbuff_t* tvb, proto_tree *ndps_tree, int foffset) } break; case 42: /* Realization */ - proto_tree_add_item(ndps_tree, hf_ndps_realization, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_realization, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; break; case 43: /* Medium Dimensions */ @@ -2924,7 +2924,7 @@ attribute_value(tvbuff_t* tvb, proto_tree *ndps_tree, int foffset) { foffset = name_or_id(tvb, ndps_tree, foffset); } - proto_tree_add_item(ndps_tree, hf_ndps_dim_flag, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_dim_flag, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; proto_tree_add_item(ndps_tree, hf_ndps_n64, tvb, foffset, 8, ENC_NA); foffset += 8; @@ -2943,7 +2943,7 @@ attribute_value(tvbuff_t* tvb, proto_tree *ndps_tree, int foffset) proto_tree_add_item(ndps_tree, hf_ndps_ydimension_n64, tvb, foffset, 8, ENC_NA); foffset += 8; } - proto_tree_add_item(ndps_tree, hf_ndps_dim_flag, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_dim_flag, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; proto_tree_add_item(ndps_tree, hf_ndps_n64, tvb, foffset, 8, ENC_NA); foffset += 8; @@ -2973,7 +2973,7 @@ attribute_value(tvbuff_t* tvb, proto_tree *ndps_tree, int foffset) { foffset = name_or_id(tvb, ndps_tree, foffset); } - proto_tree_add_item(ndps_tree, hf_ndps_dim_flag, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_dim_flag, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; proto_tree_add_item(ndps_tree, hf_ndps_n64, tvb, foffset, 8, ENC_NA); foffset += 8; @@ -3012,7 +3012,7 @@ attribute_value(tvbuff_t* tvb, proto_tree *ndps_tree, int foffset) } break; case 49: /* Edge */ - proto_tree_add_item(ndps_tree, hf_ndps_edge_value, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_edge_value, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; break; case 51: /* Cardinal or OID */ @@ -3020,7 +3020,7 @@ attribute_value(tvbuff_t* tvb, proto_tree *ndps_tree, int foffset) proto_tree_add_uint(ndps_tree, hf_ndps_cardinal_or_oid, tvb, foffset, 4, cardinal); foffset += 4; if (cardinal==0) { - proto_tree_add_item(ndps_tree, hf_ndps_attribute_value, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_attribute_value, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; } else @@ -3030,7 +3030,7 @@ attribute_value(tvbuff_t* tvb, proto_tree *ndps_tree, int foffset) break; case 52: /* OID Cardinal Map */ foffset = objectidentifier(tvb, ndps_tree, foffset); - proto_tree_add_item(ndps_tree, hf_ndps_attribute_value, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_attribute_value, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; break; case 53: /* Cardinal or Name or OID */ @@ -3038,7 +3038,7 @@ attribute_value(tvbuff_t* tvb, proto_tree *ndps_tree, int foffset) proto_tree_add_uint(ndps_tree, hf_ndps_cardinal_name_or_oid, tvb, foffset, 4, cardinal); foffset += 4; if (cardinal==0) { - proto_tree_add_item(ndps_tree, hf_ndps_attribute_value, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_attribute_value, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; } else @@ -3055,24 +3055,24 @@ attribute_value(tvbuff_t* tvb, proto_tree *ndps_tree, int foffset) } else { - proto_tree_add_item(ndps_tree, hf_ndps_attribute_value, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_attribute_value, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; } break; case 55: /* Event Handling Profile */ - proto_tree_add_item(ndps_tree, hf_ndps_profile_id, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_profile_id, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; - proto_tree_add_item(ndps_tree, hf_ndps_persistence, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_persistence, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; foffset = qualifiedname(tvb, ndps_tree, foffset); length = tvb_get_ntohl(tvb, foffset); foffset += 4; if (length==4) { - proto_tree_add_item(ndps_tree, hf_ndps_attribute_value, tvb, foffset, length, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_attribute_value, tvb, foffset, length, ENC_BIG_ENDIAN); } foffset += length; - proto_tree_add_item(ndps_tree, hf_ndps_language_id, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_language_id, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; foffset = name_or_id(tvb, ndps_tree, foffset); @@ -3101,12 +3101,12 @@ attribute_value(tvbuff_t* tvb, proto_tree *ndps_tree, int foffset) } aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Event %u", i); atree = proto_item_add_subtree(aitem, ett_ndps); - proto_tree_add_item(atree, hf_ndps_event_type, tvb, foffset, 4, FALSE); + proto_tree_add_item(atree, hf_ndps_event_type, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; foffset = objectidentifier(tvb, atree, foffset); foffset += align_4(tvb, foffset); foffset = objectidentification(tvb, atree, foffset); - proto_tree_add_item(atree, hf_ndps_object_op, tvb, foffset, 4, FALSE); + proto_tree_add_item(atree, hf_ndps_object_op, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; event_object_type = tvb_get_ntohl(tvb, foffset); proto_tree_add_uint(atree, hf_ndps_event_object_identifier, tvb, foffset, 4, event_object_type); @@ -3162,7 +3162,7 @@ attribute_value(tvbuff_t* tvb, proto_tree *ndps_tree, int foffset) foffset += align_4(tvb, foffset); break; case 59: /* Method Delivery Address */ - proto_tree_add_item(ndps_tree, hf_ndps_delivery_add_type, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_delivery_add_type, tvb, foffset, 4, ENC_BIG_ENDIAN); event_object_type = tvb_get_ntohl(tvb, foffset); foffset += 4; switch(event_object_type) @@ -3193,7 +3193,7 @@ attribute_value(tvbuff_t* tvb, proto_tree *ndps_tree, int foffset) foffset = objectidentifier(tvb, ndps_tree, foffset); foffset = name_or_id(tvb, ndps_tree, foffset); foffset = address_item(tvb, ndps_tree, foffset); - proto_tree_add_item(ndps_tree, hf_ndps_attribute_value, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_attribute_value, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; foffset = name_or_id(tvb, ndps_tree, foffset); break; @@ -3202,12 +3202,12 @@ attribute_value(tvbuff_t* tvb, proto_tree *ndps_tree, int foffset) criterion_type = tvb_get_ntohl(tvb, foffset); proto_tree_add_uint(ndps_tree, hf_ndps_criterion_type, tvb, foffset, 4, criterion_type); foffset += 4; - proto_tree_add_item(ndps_tree, hf_ndps_attribute_value, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_attribute_value, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; break; case 64: /* Job Level */ foffset = objectidentifier(tvb, ndps_tree, foffset); - proto_tree_add_item(ndps_tree, hf_ndps_attribute_value, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_attribute_value, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; break; case 65: /* Job Categories */ @@ -3227,7 +3227,7 @@ attribute_value(tvbuff_t* tvb, proto_tree *ndps_tree, int foffset) foffset += 4; if (length==4) { - proto_tree_add_item(atree, hf_ndps_attribute_value, tvb, foffset, length, FALSE); + proto_tree_add_item(atree, hf_ndps_attribute_value, tvb, foffset, length, ENC_BIG_ENDIAN); } foffset += length; foffset += (length%2); @@ -3237,7 +3237,7 @@ attribute_value(tvbuff_t* tvb, proto_tree *ndps_tree, int foffset) } break; case 67: /* Ignored Attribute */ - proto_tree_add_item(ndps_tree, hf_ndps_attribute_value, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_attribute_value, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; foffset = objectidentifier(tvb, ndps_tree, foffset); number_of_items = tvb_get_ntohl(tvb, foffset); @@ -3324,14 +3324,14 @@ attribute_value(tvbuff_t* tvb, proto_tree *ndps_tree, int foffset) } aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Page Select %u", i); atree = proto_item_add_subtree(aitem, ett_ndps); - proto_tree_add_item(atree, hf_ndps_page_flag, tvb, foffset, 4, FALSE); + proto_tree_add_item(atree, hf_ndps_page_flag, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; identifier_type = tvb_get_ntohl(tvb, foffset); proto_tree_add_uint(atree, hf_ndps_identifier_type, tvb, foffset, 4, identifier_type); foffset += 4; if (identifier_type == 0) { - proto_tree_add_item(atree, hf_ndps_attribute_value, tvb, foffset, 4, FALSE); + proto_tree_add_item(atree, hf_ndps_attribute_value, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; } if (identifier_type == 1) @@ -3342,14 +3342,14 @@ attribute_value(tvbuff_t* tvb, proto_tree *ndps_tree, int foffset) { foffset = name_or_id(tvb, atree, foffset); } - proto_tree_add_item(atree, hf_ndps_page_flag, tvb, foffset, 4, FALSE); + proto_tree_add_item(atree, hf_ndps_page_flag, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; identifier_type = tvb_get_ntohl(tvb, foffset); proto_tree_add_uint(atree, hf_ndps_identifier_type, tvb, foffset, 4, identifier_type); foffset += 4; if (identifier_type == 0) { - proto_tree_add_item(atree, hf_ndps_attribute_value, tvb, foffset, 4, FALSE); + proto_tree_add_item(atree, hf_ndps_attribute_value, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; } if (identifier_type == 1) @@ -3385,14 +3385,14 @@ attribute_value(tvbuff_t* tvb, proto_tree *ndps_tree, int foffset) } aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Item %u", i); atree = proto_item_add_subtree(aitem, ett_ndps); - proto_tree_add_item(atree, hf_ndps_page_flag, tvb, foffset, 4, FALSE); + proto_tree_add_item(atree, hf_ndps_page_flag, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; identifier_type = tvb_get_ntohl(tvb, foffset); proto_tree_add_uint(atree, hf_ndps_identifier_type, tvb, foffset, 4, identifier_type); foffset += 4; if (identifier_type == 0) { - proto_tree_add_item(atree, hf_ndps_attribute_value, tvb, foffset, 4, FALSE); + proto_tree_add_item(atree, hf_ndps_attribute_value, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; } if (identifier_type == 1) @@ -3447,11 +3447,11 @@ attribute_value(tvbuff_t* tvb, proto_tree *ndps_tree, int foffset) } break; case 77: /* Presentation Direction */ - proto_tree_add_item(ndps_tree, hf_ndps_direction, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_direction, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; break; case 78: /* Page Order */ - proto_tree_add_item(ndps_tree, hf_ndps_page_order, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_page_order, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; break; case 80: /* Medium Source Size */ @@ -3528,22 +3528,22 @@ attribute_value(tvbuff_t* tvb, proto_tree *ndps_tree, int foffset) } aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Page Information %u", i); atree = proto_item_add_subtree(aitem, ett_ndps); - proto_tree_add_item(atree, hf_ndps_page_order, tvb, foffset, 4, FALSE); + proto_tree_add_item(atree, hf_ndps_page_order, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; - proto_tree_add_item(atree, hf_ndps_page_orientation, tvb, foffset, 4, FALSE); + proto_tree_add_item(atree, hf_ndps_page_orientation, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; proto_item_set_end(aitem, tvb, foffset); } break; case 83: /* Page ID Type */ - proto_tree_add_item(ndps_tree, hf_ndps_identifier_type, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_identifier_type, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; break; case 84: /* Level Range */ foffset = objectidentifier(tvb, ndps_tree, foffset); - proto_tree_add_item(ndps_tree, hf_ndps_lower_range, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_lower_range, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; - proto_tree_add_item(ndps_tree, hf_ndps_upper_range, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_upper_range, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; break; case 85: /* Category Set */ @@ -3563,7 +3563,7 @@ attribute_value(tvbuff_t* tvb, proto_tree *ndps_tree, int foffset) foffset += 4; if (length==4) { - proto_tree_add_item(atree, hf_ndps_attribute_value, tvb, foffset, length, FALSE); + proto_tree_add_item(atree, hf_ndps_attribute_value, tvb, foffset, length, ENC_BIG_ENDIAN); } foffset += length; foffset += (length%2); @@ -3585,7 +3585,7 @@ attribute_value(tvbuff_t* tvb, proto_tree *ndps_tree, int foffset) foffset += 4; if (length==4) { - proto_tree_add_item(atree, hf_ndps_attribute_value, tvb, foffset, length, FALSE); + proto_tree_add_item(atree, hf_ndps_attribute_value, tvb, foffset, length, ENC_BIG_ENDIAN); } foffset += length; foffset += (length%2); @@ -3601,16 +3601,16 @@ attribute_value(tvbuff_t* tvb, proto_tree *ndps_tree, int foffset) switch(numbers_up) { case 0: /*Cardinal*/ - proto_tree_add_item(ndps_tree, hf_ndps_attribute_value, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_attribute_value, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; break; case 1: /*Name or OID*/ foffset = name_or_id(tvb, ndps_tree, foffset); break; case 2: /*Cardinal Range*/ - proto_tree_add_item(ndps_tree, hf_ndps_lower_range, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_lower_range, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; - proto_tree_add_item(ndps_tree, hf_ndps_upper_range, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_upper_range, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; break; default: @@ -3620,7 +3620,7 @@ attribute_value(tvbuff_t* tvb, proto_tree *ndps_tree, int foffset) case 87: /* Finishing */ case 88: /* Print Contained Object ID */ foffset = ndps_string(tvb, hf_object_name, ndps_tree, foffset, NULL); - proto_tree_add_item(ndps_tree, hf_ndps_attribute_value, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_attribute_value, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; break; case 89: /* Print Config Object ID */ @@ -3629,13 +3629,13 @@ attribute_value(tvbuff_t* tvb, proto_tree *ndps_tree, int foffset) break; case 90: /* Typed Name */ foffset = ndps_string(tvb, hf_object_name, ndps_tree, foffset, NULL); - proto_tree_add_item(ndps_tree, hf_level, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_level, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; - proto_tree_add_item(ndps_tree, hf_interval, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_interval, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; break; case 91: /* Network Address */ - proto_tree_add_item(ndps_tree, hf_ndps_address, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_address, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; length = tvb_get_ntohl(tvb, foffset); foffset += 4; @@ -3663,31 +3663,31 @@ attribute_value(tvbuff_t* tvb, proto_tree *ndps_tree, int foffset) break; default: - proto_tree_add_item(ndps_tree, hf_ndps_xdimension, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_xdimension, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; - proto_tree_add_item(ndps_tree, hf_ndps_ydimension, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_ydimension, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; break; } break; case 93: /* Name or OID Dimensions Map */ foffset = name_or_id(tvb, ndps_tree, foffset); - proto_tree_add_item(ndps_tree, hf_ndps_xdimension, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_xdimension, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; - proto_tree_add_item(ndps_tree, hf_ndps_ydimension, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_ydimension, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; break; case 94: /* Printer State Reason */ foffset += 4; foffset = name_or_id(tvb, ndps_tree, foffset); - proto_tree_add_item(ndps_tree, hf_ndps_state_severity, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_state_severity, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; - proto_tree_add_item(ndps_tree, hf_ndps_training, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_training, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; foffset = objectidentifier(tvb, ndps_tree, foffset); foffset += align_4(tvb, foffset); foffset = objectidentification(tvb, ndps_tree, foffset); - proto_tree_add_item(ndps_tree, hf_ndps_attribute_value, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_attribute_value, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; number_of_items = tvb_get_ntohl(tvb, foffset); foffset += 4*number_of_items; @@ -3716,7 +3716,7 @@ attribute_value(tvbuff_t* tvb, proto_tree *ndps_tree, int foffset) break; case 98: /* Colorant Set */ colorant_set = tvb_get_ntohl(tvb, foffset); - proto_tree_add_item(ndps_tree, hf_ndps_colorant_set, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_colorant_set, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; if (colorant_set==0) { @@ -3759,13 +3759,13 @@ attribute_value(tvbuff_t* tvb, proto_tree *ndps_tree, int foffset) foffset = ndps_string(tvb, hf_ndps_inf_file_name, atree, foffset, NULL); proto_item_set_end(aitem, tvb, foffset); } - proto_tree_add_item(ndps_tree, hf_os_type, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_os_type, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; break; case 100: /* Event Object ID */ foffset = ndps_string(tvb, hf_ndps_pa_name, ndps_tree, foffset, NULL); foffset = objectidentifier(tvb, ndps_tree, foffset); - proto_tree_add_item(ndps_tree, hf_ndps_event_type, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_event_type, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; break; case 101: /* Qualified Name Map */ @@ -3779,17 +3779,17 @@ attribute_value(tvbuff_t* tvb, proto_tree *ndps_tree, int foffset) switch (card_enum_time) { case 0: - proto_tree_add_item(ndps_tree, hf_ndps_attribute_value, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_attribute_value, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; break; case 1: - proto_tree_add_item(ndps_tree, hf_ndps_attribute_value, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_attribute_value, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; break; default: - proto_tree_add_item(ndps_tree, hf_ndps_attribute_value, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_attribute_value, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; break; } @@ -3807,7 +3807,7 @@ attribute_value(tvbuff_t* tvb, proto_tree *ndps_tree, int foffset) aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Object %u", i); atree = proto_item_add_subtree(aitem, ett_ndps); foffset = ndps_string(tvb, hf_ndps_pa_name, atree, foffset, NULL); - proto_tree_add_item(atree, hf_ndps_attribute_value, tvb, foffset, 4, FALSE); + proto_tree_add_item(atree, hf_ndps_attribute_value, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; proto_item_set_end(aitem, tvb, foffset); } @@ -3844,15 +3844,15 @@ attribute_value(tvbuff_t* tvb, proto_tree *ndps_tree, int foffset) } foffset += length; foffset += (length%2); - proto_tree_add_item(ndps_tree, hf_ndps_attribute_value, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_attribute_value, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; - proto_tree_add_item(ndps_tree, hf_ndps_attribute_value, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_attribute_value, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; break; case 109: /* Event Handling Profile 2 */ - proto_tree_add_item(ndps_tree, hf_ndps_attribute_value, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_attribute_value, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; - proto_tree_add_item(ndps_tree, hf_ndps_persistence, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_persistence, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; foffset = qualifiedname(tvb, ndps_tree, foffset); length = tvb_get_ntohl(tvb, foffset); @@ -3864,10 +3864,10 @@ attribute_value(tvbuff_t* tvb, proto_tree *ndps_tree, int foffset) } foffset += length; foffset += (length%2); - proto_tree_add_item(ndps_tree, hf_ndps_attribute_value, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_attribute_value, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; foffset = name_or_id(tvb, ndps_tree, foffset); - proto_tree_add_item(ndps_tree, hf_ndps_delivery_add_type, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_delivery_add_type, tvb, foffset, 4, ENC_BIG_ENDIAN); event_object_type = tvb_get_ntohl(tvb, foffset); foffset += 4; switch(event_object_type) @@ -3915,7 +3915,7 @@ attribute_value(tvbuff_t* tvb, proto_tree *ndps_tree, int foffset) atree = proto_item_add_subtree(aitem, ett_ndps); foffset = ndps_string(tvb, hf_object_name, atree, foffset, NULL); foffset = objectidentifier(tvb, atree, foffset); - proto_tree_add_item(atree, hf_ndps_event_type, tvb, foffset, 4, FALSE); + proto_tree_add_item(atree, hf_ndps_event_type, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; proto_item_set_end(aitem, tvb, foffset); } @@ -3935,11 +3935,11 @@ attribute_value(tvbuff_t* tvb, proto_tree *ndps_tree, int foffset) foffset = objectidentifier(tvb, atree, foffset); proto_item_set_end(aitem, tvb, foffset); } - proto_tree_add_item(ndps_tree, hf_ndps_attribute_value, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_attribute_value, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; - proto_tree_add_item(ndps_tree, hf_ndps_attribute_value, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_attribute_value, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; - proto_tree_add_item(ndps_tree, hf_ndps_attribute_value, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_attribute_value, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; foffset = ndps_string(tvb, hf_ndps_pa_name, ndps_tree, foffset, NULL); break; @@ -3991,7 +3991,7 @@ res_add_input_data(tvbuff_t* tvb, proto_tree *ndps_tree, int foffset) switch (resource_type) { case 0: /* Print Drivers */ - proto_tree_add_item(ndps_tree, hf_os_type, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_os_type, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; foffset = ndps_string(tvb, hf_ndps_prn_dir_name, ndps_tree, foffset, NULL); foffset = ndps_string(tvb, hf_ndps_prn_file_name, ndps_tree, foffset, NULL); @@ -4004,18 +4004,18 @@ res_add_input_data(tvbuff_t* tvb, proto_tree *ndps_tree, int foffset) foffset = ndps_string(tvb, hf_ndps_banner_name, ndps_tree, foffset, NULL); break; case 3: /* Font Types */ - proto_tree_add_item(ndps_tree, hf_os_type, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_os_type, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; - proto_tree_add_item(ndps_tree, hf_font_type, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_font_type, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; foffset = ndps_string(tvb, hf_ndps_prn_file_name, ndps_tree, foffset, NULL); break; case 4: /* Generic Files/ Archive */ case 5: /* Printer Driver Archive */ - proto_tree_add_item(ndps_tree, hf_os_type, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_os_type, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; foffset = ndps_string(tvb, hf_ndps_prn_dir_name, ndps_tree, foffset, NULL); - proto_tree_add_item(ndps_tree, hf_archive_type, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_archive_type, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; break; default: @@ -4189,10 +4189,10 @@ dissect_ndps(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree) } foffset = 0; proto_tree_add_item(ndps_tree, hf_ndps_record_mark, tvb, - foffset, 2, FALSE); + foffset, 2, ENC_BIG_ENDIAN); foffset += 2; proto_tree_add_item(ndps_tree, hf_ndps_length, tvb, - foffset, 2, FALSE); + foffset, 2, ENC_BIG_ENDIAN); foffset += 2; ndps_xid = tvb_get_ntohl(tvb, foffset); @@ -4204,7 +4204,7 @@ dissect_ndps(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree) if(ndps_packet_type == 0x00000001) /* Reply packet */ { col_set_str(pinfo->cinfo, COL_INFO, "R NDPS "); - proto_tree_add_item(ndps_tree, hf_ndps_rpc_accept, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_rpc_accept, tvb, foffset, 4, ENC_BIG_ENDIAN); if (tvb_get_ntohl(tvb, foffset)==0) { foffset += 4; proto_tree_add_item(ndps_tree, hf_ndps_auth_null, tvb, foffset, 8, ENC_NA); @@ -4213,7 +4213,7 @@ dissect_ndps(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree) else { foffset += 4; - proto_tree_add_item(ndps_tree, hf_ndps_rpc_rej_stat, tvb, foffset+4, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_rpc_rej_stat, tvb, foffset+4, 4, ENC_BIG_ENDIAN); foffset += 4; } dissect_ndps_reply(tvb, pinfo, ndps_tree, foffset); @@ -4221,20 +4221,20 @@ dissect_ndps(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree) else { col_set_str(pinfo->cinfo, COL_INFO, "C NDPS "); - proto_tree_add_item(ndps_tree, hf_ndps_rpc_version, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_rpc_version, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; ndps_prog = tvb_get_ntohl(tvb, foffset); ndps_program_string = match_strval(ndps_prog, spx_ndps_program_vals); if( ndps_program_string != NULL) { - proto_tree_add_item(ndps_tree, hf_spx_ndps_program, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_spx_ndps_program, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; if (check_col(pinfo->cinfo, COL_INFO)) { col_append_str(pinfo->cinfo, COL_INFO, (const gchar*) ndps_program_string); col_append_str(pinfo->cinfo, COL_INFO, ", "); } - proto_tree_add_item(ndps_tree, hf_spx_ndps_version, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_spx_ndps_version, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; ndps_func = tvb_get_ntohl(tvb, foffset); switch(ndps_prog) @@ -4573,7 +4573,7 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g break; case 0x00000002: /* Bind PA */ foffset = credentials(tvb, ndps_tree, foffset); - proto_tree_add_item(ndps_tree, hf_ndps_retrieve_restrictions, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_retrieve_restrictions, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; number_of_items=tvb_get_ntohl(tvb, foffset); proto_tree_add_uint(ndps_tree, hf_ndps_bind_security_option_count, tvb, foffset, 4, number_of_items); @@ -4598,10 +4598,10 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g break; case 0x00000003: /* Unbind */ proto_tree_add_item(ndps_tree, hf_ndps_session, tvb, foffset, - 4, FALSE); + 4, ENC_BIG_ENDIAN); break; case 0x00000004: /* Print */ - proto_tree_add_item(ndps_tree, hf_ndps_session, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_session, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; print_type = tvb_get_ntohl(tvb, foffset); proto_tree_add_uint(ndps_tree, hf_print_arg, tvb, foffset, 4, print_type); @@ -4640,7 +4640,7 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g foffset = attribute_value(tvb, ctree, foffset); proto_item_set_end(citem, tvb, foffset); } - proto_tree_add_item(btree, hf_ndps_qualifier, tvb, foffset, 4, FALSE); + proto_tree_add_item(btree, hf_ndps_qualifier, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; proto_item_set_end(bitem, tvb, foffset); } @@ -4736,7 +4736,7 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g foffset = attribute_value(tvb, ctree, foffset); proto_item_set_end(citem, tvb, foffset); } - proto_tree_add_item(btree, hf_ndps_qualifier, tvb, foffset, 4, FALSE); + proto_tree_add_item(btree, hf_ndps_qualifier, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; proto_item_set_end(bitem, tvb, foffset); } @@ -4760,7 +4760,7 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g break; case 1: /* Add Job */ foffset = ndps_string(tvb, hf_ndps_pa_name, ndps_tree, foffset, NULL); - proto_tree_add_item(ndps_tree, hf_local_id, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_local_id, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; proto_tree_add_item(ndps_tree, hf_sub_complete, tvb, foffset, 4, FALSE); foffset += 4; @@ -4780,7 +4780,7 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g foffset = objectidentifier(tvb, btree, foffset); /* Transfer Method */ proto_item_set_end(bitem, tvb, foffset); } - proto_tree_add_item(ndps_tree, hf_doc_content, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_doc_content, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; proto_item_set_end(aitem, tvb, foffset); aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Document Type"); @@ -4821,7 +4821,7 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g break; case 2: /* Close Job */ foffset = ndps_string(tvb, hf_ndps_pa_name, ndps_tree, foffset, NULL); - proto_tree_add_item(ndps_tree, hf_local_id, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_local_id, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; break; default: @@ -4829,12 +4829,12 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g } break; case 0x00000005: /* Modify Job */ - proto_tree_add_item(ndps_tree, hf_ndps_session, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_session, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; foffset = ndps_string(tvb, hf_ndps_pa_name, ndps_tree, foffset, NULL); - proto_tree_add_item(ndps_tree, hf_local_id, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_local_id, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; - proto_tree_add_item(ndps_tree, hf_ndps_document_number, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_document_number, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Job Modifications"); atree = proto_item_add_subtree(aitem, ett_ndps); @@ -4872,12 +4872,12 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g proto_item_set_end(aitem, tvb, foffset); break; case 0x00000006: /* Cancel Job */ - proto_tree_add_item(ndps_tree, hf_ndps_session, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_session, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; foffset = ndps_string(tvb, hf_ndps_pa_name, ndps_tree, foffset, NULL); - proto_tree_add_item(ndps_tree, hf_local_id, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_local_id, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; - proto_tree_add_item(ndps_tree, hf_ndps_document_number, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_document_number, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; /* XXX - what does this count? */ number_of_items = tvb_get_ntohl(tvb, foffset); @@ -4891,14 +4891,14 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g /* End of nameorid */ aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Retention Period"); atree = proto_item_add_subtree(aitem, ett_ndps); - proto_tree_add_item(atree, hf_ndps_status_flags, tvb, foffset, 4, FALSE); + proto_tree_add_item(atree, hf_ndps_status_flags, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; - proto_tree_add_item(atree, hf_ndps_attribute_value, tvb, foffset, 4, FALSE); + proto_tree_add_item(atree, hf_ndps_attribute_value, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; proto_item_set_end(aitem, tvb, foffset); break; case 0x00000007: /* List Object Attributes */ - proto_tree_add_item(ndps_tree, hf_ndps_session, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_session, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; list_attr_op = tvb_get_ntohl(tvb, foffset); proto_tree_add_uint(ndps_tree, hf_ndps_attrs_arg, tvb, foffset, 4, list_attr_op); @@ -4987,9 +4987,9 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g } proto_item_set_end(aitem, tvb, foffset); }*/ - proto_tree_add_item(ndps_tree, hf_ndps_time_limit, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_time_limit, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; - proto_tree_add_item(ndps_tree, hf_ndps_count_limit, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_count_limit, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; /* End of NWDPSelector */ } foffset += 4; /* Don't know what this is */ @@ -5014,19 +5014,19 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g { break; } - proto_tree_add_item(ndps_tree, hf_ndps_operator, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_operator, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; foffset = commonarguments(tvb, ndps_tree, foffset); } break; case 0x00000008: /* Promote Job */ - proto_tree_add_item(ndps_tree, hf_ndps_session, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_session, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; /* Start of NWDPPrtContainedObjectId */ aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Job ID"); atree = proto_item_add_subtree(aitem, ett_ndps); foffset = ndps_string(tvb, hf_ndps_pa_name, atree, foffset, NULL); - proto_tree_add_item(atree, hf_local_id, tvb, foffset, 4, FALSE); + proto_tree_add_item(atree, hf_local_id, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; proto_item_set_end(aitem, tvb, foffset); /* End of NWDPPrtContainedObjectId */ @@ -5039,7 +5039,7 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g foffset = commonarguments(tvb, ndps_tree, foffset); break; case 0x00000009: /* Interrupt */ - proto_tree_add_item(ndps_tree, hf_ndps_session, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_session, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; job_type = tvb_get_ntohl(tvb, foffset); proto_tree_add_uint(ndps_tree, hf_interrupt_job_type, tvb, foffset, 4, job_type); @@ -5050,7 +5050,7 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Job ID"); atree = proto_item_add_subtree(aitem, ett_ndps); foffset = ndps_string(tvb, hf_ndps_pa_name, atree, foffset, NULL); - proto_tree_add_item(atree, hf_local_id, tvb, foffset, 4, FALSE); + proto_tree_add_item(atree, hf_local_id, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; proto_item_set_end(aitem, tvb, foffset); /* End of NWDPPrtContainedObjectId */ @@ -5069,14 +5069,14 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Interrupting Job"); atree = proto_item_add_subtree(aitem, ett_ndps); foffset = ndps_string(tvb, hf_ndps_pa_name, atree, foffset, NULL); - proto_tree_add_item(atree, hf_local_id, tvb, foffset, 4, FALSE); + proto_tree_add_item(atree, hf_local_id, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; proto_item_set_end(aitem, tvb, foffset); /* End of NWDPPrtContainedObjectId */ foffset = commonarguments(tvb, ndps_tree, foffset); break; case 0x0000000a: /* Pause */ - proto_tree_add_item(ndps_tree, hf_ndps_session, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_session, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; job_type = tvb_get_ntohl(tvb, foffset); proto_tree_add_uint(ndps_tree, hf_pause_job_type, tvb, foffset, 4, job_type); @@ -5087,7 +5087,7 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Job ID"); atree = proto_item_add_subtree(aitem, ett_ndps); foffset = ndps_string(tvb, hf_ndps_pa_name, atree, foffset, NULL); - proto_tree_add_item(atree, hf_local_id, tvb, foffset, 4, FALSE); + proto_tree_add_item(atree, hf_local_id, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; proto_item_set_end(aitem, tvb, foffset); /* End of NWDPPrtContainedObjectId */ @@ -5105,13 +5105,13 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g foffset = commonarguments(tvb, ndps_tree, foffset); break; case 0x0000000b: /* Resume */ - proto_tree_add_item(ndps_tree, hf_ndps_session, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_session, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; /* Start of NWDPPrtContainedObjectId */ aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Job ID"); atree = proto_item_add_subtree(aitem, ett_ndps); foffset = ndps_string(tvb, hf_ndps_pa_name, atree, foffset, NULL); - proto_tree_add_item(atree, hf_local_id, tvb, foffset, 4, FALSE); + proto_tree_add_item(atree, hf_local_id, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; proto_item_set_end(aitem, tvb, foffset); /* End of NWDPPrtContainedObjectId */ @@ -5124,7 +5124,7 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g foffset = commonarguments(tvb, ndps_tree, foffset); break; case 0x0000000c: /* Clean */ - proto_tree_add_item(ndps_tree, hf_ndps_session, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_session, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; /* Start of nameorid */ aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Clean Message Option"); @@ -5135,7 +5135,7 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g foffset = commonarguments(tvb, ndps_tree, foffset); break; case 0x0000000d: /* Create */ - proto_tree_add_item(ndps_tree, hf_ndps_session, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_session, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Object Class"); atree = proto_item_add_subtree(aitem, ett_ndps); @@ -5173,7 +5173,7 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g foffset = commonarguments(tvb, ndps_tree, foffset); break; case 0x0000000e: /* Delete */ - proto_tree_add_item(ndps_tree, hf_ndps_session, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_session, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Object Class"); atree = proto_item_add_subtree(aitem, ett_ndps); @@ -5186,7 +5186,7 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g foffset = commonarguments(tvb, ndps_tree, foffset); break; case 0x0000000f: /* Disable PA */ - proto_tree_add_item(ndps_tree, hf_ndps_session, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_session, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; /* Start of NameorID */ aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Disable PA Message Option"); @@ -5197,7 +5197,7 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g foffset = commonarguments(tvb, ndps_tree, foffset); break; case 0x00000010: /* Enable PA */ - proto_tree_add_item(ndps_tree, hf_ndps_session, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_session, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; /* Start of NameorID */ aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Enable PA Message Option"); @@ -5208,11 +5208,11 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g foffset = commonarguments(tvb, ndps_tree, foffset); break; case 0x00000011: /* Resubmit Jobs */ - proto_tree_add_item(ndps_tree, hf_ndps_session, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_session, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; foffset = qualifiedname(tvb, ndps_tree, foffset); foffset = address_item(tvb, ndps_tree, foffset); - proto_tree_add_item(ndps_tree, hf_resubmit_op_type, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_resubmit_op_type, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Resubmit Job"); atree = proto_item_add_subtree(aitem, ett_ndps); @@ -5229,11 +5229,11 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g bitem = proto_tree_add_text(atree, tvb, foffset, -1, "Job ID"); btree = proto_item_add_subtree(bitem, ett_ndps); foffset = ndps_string(tvb, hf_ndps_pa_name, btree, foffset, NULL); - proto_tree_add_item(btree, hf_local_id, tvb, foffset, 4, FALSE); + proto_tree_add_item(btree, hf_local_id, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; proto_item_set_end(bitem, tvb, foffset); /* End of NWDPPrtContainedObjectId */ - proto_tree_add_item(atree, hf_ndps_document_number, tvb, foffset, 4, FALSE); + proto_tree_add_item(atree, hf_ndps_document_number, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; /* Start of AttributeSet */ bitem = proto_tree_add_text(atree, tvb, foffset, -1, "Job Attributes"); @@ -5284,7 +5284,7 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g foffset = commonarguments(tvb, ndps_tree, foffset); break; case 0x00000012: /* Set */ - proto_tree_add_item(ndps_tree, hf_ndps_session, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_session, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Object Class"); atree = proto_item_add_subtree(aitem, ett_ndps); @@ -5316,9 +5316,9 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g break; case 0x00000013: /* Shutdown PA */ case 0x0000001e: /* Shutdown PSM */ - proto_tree_add_item(ndps_tree, hf_ndps_session, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_session, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; - proto_tree_add_item(ndps_tree, hf_shutdown_type, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_shutdown_type, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; foffset = ndps_string(tvb, hf_ndps_pa_name, ndps_tree, foffset, NULL); /* Start of NameorID */ @@ -5329,7 +5329,7 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g /* End of NameorID */ foffset = commonarguments(tvb, ndps_tree, foffset); case 0x00000014: /* Startup PA */ - proto_tree_add_item(ndps_tree, hf_ndps_session, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_session, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; foffset = ndps_string(tvb, hf_ndps_pa_name, ndps_tree, foffset, NULL); /* Start of NameorID */ @@ -5341,13 +5341,13 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g foffset = commonarguments(tvb, ndps_tree, foffset); break; case 0x00000015: /* Reorder Job */ - proto_tree_add_item(ndps_tree, hf_ndps_session, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_session, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; /* Start of NWDPPrtContainedObjectId */ aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Job Identification"); atree = proto_item_add_subtree(aitem, ett_ndps); foffset = ndps_string(tvb, hf_ndps_pa_name, atree, foffset, NULL); - proto_tree_add_item(atree, hf_local_id, tvb, foffset, 4, FALSE); + proto_tree_add_item(atree, hf_local_id, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; proto_item_set_end(aitem, tvb, foffset); /* End of NWDPPrtContainedObjectId */ @@ -5355,14 +5355,14 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Reference Job ID"); atree = proto_item_add_subtree(aitem, ett_ndps); foffset = ndps_string(tvb, hf_ndps_pa_name, atree, foffset, NULL); - proto_tree_add_item(atree, hf_local_id, tvb, foffset, 4, FALSE); + proto_tree_add_item(atree, hf_local_id, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; proto_item_set_end(aitem, tvb, foffset); /* End of NWDPPrtContainedObjectId */ foffset = commonarguments(tvb, ndps_tree, foffset); break; case 0x00000016: /* Pause PA */ - proto_tree_add_item(ndps_tree, hf_ndps_session, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_session, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; /* Start of NameorID */ aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Pause Message Option"); @@ -5373,7 +5373,7 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g foffset = commonarguments(tvb, ndps_tree, foffset); break; case 0x00000017: /* Resume PA */ - proto_tree_add_item(ndps_tree, hf_ndps_session, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_session, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; /* Start of NameorID */ aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Resume Message Option"); @@ -5384,14 +5384,14 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g foffset = commonarguments(tvb, ndps_tree, foffset); break; case 0x00000018: /* Transfer Data */ - proto_tree_add_item(ndps_tree, hf_ndps_session, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_session, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; - proto_tree_add_item(ndps_tree, hf_get_status_flag, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_get_status_flag, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; proto_tree_add_item(ndps_tree, hf_ndps_data, tvb, foffset+4, tvb_get_ntohl(tvb, foffset), FALSE); break; case 0x00000019: /* Device Control */ - proto_tree_add_item(ndps_tree, hf_ndps_session, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_session, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; /* Start of Object Identifier */ aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Operation ID"); @@ -5402,16 +5402,16 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g foffset = commonarguments(tvb, ndps_tree, foffset); break; case 0x0000001a: /* Add Event Profile */ - proto_tree_add_item(ndps_tree, hf_ndps_session, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_session, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; /* Start of Eventhandling2 */ - proto_tree_add_item(ndps_tree, hf_ndps_profile_id, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_profile_id, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; - proto_tree_add_item(ndps_tree, hf_ndps_persistence, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_persistence, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; foffset = qualifiedname(tvb, ndps_tree, foffset); foffset = ndps_string(tvb, hf_ndps_supplier_name, ndps_tree, foffset, NULL); - proto_tree_add_item(ndps_tree, hf_ndps_language_id, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_language_id, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; /* Start of NameorID */ aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Method ID"); @@ -5441,15 +5441,15 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g foffset = qualifiedname(tvb, ndps_tree, foffset); break; case 0x0000001b: /* Remove Event Profile */ - proto_tree_add_item(ndps_tree, hf_ndps_session, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_session, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; - proto_tree_add_item(ndps_tree, hf_ndps_profile_id, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_profile_id, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; break; case 0x0000001c: /* Modify Event Profile */ - proto_tree_add_item(ndps_tree, hf_ndps_session, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_session, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; - proto_tree_add_item(ndps_tree, hf_ndps_profile_id, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_profile_id, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; supplier_flag = tvb_get_ntohl(tvb, foffset); proto_tree_add_boolean(ndps_tree, hf_ndps_supplier_flag, tvb, foffset, 4, supplier_flag); @@ -5462,7 +5462,7 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g foffset += 4; if (length==4) { - proto_tree_add_item(atree, hf_ndps_attribute_value, tvb, foffset, length, FALSE); + proto_tree_add_item(atree, hf_ndps_attribute_value, tvb, foffset, length, ENC_BIG_ENDIAN); } tvb_ensure_bytes_exist(tvb, foffset, length); foffset += length; @@ -5473,7 +5473,7 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g foffset += 4; if (language_flag) { - proto_tree_add_item(ndps_tree, hf_ndps_language_id, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_language_id, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; } method_flag = tvb_get_ntohl(tvb, foffset); @@ -5501,7 +5501,7 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g foffset = event_object_set(tvb, ndps_tree, foffset); break; case 0x0000001d: /* List Event Profiles */ - proto_tree_add_item(ndps_tree, hf_ndps_session, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_session, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; profiles_type = tvb_get_ntohl(tvb, foffset); proto_tree_add_uint(ndps_tree, hf_ndps_list_profiles_type, tvb, foffset, 4, profiles_type); @@ -5527,11 +5527,11 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g atree = proto_item_add_subtree(aitem, ett_ndps); foffset = name_or_id(tvb, atree, foffset); /* End of NameorID */ - proto_tree_add_item(atree, hf_ndps_language_id, tvb, foffset, 4, FALSE); + proto_tree_add_item(atree, hf_ndps_language_id, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; proto_item_set_end(aitem, tvb, foffset); } - proto_tree_add_item(ndps_tree, hf_ndps_list_profiles_result_type, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_list_profiles_result_type, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; /* Start of integeroption */ integer_type_flag = tvb_get_ntohl(tvb, foffset); @@ -5539,7 +5539,7 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g foffset += 4; if (integer_type_flag!=0) { - proto_tree_add_item(ndps_tree, hf_ndps_integer_type_value, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_integer_type_value, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; } /* End of integeroption */ @@ -5561,7 +5561,7 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g } break; case 0x0000001f: /* Cancel PSM Shutdown */ - proto_tree_add_item(ndps_tree, hf_ndps_session, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_session, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; /* Start of NameorID */ aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Cancel Shutdown Message Option"); @@ -5572,9 +5572,9 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g foffset = commonarguments(tvb, ndps_tree, foffset); break; case 0x00000020: /* Set Printer DS Information */ - proto_tree_add_item(ndps_tree, hf_ndps_session, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_session, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; - proto_tree_add_item(ndps_tree, hf_ndps_ds_info_type, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_ds_info_type, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; foffset = ndps_string(tvb, hf_ndps_printer_name, ndps_tree, foffset, NULL); aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "DS Object Name"); @@ -5583,7 +5583,7 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g proto_item_set_end(aitem, tvb, foffset); break; case 0x00000021: /* Clean User Jobs */ - proto_tree_add_item(ndps_tree, hf_ndps_session, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_session, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; /* Start of NameorID */ aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Clean Message Option"); @@ -5604,19 +5604,19 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g foffset += length; break; case 0x00000023: /* AddEventProfile2 */ - proto_tree_add_item(ndps_tree, hf_ndps_session, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_session, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; /* Start of Eventhandling2 */ - proto_tree_add_item(ndps_tree, hf_ndps_profile_id, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_profile_id, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; - proto_tree_add_item(ndps_tree, hf_ndps_persistence, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_persistence, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Consumer Name"); atree = proto_item_add_subtree(aitem, ett_ndps); foffset = qualifiedname(tvb, atree, foffset); proto_item_set_end(aitem, tvb, foffset); foffset = ndps_string(tvb, hf_ndps_supplier_name, ndps_tree, foffset, NULL); - proto_tree_add_item(ndps_tree, hf_ndps_language_id, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_language_id, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; /* Start of NameorID */ aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Method ID"); @@ -5666,17 +5666,17 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g } proto_item_set_end(aitem, tvb, foffset); /* End of object identifier set */ - proto_tree_add_item(ndps_tree, hf_notify_time_interval, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_notify_time_interval, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; - proto_tree_add_item(ndps_tree, hf_notify_sequence_number, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_notify_sequence_number, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; - proto_tree_add_item(ndps_tree, hf_notify_lease_exp_time, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_notify_lease_exp_time, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; foffset = ndps_string(tvb, hf_notify_printer_uri, ndps_tree, foffset, NULL); /* End of Eventhandling2 */ break; case 0x00000024: /* ListEventProfiles2 */ - proto_tree_add_item(ndps_tree, hf_ndps_session, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_session, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; profiles_type = tvb_get_ntohl(tvb, foffset); proto_tree_add_uint(ndps_tree, hf_ndps_list_profiles_type, tvb, foffset, 4, profiles_type); @@ -5706,10 +5706,10 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g foffset = name_or_id(tvb, atree, foffset); proto_item_set_end(aitem, tvb, foffset); /* End of NameorID */ - proto_tree_add_item(ndps_tree, hf_ndps_language_id, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_language_id, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; } - proto_tree_add_item(ndps_tree, hf_ndps_list_profiles_result_type, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_list_profiles_result_type, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; /* Start of integeroption */ integer_type_flag = tvb_get_ntohl(tvb, foffset); @@ -5717,7 +5717,7 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g foffset += 4; if (integer_type_flag!=0) { - proto_tree_add_item(ndps_tree, hf_ndps_integer_type_value, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_integer_type_value, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; } /* End of integeroption */ @@ -5747,7 +5747,7 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g { case 0x00000001: /* Bind */ foffset = credentials(tvb, ndps_tree, foffset); - proto_tree_add_item(ndps_tree, hf_ndps_retrieve_restrictions, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_retrieve_restrictions, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; number_of_items=tvb_get_ntohl(tvb, foffset); proto_tree_add_uint(ndps_tree, hf_ndps_bind_security_option_count, tvb, foffset, 4, number_of_items); @@ -5764,7 +5764,7 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g foffset += 4; if (length==4) { - proto_tree_add_item(atree, hf_bind_security, tvb, foffset, length, FALSE); + proto_tree_add_item(atree, hf_bind_security, tvb, foffset, length, ENC_BIG_ENDIAN); } proto_item_set_end(aitem, tvb, foffset); } @@ -5772,11 +5772,11 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g case 0x00000002: /* Unbind */ break; case 0x00000003: /* List Services */ - proto_tree_add_item(ndps_tree, hf_ndps_list_services_type, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_list_services_type, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; break; case 0x00000004: /* Enable Service */ - proto_tree_add_item(ndps_tree, hf_ndps_service_type, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_service_type, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Parameters"); atree = proto_item_add_subtree(aitem, ett_ndps); @@ -5801,7 +5801,7 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g proto_item_set_end(aitem, tvb, foffset); break; case 0x00000005: /* Disable Service */ - proto_tree_add_item(ndps_tree, hf_ndps_list_services_type, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_list_services_type, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; break; case 0x00000006: /* Down Broker */ @@ -5816,7 +5816,7 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g { case 0x00000001: /* Bind */ foffset = credentials(tvb, ndps_tree, foffset); - proto_tree_add_item(ndps_tree, hf_ndps_retrieve_restrictions, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_retrieve_restrictions, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; number_of_items=tvb_get_ntohl(tvb, foffset); proto_tree_add_uint(ndps_tree, hf_ndps_bind_security_option_count, tvb, foffset, 4, number_of_items); @@ -5833,7 +5833,7 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g foffset += 4; if (length==4) { - proto_tree_add_item(atree, hf_bind_security, tvb, foffset, length, FALSE); + proto_tree_add_item(atree, hf_bind_security, tvb, foffset, length, ENC_BIG_ENDIAN); } proto_item_set_end(aitem, tvb, foffset); } @@ -5903,7 +5903,7 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g foffset += 4; if (integer_type_flag!=0) { - proto_tree_add_item(ndps_tree, hf_ndps_integer_type_value, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_integer_type_value, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; } /* End of integeroption */ @@ -5933,7 +5933,7 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g { case 0x00000001: /* Notify Bind */ foffset = credentials(tvb, ndps_tree, foffset); - proto_tree_add_item(ndps_tree, hf_ndps_retrieve_restrictions, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_retrieve_restrictions, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; number_of_items=tvb_get_ntohl(tvb, foffset); foffset += 4; @@ -5949,7 +5949,7 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g foffset += 4; if (length==4) { - proto_tree_add_item(atree, hf_bind_security, tvb, foffset, length, FALSE); + proto_tree_add_item(atree, hf_bind_security, tvb, foffset, length, ENC_BIG_ENDIAN); } proto_item_set_end(aitem, tvb, foffset); } @@ -5980,20 +5980,20 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g /* End of QualifiedName Set*/ break; case 0x00000004: /* Deregister Supplier */ - proto_tree_add_item(ndps_tree, hf_ndps_session, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_session, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; break; case 0x00000005: /* Add Profile */ - proto_tree_add_item(ndps_tree, hf_ndps_session, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_session, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Supplier Alias"); atree = proto_item_add_subtree(aitem, ett_ndps); foffset = qualifiedname(tvb, atree, foffset); proto_item_set_end(aitem, tvb, foffset); /* Start of Eventhandling */ - proto_tree_add_item(ndps_tree, hf_ndps_profile_id, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_profile_id, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; - proto_tree_add_item(ndps_tree, hf_ndps_persistence, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_persistence, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Consumer Name"); atree = proto_item_add_subtree(aitem, ett_ndps); @@ -6003,10 +6003,10 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g foffset += 4; if (length==4) { - proto_tree_add_item(ndps_tree, hf_ndps_attribute_value, tvb, foffset, length, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_attribute_value, tvb, foffset, length, ENC_BIG_ENDIAN); } foffset += length; - proto_tree_add_item(ndps_tree, hf_ndps_language_id, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_language_id, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; /* Start of NameorID */ aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Method ID"); @@ -6035,15 +6035,15 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g /* End of Eventhandling */ break; case 0x00000006: /* Remove Profile */ - proto_tree_add_item(ndps_tree, hf_ndps_session, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_session, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; - proto_tree_add_item(ndps_tree, hf_ndps_profile_id, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_profile_id, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; break; case 0x00000007: /* Modify Profile */ - proto_tree_add_item(ndps_tree, hf_ndps_session, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_session, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; - proto_tree_add_item(ndps_tree, hf_ndps_profile_id, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_profile_id, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; supplier_flag = tvb_get_ntohl(tvb, foffset); proto_tree_add_boolean(ndps_tree, hf_ndps_supplier_flag, tvb, foffset, 4, supplier_flag); @@ -6056,7 +6056,7 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g foffset += 4; if (length==4) { - proto_tree_add_item(atree, hf_ndps_attribute_value, tvb, foffset, length, FALSE); + proto_tree_add_item(atree, hf_ndps_attribute_value, tvb, foffset, length, ENC_BIG_ENDIAN); } tvb_ensure_bytes_exist(tvb, foffset, length); foffset += length; @@ -6067,7 +6067,7 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g foffset += 4; if (language_flag) { - proto_tree_add_item(ndps_tree, hf_ndps_language_id, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_language_id, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; } method_flag = tvb_get_ntohl(tvb, foffset); @@ -6092,7 +6092,7 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g foffset = event_object_set(tvb, ndps_tree, foffset); break; case 0x00000008: /* List Profiles */ - proto_tree_add_item(ndps_tree, hf_ndps_session, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_session, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; profiles_type = tvb_get_ntohl(tvb, foffset); proto_tree_add_uint(ndps_tree, hf_ndps_list_profiles_type, tvb, foffset, 4, profiles_type); @@ -6121,11 +6121,11 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g atree = proto_item_add_subtree(aitem, ett_ndps); foffset = name_or_id(tvb, atree, foffset); /* End of NameorID */ - proto_tree_add_item(atree, hf_ndps_language_id, tvb, foffset, 4, FALSE); + proto_tree_add_item(atree, hf_ndps_language_id, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; proto_item_set_end(aitem, tvb, foffset); } - proto_tree_add_item(ndps_tree, hf_ndps_list_profiles_result_type, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_list_profiles_result_type, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; /* Start of integeroption */ integer_type_flag = tvb_get_ntohl(tvb, foffset); @@ -6133,7 +6133,7 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g foffset += 4; if (integer_type_flag!=0) { - proto_tree_add_item(ndps_tree, hf_ndps_integer_type_value, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_integer_type_value, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; } /* End of integeroption */ @@ -6155,7 +6155,7 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g } break; case 0x00000009: /* Report Event */ - proto_tree_add_item(ndps_tree, hf_ndps_session, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_session, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; /* Start of ReportEventItemSet */ number_of_items = tvb_get_ntohl(tvb, foffset); @@ -6172,7 +6172,7 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g bitem = proto_tree_add_text(atree, tvb, foffset, -1, "Item %d", i); btree = proto_item_add_subtree(bitem, ett_ndps); /* Start of ReportEventItem */ - proto_tree_add_item(btree, hf_ndps_event_type, tvb, foffset, 4, FALSE); + proto_tree_add_item(btree, hf_ndps_event_type, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; citem = proto_tree_add_text(btree, tvb, foffset, -1, "Containing Class"); ctree = proto_item_add_subtree(citem, ett_ndps); @@ -6217,7 +6217,7 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g proto_item_set_end(citem, tvb, foffset); /* End of AttributeSet */ foffset = ndps_string(tvb, hf_ndps_message, btree, foffset, NULL); - proto_tree_add_item(btree, hf_time, tvb, foffset, 4, FALSE); + proto_tree_add_item(btree, hf_time, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; proto_item_set_end(bitem, tvb, foffset); /* End of ReportEventItem */ @@ -6246,7 +6246,7 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g proto_item_set_end(bitem, tvb, foffset); /* End of NameorID */ /* Start of NotifyDeliveryAddr */ - proto_tree_add_item(atree, hf_address_len, tvb, foffset, 4, FALSE); + proto_tree_add_item(atree, hf_address_len, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; foffset = print_address(tvb, atree, foffset); /* End of NotifyDeliveryAddr */ @@ -6255,7 +6255,7 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g } /* End of DestinationSet */ foffset = ndps_string(tvb, hf_ndps_supplier_name, ndps_tree, foffset, NULL); - proto_tree_add_item(ndps_tree, hf_ndps_event_type, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_event_type, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Containing Class"); atree = proto_item_add_subtree(aitem, ett_ndps); @@ -6301,7 +6301,7 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g proto_item_set_end(aitem, tvb, foffset); /* End of AttributeSet */ foffset = ndps_string(tvb, hf_ndps_message, ndps_tree, foffset, NULL); - proto_tree_add_item(ndps_tree, hf_time, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_time, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Account"); atree = proto_item_add_subtree(aitem, ett_ndps); @@ -6321,7 +6321,7 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g break; case 0x0000000e: /* List Delivery Methods */ cred_type = tvb_get_ntohl(tvb, foffset); - proto_tree_add_item(ndps_tree, hf_delivery_method_type, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_delivery_method_type, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; switch (cred_type) { @@ -6332,11 +6332,11 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g foffset += 4; if (integer_type_flag!=0) { - proto_tree_add_item(ndps_tree, hf_ndps_integer_type_value, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_integer_type_value, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; } /* End of integeroption */ - proto_tree_add_item(ndps_tree, hf_ndps_language_id, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_language_id, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; break; case 1: /* Continuation */ @@ -6364,7 +6364,7 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g foffset = name_or_id(tvb, atree, foffset); proto_item_set_end(aitem, tvb, foffset); /* End of NameorID */ - proto_tree_add_item(ndps_tree, hf_ndps_language_id, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_language_id, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; break; default: @@ -6376,7 +6376,7 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g { case 0x00000001: /* Bind */ foffset = credentials(tvb, ndps_tree, foffset); - proto_tree_add_item(ndps_tree, hf_ndps_retrieve_restrictions, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_retrieve_restrictions, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; number_of_items=tvb_get_ntohl(tvb, foffset); proto_tree_add_uint(ndps_tree, hf_ndps_bind_security_option_count, tvb, foffset, 4, number_of_items); @@ -6393,7 +6393,7 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g foffset += 4; if (length==4) { - proto_tree_add_item(atree, hf_bind_security, tvb, foffset, length, FALSE); + proto_tree_add_item(atree, hf_bind_security, tvb, foffset, length, ENC_BIG_ENDIAN); } proto_item_set_end(aitem, tvb, foffset); } @@ -6404,11 +6404,11 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g /* NoOp */ break; case 0x00000003: /* Add Resource File */ - proto_tree_add_item(ndps_tree, hf_packet_count, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_packet_count, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; - proto_tree_add_item(ndps_tree, hf_last_packet_flag, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_last_packet_flag, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; - proto_tree_add_item(ndps_tree, hf_file_timestamp, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_file_timestamp, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; foffset = res_add_input_data(tvb, ndps_tree, foffset); number_of_items=tvb_get_ntohl(tvb, foffset); @@ -6437,17 +6437,17 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g foffset = res_add_input_data(tvb, ndps_tree, foffset); break; case 0x00000005: /* List Resources */ - proto_tree_add_item(ndps_tree, hf_ndps_max_items, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_max_items, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; - proto_tree_add_item(ndps_tree, hf_ndps_status_flags, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_status_flags, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; - proto_tree_add_item(ndps_tree, hf_ndps_resource_list_type, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_resource_list_type, tvb, foffset, 4, ENC_BIG_ENDIAN); resource_type = tvb_get_ntohl(tvb, foffset); foffset += 4; switch (resource_type) { case 0: /* Print Drivers */ - proto_tree_add_item(ndps_tree, hf_os_type, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_os_type, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; break; case 1: /* Printer Definitions */ @@ -6455,19 +6455,19 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g foffset = ndps_string(tvb, hf_ndps_vendor_dir, ndps_tree, foffset, NULL); break; case 3: /* Banner Page Files */ - proto_tree_add_item(ndps_tree, hf_banner_type, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_banner_type, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; break; case 4: /* Font Types */ - proto_tree_add_item(ndps_tree, hf_font_type, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_font_type, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; - proto_tree_add_item(ndps_tree, hf_os_type, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_os_type, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; break; case 5: /* Printer Driver Files */ case 12: /* Printer Driver Files 2 */ case 9: /* Generic Files */ - proto_tree_add_item(ndps_tree, hf_os_type, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_os_type, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; foffset = ndps_string(tvb, hf_ndps_printer_type, ndps_tree, foffset, NULL); foffset = ndps_string(tvb, hf_ndps_printer_manuf, ndps_tree, foffset, NULL); @@ -6488,9 +6488,9 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g proto_tree_add_item(ndps_tree, hf_printer_id, tvb, foffset, field_len, ENC_NA); break; case 7: /* Font Files */ - proto_tree_add_item(ndps_tree, hf_os_type, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_os_type, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; - proto_tree_add_item(ndps_tree, hf_font_type, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_font_type, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; foffset = ndps_string(tvb, hf_ndps_font_name, ndps_tree, foffset, NULL); break; @@ -6508,15 +6508,15 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g } break; case 0x00000006: /* Get Resource File */ - proto_tree_add_item(ndps_tree, hf_get_status_flag, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_get_status_flag, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; - proto_tree_add_item(ndps_tree, hf_res_type, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_res_type, tvb, foffset, 4, ENC_BIG_ENDIAN); resource_type = tvb_get_ntohl(tvb, foffset); foffset += 4; switch (resource_type) { case 0: /* Print Drivers */ - proto_tree_add_item(ndps_tree, hf_os_type, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_os_type, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; foffset = ndps_string(tvb, hf_ndps_prn_dir_name, ndps_tree, foffset, NULL); foffset = ndps_string(tvb, hf_ndps_prn_file_name, ndps_tree, foffset, NULL); @@ -6529,18 +6529,18 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g foffset = ndps_string(tvb, hf_ndps_banner_name, ndps_tree, foffset, NULL); break; case 3: /* Font Types */ - proto_tree_add_item(ndps_tree, hf_os_type, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_os_type, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; - proto_tree_add_item(ndps_tree, hf_font_type, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_font_type, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; foffset = ndps_string(tvb, hf_ndps_prn_file_name, ndps_tree, foffset, NULL); break; case 4: /* Generic Files/ Archive */ case 5: /* Printer Driver Archive */ - proto_tree_add_item(ndps_tree, hf_os_type, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_os_type, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; foffset = ndps_string(tvb, hf_ndps_prn_dir_name, ndps_tree, foffset, NULL); - proto_tree_add_item(ndps_tree, hf_archive_type, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_archive_type, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; break; default: @@ -6548,12 +6548,12 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g } break; case 0x00000007: /* Get Resource File Date */ - proto_tree_add_item(ndps_tree, hf_ndps_status_flags, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_status_flags, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; foffset = res_add_input_data(tvb, ndps_tree, foffset); break; case 0x0000000a: /* Set Resource Language Context */ - proto_tree_add_item(ndps_tree, hf_ndps_language_id, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_language_id, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; break; default: @@ -6581,7 +6581,7 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g } aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Item %d", i); atree = proto_item_add_subtree(aitem, ett_ndps); - proto_tree_add_item(atree, hf_ndps_session, tvb, foffset, 4, FALSE); + proto_tree_add_item(atree, hf_ndps_session, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; bitem = proto_tree_add_text(atree, tvb, foffset, -1, "Supplier ID"); btree = proto_item_add_subtree(bitem, ett_ndps); @@ -6589,10 +6589,10 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g foffset += 4; if (length==4) { - proto_tree_add_item(btree, hf_ndps_attribute_value, tvb, foffset, length, FALSE); + proto_tree_add_item(btree, hf_ndps_attribute_value, tvb, foffset, length, ENC_BIG_ENDIAN); } foffset += length; - proto_tree_add_item(btree, hf_ndps_event_type, tvb, foffset, 4, FALSE); + proto_tree_add_item(btree, hf_ndps_event_type, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; proto_item_set_end(bitem, tvb, foffset); bitem = proto_tree_add_text(atree, tvb, foffset, -1, "Containing Class"); @@ -6620,7 +6620,7 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g foffset = objectidentifier(tvb, btree, foffset); foffset = attribute_value(tvb, atree, foffset); foffset = ndps_string(tvb, hf_ndps_message, atree, foffset, NULL); - proto_tree_add_item(atree, hf_time, tvb, foffset, 4, FALSE); + proto_tree_add_item(atree, hf_time, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; proto_item_set_end(bitem, tvb, foffset); bitem = proto_tree_add_text(atree, tvb, foffset, -1, "Account"); @@ -6642,7 +6642,7 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g } aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Object %d", i); atree = proto_item_add_subtree(aitem, ett_ndps); - proto_tree_add_item(atree, hf_ndps_session, tvb, foffset, 4, FALSE); + proto_tree_add_item(atree, hf_ndps_session, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; bitem = proto_tree_add_text(atree, tvb, foffset, -1, "Supplier ID"); btree = proto_item_add_subtree(bitem, ett_ndps); @@ -6650,10 +6650,10 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g foffset += 4; if (length==4) { - proto_tree_add_item(btree, hf_ndps_attribute_value, tvb, foffset, length, FALSE); + proto_tree_add_item(btree, hf_ndps_attribute_value, tvb, foffset, length, ENC_BIG_ENDIAN); } foffset += length; - proto_tree_add_item(atree, hf_ndps_event_type, tvb, foffset, 4, FALSE); + proto_tree_add_item(atree, hf_ndps_event_type, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; proto_item_set_end(bitem, tvb, foffset); bitem = proto_tree_add_text(atree, tvb, foffset, -1, "Containing Class"); @@ -6697,7 +6697,7 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g proto_item_set_end(bitem, tvb, foffset); /* End of AttributeSet */ foffset = ndps_string(tvb, hf_ndps_message, atree, foffset, NULL); - proto_tree_add_item(atree, hf_time, tvb, foffset, 4, FALSE); + proto_tree_add_item(atree, hf_time, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; bitem = proto_tree_add_text(atree, tvb, foffset, -1, "Account"); btree = proto_item_add_subtree(bitem, ett_ndps); @@ -6742,7 +6742,7 @@ ndps_error(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, int foffset foffset += 4; if (problem_type==0) /* Standard Error */ { - proto_tree_add_item(ndps_tree, hf_security_problem_type, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_security_problem_type, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; } else /* Extended Error */ @@ -6762,11 +6762,11 @@ ndps_error(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, int foffset /* End of NameorID */ break; case 1: /* Service Error */ - proto_tree_add_item(ndps_tree, hf_problem_type, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_problem_type, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; if (tvb_get_ntohl(tvb, foffset-4)==0) /* Standard Error */ { - proto_tree_add_item(ndps_tree, hf_service_problem_type, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_service_problem_type, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; } else /* Extended Error */ @@ -6780,22 +6780,22 @@ ndps_error(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, int foffset } foffset = objectidentification(tvb, ndps_tree, foffset); foffset = attribute_value(tvb, ndps_tree, foffset); /* Object Attribute Set */ - proto_tree_add_item(ndps_tree, hf_ndps_lib_error, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_lib_error, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; - proto_tree_add_item(ndps_tree, hf_ndps_other_error, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_other_error, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; - proto_tree_add_item(ndps_tree, hf_ndps_other_error_2, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_other_error_2, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; if (tvb_length_remaining(tvb, foffset) >= 4) { foffset = ndps_string(tvb, hf_ndps_other_error_string, ndps_tree, foffset, NULL); } break; case 2: /* Access Error */ - proto_tree_add_item(ndps_tree, hf_problem_type, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_problem_type, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; if (tvb_get_ntohl(tvb, foffset-4)==0) /* Standard Error */ { - proto_tree_add_item(ndps_tree, hf_access_problem_type, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_access_problem_type, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; } else /* Extended Error */ @@ -6810,11 +6810,11 @@ ndps_error(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, int foffset foffset = objectidentification(tvb, ndps_tree, foffset); break; case 3: /* Printer Error */ - proto_tree_add_item(ndps_tree, hf_problem_type, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_problem_type, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; if (tvb_get_ntohl(tvb, foffset-4)==0) /* Standard Error */ { - proto_tree_add_item(ndps_tree, hf_printer_problem_type, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_printer_problem_type, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; } else /* Extended Error */ @@ -6829,11 +6829,11 @@ ndps_error(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, int foffset foffset = objectidentification(tvb, ndps_tree, foffset); break; case 4: /* Selection Error */ - proto_tree_add_item(ndps_tree, hf_problem_type, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_problem_type, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; if (tvb_get_ntohl(tvb, foffset-4)==0) /* Standard Error */ { - proto_tree_add_item(ndps_tree, hf_selection_problem_type, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_selection_problem_type, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; } else /* Extended Error */ @@ -6849,11 +6849,11 @@ ndps_error(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, int foffset foffset = attribute_value(tvb, ndps_tree, foffset); /* Object Attribute Set */ break; case 5: /* Document Access Error */ - proto_tree_add_item(ndps_tree, hf_problem_type, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_problem_type, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; if (tvb_get_ntohl(tvb, foffset-4)==0) /* Standard Error */ { - proto_tree_add_item(ndps_tree, hf_doc_access_problem_type, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_doc_access_problem_type, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset = objectidentifier(tvb, ndps_tree, foffset); } else /* Extended Error */ @@ -6879,11 +6879,11 @@ ndps_error(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, int foffset } aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Item %d", i); atree = proto_item_add_subtree(aitem, ett_ndps); - proto_tree_add_item(atree, hf_problem_type, tvb, foffset, 4, FALSE); + proto_tree_add_item(atree, hf_problem_type, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; if (tvb_get_ntohl(tvb, foffset-4)==0) /* Standard Error */ { - proto_tree_add_item(atree, hf_attribute_problem_type, tvb, foffset, 4, FALSE); + proto_tree_add_item(atree, hf_attribute_problem_type, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; } else /* Extended Error */ @@ -6900,11 +6900,11 @@ ndps_error(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, int foffset } break; case 7: /* Update Error */ - proto_tree_add_item(ndps_tree, hf_problem_type, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_problem_type, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; if (tvb_get_ntohl(tvb, foffset-4)==0) /* Standard Error */ { - proto_tree_add_item(ndps_tree, hf_update_problem_type, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_update_problem_type, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; } else /* Extended Error */ @@ -6931,7 +6931,7 @@ return_code(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, int foffse proto_item *expert_item; expert_status = tvb_get_ntohl(tvb, foffset); - expert_item = proto_tree_add_item(ndps_tree, hf_ndps_return_code, tvb, foffset, 4, FALSE); + expert_item = proto_tree_add_item(ndps_tree, hf_ndps_return_code, tvb, foffset, 4, ENC_BIG_ENDIAN); if (expert_status != 0) { expert_add_info_format(pinfo, expert_item, PI_RESPONSE_CODE, PI_ERROR, "Fault: %s", val_to_str(expert_status, ndps_error_types, "Unknown NDPS Error (0x%08x)")); } @@ -6942,7 +6942,7 @@ return_code(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, int foffse { return foffset; } - proto_tree_add_item(ndps_tree, hf_ndps_ext_error, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_ext_error, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; return foffset; } @@ -7007,7 +7007,7 @@ dissect_ndps_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, int } if(ndps_func == 1 || ndps_func == 2) { - expert_item = proto_tree_add_item(ndps_tree, hf_ndps_rpc_acc_stat, tvb, foffset, 4, FALSE); + expert_item = proto_tree_add_item(ndps_tree, hf_ndps_rpc_acc_stat, tvb, foffset, 4, ENC_BIG_ENDIAN); expert_status = tvb_get_ntohl(tvb, foffset); if (expert_status != 0) { expert_add_info_format(pinfo, expert_item, PI_RESPONSE_CODE, PI_ERROR, "Fault: %s", val_to_str(expert_status, accept_stat, "Unknown NDPS Error (0x%08x)")); @@ -7017,7 +7017,7 @@ dissect_ndps_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, int col_append_str(pinfo->cinfo, COL_INFO, "- Error"); return foffset; } - proto_tree_add_item(ndps_tree, hf_ndps_rpc_acc_results, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_rpc_acc_results, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; if (tvb_length_remaining(tvb,foffset) < 4) { col_append_str(pinfo->cinfo, COL_INFO, "- Error"); @@ -7031,7 +7031,7 @@ dissect_ndps_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, int if (match_strval(tvb_get_ntohl(tvb, foffset), ndps_error_types) && tvb_length_remaining(tvb,foffset) < 8 && (tvb_get_ntohl(tvb, foffset)!=0)) { expert_status = tvb_get_ntohl(tvb, foffset); - expert_item = proto_tree_add_item(ndps_tree, hf_ndps_return_code, tvb, foffset, 4, FALSE); + expert_item = proto_tree_add_item(ndps_tree, hf_ndps_return_code, tvb, foffset, 4, ENC_BIG_ENDIAN); expert_add_info_format(pinfo, expert_item, PI_RESPONSE_CODE, PI_ERROR, "Fault: %s", val_to_str(expert_status, ndps_error_types, "Unknown NDPS Error (0x%08x)")); col_append_str(pinfo->cinfo, COL_INFO, "- Error"); return foffset; @@ -7043,7 +7043,7 @@ dissect_ndps_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, int switch(ndps_func) { case 0x00000001: /* Bind PSM */ - proto_tree_add_item(ndps_tree, hf_ndps_session, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_session, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; if(error_val != 0) { @@ -7052,7 +7052,7 @@ dissect_ndps_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, int { break; } - proto_tree_add_item(ndps_tree, hf_ndps_session, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_session, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; } aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "PSM Name"); @@ -7061,7 +7061,7 @@ dissect_ndps_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, int proto_item_set_end(aitem, tvb, foffset); break; case 0x00000002: /* Bind PA */ - proto_tree_add_item(ndps_tree, hf_ndps_session, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_session, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; if(error_val != 0) { @@ -7070,7 +7070,7 @@ dissect_ndps_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, int { break; } - proto_tree_add_item(ndps_tree, hf_ndps_session, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_session, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; } foffset = ndps_string(tvb, hf_ndps_pa_name, ndps_tree, foffset, NULL); @@ -7079,7 +7079,7 @@ dissect_ndps_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, int break; case 0x00000004: /* Print */ foffset = ndps_string(tvb, hf_ndps_pa_name, ndps_tree, foffset, NULL); - proto_tree_add_item(ndps_tree, hf_local_id, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_local_id, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; if(error_val != 0) { @@ -7116,7 +7116,7 @@ dissect_ndps_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, int } break; case 0x00000007: /* List Object Attributes */ - proto_tree_add_item(ndps_tree, hf_answer_time, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_answer_time, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; /* Continuation Option */ aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Continuation Option"); @@ -7146,9 +7146,9 @@ dissect_ndps_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, int /* Limit Encountered Option */ aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Limit Encountered Option"); atree = proto_item_add_subtree(aitem, ett_ndps); - proto_tree_add_item(atree, hf_ndps_len, tvb, foffset, 4, FALSE); + proto_tree_add_item(atree, hf_ndps_len, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; - proto_tree_add_item(atree, hf_ndps_limit_enc, tvb, foffset, 4, FALSE); + proto_tree_add_item(atree, hf_ndps_limit_enc, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; proto_item_set_end(aitem, tvb, foffset); /* Object Results Set */ @@ -7196,7 +7196,7 @@ dissect_ndps_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, int foffset = attribute_value(tvb, dtree, foffset); proto_item_set_end(ditem, tvb, foffset); } - proto_tree_add_item(ctree, hf_ndps_qualifier, tvb, foffset, 4, FALSE); + proto_tree_add_item(ctree, hf_ndps_qualifier, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; foffset += align_4(tvb, foffset); proto_item_set_end(citem, tvb, foffset); @@ -7219,7 +7219,7 @@ dissect_ndps_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, int aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Job ID"); atree = proto_item_add_subtree(aitem, ett_ndps); foffset = ndps_string(tvb, hf_ndps_pa_name, atree, foffset, NULL); - proto_tree_add_item(atree, hf_local_id, tvb, foffset, 4, FALSE); + proto_tree_add_item(atree, hf_local_id, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; proto_item_set_end(aitem, tvb, foffset); /* End of NWDPPrtContainedObjectId */ @@ -7285,7 +7285,7 @@ dissect_ndps_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, int citem = proto_tree_add_text(btree, tvb, foffset, -1, "Old Job"); ctree = proto_item_add_subtree(citem, ett_ndps); foffset = ndps_string(tvb, hf_ndps_pa_name, ctree, foffset, NULL); - proto_tree_add_item(ctree, hf_local_id, tvb, foffset, 4, FALSE); + proto_tree_add_item(ctree, hf_local_id, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; proto_item_set_end(citem, tvb, foffset); /* End of NWDPPrtContainedObjectId */ @@ -7293,7 +7293,7 @@ dissect_ndps_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, int citem = proto_tree_add_text(btree, tvb, foffset, -1, "New Job"); ctree = proto_item_add_subtree(citem, ett_ndps); foffset = ndps_string(tvb, hf_ndps_pa_name, ctree, foffset, NULL); - proto_tree_add_item(ctree, hf_local_id, tvb, foffset, 4, FALSE); + proto_tree_add_item(ctree, hf_local_id, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; proto_item_set_end(citem, tvb, foffset); /* End of NWDPPrtContainedObjectId */ @@ -7377,7 +7377,7 @@ dissect_ndps_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, int } break; case 0x0000001a: /* Add Event Profile */ - proto_tree_add_item(ndps_tree, hf_ndps_profile_id, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_profile_id, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; if(error_val != 0) { @@ -7389,13 +7389,13 @@ dissect_ndps_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, int foffset += 4; if (length==4) { - proto_tree_add_item(ndps_tree, hf_ndps_attribute_value, tvb, foffset, length, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_attribute_value, tvb, foffset, length, ENC_BIG_ENDIAN); } foffset += length; /* Start of Eventhandling */ - proto_tree_add_item(ndps_tree, hf_ndps_profile_id, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_profile_id, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; - proto_tree_add_item(ndps_tree, hf_ndps_persistence, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_persistence, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Consumer Name"); atree = proto_item_add_subtree(aitem, ett_ndps); @@ -7404,10 +7404,10 @@ dissect_ndps_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, int foffset += 4; if (length==4) { - proto_tree_add_item(ndps_tree, hf_ndps_attribute_value, tvb, foffset, length, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_attribute_value, tvb, foffset, length, ENC_BIG_ENDIAN); } foffset += length; - proto_tree_add_item(ndps_tree, hf_ndps_language_id, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_language_id, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; proto_item_set_end(aitem, tvb, foffset); /* Start of NameorID */ @@ -7459,9 +7459,9 @@ dissect_ndps_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, int } break; case 0x00000023: /* AddEventProfile2 */ - proto_tree_add_item(ndps_tree, hf_ndps_profile_id, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_profile_id, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; - proto_tree_add_item(ndps_tree, hf_notify_lease_exp_time, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_notify_lease_exp_time, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; if(error_val != 0) { @@ -7481,15 +7481,15 @@ dissect_ndps_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, int aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Event %d", i); atree = proto_item_add_subtree(aitem, ett_ndps); /* Start of Eventhandling2 */ - proto_tree_add_item(atree, hf_ndps_profile_id, tvb, foffset, 4, FALSE); + proto_tree_add_item(atree, hf_ndps_profile_id, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; - proto_tree_add_item(atree, hf_ndps_persistence, tvb, foffset, 4, FALSE); + proto_tree_add_item(atree, hf_ndps_persistence, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; bitem = proto_tree_add_text(atree, tvb, foffset, -1, "Consumer Name"); btree = proto_item_add_subtree(bitem, ett_ndps); foffset = qualifiedname(tvb, btree, foffset); foffset = ndps_string(tvb, hf_ndps_supplier_name, atree, foffset, NULL); - proto_tree_add_item(atree, hf_ndps_language_id, tvb, foffset, 4, FALSE); + proto_tree_add_item(atree, hf_ndps_language_id, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; proto_item_set_end(bitem, tvb, foffset); /* Start of NameorID */ @@ -7540,11 +7540,11 @@ dissect_ndps_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, int } proto_item_set_end(bitem, tvb, foffset); /* End of object identifier set */ - proto_tree_add_item(atree, hf_notify_time_interval, tvb, foffset, 4, FALSE); + proto_tree_add_item(atree, hf_notify_time_interval, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; - proto_tree_add_item(atree, hf_notify_sequence_number, tvb, foffset, 4, FALSE); + proto_tree_add_item(atree, hf_notify_sequence_number, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; - proto_tree_add_item(atree, hf_notify_lease_exp_time, tvb, foffset, 4, FALSE); + proto_tree_add_item(atree, hf_notify_lease_exp_time, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; foffset = ndps_string(tvb, hf_notify_printer_uri, atree, foffset, NULL); proto_item_set_end(aitem, tvb, foffset); @@ -7589,7 +7589,7 @@ dissect_ndps_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, int } aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Service %d", i); atree = proto_item_add_subtree(aitem, ett_ndps); - proto_tree_add_item(atree, hf_ndps_service_type, tvb, foffset, 4, FALSE); + proto_tree_add_item(atree, hf_ndps_service_type, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; proto_tree_add_item(atree, hf_ndps_service_enabled, tvb, foffset, 4, FALSE); foffset += 4; @@ -7599,7 +7599,7 @@ dissect_ndps_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, int break; case 0x00000007: /* Get Broker NDS Object Name */ proto_tree_add_item(ndps_tree, hf_ndps_item_count, tvb, foffset, - 4, FALSE); /* XXX - what does this count? */ + 4, ENC_BIG_ENDIAN); /* XXX - what does this count? */ foffset += 4; foffset = ndps_string(tvb, hf_ndps_broker_name, ndps_tree, foffset, NULL); foffset = ndps_string(tvb, hf_ndps_tree, ndps_tree, foffset, NULL); @@ -7673,7 +7673,7 @@ dissect_ndps_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, int break; case 0x0000000a: /* List Known Registries */ number_of_items = tvb_get_ntohl(tvb, foffset); - proto_tree_add_item(ndps_tree, hf_ndps_item_count, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_item_count, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; for (i = 1 ; i <= number_of_items; i++ ) { @@ -7681,7 +7681,7 @@ dissect_ndps_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, int proto_tree_add_text(ndps_tree, tvb, foffset, -1, "[Truncated]"); break; } - aitem = proto_tree_add_item(ndps_tree, hf_ndps_client_server_type, tvb, foffset, 4, FALSE); + aitem = proto_tree_add_item(ndps_tree, hf_ndps_client_server_type, tvb, foffset, 4, ENC_BIG_ENDIAN); atree = proto_item_add_subtree(aitem, ett_ndps); foffset += 4; foffset = ndps_string(tvb, hf_ndps_registry_name, atree, foffset, NULL); @@ -7705,9 +7705,9 @@ dissect_ndps_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, int foffset = return_code(tvb, pinfo, ndps_tree, foffset); break; case 0x0000000c: /* Get Registry Session Information */ - proto_tree_add_item(ndps_tree, hf_ndps_session_type, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_session_type, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; - proto_tree_add_item(ndps_tree, hf_time, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_time, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; foffset = return_code(tvb, pinfo, ndps_tree, foffset); break; @@ -7744,7 +7744,7 @@ dissect_ndps_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, int /* NoOp */ break; case 0x00000003: /* Register Supplier */ - proto_tree_add_item(ndps_tree, hf_ndps_session, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_session, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; foffset = event_object_set(tvb, ndps_tree, foffset); foffset = return_code(tvb, pinfo, ndps_tree, foffset); @@ -7755,7 +7755,7 @@ dissect_ndps_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, int foffset = return_code(tvb, pinfo, ndps_tree, foffset); break; case 0x00000005: /* Add Profile */ - proto_tree_add_item(ndps_tree, hf_ndps_profile_id, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_profile_id, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; foffset = event_object_set(tvb, ndps_tree, foffset); foffset = return_code(tvb, pinfo, ndps_tree, foffset); @@ -7768,12 +7768,12 @@ dissect_ndps_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, int break; case 0x00000008: /* List Profiles */ /* Start of ProfileResultSet */ - proto_tree_add_item(ndps_tree, hf_ndps_len, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_len, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; /* Start of Eventhandling */ - proto_tree_add_item(ndps_tree, hf_ndps_profile_id, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_profile_id, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; - proto_tree_add_item(ndps_tree, hf_ndps_persistence, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_persistence, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Consumer Name"); atree = proto_item_add_subtree(aitem, ett_ndps); @@ -7783,10 +7783,10 @@ dissect_ndps_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, int foffset += 4; if (length==4) { - proto_tree_add_item(ndps_tree, hf_ndps_attribute_value, tvb, foffset, length, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_attribute_value, tvb, foffset, length, ENC_BIG_ENDIAN); } foffset += length; - proto_tree_add_item(ndps_tree, hf_ndps_language_id, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_language_id, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; /* Start of NameorID */ aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Method ID"); @@ -7830,7 +7830,7 @@ dissect_ndps_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, int foffset += 4; if (length==4) { - proto_tree_add_item(ndps_tree, hf_ndps_language_id, tvb, foffset, length, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_language_id, tvb, foffset, length, ENC_BIG_ENDIAN); } foffset += length; /* End of IntegerSeq */ @@ -7912,16 +7912,16 @@ dissect_ndps_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, int break; case 0x00000010: /* Get Notify NDS Object Name */ proto_tree_add_item(ndps_tree, hf_ndps_item_count, tvb, foffset, - 4, FALSE); /* XXX - what does this count? */ + 4, ENC_BIG_ENDIAN); /* XXX - what does this count? */ foffset += 4; foffset = ndps_string(tvb, hf_ndps_broker_name, ndps_tree, foffset, NULL); foffset = ndps_string(tvb, hf_ndps_tree, ndps_tree, foffset, NULL); foffset = return_code(tvb, pinfo, ndps_tree, foffset); break; case 0x00000011: /* Get Notify Session Information */ - proto_tree_add_item(ndps_tree, hf_ndps_get_session_type, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_get_session_type, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; - proto_tree_add_item(ndps_tree, hf_time, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_time, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; foffset = return_code(tvb, pinfo, ndps_tree, foffset); break; @@ -7949,7 +7949,7 @@ dissect_ndps_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, int foffset = return_code(tvb, pinfo, ndps_tree, foffset); break; case 0x00000005: /* List Resources */ - proto_tree_add_item(ndps_tree, hf_ndps_return_code, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_return_code, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; if (check_col(pinfo->cinfo, COL_INFO) && tvb_get_ntohl(tvb, foffset-4) != 0) col_set_str(pinfo->cinfo, COL_INFO, "R NDPS - Error"); @@ -7957,9 +7957,9 @@ dissect_ndps_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, int { break; } - proto_tree_add_item(ndps_tree, hf_ndps_status_flags, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_status_flags, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; - proto_tree_add_item(ndps_tree, hf_ndps_resource_list_type, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_resource_list_type, tvb, foffset, 4, ENC_BIG_ENDIAN); resource_type = tvb_get_ntohl(tvb, foffset); foffset += 4; switch (resource_type) @@ -8137,7 +8137,7 @@ dissect_ndps_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, int } aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "OS %d", i); atree = proto_item_add_subtree(aitem, ett_ndps); - proto_tree_add_item(atree, hf_os_type, tvb, foffset, 4, FALSE); + proto_tree_add_item(atree, hf_os_type, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; number_of_items2 = tvb_get_ntohl(tvb, foffset); proto_tree_add_uint(atree, hf_ndps_num_windows_keys, tvb, foffset, 4, number_of_items2); @@ -8174,9 +8174,9 @@ dissect_ndps_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, int foffset = ndps_string(tvb, hf_ndps_printer_type, atree, foffset, NULL); foffset = ndps_string(tvb, hf_ndps_prn_file_name, atree, foffset, NULL); foffset = ndps_string(tvb, hf_ndps_prn_dir_name, atree, foffset, NULL); - proto_tree_add_item(atree, hf_archive_type, tvb, foffset, 4, FALSE); + proto_tree_add_item(atree, hf_archive_type, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; - proto_tree_add_item(atree, hf_archive_file_size, tvb, foffset, 4, FALSE); + proto_tree_add_item(atree, hf_archive_file_size, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; proto_item_set_end(aitem, tvb, foffset); } @@ -8193,7 +8193,7 @@ dissect_ndps_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, int } aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Language %d", i); atree = proto_item_add_subtree(aitem, ett_ndps); - proto_tree_add_item(atree, hf_ndps_language_id, tvb, foffset, 4, FALSE); + proto_tree_add_item(atree, hf_ndps_language_id, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; proto_item_set_end(aitem, tvb, foffset); } @@ -8203,7 +8203,7 @@ dissect_ndps_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, int } break; case 0x00000006: /* Get Resource File */ - proto_tree_add_item(ndps_tree, hf_ndps_return_code, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_return_code, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; if (check_col(pinfo->cinfo, COL_INFO) && tvb_get_ntohl(tvb, foffset-4) != 0) col_set_str(pinfo->cinfo, COL_INFO, "R NDPS - Error"); @@ -8211,14 +8211,14 @@ dissect_ndps_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, int { break; } - proto_tree_add_item(ndps_tree, hf_get_status_flag, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_get_status_flag, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; - proto_tree_add_item(ndps_tree, hf_file_timestamp, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_file_timestamp, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; proto_tree_add_item(ndps_tree, hf_ndps_data, tvb, foffset, -1, FALSE); break; case 0x00000007: /* Get Resource File Date */ - proto_tree_add_item(ndps_tree, hf_ndps_return_code, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_return_code, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; if (check_col(pinfo->cinfo, COL_INFO) && tvb_get_ntohl(tvb, foffset-4) != 0) col_set_str(pinfo->cinfo, COL_INFO, "R NDPS - Error"); @@ -8226,7 +8226,7 @@ dissect_ndps_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, int { break; } - proto_tree_add_item(ndps_tree, hf_file_timestamp, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_file_timestamp, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; break; case 0x00000008: /* Get Resource Manager NDS Object Name */ @@ -8235,14 +8235,14 @@ dissect_ndps_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, int foffset += 4; break; case 0x00000009: /* Get Resource Manager Session Information */ - proto_tree_add_item(ndps_tree, hf_ndps_get_resman_session_type, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_get_resman_session_type, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; - proto_tree_add_item(ndps_tree, hf_time, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_time, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; foffset = return_code(tvb, pinfo, ndps_tree, foffset); break; case 0x0000000a: /* Set Resource Language Context */ - proto_tree_add_item(ndps_tree, hf_ndps_return_code, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_return_code, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; if (check_col(pinfo->cinfo, COL_INFO) && tvb_get_ntohl(tvb, foffset-4) != 0) col_set_str(pinfo->cinfo, COL_INFO, "R NDPS - Error"); @@ -8250,7 +8250,7 @@ dissect_ndps_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, int { break; } - proto_tree_add_item(ndps_tree, hf_ndps_language_id, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_language_id, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; break; default: @@ -8261,7 +8261,7 @@ dissect_ndps_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, int switch(ndps_func) { case 0x00000001: /* Delivery Bind */ - proto_tree_add_item(ndps_tree, hf_ndps_return_code, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_return_code, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; if (check_col(pinfo->cinfo, COL_INFO) && tvb_get_ntohl(tvb, foffset-4) != 0) col_set_str(pinfo->cinfo, COL_INFO, "R NDPS - Error"); @@ -8271,7 +8271,7 @@ dissect_ndps_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, int break; case 0x00000003: /* Delivery Send */ case 0x00000004: /* Delivery Send2 */ - proto_tree_add_item(ndps_tree, hf_ndps_return_code, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_return_code, tvb, foffset, 4, ENC_BIG_ENDIAN); foffset += 4; if (check_col(pinfo->cinfo, COL_INFO) && tvb_get_ntohl(tvb, foffset-4) != 0) col_set_str(pinfo->cinfo, COL_INFO, "R NDPS - Error"); diff --git a/epan/dissectors/packet-netbios.c b/epan/dissectors/packet-netbios.c index caac7af1a0..4f6e66401f 100644 --- a/epan/dissectors/packet-netbios.c +++ b/epan/dissectors/packet-netbios.c @@ -477,7 +477,7 @@ static void nb_xmit_corrl( tvbuff_t *tvb, int offset, proto_tree *tree) {/* display the transmit correlator */ proto_tree_add_item( tree, hf_netb_xmit_corrl, tvb, offset + NB_XMIT_CORL, - 2, TRUE); + 2, ENC_LITTLE_ENDIAN); } @@ -486,7 +486,7 @@ static void nb_resp_corrl( tvbuff_t *tvb, int offset, proto_tree *tree) {/* display the response correlator */ proto_tree_add_item( tree, hf_netb_resp_corrl, tvb, offset + NB_RESP_CORL, - 2, TRUE); + 2, ENC_LITTLE_ENDIAN); } @@ -495,7 +495,7 @@ static void nb_call_name_type( tvbuff_t *tvb, int offset, proto_tree *tree) {/* display the call name type */ proto_tree_add_item( tree, hf_netb_call_name_type, tvb, offset + NB_CALL_NAME_TYPE, - 1, TRUE); + 1, ENC_LITTLE_ENDIAN); } diff --git a/epan/dissectors/packet-netdump.c b/epan/dissectors/packet-netdump.c index bb00eb13c0..ddef3c2ab8 100644 --- a/epan/dissectors/packet-netdump.c +++ b/epan/dissectors/packet-netdump.c @@ -108,17 +108,17 @@ dissect_netdump(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) netdump_tree = proto_item_add_subtree(ti, ett_netdump); if (tvb_reported_length(tvb) == 24) { /* Its a request format packet */ - proto_tree_add_item(netdump_tree, hf_netdump_magic_number, tvb, 0, 8, FALSE); - proto_tree_add_item(netdump_tree, hf_netdump_seq_nr, tvb, 8, 4, FALSE); - proto_tree_add_item(netdump_tree, hf_netdump_command, tvb, 12, 4, FALSE); - proto_tree_add_item(netdump_tree, hf_netdump_from, tvb, 16, 4, FALSE); - proto_tree_add_item(netdump_tree, hf_netdump_to, tvb, 20, 4, FALSE); + proto_tree_add_item(netdump_tree, hf_netdump_magic_number, tvb, 0, 8, ENC_BIG_ENDIAN); + proto_tree_add_item(netdump_tree, hf_netdump_seq_nr, tvb, 8, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(netdump_tree, hf_netdump_command, tvb, 12, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(netdump_tree, hf_netdump_from, tvb, 16, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(netdump_tree, hf_netdump_to, tvb, 20, 4, ENC_BIG_ENDIAN); } else { /* Its a reply packet */ - proto_tree_add_item(netdump_tree, hf_netdump_version, tvb, 0, 1, FALSE); - proto_tree_add_item(netdump_tree, hf_netdump_seq_nr, tvb, 1, 4, FALSE); - proto_tree_add_item(netdump_tree, hf_netdump_code, tvb, 5, 4, FALSE); - proto_tree_add_item(netdump_tree, hf_netdump_info, tvb, 9, 4, TRUE); + proto_tree_add_item(netdump_tree, hf_netdump_version, tvb, 0, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(netdump_tree, hf_netdump_seq_nr, tvb, 1, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(netdump_tree, hf_netdump_code, tvb, 5, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(netdump_tree, hf_netdump_info, tvb, 9, 4, ENC_LITTLE_ENDIAN); proto_tree_add_item(netdump_tree, hf_netdump_payload, tvb, 13, -1, ENC_NA); } } diff --git a/epan/dissectors/packet-netflow.c b/epan/dissectors/packet-netflow.c index 4e551d08d1..1c16040f3f 100644 --- a/epan/dissectors/packet-netflow.c +++ b/epan/dissectors/packet-netflow.c @@ -4581,43 +4581,43 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree, case (NTOP_BASE + 81): /* FINGERPRINT */ case ((VENDOR_NTOP << 16) | 81): /* FINGERPRINT */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_fingerprint, - tvb, offset, length, FALSE); + tvb, offset, length, ENC_BIG_ENDIAN); break; case (NTOP_BASE + 82): /* CLIENT_NW_DELAY_SEC */ case ((VENDOR_NTOP << 16) | 82): /* CLIENT_NW_DELAY_SEC */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_client_nw_delay_sec, - tvb, offset, length, FALSE); + tvb, offset, length, ENC_BIG_ENDIAN); break; case (NTOP_BASE + 83): /* /\* CLIENT_NW_DELAY_USEC *\/ */ case ((VENDOR_NTOP << 16) | 83): /* CLIENT_NW_DELAY_USEC */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_client_nw_delay_usec, - tvb, offset, length, FALSE); + tvb, offset, length, ENC_BIG_ENDIAN); break; case (NTOP_BASE + 84): /* SERVER_NW_DELAY_SEC */ case ((VENDOR_NTOP << 16) | 84): /* SERVER_NW_DELAY_SEC */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_server_nw_delay_sec, - tvb, offset, length, FALSE); + tvb, offset, length, ENC_BIG_ENDIAN); break; case (NTOP_BASE + 85): /* SERVER_NW_DELAY_USEC */ case ((VENDOR_NTOP << 16) | 85): /* SERVER_NW_DELAY_USEC */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_server_nw_delay_usec, - tvb, offset, length, FALSE); + tvb, offset, length, ENC_BIG_ENDIAN); break; case (NTOP_BASE + 86): /* APPL_LATENCY_SEC */ case ((VENDOR_NTOP << 16) | 86): /* APPL_LATENCY_SEC */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_appl_latency_sec, - tvb, offset, length, FALSE); + tvb, offset, length, ENC_BIG_ENDIAN); break; case (NTOP_BASE + 87): /* APPL_LATENCY_USEC */ case ((VENDOR_NTOP << 16) | 87): /* APPL_LATENCY_USEC */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_appl_latency_sec, - tvb, offset, length, FALSE); + tvb, offset, length, ENC_BIG_ENDIAN); break; case (NTOP_BASE + 98): /* ICMP_FLAGS */ case ((VENDOR_NTOP << 16) | 98): /* ICMP_FLAGS */ /* Cumulative of all flow ICMP types */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_icmp_flags, - tvb, offset, length, FALSE); + tvb, offset, length, ENC_BIG_ENDIAN); break; case (NTOP_BASE + 101): /* SRC_IP_COUNTRY */ case ((VENDOR_NTOP << 16) | 101): /* SRC_IP_COUNTRY */ @@ -4642,48 +4642,48 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree, case (NTOP_BASE + 105): /* FLOW_PROTO_PORT */ case ((VENDOR_NTOP << 16) | 105): /* FLOW_PROTO_PORT */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_flow_proto_port, - tvb, offset, length, FALSE); + tvb, offset, length, ENC_BIG_ENDIAN); break; case (NTOP_BASE + 106): /* TUNNEL_ID */ case ((VENDOR_NTOP << 16) | 106): /* TUNNEL_ID */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_tunnel_id, - tvb, offset, length, FALSE); + tvb, offset, length, ENC_BIG_ENDIAN); break; case (NTOP_BASE + 107): /* LONGEST_FLOW_PKT */ case ((VENDOR_NTOP << 16) | 107): /* LONGEST_FLOW_PKT */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_longest_flow_pkt, - tvb, offset, length, FALSE); + tvb, offset, length, ENC_BIG_ENDIAN); break; case (NTOP_BASE + 108): /* SHORTEST_FLOW_PKT */ case ((VENDOR_NTOP << 16) | 108): /* SHORTEST_FLOW_PKT */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_shortest_flow_pkt, - tvb, offset, length, FALSE); + tvb, offset, length, ENC_BIG_ENDIAN); break; case (NTOP_BASE + 109): /* RETRANSMITTED_IN_PKTS */ case ((VENDOR_NTOP << 16) | 109): /* RETRANSMITTED_IN_PKTS */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_retransmitted_in_pkts, - tvb, offset, length, FALSE); + tvb, offset, length, ENC_BIG_ENDIAN); break; case (NTOP_BASE + 110): /* RETRANSMITTED_OUT_PKTS */ case ((VENDOR_NTOP << 16) | 110): /* RETRANSMITTED_OUT_PKTS */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_retransmitted_out_pkts, - tvb, offset, length, FALSE); + tvb, offset, length, ENC_BIG_ENDIAN); break; case (NTOP_BASE + 111): /* OOORDER_IN_PKTS */ case ((VENDOR_NTOP << 16) | 111): /* OOORDER_IN_PKTS */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_ooorder_in_pkts, - tvb, offset, length, FALSE); + tvb, offset, length, ENC_BIG_ENDIAN); break; case (NTOP_BASE + 112): /* OOORDER_OUT_PKTS */ case ((VENDOR_NTOP << 16) | 112): /* OOORDER_OUT_PKTS */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_ooorder_out_pkts, - tvb, offset, length, FALSE); + tvb, offset, length, ENC_BIG_ENDIAN); break; case (NTOP_BASE + 113): /* UNTUNNELED_PROTOCOL */ case ((VENDOR_NTOP << 16) | 113): /* UNTUNNELED_PROTOCOL */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_untunneled_protocol, - tvb, offset, length, FALSE); + tvb, offset, length, ENC_BIG_ENDIAN); break; case (NTOP_BASE + 114): /* UNTUNNELED_IPV4_SRC_ADDR */ case ((VENDOR_NTOP << 16) | 114): /* UNTUNNELED_IPV4_SRC_ADDR */ @@ -4693,7 +4693,7 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree, case (NTOP_BASE + 115): /* UNTUNNELED_L4_SRC_PORT */ case ((VENDOR_NTOP << 16) | 115): /* UNTUNNELED_L4_SRC_PORT */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_untunneled_l4_src_port, - tvb, offset, length, FALSE); + tvb, offset, length, ENC_BIG_ENDIAN); break; case (NTOP_BASE + 116): /* UNTUNNELED_IPV4_DST_ADDR */ case ((VENDOR_NTOP << 16) | 116): /* UNTUNNELED_IPV4_DST_ADDR */ @@ -4703,7 +4703,7 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree, case (NTOP_BASE + 117): /* UNTUNNELED_L4_DST_PORT */ case ((VENDOR_NTOP << 16) | 117): /* UNTUNNELED_L4_DST_PORT */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_untunneled_l4_dst_port, - tvb, offset, length, FALSE); + tvb, offset, length, ENC_BIG_ENDIAN); break; case (NTOP_BASE + 120): /* DUMP_PATH */ @@ -4739,27 +4739,27 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree, case (NTOP_BASE + 134): /* SIP_INVITE_TIME */ case ((VENDOR_NTOP << 16) | 134): /* SIP_INVITE_TIME */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_sip_invite_time, - tvb, offset, length, FALSE); + tvb, offset, length, ENC_BIG_ENDIAN); break; case (NTOP_BASE + 135): /* SIP_TRYING_TIME */ case ((VENDOR_NTOP << 16) | 135): /* SIP_TRYING_TIME */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_sip_trying_time, - tvb, offset, length, FALSE); + tvb, offset, length, ENC_BIG_ENDIAN); break; case (NTOP_BASE + 136): /* SIP_RINGING_TIME */ case ((VENDOR_NTOP << 16) | 136): /* SIP_RINGING_TIME */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_sip_ringing_time, - tvb, offset, length, FALSE); + tvb, offset, length, ENC_BIG_ENDIAN); break; case (NTOP_BASE + 137): /* SIP_OK_TIME */ case ((VENDOR_NTOP << 16) | 137): /* SIP_OK_TIME */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_sip_ok_time, - tvb, offset, length, FALSE); + tvb, offset, length, ENC_BIG_ENDIAN); break; case (NTOP_BASE + 138): /* SIP_BYE_TIME */ case ((VENDOR_NTOP << 16) | 138): /* SIP_BYE_TIME */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_sip_bye_time, - tvb, offset, length, FALSE); + tvb, offset, length, ENC_BIG_ENDIAN); break; case (NTOP_BASE + 139): /* SIP_RTP_SRC_IP */ case ((VENDOR_NTOP << 16) | 139): /* SIP_RTP_SRC_IP */ @@ -4769,7 +4769,7 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree, case (NTOP_BASE + 140): /* SIP_RTP_SRC_PORT */ case ((VENDOR_NTOP << 16) | 140): /* SIP_RTP_SRC_PORT */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_sip_rtp_src_port, - tvb, offset, length, FALSE); + tvb, offset, length, ENC_BIG_ENDIAN); break; case (NTOP_BASE + 141): /* SIP_RTP_DST_IP */ case ((VENDOR_NTOP << 16) | 141): /* SIP_RTP_DST_IP */ @@ -4779,12 +4779,12 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree, case (NTOP_BASE + 142): /* SIP_RTP_DST_PORT */ case ((VENDOR_NTOP << 16) | 142): /* SIP_RTP_DST_PORT */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_sip_rtp_dst_port, - tvb, offset, length, FALSE); + tvb, offset, length, ENC_BIG_ENDIAN); break; case (NTOP_BASE + 150): /* RTP_FIRST_SSRC */ case ((VENDOR_NTOP << 16) | 150): /* RTP_FIRST_SSRC */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_rtp_first_ssrc, - tvb, offset, length, FALSE); + tvb, offset, length, ENC_BIG_ENDIAN); break; case (NTOP_BASE + 151): /* RTP_FIRST_TS */ case ((VENDOR_NTOP << 16) | 151): /* RTP_FIRST_TS */ @@ -4794,7 +4794,7 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree, case (NTOP_BASE + 152): /* RTP_LAST_SSRC */ case ((VENDOR_NTOP << 16) | 152): /* RTP_LAST_SSRC */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_rtp_last_ssrc, - tvb, offset, length, FALSE); + tvb, offset, length, ENC_BIG_ENDIAN); break; case (NTOP_BASE + 153): /* RTP_LAST_TS */ case ((VENDOR_NTOP << 16) | 153): /* RTP_LAST_TS */ @@ -4804,42 +4804,42 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree, case (NTOP_BASE + 154): /* RTP_IN_JITTER */ case ((VENDOR_NTOP << 16) | 154): /* RTP_IN_JITTER */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_rtp_in_jitter, - tvb, offset, length, FALSE); + tvb, offset, length, ENC_BIG_ENDIAN); break; case (NTOP_BASE + 155): /* RTP_OUT_JITTER */ case ((VENDOR_NTOP << 16) | 155): /* RTP_OUT_JITTER */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_rtp_out_jitter, - tvb, offset, length, FALSE); + tvb, offset, length, ENC_BIG_ENDIAN); break; case (NTOP_BASE + 156): /* RTP_IN_PKT_LOST */ case ((VENDOR_NTOP << 16) | 156): /* RTP_IN_PKT_LOST */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_rtp_in_pkt_lost, - tvb, offset, length, FALSE); + tvb, offset, length, ENC_BIG_ENDIAN); break; case (NTOP_BASE + 157): /* RTP_OUT_PKT_LOST */ case ((VENDOR_NTOP << 16) | 157): /* RTP_OUT_PKT_LOST */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_rtp_out_pkt_lost, - tvb, offset, length, FALSE); + tvb, offset, length, ENC_BIG_ENDIAN); break; case (NTOP_BASE + 158): /* RTP_OUT_PAYLOAD_TYPE */ case ((VENDOR_NTOP << 16) | 158): /* RTP_OUT_PAYLOAD_TYPE */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_rtp_out_payload_type, - tvb, offset, length, FALSE); + tvb, offset, length, ENC_BIG_ENDIAN); break; case (NTOP_BASE + 159): /* RTP_IN_MAX_DELTA */ case ((VENDOR_NTOP << 16) | 159): /* RTP_IN_MAX_DELTA */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_rtp_in_max_delta, - tvb, offset, length, FALSE); + tvb, offset, length, ENC_BIG_ENDIAN); break; case (NTOP_BASE + 160): /* RTP_OUT_MAX_DELTA */ case ((VENDOR_NTOP << 16) | 160): /* RTP_OUT_MAX_DELTA */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_rtp_out_max_delta, - tvb, offset, length, FALSE); + tvb, offset, length, ENC_BIG_ENDIAN); break; case (NTOP_BASE + 168): /* PROC_ID */ case ((VENDOR_NTOP << 16) | 168): /* PROC_ID */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_proc_id, - tvb, offset, length, FALSE); + tvb, offset, length, ENC_BIG_ENDIAN); break; case (NTOP_BASE + 169): /* PROC_NAME */ case ((VENDOR_NTOP << 16) | 169): /* PROC_NAME */ @@ -4855,7 +4855,7 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree, case (NTOP_BASE + 181): /* HTTP_RET_CODE */ case ((VENDOR_NTOP << 16) | 181): /* HTTP_RET_CODE */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_http_ret_code, - tvb, offset, length, FALSE); + tvb, offset, length, ENC_BIG_ENDIAN); break; @@ -4915,7 +4915,7 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree, case (NTOP_BASE + 199): /* MYSQL_RESPONSE */ case ((VENDOR_NTOP << 16) | 199): /* MYSQL_RESPONSE */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_mysql_response, - tvb, offset, length, FALSE); + tvb, offset, length, ENC_BIG_ENDIAN); break; @@ -4952,7 +4952,7 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree, break; case ((VENDOR_PLIXER << 16) | 106): /* event_id */ ti = proto_tree_add_item(pdutree, hf_pie_plixer_event_id, - tvb, offset, length, FALSE); + tvb, offset, length, ENC_BIG_ENDIAN); break; case ((VENDOR_PLIXER << 16) | 107): /* msgid */ gen_str = tvb_format_text(tvb, offset, length); @@ -4961,15 +4961,15 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree, break; case ((VENDOR_PLIXER << 16) | 108): /* priority */ ti = proto_tree_add_item(pdutree, hf_pie_plixer_priority, - tvb, offset, length, FALSE); + tvb, offset, length, ENC_BIG_ENDIAN); break; case ((VENDOR_PLIXER << 16) | 109): /* recipient_report_status */ ti = proto_tree_add_item(pdutree, hf_pie_plixer_recipient_report_status, - tvb, offset, length, FALSE); + tvb, offset, length, ENC_BIG_ENDIAN); break; case ((VENDOR_PLIXER << 16) | 110): /* number_recipients */ ti = proto_tree_add_item(pdutree, hf_pie_plixer_number_recipients, - tvb, offset, length, FALSE); + tvb, offset, length, ENC_BIG_ENDIAN); break; case ((VENDOR_PLIXER << 16) | 111): /* origination_time */ ti = proto_tree_add_item(pdutree, hf_pie_plixer_origination_time, @@ -4977,7 +4977,7 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree, break; case ((VENDOR_PLIXER << 16) | 112): /* encryption */ ti = proto_tree_add_item(pdutree, hf_pie_plixer_encryption, - tvb, offset, length, FALSE); + tvb, offset, length, ENC_BIG_ENDIAN); break; case ((VENDOR_PLIXER << 16) | 113): /* service_version */ gen_str = tvb_format_text(tvb, offset, length); diff --git a/epan/dissectors/packet-netsync.c b/epan/dissectors/packet-netsync.c index 49530bb830..1a322ba065 100644 --- a/epan/dissectors/packet-netsync.c +++ b/epan/dissectors/packet-netsync.c @@ -232,7 +232,7 @@ static gint dissect_netsync_cmd_anonymous(tvbuff_t *tvb, gint offset, proto_tre guint len = 0; proto_tree_add_item(tree, hf_netsync_cmd_anonymous_role, tvb, - offset, 1, FALSE ); + offset, 1, ENC_BIG_ENDIAN ); offset += 1; offset += dissect_uleb128( tvb, offset, &len ); @@ -254,7 +254,7 @@ static gint dissect_netsync_cmd_auth(tvbuff_t *tvb, gint offset, proto_tree *tr guint len = 0; proto_tree_add_item(tree, hf_netsync_cmd_auth_role, tvb, - offset, 1, FALSE ); + offset, 1, ENC_BIG_ENDIAN ); offset += 1; @@ -327,7 +327,7 @@ static gint dissect_netsync_cmd_done(tvbuff_t *tvb, gint offset, proto_tree *tr offset += bytes; proto_tree_add_item(tree, hf_netsync_cmd_done_type, tvb, - offset, 1, FALSE ); + offset, 1, ENC_BIG_ENDIAN ); offset += 1; return offset; @@ -337,7 +337,7 @@ static gint dissect_netsync_cmd_done(tvbuff_t *tvb, gint offset, proto_tree *tr static gint dissect_netsync_cmd_send_data(tvbuff_t *tvb, gint offset, proto_tree *tree, guint size _U_) { proto_tree_add_item(tree, hf_netsync_cmd_send_data_type, tvb, - offset, 1, FALSE ); + offset, 1, ENC_BIG_ENDIAN ); offset += 1; proto_tree_add_item(tree, hf_netsync_cmd_send_data_id, tvb, @@ -351,7 +351,7 @@ static gint dissect_netsync_cmd_send_data(tvbuff_t *tvb, gint offset, proto_tre static gint dissect_netsync_cmd_send_delta(tvbuff_t *tvb, gint offset, proto_tree *tree, guint size _U_) { proto_tree_add_item(tree, hf_netsync_cmd_send_delta_type, tvb, - offset, 1, FALSE ); + offset, 1, ENC_BIG_ENDIAN ); offset += 1; proto_tree_add_item(tree, hf_netsync_cmd_send_delta_base_id, tvb, @@ -372,7 +372,7 @@ static gint dissect_netsync_cmd_data(tvbuff_t *tvb, gint offset, proto_tree *tr guint len = 0; proto_tree_add_item(tree, hf_netsync_cmd_data_type, tvb, - offset, 1, FALSE ); + offset, 1, ENC_BIG_ENDIAN ); offset += 1; proto_tree_add_item(tree, hf_netsync_cmd_data_id, tvb, @@ -380,7 +380,7 @@ static gint dissect_netsync_cmd_data(tvbuff_t *tvb, gint offset, proto_tree *tr offset += NETSNYC_MERKLE_HASH_LENGTH; proto_tree_add_item(tree, hf_netsync_cmd_data_compressed, tvb, - offset, 1, FALSE ); + offset, 1, ENC_BIG_ENDIAN ); offset += 1; offset += dissect_uleb128( tvb, offset, &len ); @@ -398,7 +398,7 @@ static gint dissect_netsync_cmd_delta(tvbuff_t *tvb, gint offset, proto_tree *t guint len = 0; proto_tree_add_item(tree, hf_netsync_cmd_delta_type, tvb, - offset, 1, FALSE ); + offset, 1, ENC_BIG_ENDIAN ); offset += 1; proto_tree_add_item(tree, hf_netsync_cmd_delta_base_id, tvb, @@ -410,7 +410,7 @@ static gint dissect_netsync_cmd_delta(tvbuff_t *tvb, gint offset, proto_tree *t offset += NETSNYC_MERKLE_HASH_LENGTH; proto_tree_add_item(tree, hf_netsync_cmd_delta_compressed, tvb, - offset, 1, FALSE ); + offset, 1, ENC_BIG_ENDIAN ); offset += 1; offset += dissect_uleb128( tvb, offset, &len ); @@ -426,7 +426,7 @@ static gint dissect_netsync_cmd_delta(tvbuff_t *tvb, gint offset, proto_tree *t static gint dissect_netsync_cmd_nonexistent(tvbuff_t *tvb, gint offset, proto_tree *tree, guint size _U_) { proto_tree_add_item(tree, hf_netsync_cmd_nonexistent_type, tvb, - offset, 1, FALSE ); + offset, 1, ENC_BIG_ENDIAN ); offset += 1; proto_tree_add_item(tree, hf_netsync_cmd_nonexistent_id, tvb, @@ -476,12 +476,12 @@ dissect_netsync_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) version = tvb_get_guint8(tvb, offset); proto_tree_add_item(netsync_tree, hf_netsync_version, tvb, - offset, 1, FALSE ); + offset, 1, ENC_BIG_ENDIAN ); offset += 1; cmd = tvb_get_guint8(tvb, offset); proto_tree_add_item(netsync_tree, hf_netsync_command, tvb, - offset, 1, FALSE ); + offset, 1, ENC_BIG_ENDIAN ); offset += 1; @@ -564,7 +564,7 @@ dissect_netsync_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset += size; proto_tree_add_item(netsync_tree, hf_netsync_checksum, tvb, - offset, 4, FALSE ); + offset, 4, ENC_BIG_ENDIAN ); offset += 4; diff --git a/epan/dissectors/packet-nfs.c b/epan/dissectors/packet-nfs.c index c3f6570a50..442c21eba5 100644 --- a/epan/dissectors/packet-nfs.c +++ b/epan/dissectors/packet-nfs.c @@ -4826,18 +4826,18 @@ display_access_items(tvbuff_t* tvb, int offset, packet_info* pinfo, proto_tree* switch (mtype) { case 'C': access_item = proto_tree_add_item(tree, hf_nfs_access_check, tvb, - offset, 4, FALSE); + offset, 4, ENC_BIG_ENDIAN); access_subtree = proto_item_add_subtree(access_item, (nfsv3 ? ett_nfs_access3 : ett_nfs_access4)); break; case 'S': access_item = proto_tree_add_item(tree, hf_nfs_access_supported, tvb, - offset, 4, FALSE); + offset, 4, ENC_BIG_ENDIAN); access_subtree = proto_item_add_subtree(access_item, ett_nfs_access_supp4); break; case 'R': access_item = proto_tree_add_item(tree, hf_nfs_access_rights, tvb, - offset, 4, FALSE); + offset, 4, ENC_BIG_ENDIAN); access_subtree = proto_item_add_subtree(access_item, (nfsv3 ? ett_nfs_access3 : ett_nfs_access4)); break; diff --git a/epan/dissectors/packet-nhrp.c b/epan/dissectors/packet-nhrp.c index 15a6fabbd2..7af791207a 100644 --- a/epan/dissectors/packet-nhrp.c +++ b/epan/dissectors/packet-nhrp.c @@ -310,7 +310,7 @@ void dissect_nhrp_hdr(tvbuff_t *tvb, } hdr->ar_afn = tvb_get_ntohs(tvb, offset); - proto_tree_add_item(nhrp_tree, hf_nhrp_hdr_afn, tvb, offset, 2, FALSE); + proto_tree_add_item(nhrp_tree, hf_nhrp_hdr_afn, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; hdr->ar_pro_type = tvb_get_ntohs(tvb, offset); @@ -366,10 +366,10 @@ void dissect_nhrp_hdr(tvbuff_t *tvb, offset += 5; } - proto_tree_add_item(nhrp_tree, hf_nhrp_hdr_hopcnt, tvb, offset, 1, FALSE); + proto_tree_add_item(nhrp_tree, hf_nhrp_hdr_hopcnt, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(nhrp_tree, hf_nhrp_hdr_pktsz, tvb, offset, 2, FALSE); + proto_tree_add_item(nhrp_tree, hf_nhrp_hdr_pktsz, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; rx_chksum = tvb_get_ntohs(tvb, offset); @@ -391,7 +391,7 @@ void dissect_nhrp_hdr(tvbuff_t *tvb, offset += 2; hdr->ar_extoff = tvb_get_ntohs(tvb, offset); - ti = proto_tree_add_item(nhrp_tree, hf_nhrp_hdr_extoff, tvb, offset, 2, FALSE); + ti = proto_tree_add_item(nhrp_tree, hf_nhrp_hdr_extoff, tvb, offset, 2, ENC_BIG_ENDIAN); if (hdr->ar_extoff != 0 && hdr->ar_extoff < 20) { expert_add_info_format(pinfo, ti, PI_MALFORMED, PI_ERROR, "Extension offset is less than the fixed header length"); @@ -403,7 +403,7 @@ void dissect_nhrp_hdr(tvbuff_t *tvb, hdr->ar_op_version, "Version : %u (%s)", hdr->ar_op_version, (hdr->ar_op_version == 1) ? "NHRP - rfc2332" : "Unknown"); offset += 1; - proto_tree_add_item(nhrp_tree, hf_nhrp_hdr_op_type, tvb, offset, 1, FALSE); + proto_tree_add_item(nhrp_tree, hf_nhrp_hdr_op_type, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; hdr->ar_shtl = tvb_get_guint8(tvb, offset); @@ -412,8 +412,8 @@ void dissect_nhrp_hdr(tvbuff_t *tvb, val_to_str(NHRP_SHTL_TYPE(hdr->ar_shtl), nhrp_shtl_type_vals, "Unknown Type"), NHRP_SHTL_LEN(hdr->ar_shtl)); shtl_tree = proto_item_add_subtree(shtl_tree_item, ett_nhrp_hdr_shtl); - proto_tree_add_item(shtl_tree, hf_nhrp_hdr_shtl_type, tvb, offset, 1, FALSE); - proto_tree_add_item(shtl_tree, hf_nhrp_hdr_shtl_len, tvb, offset, 1, FALSE); + proto_tree_add_item(shtl_tree, hf_nhrp_hdr_shtl_type, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(shtl_tree, hf_nhrp_hdr_shtl_len, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; hdr->ar_sstl = tvb_get_guint8(tvb, offset); @@ -422,8 +422,8 @@ void dissect_nhrp_hdr(tvbuff_t *tvb, val_to_str(NHRP_SHTL_TYPE(hdr->ar_sstl), nhrp_shtl_type_vals, "Unknown Type"), NHRP_SHTL_LEN(hdr->ar_sstl)); sstl_tree = proto_item_add_subtree(sstl_tree_item, ett_nhrp_hdr_sstl); - proto_tree_add_item(sstl_tree, hf_nhrp_hdr_sstl_type, tvb, offset, 1, FALSE); - proto_tree_add_item(sstl_tree, hf_nhrp_hdr_sstl_len, tvb, offset, 1, FALSE); + proto_tree_add_item(sstl_tree, hf_nhrp_hdr_sstl_type, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(sstl_tree, hf_nhrp_hdr_sstl_len, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; *pOffset = offset; @@ -472,7 +472,7 @@ void dissect_cie_list(tvbuff_t *tvb, proto_tree *cie_tree = proto_item_add_subtree(cie_tree_item, ett_nhrp_cie); if (isReq) { - proto_tree_add_item(cie_tree, hf_nhrp_code, tvb, offset, 1, FALSE); + proto_tree_add_item(cie_tree, hf_nhrp_code, tvb, offset, 1, ENC_BIG_ENDIAN); } else { guint8 code = tvb_get_guint8(tvb, offset); @@ -485,16 +485,16 @@ void dissect_cie_list(tvbuff_t *tvb, } offset += 1; - proto_tree_add_item(cie_tree, hf_nhrp_prefix_len, tvb, offset, 1, FALSE); + proto_tree_add_item(cie_tree, hf_nhrp_prefix_len, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(cie_tree, hf_nhrp_unused, tvb, offset, 2, FALSE); + proto_tree_add_item(cie_tree, hf_nhrp_unused, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(cie_tree, hf_nhrp_mtu, tvb, offset, 2, FALSE); + proto_tree_add_item(cie_tree, hf_nhrp_mtu, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(cie_tree, hf_nhrp_holding_time, tvb, offset, 2, FALSE); + proto_tree_add_item(cie_tree, hf_nhrp_holding_time, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; val = tvb_get_guint8(tvb, offset); @@ -504,8 +504,8 @@ void dissect_cie_list(tvbuff_t *tvb, val_to_str(NHRP_SHTL_TYPE(val), nhrp_shtl_type_vals, "Unknown Type"), NHRP_SHTL_LEN(val)); cli_addr_tree = proto_item_add_subtree(cli_addr_tree_item, ett_nhrp_cie_cli_addr_tl); - proto_tree_add_item(cli_addr_tree, hf_nhrp_cli_addr_tl_type, tvb, offset, 1, FALSE); - proto_tree_add_item(cli_addr_tree, hf_nhrp_cli_addr_tl_len, tvb, offset, 1, FALSE); + proto_tree_add_item(cli_addr_tree, hf_nhrp_cli_addr_tl_type, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(cli_addr_tree, hf_nhrp_cli_addr_tl_len, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; val = tvb_get_guint8(tvb, offset); @@ -515,14 +515,14 @@ void dissect_cie_list(tvbuff_t *tvb, val_to_str(NHRP_SHTL_TYPE(val), nhrp_shtl_type_vals, "Unknown Type"), NHRP_SHTL_LEN(val)); cli_saddr_tree = proto_item_add_subtree(cli_saddr_tree_item, ett_nhrp_cie_cli_saddr_tl); - proto_tree_add_item(cli_saddr_tree, hf_nhrp_cli_saddr_tl_type, tvb, offset, 1, FALSE); - proto_tree_add_item(cli_saddr_tree, hf_nhrp_cli_saddr_tl_len, tvb, offset, 1, FALSE); + proto_tree_add_item(cli_saddr_tree, hf_nhrp_cli_saddr_tl_type, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(cli_saddr_tree, hf_nhrp_cli_saddr_tl_len, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(cie_tree, hf_nhrp_cli_prot_len, tvb, offset, 1, FALSE); + proto_tree_add_item(cie_tree, hf_nhrp_cli_prot_len, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(cie_tree, hf_nhrp_pref, tvb, offset, 1, FALSE); + proto_tree_add_item(cie_tree, hf_nhrp_pref, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; if (cli_addr_len) { @@ -615,11 +615,11 @@ void dissect_nhrp_mand(tvbuff_t *tvb, nhrp_tree = proto_item_add_subtree(nhrp_tree_item, ett_nhrp_mand); *srcLen = tvb_get_guint8(tvb, offset); - proto_tree_add_item(nhrp_tree, hf_nhrp_src_proto_len, tvb, offset, 1, FALSE); + proto_tree_add_item(nhrp_tree, hf_nhrp_src_proto_len, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; dstLen = tvb_get_guint8(tvb, offset); - proto_tree_add_item(nhrp_tree, hf_nhrp_dst_proto_len, tvb, offset, 1, FALSE); + proto_tree_add_item(nhrp_tree, hf_nhrp_dst_proto_len, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; if (!isInd) { @@ -652,7 +652,7 @@ void dissect_nhrp_mand(tvbuff_t *tvb, offset += 2; col_append_fstr(pinfo->cinfo, COL_INFO, ", ID=%u", tvb_get_ntohl(tvb, offset)); - proto_tree_add_item(nhrp_tree, hf_nhrp_request_id, tvb, offset, 4, FALSE); + proto_tree_add_item(nhrp_tree, hf_nhrp_request_id, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; } else if (isErr) { @@ -660,10 +660,10 @@ void dissect_nhrp_mand(tvbuff_t *tvb, col_append_fstr(pinfo->cinfo, COL_INFO, ", %s", val_to_str(tvb_get_ntohs(tvb, offset), nhrp_error_code_vals, "Unknown Error (%u)")); - proto_tree_add_item(nhrp_tree, hf_nhrp_error_code, tvb, offset, 2, FALSE); + proto_tree_add_item(nhrp_tree, hf_nhrp_error_code, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(nhrp_tree, hf_nhrp_error_offset, tvb, offset, 2, FALSE); + proto_tree_add_item(nhrp_tree, hf_nhrp_error_offset, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; } else { @@ -855,10 +855,10 @@ void dissect_nhrp_ext(tvbuff_t *tvb, } nhrp_tree = proto_item_add_subtree(nhrp_tree_item, ett_nhrp_ext); proto_tree_add_boolean(nhrp_tree, hf_nhrp_ext_C, tvb, offset, 2, extTypeC); - proto_tree_add_item(nhrp_tree, hf_nhrp_ext_type, tvb, offset, 2, FALSE); + proto_tree_add_item(nhrp_tree, hf_nhrp_ext_type, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(nhrp_tree, hf_nhrp_ext_len, tvb, offset, 2, FALSE); + proto_tree_add_item(nhrp_tree, hf_nhrp_ext_len, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; if (len && (extType != NHRP_EXT_NULL)) { @@ -876,11 +876,11 @@ void dissect_nhrp_ext(tvbuff_t *tvb, tvb_get_ntohl(tvb, offset) & 1 ? "" : "non-", tvb_get_ntohl(tvb, offset + 4) & 1 ? "" : "non-"); devcap_tree = proto_item_add_subtree(devcap_item, ett_nhrp_devcap_ext); - cap_item = proto_tree_add_item(devcap_tree, hf_nhrp_devcap_ext_srccap, tvb, offset, 4, FALSE); + cap_item = proto_tree_add_item(devcap_tree, hf_nhrp_devcap_ext_srccap, tvb, offset, 4, ENC_BIG_ENDIAN); cap_tree = proto_item_add_subtree(cap_item, ett_nhrp_devcap_ext_srccap); proto_tree_add_item(cap_tree, hf_nhrp_devcap_ext_srccap_V, tvb, offset, 4, FALSE); - cap_item = proto_tree_add_item(devcap_tree, hf_nhrp_devcap_ext_dstcap, tvb, offset + 4, 4, FALSE); + cap_item = proto_tree_add_item(devcap_tree, hf_nhrp_devcap_ext_dstcap, tvb, offset + 4, 4, ENC_BIG_ENDIAN); cap_tree = proto_item_add_subtree(cap_item, ett_nhrp_devcap_ext_dstcap); proto_tree_add_item(cap_tree, hf_nhrp_devcap_ext_dstcap_V, tvb, offset + 4, 4, FALSE); goto skip_switch; @@ -912,8 +912,8 @@ void dissect_nhrp_ext(tvbuff_t *tvb, "Extension Data: SPI=%u: Data=%s", tvb_get_ntohs(tvb, offset + 2), tvb_bytes_to_str(tvb, offset + 4, len - 4)); auth_tree = proto_item_add_subtree(auth_item, ett_nhrp_auth_ext); - proto_tree_add_item(auth_tree, hf_nhrp_auth_ext_reserved, tvb, offset, 2, FALSE); - proto_tree_add_item(auth_tree, hf_nhrp_auth_ext_spi, tvb, offset + 2, 2, FALSE); + proto_tree_add_item(auth_tree, hf_nhrp_auth_ext_reserved, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(auth_tree, hf_nhrp_auth_ext_spi, tvb, offset + 2, 2, ENC_BIG_ENDIAN); if (srcLen == 4) proto_tree_add_item(auth_tree, hf_nhrp_auth_ext_src_addr, tvb, offset + 4, 4, FALSE); else if (srcLen) { diff --git a/epan/dissectors/packet-nlsp.c b/epan/dissectors/packet-nlsp.c index 2a7cd973fd..37496f18f0 100644 --- a/epan/dissectors/packet-nlsp.c +++ b/epan/dissectors/packet-nlsp.c @@ -440,13 +440,13 @@ nlsp_dissect_nlsp_hello(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (tree) { if (hello_type == NLSP_TYPE_WAN_HELLO) { proto_tree_add_item(tree, hf_nlsp_hello_state, tvb, - offset, 1, FALSE); + offset, 1, ENC_BIG_ENDIAN); } else { proto_tree_add_item(tree, hf_nlsp_hello_multicast, tvb, offset, 1, FALSE); } proto_tree_add_item(tree, hf_nlsp_hello_circuit_type, tvb, - offset, 1, FALSE); + offset, 1, ENC_BIG_ENDIAN); } offset += 1; @@ -478,7 +478,7 @@ nlsp_dissect_nlsp_hello(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (tree) { proto_tree_add_item(tree, hf_nlsp_hello_priority, tvb, - offset, 1, FALSE); + offset, 1, ENC_BIG_ENDIAN); } offset += 1; @@ -1062,7 +1062,7 @@ nlsp_dissect_nlsp_lsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (tree) { /* XXX -> we could validate the cksum here! */ proto_tree_add_item(tree, hf_nlsp_lsp_checksum, tvb, - offset, 2, FALSE ); + offset, 2, ENC_BIG_ENDIAN ); } offset += 2; @@ -1070,11 +1070,11 @@ nlsp_dissect_nlsp_lsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_tree_add_item(tree, hf_nlsp_lsp_p, tvb, offset, 1, FALSE); proto_tree_add_item(tree, hf_nlsp_lsp_attached_flag, tvb, - offset, 1, FALSE); + offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_nlsp_lsp_lspdbol, tvb, offset, 1, FALSE); proto_tree_add_item(tree, hf_nlsp_lsp_router_type, tvb, - offset, 1, FALSE); + offset, 1, ENC_BIG_ENDIAN); } offset += 1; @@ -1455,7 +1455,7 @@ dissect_nlsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { proto_tree_add_item(nlsp_tree, hf_nlsp_irpd, tvb, offset, 1, - FALSE ); + ENC_BIG_ENDIAN ); } offset += 1; @@ -1468,7 +1468,7 @@ dissect_nlsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { proto_tree_add_item(nlsp_tree, hf_nlsp_minor_version, tvb, - offset, 1, FALSE ); + offset, 1, ENC_BIG_ENDIAN ); } offset += 1; @@ -1492,7 +1492,7 @@ dissect_nlsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { proto_tree_add_item(nlsp_tree, hf_nlsp_major_version, tvb, - offset, 1, FALSE ); + offset, 1, ENC_BIG_ENDIAN ); } offset += 1; diff --git a/epan/dissectors/packet-nsip.c b/epan/dissectors/packet-nsip.c index eaf879d9b3..42fb470911 100644 --- a/epan/dissectors/packet-nsip.c +++ b/epan/dissectors/packet-nsip.c @@ -560,7 +560,7 @@ decode_iei_ip_address(nsip_ie_t *ie, build_info_t *bi, int ie_start_offset) { addr_type = tvb_get_guint8(bi->tvb, bi->offset); proto_tree_add_item(bi->nsip_tree, hf_nsip_ip_address_type, - bi->tvb, bi->offset, 1, FALSE); + bi->tvb, bi->offset, 1, ENC_BIG_ENDIAN); switch (addr_type) { case NSIP_IP_ADDRESS_TYPE_IPV4: ie->total_length = 2 + ipv4_element.address_length; diff --git a/epan/dissectors/packet-nsrp.c b/epan/dissectors/packet-nsrp.c index e099e095b6..eea05c276d 100644 --- a/epan/dissectors/packet-nsrp.c +++ b/epan/dissectors/packet-nsrp.c @@ -165,32 +165,32 @@ dissect_nsrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) nsrp_tree = proto_item_add_subtree(ti, ett_nsrp); - proto_tree_add_item(nsrp_tree, hf_nsrp_version, tvb, offset, 1, FALSE); + proto_tree_add_item(nsrp_tree, hf_nsrp_version, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; msgtype = tvb_get_guint8(tvb, offset); - proto_tree_add_item(nsrp_tree, hf_nsrp_msg_type, tvb, offset, 1, FALSE); + proto_tree_add_item(nsrp_tree, hf_nsrp_msg_type, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(nsrp_tree, hf_nsrp_clust_id, tvb, offset, 1, FALSE); + proto_tree_add_item(nsrp_tree, hf_nsrp_clust_id, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(nsrp_tree, hf_nsrp_msg_flag, tvb, offset, 1, FALSE); + proto_tree_add_item(nsrp_tree, hf_nsrp_msg_flag, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(nsrp_tree, hf_nsrp_len, tvb, offset, 2, FALSE); + proto_tree_add_item(nsrp_tree, hf_nsrp_len, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(nsrp_tree, hf_nsrp_ha_port, tvb, offset, 1, FALSE); + proto_tree_add_item(nsrp_tree, hf_nsrp_ha_port, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(nsrp_tree, hf_nsrp_not_used, tvb, offset, 1, FALSE); + proto_tree_add_item(nsrp_tree, hf_nsrp_not_used, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(nsrp_tree, hf_nsrp_dst_unit, tvb, offset, 4, FALSE); + proto_tree_add_item(nsrp_tree, hf_nsrp_dst_unit, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(nsrp_tree, hf_nsrp_src_unit, tvb, offset, 4, FALSE); + proto_tree_add_item(nsrp_tree, hf_nsrp_src_unit, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; } @@ -213,40 +213,40 @@ dissect_nsrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if ( msgtype == 0x00 ) { - proto_tree_add_item(nsrp_tree, hf_nsrp_msgtype, tvb, offset, 1, FALSE); + proto_tree_add_item(nsrp_tree, hf_nsrp_msgtype, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(nsrp_tree, hf_nsrp_wst_group, tvb, offset, 1, FALSE); + proto_tree_add_item(nsrp_tree, hf_nsrp_wst_group, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(nsrp_tree, hf_nsrp_hst_group, tvb, offset, 1, FALSE); + proto_tree_add_item(nsrp_tree, hf_nsrp_hst_group, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(nsrp_tree, hf_nsrp_msgflag, tvb, offset, 1, FALSE); + proto_tree_add_item(nsrp_tree, hf_nsrp_msgflag, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(nsrp_tree, hf_nsrp_msglen, tvb, offset, 2, FALSE); + proto_tree_add_item(nsrp_tree, hf_nsrp_msglen, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(nsrp_tree, hf_nsrp_encflag, tvb, offset, 1, FALSE); + proto_tree_add_item(nsrp_tree, hf_nsrp_encflag, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(nsrp_tree, hf_nsrp_not_used, tvb, offset, 1, FALSE); + proto_tree_add_item(nsrp_tree, hf_nsrp_not_used, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(nsrp_tree, hf_nsrp_total_size, tvb, offset, 4, FALSE); + proto_tree_add_item(nsrp_tree, hf_nsrp_total_size, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(nsrp_tree, hf_nsrp_ns, tvb, offset, 2, FALSE); + proto_tree_add_item(nsrp_tree, hf_nsrp_ns, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(nsrp_tree, hf_nsrp_nr, tvb, offset, 2, FALSE); + proto_tree_add_item(nsrp_tree, hf_nsrp_nr, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(nsrp_tree, hf_nsrp_no_used, tvb, offset, 2, FALSE); + proto_tree_add_item(nsrp_tree, hf_nsrp_no_used, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(nsrp_tree, hf_nsrp_checksum, tvb, offset, 2, FALSE); + proto_tree_add_item(nsrp_tree, hf_nsrp_checksum, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(nsrp_tree, hf_nsrp_data, tvb, offset, -1, FALSE); @@ -269,34 +269,34 @@ dissect_nsrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if ( msgtype == 0x02 ) { - proto_tree_add_item(nsrp_tree, hf_nsrp_msgtype, tvb, offset, 1, FALSE); + proto_tree_add_item(nsrp_tree, hf_nsrp_msgtype, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(nsrp_tree, hf_nsrp_wst_group, tvb, offset, 1, FALSE); + proto_tree_add_item(nsrp_tree, hf_nsrp_wst_group, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(nsrp_tree, hf_nsrp_hst_group, tvb, offset, 1, FALSE); + proto_tree_add_item(nsrp_tree, hf_nsrp_hst_group, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(nsrp_tree, hf_nsrp_msgflag, tvb, offset, 1, FALSE); + proto_tree_add_item(nsrp_tree, hf_nsrp_msgflag, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(nsrp_tree, hf_nsrp_msglen, tvb, offset, 2, FALSE); + proto_tree_add_item(nsrp_tree, hf_nsrp_msglen, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(nsrp_tree, hf_nsrp_authflag, tvb, offset, 1, FALSE); + proto_tree_add_item(nsrp_tree, hf_nsrp_authflag, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(nsrp_tree, hf_nsrp_not_used, tvb, offset, 1, FALSE); + proto_tree_add_item(nsrp_tree, hf_nsrp_not_used, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(nsrp_tree, hf_nsrp_priority, tvb, offset, 1, FALSE); + proto_tree_add_item(nsrp_tree, hf_nsrp_priority, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(nsrp_tree, hf_nsrp_dummy, tvb, offset, 1, FALSE); + proto_tree_add_item(nsrp_tree, hf_nsrp_dummy, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(nsrp_tree, hf_nsrp_authchecksum, tvb, offset, 2, FALSE); + proto_tree_add_item(nsrp_tree, hf_nsrp_authchecksum, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(nsrp_tree, hf_nsrp_data, tvb, offset, -1, FALSE); @@ -320,28 +320,28 @@ dissect_nsrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) */ if ( msgtype == 0x03 ) { - proto_tree_add_item(nsrp_tree, hf_nsrp_msgtype, tvb, offset, 1, FALSE); + proto_tree_add_item(nsrp_tree, hf_nsrp_msgtype, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(nsrp_tree, hf_nsrp_wst_group, tvb, offset, 1, FALSE); + proto_tree_add_item(nsrp_tree, hf_nsrp_wst_group, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(nsrp_tree, hf_nsrp_hst_group, tvb, offset, 1, FALSE); + proto_tree_add_item(nsrp_tree, hf_nsrp_hst_group, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(nsrp_tree, hf_nsrp_msgflag, tvb, offset, 1, FALSE); + proto_tree_add_item(nsrp_tree, hf_nsrp_msgflag, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(nsrp_tree, hf_nsrp_msglen, tvb, offset, 2, FALSE); + proto_tree_add_item(nsrp_tree, hf_nsrp_msglen, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(nsrp_tree, hf_nsrp_ifnum, tvb, offset, 1, FALSE); + proto_tree_add_item(nsrp_tree, hf_nsrp_ifnum, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(nsrp_tree, hf_nsrp_not_used, tvb, offset, 1, FALSE); + proto_tree_add_item(nsrp_tree, hf_nsrp_not_used, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(nsrp_tree, hf_nsrp_total_size, tvb, offset, 4, FALSE); + proto_tree_add_item(nsrp_tree, hf_nsrp_total_size, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; proto_tree_add_item(nsrp_tree, hf_nsrp_data, tvb, offset, -1, FALSE); diff --git a/epan/dissectors/packet-nstrace.c b/epan/dissectors/packet-nstrace.c index f70a0554b5..a5d07683f8 100644 --- a/epan/dissectors/packet-nstrace.c +++ b/epan/dissectors/packet-nstrace.c @@ -93,27 +93,27 @@ dissect_nstrace(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ti = proto_tree_add_protocol_format(tree, proto_nstrace, tvb, 0, pnstr->eth_offset, "NetScaler Packet Trace"); ns_tree = proto_item_add_subtree(ti, ett_ns); - proto_tree_add_item(ns_tree, hf_ns_dir, tvb, pnstr->dir_offset, pnstr->dir_len, TRUE); - proto_tree_add_item(ns_tree, hf_ns_nicno, tvb, pnstr->nicno_offset, pnstr->nicno_len, TRUE); + proto_tree_add_item(ns_tree, hf_ns_dir, tvb, pnstr->dir_offset, pnstr->dir_len, ENC_LITTLE_ENDIAN); + proto_tree_add_item(ns_tree, hf_ns_nicno, tvb, pnstr->nicno_offset, pnstr->nicno_len, ENC_LITTLE_ENDIAN); switch (pnstr->rec_type) { case NSPR_HEADER_VERSION203: - proto_tree_add_item(ns_tree, hf_ns_coreid, tvb, pnstr->coreid_offset, 2, TRUE); + proto_tree_add_item(ns_tree, hf_ns_coreid, tvb, pnstr->coreid_offset, 2, ENC_LITTLE_ENDIAN); /* fall through to next case */ case NSPR_HEADER_VERSION202: col_add_fstr(pinfo->cinfo, COL_8021Q_VLAN_ID, "%d", tvb_get_letohs(tvb, pnstr->vlantag_offset)); - proto_tree_add_item(ns_tree, hf_ns_vlantag, tvb, pnstr->vlantag_offset, 2, TRUE); + proto_tree_add_item(ns_tree, hf_ns_vlantag, tvb, pnstr->vlantag_offset, 2, ENC_LITTLE_ENDIAN); /* fall through to next case */ case NSPR_HEADER_VERSION201: - proto_tree_add_item(ns_tree, hf_ns_pcbdevno, tvb, pnstr->pcb_offset, 4, TRUE); - ti = proto_tree_add_item(ns_tree, hf_ns_devno, tvb, pnstr->pcb_offset, 4, TRUE); + proto_tree_add_item(ns_tree, hf_ns_pcbdevno, tvb, pnstr->pcb_offset, 4, ENC_LITTLE_ENDIAN); + ti = proto_tree_add_item(ns_tree, hf_ns_devno, tvb, pnstr->pcb_offset, 4, ENC_LITTLE_ENDIAN); PROTO_ITEM_SET_HIDDEN(ti); - proto_tree_add_item(ns_tree, hf_ns_l_pcbdevno, tvb, pnstr->l_pcb_offset, 4, TRUE); - ti = proto_tree_add_item(ns_tree, hf_ns_devno, tvb, pnstr->l_pcb_offset, 4, TRUE); + proto_tree_add_item(ns_tree, hf_ns_l_pcbdevno, tvb, pnstr->l_pcb_offset, 4, ENC_LITTLE_ENDIAN); + ti = proto_tree_add_item(ns_tree, hf_ns_devno, tvb, pnstr->l_pcb_offset, 4, ENC_LITTLE_ENDIAN); PROTO_ITEM_SET_HIDDEN(ti); break; diff --git a/epan/dissectors/packet-ntlmssp.c b/epan/dissectors/packet-ntlmssp.c index 3ced90e808..7cef993a09 100644 --- a/epan/dissectors/packet-ntlmssp.c +++ b/epan/dissectors/packet-ntlmssp.c @@ -1340,13 +1340,13 @@ dissect_ntlmv2_response(tvbuff_t *tvb, proto_tree *tree, int offset, int len) proto_tree_add_item( ntlmv2_tree, hf_ntlmssp_ntlmv2_response_header, tvb, - offset, 4, TRUE); + offset, 4, ENC_LITTLE_ENDIAN); offset += 4; proto_tree_add_item( ntlmv2_tree, hf_ntlmssp_ntlmv2_response_reserved, tvb, - offset, 4, TRUE); + offset, 4, ENC_LITTLE_ENDIAN); offset += 4; @@ -1361,7 +1361,7 @@ dissect_ntlmv2_response(tvbuff_t *tvb, proto_tree *tree, int offset, int len) proto_tree_add_item( ntlmv2_tree, hf_ntlmssp_ntlmv2_response_unknown, tvb, - offset, 4, TRUE); + offset, 4, ENC_LITTLE_ENDIAN); offset += 4; @@ -1979,7 +1979,7 @@ dissect_ntlmssp_payload(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) TRY { /* Version number */ proto_tree_add_item (ntlmssp_tree, hf_ntlmssp_verf_vers, - tvb, offset, 4, TRUE); + tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; /* Encrypted body */ @@ -2160,7 +2160,7 @@ dissect_ntlmssp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* NTLMSSP Message Type */ proto_tree_add_item (ntlmssp_tree, hf_ntlmssp_message_type, - tvb, offset, 4, TRUE); + tvb, offset, 4, ENC_LITTLE_ENDIAN); ntlmssph->type = tvb_get_letohl (tvb, offset); offset += 4; @@ -2375,12 +2375,12 @@ decrypt_verifier(tvbuff_t *tvb, int offset, guint32 encrypted_block_length, /* RANDOM PAD usually it's 0 */ proto_tree_add_item (decr_tree, hf_ntlmssp_verf_randompad, - decr_tvb, decrypted_offset, 4, TRUE); + decr_tvb, decrypted_offset, 4, ENC_LITTLE_ENDIAN); decrypted_offset += 4; /* CRC32 of the DCE fragment data */ proto_tree_add_item (decr_tree, hf_ntlmssp_verf_crc32, - decr_tvb, decrypted_offset, 4, TRUE); + decr_tvb, decrypted_offset, 4, ENC_LITTLE_ENDIAN); decrypted_offset += 4; /* Incrementing sequence number of DCE conversation */ @@ -2497,7 +2497,7 @@ dissect_ntlmssp_verf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) TRY { /* Version number */ proto_tree_add_item (ntlmssp_tree, hf_ntlmssp_verf_vers, - tvb, offset, 4, TRUE); + tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; /* Encrypted body */ diff --git a/epan/dissectors/packet-nwmtp.c b/epan/dissectors/packet-nwmtp.c index 33c7a55142..3228fd2ac0 100644 --- a/epan/dissectors/packet-nwmtp.c +++ b/epan/dissectors/packet-nwmtp.c @@ -94,15 +94,15 @@ static void dissect_nwmtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) nwmtp_tree = proto_item_add_subtree(ti, ett_mwmtp); proto_tree_add_item(nwmtp_tree, hf_nwmtp_transp_type, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(nwmtp_tree, hf_nwmtp_data_type, - tvb, offset + 1, 1, FALSE); + tvb, offset + 1, 1, ENC_BIG_ENDIAN); proto_tree_add_item(nwmtp_tree, hf_nwmtp_data_index, - tvb, offset + 2, 2, FALSE); + tvb, offset + 2, 2, ENC_BIG_ENDIAN); proto_tree_add_item(nwmtp_tree, hf_nwmtp_user_context, - tvb, offset + 4, 4, FALSE); + tvb, offset + 4, 4, ENC_BIG_ENDIAN); proto_tree_add_item(nwmtp_tree, hf_nwmtp_data_length, - tvb, offset + 8, 4, FALSE); + tvb, offset + 8, 4, ENC_BIG_ENDIAN); } next_tvb = tvb_new_subset(tvb, offset + 12, len, len); diff --git a/epan/dissectors/packet-oicq.c b/epan/dissectors/packet-oicq.c index 19f6192abb..50c0c1d4eb 100644 --- a/epan/dissectors/packet-oicq.c +++ b/epan/dissectors/packet-oicq.c @@ -137,17 +137,17 @@ dissect_oicq(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ti = proto_tree_add_item(tree, proto_oicq, tvb, 0, -1, FALSE); oicq_tree = proto_item_add_subtree(ti, ett_oicq); - proto_tree_add_item(oicq_tree, hf_oicq_flag, tvb, offset, 1, FALSE); + proto_tree_add_item(oicq_tree, hf_oicq_flag, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(oicq_tree, hf_oicq_version, tvb, offset, 2, FALSE); + proto_tree_add_item(oicq_tree, hf_oicq_version, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(oicq_tree, hf_oicq_command, tvb, offset, 2, FALSE); + proto_tree_add_item(oicq_tree, hf_oicq_command, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(oicq_tree, hf_oicq_seq, tvb, offset, 2, FALSE); + proto_tree_add_item(oicq_tree, hf_oicq_seq, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(oicq_tree, hf_oicq_qqid, tvb, offset, 4, FALSE); diff --git a/epan/dissectors/packet-olsr.c b/epan/dissectors/packet-olsr.c index 905918d70b..8543cebadb 100644 --- a/epan/dissectors/packet-olsr.c +++ b/epan/dissectors/packet-olsr.c @@ -176,7 +176,7 @@ static int dissect_olsr_tc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *olsr_t return message_end; } - proto_tree_add_item(olsr_tree, hf_olsr_ansn, tvb, offset, 2, FALSE); + proto_tree_add_item(olsr_tree, hf_olsr_ansn, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 4; while (offset < message_end) { @@ -205,7 +205,7 @@ static int dissect_olsrorg_lq_tc(tvbuff_t *tvb, packet_info *pinfo, proto_tree * NULL, "Not enough bytes for Olsr.org LQ-TC"); return message_end; } - proto_tree_add_item(olsr_tree, hf_olsr_ansn, tvb, offset, 2, FALSE); + proto_tree_add_item(olsr_tree, hf_olsr_ansn, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 4; while (offset < message_end) { @@ -249,8 +249,8 @@ static int dissect_olsrorg_lq_tc(tvbuff_t *tvb, packet_info *pinfo, proto_tree * break; /* unknown address type should be handled in dissect_olsr, just be sure */ } - proto_tree_add_item(address_tree, hf_olsrorg_lq, tvb, offset++, 1, FALSE); - proto_tree_add_item(address_tree, hf_olsrorg_nlq, tvb, offset++, 1, FALSE); + proto_tree_add_item(address_tree, hf_olsrorg_lq, tvb, offset++, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(address_tree, hf_olsrorg_nlq, tvb, offset++, 1, ENC_BIG_ENDIAN); offset += 2; } return message_end; @@ -264,7 +264,7 @@ static int dissect_nrlolsr_tc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ols return message_end; } - proto_tree_add_item(olsr_tree, hf_olsr_ansn, tvb, offset, 2, FALSE); + proto_tree_add_item(olsr_tree, hf_olsr_ansn, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 4; field1Ptr = offset + (message_end - offset) / (pinfo->src.len + 2) * (pinfo->src.len); @@ -282,8 +282,8 @@ static int dissect_nrlolsr_tc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ols break; /* unknown address type should be handled in dissect_olsr, just be sure */ } - proto_tree_add_item(olsr_tree, hf_nrlolsr_f1, tvb, field1Ptr++, 1, FALSE); - proto_tree_add_item(olsr_tree, hf_nrlolsr_f2, tvb, field2Ptr++, 1, FALSE); + proto_tree_add_item(olsr_tree, hf_nrlolsr_f1, tvb, field1Ptr++, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(olsr_tree, hf_nrlolsr_f2, tvb, field2Ptr++, 1, ENC_BIG_ENDIAN); } return message_end; } @@ -312,7 +312,7 @@ static int dissect_olsr_hello(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ols offset++; /*-------------------------Dissect Willingness---------------------------*/ - proto_tree_add_item(olsr_tree, hf_olsr_willingness, tvb, offset++, 1, FALSE); + proto_tree_add_item(olsr_tree, hf_olsr_willingness, tvb, offset++, 1, ENC_BIG_ENDIAN); while (offset < message_end) { if (message_end - offset < 4) { @@ -322,7 +322,7 @@ static int dissect_olsr_hello(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ols } /*------------------------------Dissect Link Type---------------------------------- */ - ti = proto_tree_add_item(olsr_tree, hf_olsr_link_type, tvb, offset++, 1, FALSE); + ti = proto_tree_add_item(olsr_tree, hf_olsr_link_type, tvb, offset++, 1, ENC_BIG_ENDIAN); link_type_tree = proto_item_add_subtree(ti, ett_olsr_message_linktype); /* reserved byte */ @@ -330,7 +330,7 @@ static int dissect_olsr_hello(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ols /*----------------------Dissect Link Message Size--------------------------*/ message_size = tvb_get_ntohs(tvb, offset); - ti = proto_tree_add_item(link_type_tree, hf_olsr_link_message_size, tvb, offset, 2, FALSE); + ti = proto_tree_add_item(link_type_tree, hf_olsr_link_message_size, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; if (message_size < 4) { @@ -405,8 +405,8 @@ static int handle_olsr_hello_olsrorg(tvbuff_t *tvb, packet_info *pinfo, proto_tr break; /* unknown address type should be handled in dissect_olsr, just be sure */ } - proto_tree_add_item(address_tree, hf_olsrorg_lq, tvb, offset++, 1, FALSE); - proto_tree_add_item(address_tree, hf_olsrorg_nlq, tvb, offset++, 1, FALSE); + proto_tree_add_item(address_tree, hf_olsrorg_lq, tvb, offset++, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(address_tree, hf_olsrorg_nlq, tvb, offset++, 1, ENC_BIG_ENDIAN); offset += 2; } /* end while */ return link_message_end; @@ -474,10 +474,10 @@ static int dissect_olsrorg_nameservice(tvbuff_t *tvb, packet_info *pinfo, proto_ } version = tvb_get_ntohs(tvb, offset); - proto_tree_add_item(olsr_tree, hf_olsrorg_ns_version, tvb, offset, 2, FALSE); + proto_tree_add_item(olsr_tree, hf_olsrorg_ns_version, tvb, offset, 2, ENC_BIG_ENDIAN); count = tvb_get_ntohs(tvb, offset + 2); - proto_tree_add_item(olsr_tree, hf_olsrorg_ns_count, tvb, offset + 2, 2, FALSE); + proto_tree_add_item(olsr_tree, hf_olsrorg_ns_count, tvb, offset + 2, 2, ENC_BIG_ENDIAN); offset += 4; @@ -507,7 +507,7 @@ static int dissect_olsrorg_nameservice(tvbuff_t *tvb, packet_info *pinfo, proto_ olsr_ns_tree = proto_item_add_subtree(olsr_ns_item, ett_olsr_message_ns); - proto_tree_add_item(olsr_ns_tree, hf_olsrorg_ns_type, tvb, offset, 2, FALSE); + proto_tree_add_item(olsr_ns_tree, hf_olsrorg_ns_type, tvb, offset, 2, ENC_BIG_ENDIAN); proto_tree_add_uint(olsr_ns_tree, hf_olsrorg_ns_length, tvb, offset + 2, 2, length); if (pinfo->src.type == AT_IPv4) { @@ -576,8 +576,8 @@ static int dissect_olsr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { ti = proto_tree_add_item(tree, proto_olsr, tvb, 0, -1, FALSE); olsr_tree = proto_item_add_subtree(ti, ett_olsr); - proto_tree_add_item(olsr_tree, hf_olsr_packet_len, tvb, 0, 2, FALSE); - proto_tree_add_item(olsr_tree, hf_olsr_packet_seq_num, tvb, 2, 2, FALSE); + proto_tree_add_item(olsr_tree, hf_olsr_packet_len, tvb, 0, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(olsr_tree, hf_olsr_packet_seq_num, tvb, 2, 2, ENC_BIG_ENDIAN); offset = 4; @@ -609,7 +609,7 @@ static int dissect_olsr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { offset++; /*-------------Dissect Message Size---------------------------*/ - ti = proto_tree_add_item(message_tree, hf_olsr_message_size, tvb, offset, 2, FALSE); + ti = proto_tree_add_item(message_tree, hf_olsr_message_size, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; if (message_len < 8 + pinfo->src.len) { @@ -634,9 +634,9 @@ static int dissect_olsr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { break; /* unknown address type should be handled before this loop, just be sure */ } - proto_tree_add_item(message_tree, hf_olsr_ttl, tvb, offset, 1, FALSE); - proto_tree_add_item(message_tree, hf_olsr_hop_count, tvb, offset + 1, 1, FALSE); - proto_tree_add_item(message_tree, hf_olsr_message_seq_num, tvb, offset + 2, 2, FALSE); + proto_tree_add_item(message_tree, hf_olsr_ttl, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(message_tree, hf_olsr_hop_count, tvb, offset + 1, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(message_tree, hf_olsr_message_seq_num, tvb, offset + 2, 2, ENC_BIG_ENDIAN); offset += 4; if (offset < message_end) { diff --git a/epan/dissectors/packet-omron-fins.c b/epan/dissectors/packet-omron-fins.c index 9548f4c4e8..754138a296 100644 --- a/epan/dissectors/packet-omron-fins.c +++ b/epan/dissectors/packet-omron-fins.c @@ -1151,43 +1151,43 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Byte 2 RSV */ offset = offset + 1; - proto_tree_add_item(omron_header_tree, hf_omron_rsv, tvb, offset, 1, FALSE); + proto_tree_add_item(omron_header_tree, hf_omron_rsv, tvb, offset, 1, ENC_BIG_ENDIAN); /* Byte 3 GCT */ offset = offset + 1; - proto_tree_add_item(omron_header_tree, hf_omron_gct, tvb, offset, 1, FALSE); + proto_tree_add_item(omron_header_tree, hf_omron_gct, tvb, offset, 1, ENC_BIG_ENDIAN); /* Byte 4 DNA */ offset = offset + 1; - proto_tree_add_item(omron_header_tree, hf_omron_dna, tvb, offset, 1, FALSE); + proto_tree_add_item(omron_header_tree, hf_omron_dna, tvb, offset, 1, ENC_BIG_ENDIAN); /* Byte 5 DA1 */ offset = offset + 1; - proto_tree_add_item(omron_header_tree, hf_omron_da1, tvb, offset, 1, FALSE); + proto_tree_add_item(omron_header_tree, hf_omron_da1, tvb, offset, 1, ENC_BIG_ENDIAN); /* Byte 6 DA2 */ offset = offset + 1; - proto_tree_add_item(omron_header_tree, hf_omron_da2, tvb, offset, 1, FALSE); + proto_tree_add_item(omron_header_tree, hf_omron_da2, tvb, offset, 1, ENC_BIG_ENDIAN); /* Byte 7 SNA */ offset = offset + 1; - proto_tree_add_item(omron_header_tree, hf_omron_sna, tvb, offset, 1, FALSE); + proto_tree_add_item(omron_header_tree, hf_omron_sna, tvb, offset, 1, ENC_BIG_ENDIAN); /* Byte 8 SA1 */ offset = offset + 1; - proto_tree_add_item(omron_header_tree, hf_omron_sa1, tvb, offset, 1, FALSE); + proto_tree_add_item(omron_header_tree, hf_omron_sa1, tvb, offset, 1, ENC_BIG_ENDIAN); /* Byte 9 SA2 */ offset = offset + 1; - proto_tree_add_item(omron_header_tree, hf_omron_sa2, tvb, offset, 1, FALSE); + proto_tree_add_item(omron_header_tree, hf_omron_sa2, tvb, offset, 1, ENC_BIG_ENDIAN); /* Byte 10 SID */ offset = offset + 1; - proto_tree_add_item(omron_header_tree, hf_omron_sid, tvb, offset, 1, FALSE); + proto_tree_add_item(omron_header_tree, hf_omron_sid, tvb, offset, 1, ENC_BIG_ENDIAN); /* Byte 11 and 12 Command Code */ offset = offset + 1; - ti = proto_tree_add_item(omron_header_tree, hf_omron_command, tvb, offset, 2, FALSE); + ti = proto_tree_add_item(omron_header_tree, hf_omron_command, tvb, offset, 2, ENC_BIG_ENDIAN); offset = offset + 2; @@ -1277,11 +1277,11 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if(reported_length_remaining == 6) { proto_tree_add_item(command_tree, hf_omron_command_memory_area_code, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(command_tree, hf_omron_address, tvb, (offset+1), 2, FALSE); - proto_tree_add_item(command_tree, hf_omron_address_bits, tvb, (offset+3), 1, FALSE); - proto_tree_add_item(command_tree, hf_omron_num_items, tvb, (offset+4), 2, FALSE); + proto_tree_add_item(command_tree, hf_omron_address, tvb, (offset+1), 2, ENC_BIG_ENDIAN); + proto_tree_add_item(command_tree, hf_omron_address_bits, tvb, (offset+3), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(command_tree, hf_omron_num_items, tvb, (offset+4), 2, ENC_BIG_ENDIAN); offset = offset + 6; } } @@ -1291,7 +1291,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if(reported_length_remaining >= 2) { proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, - 2, FALSE); + 2, ENC_BIG_ENDIAN); if(reported_length_remaining > 2) { @@ -1311,11 +1311,11 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if(reported_length_remaining >= 6) { proto_tree_add_item(command_tree, hf_omron_command_memory_area_code, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(command_tree, hf_omron_address, tvb, (offset+1), 2, FALSE); - proto_tree_add_item(command_tree, hf_omron_address_bits, tvb, (offset+3), 1, FALSE); - proto_tree_add_item(command_tree, hf_omron_num_items, tvb, (offset+4), 2, FALSE); + proto_tree_add_item(command_tree, hf_omron_address, tvb, (offset+1), 2, ENC_BIG_ENDIAN); + proto_tree_add_item(command_tree, hf_omron_address_bits, tvb, (offset+3), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(command_tree, hf_omron_num_items, tvb, (offset+4), 2, ENC_BIG_ENDIAN); proto_tree_add_item(command_tree, hf_omron_command_data, tvb, (offset+6), -1, ENC_NA); offset = offset + reported_length_remaining; @@ -1327,7 +1327,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if(reported_length_remaining == 2) { proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, - 2, FALSE); + 2, ENC_BIG_ENDIAN); offset = offset + 2; } } @@ -1341,11 +1341,11 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if(reported_length_remaining == 8) { proto_tree_add_item(command_tree, hf_omron_command_memory_area_code, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(command_tree, hf_omron_address, tvb, (offset+1), 2, FALSE); - proto_tree_add_item(command_tree, hf_omron_address_bits, tvb, (offset+3), 1, FALSE); - proto_tree_add_item(command_tree, hf_omron_num_items, tvb, (offset+4), 2, FALSE); + proto_tree_add_item(command_tree, hf_omron_address, tvb, (offset+1), 2, ENC_BIG_ENDIAN); + proto_tree_add_item(command_tree, hf_omron_address_bits, tvb, (offset+3), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(command_tree, hf_omron_num_items, tvb, (offset+4), 2, ENC_BIG_ENDIAN); proto_tree_add_item(command_tree, hf_omron_command_data, tvb, (offset+6), 2, ENC_NA); offset = offset + 8; @@ -1357,7 +1357,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if(reported_length_remaining == 2) { proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, - 2, FALSE); + 2, ENC_BIG_ENDIAN); offset = offset + 2; } } @@ -1370,8 +1370,8 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { while(reported_length_remaining >= 4) { - proto_tree_add_item(command_tree, hf_omron_command_memory_area_code, tvb, offset, 1, FALSE); - proto_tree_add_item(command_tree, hf_omron_transfer_beginning_address, tvb, (offset+1), 3, FALSE); + proto_tree_add_item(command_tree, hf_omron_command_memory_area_code, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(command_tree, hf_omron_transfer_beginning_address, tvb, (offset+1), 3, ENC_BIG_ENDIAN); offset = offset + 4; reported_length_remaining = reported_length_remaining - 4; } @@ -1381,7 +1381,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if(reported_length_remaining >= 3) { - proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, FALSE); + proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, ENC_BIG_ENDIAN); offset = offset + 2; reported_length_remaining = reported_length_remaining - 2; @@ -1390,7 +1390,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint8 memory_area_code; guint8 memory_code_len; - ti = proto_tree_add_item(command_tree, hf_omron_command_memory_area_code, tvb, offset, 1, FALSE); + ti = proto_tree_add_item(command_tree, hf_omron_command_memory_area_code, tvb, offset, 1, ENC_BIG_ENDIAN); memory_area_code = tvb_get_guint8(tvb, offset); switch(memory_area_code) { case 0x00: @@ -1503,16 +1503,16 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if(reported_length_remaining == 10) { proto_tree_add_item(command_tree, hf_omron_command_memory_area_code, - tvb, offset, 1, FALSE); - proto_tree_add_item(command_tree, hf_omron_address, tvb, (offset+1), 2, FALSE); - proto_tree_add_item(command_tree, hf_omron_address_bits, tvb, (offset+3), 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(command_tree, hf_omron_address, tvb, (offset+1), 2, ENC_BIG_ENDIAN); + proto_tree_add_item(command_tree, hf_omron_address_bits, tvb, (offset+3), 1, ENC_BIG_ENDIAN); proto_tree_add_item(command_tree, hf_omron_command_memory_area_code, - tvb, (offset+4), 1, FALSE); - proto_tree_add_item(command_tree, hf_omron_address, tvb, (offset+5), 2, FALSE); - proto_tree_add_item(command_tree, hf_omron_address_bits, tvb, (offset+7), 1, FALSE); + tvb, (offset+4), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(command_tree, hf_omron_address, tvb, (offset+5), 2, ENC_BIG_ENDIAN); + proto_tree_add_item(command_tree, hf_omron_address_bits, tvb, (offset+7), 1, ENC_BIG_ENDIAN); - proto_tree_add_item(command_tree, hf_omron_num_items, tvb, (offset+8), 2, FALSE); + proto_tree_add_item(command_tree, hf_omron_num_items, tvb, (offset+8), 2, ENC_BIG_ENDIAN); offset = offset + 10; } } @@ -1522,7 +1522,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if(reported_length_remaining == 2) { proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, - 2, FALSE); + 2, ENC_BIG_ENDIAN); offset = offset + 2; } } @@ -1536,9 +1536,9 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if(reported_length_remaining == 6) { - proto_tree_add_item(command_tree, hf_omron_parameter_area_code, tvb, offset, 2, FALSE); - proto_tree_add_item(command_tree, hf_omron_beginning_word, tvb, (offset+2), 2, FALSE); - proto_tree_add_item(command_tree, hf_omron_num_words, tvb, (offset+4), 2, FALSE); + proto_tree_add_item(command_tree, hf_omron_parameter_area_code, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(command_tree, hf_omron_beginning_word, tvb, (offset+2), 2, ENC_BIG_ENDIAN); + proto_tree_add_item(command_tree, hf_omron_num_words, tvb, (offset+4), 2, ENC_BIG_ENDIAN); offset = offset + 6; } } @@ -1548,10 +1548,10 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if(reported_length_remaining >= 8) { proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, - 2, FALSE); - proto_tree_add_item(command_tree, hf_omron_parameter_area_code, tvb, (offset+2), 2, FALSE); - proto_tree_add_item(command_tree, hf_omron_beginning_word, tvb, (offset+4), 2, FALSE); - proto_tree_add_item(command_tree, hf_omron_num_words, tvb, (offset+6), 2, FALSE); + 2, ENC_BIG_ENDIAN); + proto_tree_add_item(command_tree, hf_omron_parameter_area_code, tvb, (offset+2), 2, ENC_BIG_ENDIAN); + proto_tree_add_item(command_tree, hf_omron_beginning_word, tvb, (offset+4), 2, ENC_BIG_ENDIAN); + proto_tree_add_item(command_tree, hf_omron_num_words, tvb, (offset+6), 2, ENC_BIG_ENDIAN); if(reported_length_remaining > 8) { @@ -1572,9 +1572,9 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if(reported_length_remaining >= 6) { - proto_tree_add_item(command_tree, hf_omron_parameter_area_code, tvb, offset, 2, FALSE); - proto_tree_add_item(command_tree, hf_omron_beginning_word, tvb, (offset+2), 2, FALSE); - proto_tree_add_item(command_tree, hf_omron_num_words, tvb, (offset+4), 2, FALSE); + proto_tree_add_item(command_tree, hf_omron_parameter_area_code, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(command_tree, hf_omron_beginning_word, tvb, (offset+2), 2, ENC_BIG_ENDIAN); + proto_tree_add_item(command_tree, hf_omron_num_words, tvb, (offset+4), 2, ENC_BIG_ENDIAN); if(reported_length_remaining > 6) { @@ -1590,7 +1590,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if(reported_length_remaining == 2) { proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, - 2, FALSE); + 2, ENC_BIG_ENDIAN); offset = offset + 2; } } @@ -1603,10 +1603,10 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if(reported_length_remaining == 8) { - proto_tree_add_item(command_tree, hf_omron_fixed, tvb, offset, 2, FALSE); - proto_tree_add_item(command_tree, hf_omron_intelligent_id_no, tvb, (offset+2), 2, FALSE); - proto_tree_add_item(command_tree, hf_omron_first_word, tvb, (offset+4), 2, FALSE); - proto_tree_add_item(command_tree, hf_omron_read_len, tvb, (offset+6), 2, FALSE); + proto_tree_add_item(command_tree, hf_omron_fixed, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(command_tree, hf_omron_intelligent_id_no, tvb, (offset+2), 2, ENC_BIG_ENDIAN); + proto_tree_add_item(command_tree, hf_omron_first_word, tvb, (offset+4), 2, ENC_BIG_ENDIAN); + proto_tree_add_item(command_tree, hf_omron_read_len, tvb, (offset+6), 2, ENC_BIG_ENDIAN); offset = offset + 8; } } @@ -1615,8 +1615,8 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if(reported_length_remaining >= 3) { - proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, FALSE); - proto_tree_add_item(command_tree, hf_omron_no_of_link_nodes, tvb, (offset+2), 1, FALSE); + proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(command_tree, hf_omron_no_of_link_nodes, tvb, (offset+2), 1, ENC_BIG_ENDIAN); offset = offset + 3; reported_length_remaining = reported_length_remaining - 3; @@ -1627,11 +1627,11 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ti = proto_tree_add_text(command_tree, tvb, offset, 8, "Block Record"); omron_block_record_tree = proto_item_add_subtree(ti, ett_omron_block_record); proto_tree_add_item(omron_block_record_tree, hf_omron_block_record_node_num_status, tvb, offset, 1, FALSE); - proto_tree_add_item(omron_block_record_tree, hf_omron_block_record_node_num_num_nodes, tvb, offset, 1, FALSE); - proto_tree_add_item(omron_block_record_tree, hf_omron_block_record_cio_area, tvb, (offset+1), 2, FALSE); - proto_tree_add_item(omron_block_record_tree, hf_omron_block_record_kind_of_dm, tvb, (offset+3), 1, FALSE); - proto_tree_add_item(omron_block_record_tree, hf_omron_block_record_dm_area_first_word, tvb, (offset+4), 2, FALSE); - proto_tree_add_item(omron_block_record_tree, hf_omron_block_record_no_of_total_words, tvb, (offset+6), 2, FALSE); + proto_tree_add_item(omron_block_record_tree, hf_omron_block_record_node_num_num_nodes, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(omron_block_record_tree, hf_omron_block_record_cio_area, tvb, (offset+1), 2, ENC_BIG_ENDIAN); + proto_tree_add_item(omron_block_record_tree, hf_omron_block_record_kind_of_dm, tvb, (offset+3), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(omron_block_record_tree, hf_omron_block_record_dm_area_first_word, tvb, (offset+4), 2, ENC_BIG_ENDIAN); + proto_tree_add_item(omron_block_record_tree, hf_omron_block_record_no_of_total_words, tvb, (offset+6), 2, ENC_BIG_ENDIAN); offset = offset + 8; reported_length_remaining = reported_length_remaining - 8; } @@ -1646,11 +1646,11 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if(reported_length_remaining >= 9) { - proto_tree_add_item(command_tree, hf_omron_fixed, tvb, offset, 2, FALSE); - proto_tree_add_item(command_tree, hf_omron_intelligent_id_no, tvb, (offset+2), 2, FALSE); - proto_tree_add_item(command_tree, hf_omron_first_word, tvb, (offset+4), 2, FALSE); - proto_tree_add_item(command_tree, hf_omron_read_len, tvb, (offset+6), 2, FALSE); - proto_tree_add_item(command_tree, hf_omron_no_of_link_nodes, tvb, (offset+8), 1, FALSE); + proto_tree_add_item(command_tree, hf_omron_fixed, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(command_tree, hf_omron_intelligent_id_no, tvb, (offset+2), 2, ENC_BIG_ENDIAN); + proto_tree_add_item(command_tree, hf_omron_first_word, tvb, (offset+4), 2, ENC_BIG_ENDIAN); + proto_tree_add_item(command_tree, hf_omron_read_len, tvb, (offset+6), 2, ENC_BIG_ENDIAN); + proto_tree_add_item(command_tree, hf_omron_no_of_link_nodes, tvb, (offset+8), 1, ENC_BIG_ENDIAN); offset = offset + 9; reported_length_remaining = reported_length_remaining - 9; @@ -1660,11 +1660,11 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ti = proto_tree_add_text(command_tree, tvb, offset, 8, "Block Record"); omron_block_record_tree = proto_item_add_subtree(ti, ett_omron_block_record); proto_tree_add_item(omron_block_record_tree, hf_omron_block_record_node_num_status, tvb, offset, 1, FALSE); - proto_tree_add_item(omron_block_record_tree, hf_omron_block_record_node_num_num_nodes, tvb, offset, 1, FALSE); - proto_tree_add_item(omron_block_record_tree, hf_omron_block_record_cio_area, tvb, (offset+1), 2, FALSE); - proto_tree_add_item(omron_block_record_tree, hf_omron_block_record_kind_of_dm, tvb, (offset+3), 1, FALSE); - proto_tree_add_item(omron_block_record_tree, hf_omron_block_record_dm_area_first_word, tvb, (offset+4), 2, FALSE); - proto_tree_add_item(omron_block_record_tree, hf_omron_block_record_no_of_total_words, tvb, (offset+6), 2, FALSE); + proto_tree_add_item(omron_block_record_tree, hf_omron_block_record_node_num_num_nodes, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(omron_block_record_tree, hf_omron_block_record_cio_area, tvb, (offset+1), 2, ENC_BIG_ENDIAN); + proto_tree_add_item(omron_block_record_tree, hf_omron_block_record_kind_of_dm, tvb, (offset+3), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(omron_block_record_tree, hf_omron_block_record_dm_area_first_word, tvb, (offset+4), 2, ENC_BIG_ENDIAN); + proto_tree_add_item(omron_block_record_tree, hf_omron_block_record_no_of_total_words, tvb, (offset+6), 2, ENC_BIG_ENDIAN); offset = offset + 8; reported_length_remaining = reported_length_remaining - 8; } @@ -1675,7 +1675,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if(reported_length_remaining == 2) { - proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, FALSE); + proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, ENC_BIG_ENDIAN); offset = offset + 2; } } @@ -1689,10 +1689,10 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if(reported_length_remaining == 15) { - proto_tree_add_item(command_tree, hf_omron_program_number, tvb, offset, 2, FALSE); - proto_tree_add_item(command_tree, hf_omron_protect_code, tvb, (offset+2), 1, FALSE); - proto_tree_add_item(command_tree, hf_omron_begin_word, tvb, (offset+3),4,FALSE); - proto_tree_add_item(command_tree, hf_omron_last_word, tvb, (offset+7),4,FALSE); + proto_tree_add_item(command_tree, hf_omron_program_number, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(command_tree, hf_omron_protect_code, tvb, (offset+2), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(command_tree, hf_omron_begin_word, tvb, (offset+3),4,ENC_BIG_ENDIAN); + proto_tree_add_item(command_tree, hf_omron_last_word, tvb, (offset+7),4,ENC_BIG_ENDIAN); proto_tree_add_item(command_tree, hf_omron_password, tvb, (offset+11),4,FALSE); offset = offset + 15; } @@ -1702,7 +1702,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if(reported_length_remaining == 2) { - proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, FALSE); + proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, ENC_BIG_ENDIAN); offset = offset + 2; } } @@ -1715,9 +1715,9 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if(reported_length_remaining == 8) { - proto_tree_add_item(command_tree, hf_omron_program_number, tvb, offset, 2, FALSE); - proto_tree_add_item(command_tree, hf_omron_begin_word, tvb, (offset+2), 4, FALSE); - proto_tree_add_item(command_tree, hf_omron_num_words, tvb, (offset+6), 2, FALSE); + proto_tree_add_item(command_tree, hf_omron_program_number, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(command_tree, hf_omron_begin_word, tvb, (offset+2), 4, ENC_BIG_ENDIAN); + proto_tree_add_item(command_tree, hf_omron_num_words, tvb, (offset+6), 2, ENC_BIG_ENDIAN); offset = offset + 8; } } @@ -1726,10 +1726,10 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if(reported_length_remaining >= 10) { - proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, FALSE); - proto_tree_add_item(command_tree, hf_omron_program_number, tvb, (offset+2), 2, FALSE); - proto_tree_add_item(command_tree, hf_omron_begin_word, tvb, (offset+4), 4, FALSE); - proto_tree_add_item(command_tree, hf_omron_num_words, tvb, (offset+8), 2, FALSE); + proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(command_tree, hf_omron_program_number, tvb, (offset+2), 2, ENC_BIG_ENDIAN); + proto_tree_add_item(command_tree, hf_omron_begin_word, tvb, (offset+4), 4, ENC_BIG_ENDIAN); + proto_tree_add_item(command_tree, hf_omron_num_words, tvb, (offset+8), 2, ENC_BIG_ENDIAN); if(reported_length_remaining > 10) { @@ -1747,9 +1747,9 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if(reported_length_remaining >= 8) { - proto_tree_add_item(command_tree, hf_omron_program_number, tvb, offset, 2, FALSE); - proto_tree_add_item(command_tree, hf_omron_begin_word, tvb, (offset+2), 4, FALSE); - proto_tree_add_item(command_tree, hf_omron_num_words, tvb, (offset+6), 2, FALSE); + proto_tree_add_item(command_tree, hf_omron_program_number, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(command_tree, hf_omron_begin_word, tvb, (offset+2), 4, ENC_BIG_ENDIAN); + proto_tree_add_item(command_tree, hf_omron_num_words, tvb, (offset+6), 2, ENC_BIG_ENDIAN); if(reported_length_remaining > 8) { @@ -1762,10 +1762,10 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if(reported_length_remaining == 10) { - proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, FALSE); - proto_tree_add_item(command_tree, hf_omron_program_number, tvb, (offset+2), 2, FALSE); - proto_tree_add_item(command_tree, hf_omron_begin_word, tvb, (offset+4), 4, FALSE); - proto_tree_add_item(command_tree, hf_omron_num_words, tvb, (offset+8), 2, FALSE); + proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(command_tree, hf_omron_program_number, tvb, (offset+2), 2, ENC_BIG_ENDIAN); + proto_tree_add_item(command_tree, hf_omron_begin_word, tvb, (offset+4), 4, ENC_BIG_ENDIAN); + proto_tree_add_item(command_tree, hf_omron_num_words, tvb, (offset+8), 2, ENC_BIG_ENDIAN); offset = offset + 10; } } @@ -1778,8 +1778,8 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if(reported_length_remaining == 3) { - proto_tree_add_item(command_tree, hf_omron_program_number, tvb, offset, 2, FALSE); - proto_tree_add_item(command_tree, hf_omron_clear_code, tvb, (offset+2), 1, FALSE); + proto_tree_add_item(command_tree, hf_omron_program_number, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(command_tree, hf_omron_clear_code, tvb, (offset+2), 1, ENC_BIG_ENDIAN); offset = offset + 3; } } @@ -1787,7 +1787,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if(reported_length_remaining == 2) { - proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, FALSE); + proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, ENC_BIG_ENDIAN); offset = offset + 2; } } @@ -1800,13 +1800,13 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if(reported_length_remaining == 3) { - proto_tree_add_item(command_tree, hf_omron_program_number, tvb, offset, 2, FALSE); - proto_tree_add_item(command_tree, hf_omron_mode_code, tvb, (offset+2), 1, FALSE); + proto_tree_add_item(command_tree, hf_omron_program_number, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(command_tree, hf_omron_mode_code, tvb, (offset+2), 1, ENC_BIG_ENDIAN); offset = offset + 3; } else if (reported_length_remaining == 2) { - proto_tree_add_item(command_tree, hf_omron_program_number, tvb, offset, 2, FALSE); + proto_tree_add_item(command_tree, hf_omron_program_number, tvb, offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(command_tree, hf_omron_monitor_label, tvb, offset, 0, ENC_NA); offset = offset + 2; } @@ -1815,7 +1815,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if(reported_length_remaining == 2) { - proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, FALSE); + proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, ENC_BIG_ENDIAN); offset = offset + 2; } } @@ -1830,7 +1830,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if(reported_length_remaining == 2) { - proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, FALSE); + proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, ENC_BIG_ENDIAN); offset = offset + 2; } } @@ -1853,51 +1853,51 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if(reported_length_remaining == 94) { - proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, FALSE); + proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(command_tree, hf_omron_controller_model, tvb, (offset+2), 20, FALSE); proto_tree_add_item(command_tree, hf_omron_controller_version, tvb, (offset+22), 20, FALSE); proto_tree_add_item(command_tree, hf_omron_for_system_use, tvb, (offset+42), 40, FALSE); /* add area data sub tree */ ti = proto_tree_add_text(command_tree, tvb, (offset+82), 12, "Area Data"); area_data_tree = proto_item_add_subtree(ti, ett_area_data); - proto_tree_add_item(area_data_tree, hf_omron_program_area_size, tvb, (offset+82), 2, FALSE); - proto_tree_add_item(area_data_tree, hf_omron_iom_size, tvb, (offset+84), 1, FALSE); - proto_tree_add_item(area_data_tree, hf_omron_num_dm_words, tvb, (offset+85), 2, FALSE); - proto_tree_add_item(area_data_tree, hf_omron_timer_counter_size, tvb, (offset+87), 1, FALSE); - proto_tree_add_item(area_data_tree, hf_omron_expansion_dm_size, tvb, (offset+88), 1, FALSE); - proto_tree_add_item(area_data_tree, hf_omron_num_step_transitions, tvb, (offset+89), 2, FALSE); - proto_tree_add_item(area_data_tree, hf_omron_kind_memory_card, tvb, (offset+91), 1, FALSE); - proto_tree_add_item(area_data_tree, hf_omron_memory_card_size, tvb, (offset+92), 2, FALSE); + proto_tree_add_item(area_data_tree, hf_omron_program_area_size, tvb, (offset+82), 2, ENC_BIG_ENDIAN); + proto_tree_add_item(area_data_tree, hf_omron_iom_size, tvb, (offset+84), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(area_data_tree, hf_omron_num_dm_words, tvb, (offset+85), 2, ENC_BIG_ENDIAN); + proto_tree_add_item(area_data_tree, hf_omron_timer_counter_size, tvb, (offset+87), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(area_data_tree, hf_omron_expansion_dm_size, tvb, (offset+88), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(area_data_tree, hf_omron_num_step_transitions, tvb, (offset+89), 2, ENC_BIG_ENDIAN); + proto_tree_add_item(area_data_tree, hf_omron_kind_memory_card, tvb, (offset+91), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(area_data_tree, hf_omron_memory_card_size, tvb, (offset+92), 2, ENC_BIG_ENDIAN); offset = offset + 94; } else if(reported_length_remaining == 69) { - proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, FALSE); + proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, ENC_BIG_ENDIAN); ti = proto_tree_add_text(command_tree, tvb, (offset+2), 64, "CPU Bus Unit Conf"); cpu_bus_tree = proto_item_add_subtree(ti, ett_cpu_bus); - proto_tree_add_item(cpu_bus_tree, hf_omron_cpu_bus_unit_0, tvb, (offset+2), 2, FALSE); - proto_tree_add_item(cpu_bus_tree, hf_omron_cpu_bus_unit_1, tvb, (offset+4), 2, FALSE); - proto_tree_add_item(cpu_bus_tree, hf_omron_cpu_bus_unit_2, tvb, (offset+6), 2, FALSE); - proto_tree_add_item(cpu_bus_tree, hf_omron_cpu_bus_unit_3, tvb, (offset+8), 2, FALSE); - proto_tree_add_item(cpu_bus_tree, hf_omron_cpu_bus_unit_4, tvb, (offset+10), 2, FALSE); - proto_tree_add_item(cpu_bus_tree, hf_omron_cpu_bus_unit_5, tvb, (offset+12), 2, FALSE); - proto_tree_add_item(cpu_bus_tree, hf_omron_cpu_bus_unit_6, tvb, (offset+14), 2, FALSE); - proto_tree_add_item(cpu_bus_tree, hf_omron_cpu_bus_unit_7, tvb, (offset+16), 2, FALSE); - proto_tree_add_item(cpu_bus_tree, hf_omron_cpu_bus_unit_8, tvb, (offset+18), 2, FALSE); - proto_tree_add_item(cpu_bus_tree, hf_omron_cpu_bus_unit_9, tvb, (offset+20), 2, FALSE); - proto_tree_add_item(cpu_bus_tree, hf_omron_cpu_bus_unit_10, tvb, (offset+22), 2, FALSE); - proto_tree_add_item(cpu_bus_tree, hf_omron_cpu_bus_unit_11, tvb, (offset+24), 2, FALSE); - proto_tree_add_item(cpu_bus_tree, hf_omron_cpu_bus_unit_12, tvb, (offset+26), 2, FALSE); - proto_tree_add_item(cpu_bus_tree, hf_omron_cpu_bus_unit_13, tvb, (offset+28), 2, FALSE); - proto_tree_add_item(cpu_bus_tree, hf_omron_cpu_bus_unit_14, tvb, (offset+30), 2, FALSE); - proto_tree_add_item(cpu_bus_tree, hf_omron_cpu_bus_unit_15, tvb, (offset+32), 2, FALSE); + proto_tree_add_item(cpu_bus_tree, hf_omron_cpu_bus_unit_0, tvb, (offset+2), 2, ENC_BIG_ENDIAN); + proto_tree_add_item(cpu_bus_tree, hf_omron_cpu_bus_unit_1, tvb, (offset+4), 2, ENC_BIG_ENDIAN); + proto_tree_add_item(cpu_bus_tree, hf_omron_cpu_bus_unit_2, tvb, (offset+6), 2, ENC_BIG_ENDIAN); + proto_tree_add_item(cpu_bus_tree, hf_omron_cpu_bus_unit_3, tvb, (offset+8), 2, ENC_BIG_ENDIAN); + proto_tree_add_item(cpu_bus_tree, hf_omron_cpu_bus_unit_4, tvb, (offset+10), 2, ENC_BIG_ENDIAN); + proto_tree_add_item(cpu_bus_tree, hf_omron_cpu_bus_unit_5, tvb, (offset+12), 2, ENC_BIG_ENDIAN); + proto_tree_add_item(cpu_bus_tree, hf_omron_cpu_bus_unit_6, tvb, (offset+14), 2, ENC_BIG_ENDIAN); + proto_tree_add_item(cpu_bus_tree, hf_omron_cpu_bus_unit_7, tvb, (offset+16), 2, ENC_BIG_ENDIAN); + proto_tree_add_item(cpu_bus_tree, hf_omron_cpu_bus_unit_8, tvb, (offset+18), 2, ENC_BIG_ENDIAN); + proto_tree_add_item(cpu_bus_tree, hf_omron_cpu_bus_unit_9, tvb, (offset+20), 2, ENC_BIG_ENDIAN); + proto_tree_add_item(cpu_bus_tree, hf_omron_cpu_bus_unit_10, tvb, (offset+22), 2, ENC_BIG_ENDIAN); + proto_tree_add_item(cpu_bus_tree, hf_omron_cpu_bus_unit_11, tvb, (offset+24), 2, ENC_BIG_ENDIAN); + proto_tree_add_item(cpu_bus_tree, hf_omron_cpu_bus_unit_12, tvb, (offset+26), 2, ENC_BIG_ENDIAN); + proto_tree_add_item(cpu_bus_tree, hf_omron_cpu_bus_unit_13, tvb, (offset+28), 2, ENC_BIG_ENDIAN); + proto_tree_add_item(cpu_bus_tree, hf_omron_cpu_bus_unit_14, tvb, (offset+30), 2, ENC_BIG_ENDIAN); + proto_tree_add_item(cpu_bus_tree, hf_omron_cpu_bus_unit_15, tvb, (offset+32), 2, ENC_BIG_ENDIAN); proto_tree_add_item(cpu_bus_tree, hf_omron_cpu_bus_reserved, tvb, (offset+34), 32, FALSE); /* Remote IO Data tree */ ti = proto_tree_add_text(command_tree, tvb, (offset+66), 2, "Remote I/O data"); io_data_tree = proto_item_add_subtree(ti, ett_io_data); - proto_tree_add_item(io_data_tree, hf_omron_io_data_num_sysmac_1, tvb, (offset+66), 1, FALSE); - proto_tree_add_item(io_data_tree, hf_omron_io_data_num_sysmac_2, tvb, (offset+67), 1, FALSE); + proto_tree_add_item(io_data_tree, hf_omron_io_data_num_sysmac_1, tvb, (offset+66), 1, ENC_BIG_ENDIAN); + 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); @@ -1906,46 +1906,46 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) else if(reported_length_remaining == 161) { - proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, FALSE); + proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(command_tree, hf_omron_controller_model, tvb, (offset+2), 20, FALSE); proto_tree_add_item(command_tree, hf_omron_controller_version, tvb, (offset+22), 20, FALSE); proto_tree_add_item(command_tree, hf_omron_for_system_use, tvb, (offset+42), 40, FALSE); /* add area data sub tree */ ti = proto_tree_add_text(command_tree, tvb, (offset+82), 12, "Area Data"); area_data_tree = proto_item_add_subtree(ti, ett_area_data); - proto_tree_add_item(area_data_tree, hf_omron_program_area_size, tvb, (offset+82), 2, FALSE); - proto_tree_add_item(area_data_tree, hf_omron_iom_size, tvb, (offset+84), 1, FALSE); - proto_tree_add_item(area_data_tree, hf_omron_num_dm_words, tvb, (offset+85), 2, FALSE); - proto_tree_add_item(area_data_tree, hf_omron_timer_counter_size, tvb, (offset+87), 1, FALSE); - proto_tree_add_item(area_data_tree, hf_omron_expansion_dm_size, tvb, (offset+88), 1, FALSE); - proto_tree_add_item(area_data_tree, hf_omron_num_step_transitions, tvb, (offset+89), 2, FALSE); - proto_tree_add_item(area_data_tree, hf_omron_kind_memory_card, tvb, (offset+91), 1, FALSE); - proto_tree_add_item(area_data_tree, hf_omron_memory_card_size, tvb, (offset+92), 2, FALSE); + proto_tree_add_item(area_data_tree, hf_omron_program_area_size, tvb, (offset+82), 2, ENC_BIG_ENDIAN); + proto_tree_add_item(area_data_tree, hf_omron_iom_size, tvb, (offset+84), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(area_data_tree, hf_omron_num_dm_words, tvb, (offset+85), 2, ENC_BIG_ENDIAN); + proto_tree_add_item(area_data_tree, hf_omron_timer_counter_size, tvb, (offset+87), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(area_data_tree, hf_omron_expansion_dm_size, tvb, (offset+88), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(area_data_tree, hf_omron_num_step_transitions, tvb, (offset+89), 2, ENC_BIG_ENDIAN); + proto_tree_add_item(area_data_tree, hf_omron_kind_memory_card, tvb, (offset+91), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(area_data_tree, hf_omron_memory_card_size, tvb, (offset+92), 2, ENC_BIG_ENDIAN); /* cpu bus unit configuration */ ti = proto_tree_add_text(command_tree, tvb, (offset+94), 64, "CPU Bus Unit Conf"); cpu_bus_tree = proto_item_add_subtree(ti, ett_cpu_bus); - proto_tree_add_item(cpu_bus_tree, hf_omron_cpu_bus_unit_0, tvb, (offset+94), 2, FALSE); - proto_tree_add_item(cpu_bus_tree, hf_omron_cpu_bus_unit_1, tvb, (offset+96), 2, FALSE); - proto_tree_add_item(cpu_bus_tree, hf_omron_cpu_bus_unit_2, tvb, (offset+98), 2, FALSE); - proto_tree_add_item(cpu_bus_tree, hf_omron_cpu_bus_unit_3, tvb, (offset+100), 2, FALSE); - proto_tree_add_item(cpu_bus_tree, hf_omron_cpu_bus_unit_4, tvb, (offset+102), 2, FALSE); - proto_tree_add_item(cpu_bus_tree, hf_omron_cpu_bus_unit_5, tvb, (offset+104), 2, FALSE); - proto_tree_add_item(cpu_bus_tree, hf_omron_cpu_bus_unit_6, tvb, (offset+106), 2, FALSE); - proto_tree_add_item(cpu_bus_tree, hf_omron_cpu_bus_unit_7, tvb, (offset+108), 2, FALSE); - proto_tree_add_item(cpu_bus_tree, hf_omron_cpu_bus_unit_8, tvb, (offset+110), 2, FALSE); - proto_tree_add_item(cpu_bus_tree, hf_omron_cpu_bus_unit_9, tvb, (offset+112), 2, FALSE); - proto_tree_add_item(cpu_bus_tree, hf_omron_cpu_bus_unit_10, tvb, (offset+114), 2, FALSE); - proto_tree_add_item(cpu_bus_tree, hf_omron_cpu_bus_unit_11, tvb, (offset+116), 2, FALSE); - proto_tree_add_item(cpu_bus_tree, hf_omron_cpu_bus_unit_12, tvb, (offset+118), 2, FALSE); - proto_tree_add_item(cpu_bus_tree, hf_omron_cpu_bus_unit_13, tvb, (offset+120), 2, FALSE); - proto_tree_add_item(cpu_bus_tree, hf_omron_cpu_bus_unit_14, tvb, (offset+122), 2, FALSE); - proto_tree_add_item(cpu_bus_tree, hf_omron_cpu_bus_unit_15, tvb, (offset+124), 2, FALSE); + proto_tree_add_item(cpu_bus_tree, hf_omron_cpu_bus_unit_0, tvb, (offset+94), 2, ENC_BIG_ENDIAN); + proto_tree_add_item(cpu_bus_tree, hf_omron_cpu_bus_unit_1, tvb, (offset+96), 2, ENC_BIG_ENDIAN); + proto_tree_add_item(cpu_bus_tree, hf_omron_cpu_bus_unit_2, tvb, (offset+98), 2, ENC_BIG_ENDIAN); + proto_tree_add_item(cpu_bus_tree, hf_omron_cpu_bus_unit_3, tvb, (offset+100), 2, ENC_BIG_ENDIAN); + proto_tree_add_item(cpu_bus_tree, hf_omron_cpu_bus_unit_4, tvb, (offset+102), 2, ENC_BIG_ENDIAN); + proto_tree_add_item(cpu_bus_tree, hf_omron_cpu_bus_unit_5, tvb, (offset+104), 2, ENC_BIG_ENDIAN); + proto_tree_add_item(cpu_bus_tree, hf_omron_cpu_bus_unit_6, tvb, (offset+106), 2, ENC_BIG_ENDIAN); + proto_tree_add_item(cpu_bus_tree, hf_omron_cpu_bus_unit_7, tvb, (offset+108), 2, ENC_BIG_ENDIAN); + proto_tree_add_item(cpu_bus_tree, hf_omron_cpu_bus_unit_8, tvb, (offset+110), 2, ENC_BIG_ENDIAN); + proto_tree_add_item(cpu_bus_tree, hf_omron_cpu_bus_unit_9, tvb, (offset+112), 2, ENC_BIG_ENDIAN); + proto_tree_add_item(cpu_bus_tree, hf_omron_cpu_bus_unit_10, tvb, (offset+114), 2, ENC_BIG_ENDIAN); + proto_tree_add_item(cpu_bus_tree, hf_omron_cpu_bus_unit_11, tvb, (offset+116), 2, ENC_BIG_ENDIAN); + proto_tree_add_item(cpu_bus_tree, hf_omron_cpu_bus_unit_12, tvb, (offset+118), 2, ENC_BIG_ENDIAN); + proto_tree_add_item(cpu_bus_tree, hf_omron_cpu_bus_unit_13, tvb, (offset+120), 2, ENC_BIG_ENDIAN); + proto_tree_add_item(cpu_bus_tree, hf_omron_cpu_bus_unit_14, tvb, (offset+122), 2, ENC_BIG_ENDIAN); + proto_tree_add_item(cpu_bus_tree, hf_omron_cpu_bus_unit_15, tvb, (offset+124), 2, ENC_BIG_ENDIAN); proto_tree_add_item(cpu_bus_tree, hf_omron_cpu_bus_reserved, tvb, (offset+126), 32, FALSE); /* Remote IO Data tree */ ti = proto_tree_add_text(command_tree, tvb, (offset+158), 2, "Remote I/O data"); io_data_tree = proto_item_add_subtree(ti, ett_io_data); - proto_tree_add_item(io_data_tree, hf_omron_io_data_num_sysmac_1, tvb, (offset+158), 1, FALSE); - proto_tree_add_item(io_data_tree, hf_omron_io_data_num_sysmac_2, tvb, (offset+159), 1, FALSE); + proto_tree_add_item(io_data_tree, hf_omron_io_data_num_sysmac_1, tvb, (offset+158), 1, ENC_BIG_ENDIAN); + 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); @@ -1961,10 +1961,10 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if(reported_length_remaining >= 1) { - proto_tree_add_item(command_tree, hf_omron_unit_address, tvb, offset, 1, FALSE); + proto_tree_add_item(command_tree, hf_omron_unit_address, tvb, offset, 1, ENC_BIG_ENDIAN); if (reported_length_remaining == 2) { - proto_tree_add_item(command_tree, hf_omron_num_units, tvb, (offset+1), 1, FALSE); + proto_tree_add_item(command_tree, hf_omron_num_units, tvb, (offset+1), 1, ENC_BIG_ENDIAN); offset = offset + 1; } offset = offset + 1; @@ -1975,14 +1975,14 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if(reported_length_remaining >= 24) { - proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, FALSE); - proto_tree_add_item(command_tree, hf_omron_num_units, tvb, offset+2, 1, FALSE); + proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(command_tree, hf_omron_num_units, tvb, offset+2, 1, ENC_BIG_ENDIAN); offset = offset + 3; reported_length_remaining = reported_length_remaining - 3; while(reported_length_remaining >= 21) { - proto_tree_add_item(command_tree, hf_omron_unit_address, tvb, offset, 1, FALSE); + proto_tree_add_item(command_tree, hf_omron_unit_address, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(command_tree, hf_omron_model_number, tvb, offset+1, 20, FALSE); offset = offset + 21; reported_length_remaining = reported_length_remaining - 21; @@ -2000,9 +2000,9 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if(reported_length_remaining == 28) { - proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, FALSE); - proto_tree_add_item(command_tree, hf_omron_status, tvb, (offset+2), 1, FALSE); - proto_tree_add_item(command_tree, hf_omron_mode_code, tvb, (offset+3), 1, FALSE); + proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(command_tree, hf_omron_status, tvb, (offset+2), 1, ENC_BIG_ENDIAN); + 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); @@ -2013,7 +2013,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_bitmask(command_tree, tvb, (offset+8), hf_omron_message, ett_message_fields, message_fields, FALSE); /* Add rest of fields */ - proto_tree_add_item(command_tree, hf_omron_fals, tvb, (offset+10), 2, FALSE); + 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, FALSE); offset = offset + 28; } @@ -2038,7 +2038,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint8 i; guint8 node_num; - proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, FALSE); + proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, ENC_BIG_ENDIAN); offset = offset + 2; /* parsing 31 bytes of foo */ @@ -2066,10 +2066,10 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = offset + 1; } - proto_tree_add_item(command_tree, hf_omron_com_cycle_time, tvb, offset, 2, FALSE); - proto_tree_add_item(command_tree, hf_omron_polling_unit_node_num, tvb, (offset+2), 1, FALSE); - proto_tree_add_item(command_tree, hf_omron_cyclic_operation, tvb, (offset+3), 1, FALSE); - proto_tree_add_item(command_tree, hf_omron_cyclic_trans_status, tvb, (offset+4), 1, FALSE); + proto_tree_add_item(command_tree, hf_omron_com_cycle_time, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(command_tree, hf_omron_polling_unit_node_num, tvb, (offset+2), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(command_tree, hf_omron_cyclic_operation, tvb, (offset+3), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(command_tree, hf_omron_cyclic_trans_status, tvb, (offset+4), 1, ENC_BIG_ENDIAN); offset =offset + 5; netw_nodes_non_fatal_err_sts = @@ -2123,16 +2123,16 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_item *status_flags; proto_tree *status_flags_tree; - proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, FALSE); + proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, ENC_BIG_ENDIAN); /* add status flag tree */ - ti = proto_tree_add_item(command_tree, hf_omron_status_flags, tvb, (offset+2), 1, FALSE); + ti = proto_tree_add_item(command_tree, hf_omron_status_flags, tvb, (offset+2), 1, ENC_BIG_ENDIAN); omron_status_tree = proto_item_add_subtree(ti, ett_omron_status_block); proto_tree_add_item(omron_status_tree, hf_omron_status_flags_slave_master, tvb, (offset+2), 1, FALSE); proto_tree_add_item(omron_status_tree, hf_omron_status_flags_data_link, tvb, (offset+2), 1, FALSE); /* command_tree for master node */ - proto_tree_add_item(command_tree, hf_omron_master_node_number, tvb, (offset+3), 1, FALSE); + proto_tree_add_item(command_tree, hf_omron_master_node_number, tvb, (offset+3), 1, ENC_BIG_ENDIAN); offset = offset + 4; /* Status flag blocks */ @@ -2140,7 +2140,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) status_flags_tree = proto_item_add_subtree(status_flags, ett_omron_data_link_status_tree); /* Status block 1 */ - ti = proto_tree_add_item(status_flags_tree, hf_omron_status_flags, tvb, (offset+0), 3, FALSE); + ti = proto_tree_add_item(status_flags_tree, hf_omron_status_flags, tvb, (offset+0), 3, ENC_BIG_ENDIAN); omron_status_tree = proto_item_add_subtree(ti, ett_omron_status_block); proto_tree_add_item(omron_status_tree, hf_omron_status_node_0, tvb, (offset+0), 1, FALSE); proto_tree_add_item(omron_status_tree, hf_omron_status_node_1, tvb, (offset+0), 1, FALSE); @@ -2151,7 +2151,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(omron_status_tree, hf_omron_status_node_6, tvb, (offset+0), 1, FALSE); proto_tree_add_item(omron_status_tree, hf_omron_status_node_7, tvb, (offset+0), 1, FALSE); - ti = proto_tree_add_item(status_flags_tree, hf_omron_status_flags, tvb, (offset+0), 3, FALSE); + ti = proto_tree_add_item(status_flags_tree, hf_omron_status_flags, tvb, (offset+0), 3, ENC_BIG_ENDIAN); omron_status_tree = proto_item_add_subtree(ti, ett_omron_status_block); proto_tree_add_item(omron_status_tree, hf_omron_status_1_node_0, tvb, (offset+1), 1, FALSE); proto_tree_add_item(omron_status_tree, hf_omron_status_1_node_1, tvb, (offset+1), 1, FALSE); @@ -2162,7 +2162,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(omron_status_tree, hf_omron_status_1_node_6, tvb, (offset+1), 1, FALSE); proto_tree_add_item(omron_status_tree, hf_omron_status_1_node_7, tvb, (offset+1), 1, FALSE); - ti = proto_tree_add_item(status_flags_tree, hf_omron_status_flags, tvb, (offset+0), 3, FALSE); + ti = proto_tree_add_item(status_flags_tree, hf_omron_status_flags, tvb, (offset+0), 3, ENC_BIG_ENDIAN); omron_status_tree = proto_item_add_subtree(ti, ett_omron_status_block); proto_tree_add_item(omron_status_tree, hf_omron_status_2_node_0, tvb, (offset+2), 1, FALSE); proto_tree_add_item(omron_status_tree, hf_omron_status_2_node_1, tvb, (offset+2), 1, FALSE); @@ -2174,7 +2174,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(omron_status_tree, hf_omron_status_2_node_7, tvb, (offset+2), 1, FALSE); /* status block 2 */ - ti = proto_tree_add_item(status_flags_tree, hf_omron_status_flags, tvb, (offset+3), 3, FALSE); + ti = proto_tree_add_item(status_flags_tree, hf_omron_status_flags, tvb, (offset+3), 3, ENC_BIG_ENDIAN); omron_status_tree = proto_item_add_subtree(ti, ett_omron_status_block); proto_tree_add_item(omron_status_tree, hf_omron_status_node_0, tvb, (offset+3), 1, FALSE); proto_tree_add_item(omron_status_tree, hf_omron_status_node_1, tvb, (offset+3), 1, FALSE); @@ -2185,7 +2185,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(omron_status_tree, hf_omron_status_node_6, tvb, (offset+3), 1, FALSE); proto_tree_add_item(omron_status_tree, hf_omron_status_node_7, tvb, (offset+3), 1, FALSE); - ti = proto_tree_add_item(status_flags_tree, hf_omron_status_flags, tvb, (offset+3), 3, FALSE); + ti = proto_tree_add_item(status_flags_tree, hf_omron_status_flags, tvb, (offset+3), 3, ENC_BIG_ENDIAN); omron_status_tree = proto_item_add_subtree(ti, ett_omron_status_block); proto_tree_add_item(omron_status_tree, hf_omron_status_1_node_0, tvb, (offset+4), 1, FALSE); proto_tree_add_item(omron_status_tree, hf_omron_status_1_node_1, tvb, (offset+4), 1, FALSE); @@ -2196,7 +2196,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(omron_status_tree, hf_omron_status_1_node_6, tvb, (offset+4), 1, FALSE); proto_tree_add_item(omron_status_tree, hf_omron_status_1_node_7, tvb, (offset+4), 1, FALSE); - ti = proto_tree_add_item(status_flags_tree, hf_omron_status_flags, tvb, (offset+3), 3, FALSE); + ti = proto_tree_add_item(status_flags_tree, hf_omron_status_flags, tvb, (offset+3), 3, ENC_BIG_ENDIAN); omron_status_tree = proto_item_add_subtree(ti, ett_omron_status_block); proto_tree_add_item(omron_status_tree, hf_omron_status_2_node_0, tvb, (offset+5), 1, FALSE); proto_tree_add_item(omron_status_tree, hf_omron_status_2_node_1, tvb, (offset+5), 1, FALSE); @@ -2208,7 +2208,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(omron_status_tree, hf_omron_status_2_node_7, tvb, (offset+5), 1, FALSE); /* status block 3 */ - ti = proto_tree_add_item(status_flags_tree, hf_omron_status_flags, tvb, (offset+6), 3, FALSE); + ti = proto_tree_add_item(status_flags_tree, hf_omron_status_flags, tvb, (offset+6), 3, ENC_BIG_ENDIAN); omron_status_tree = proto_item_add_subtree(ti, ett_omron_status_block); proto_tree_add_item(omron_status_tree, hf_omron_status_node_0, tvb, (offset+6), 1, FALSE); proto_tree_add_item(omron_status_tree, hf_omron_status_node_1, tvb, (offset+6), 1, FALSE); @@ -2219,7 +2219,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(omron_status_tree, hf_omron_status_node_6, tvb, (offset+6), 1, FALSE); proto_tree_add_item(omron_status_tree, hf_omron_status_node_7, tvb, (offset+6), 1, FALSE); - ti = proto_tree_add_item(status_flags_tree, hf_omron_status_flags, tvb, (offset+6), 3, FALSE); + ti = proto_tree_add_item(status_flags_tree, hf_omron_status_flags, tvb, (offset+6), 3, ENC_BIG_ENDIAN); omron_status_tree = proto_item_add_subtree(ti, ett_omron_status_block); proto_tree_add_item(omron_status_tree, hf_omron_status_1_node_0, tvb, (offset+7), 1, FALSE); proto_tree_add_item(omron_status_tree, hf_omron_status_1_node_1, tvb, (offset+7), 1, FALSE); @@ -2230,7 +2230,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(omron_status_tree, hf_omron_status_1_node_6, tvb, (offset+7), 1, FALSE); proto_tree_add_item(omron_status_tree, hf_omron_status_1_node_7, tvb, (offset+7), 1, FALSE); - ti = proto_tree_add_item(status_flags_tree, hf_omron_status_flags, tvb, (offset+6), 3, FALSE); + ti = proto_tree_add_item(status_flags_tree, hf_omron_status_flags, tvb, (offset+6), 3, ENC_BIG_ENDIAN); omron_status_tree = proto_item_add_subtree(ti, ett_omron_status_block); proto_tree_add_item(omron_status_tree, hf_omron_status_2_node_0, tvb, (offset+8), 1, FALSE); proto_tree_add_item(omron_status_tree, hf_omron_status_2_node_1, tvb, (offset+8), 1, FALSE); @@ -2242,7 +2242,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(omron_status_tree, hf_omron_status_2_node_7, tvb, (offset+8), 1, FALSE); /* status block 4 */ - ti = proto_tree_add_item(status_flags_tree, hf_omron_status_flags, tvb, (offset+9), 3, FALSE); + ti = proto_tree_add_item(status_flags_tree, hf_omron_status_flags, tvb, (offset+9), 3, ENC_BIG_ENDIAN); omron_status_tree = proto_item_add_subtree(ti, ett_omron_status_block); proto_tree_add_item(omron_status_tree, hf_omron_status_node_0, tvb, (offset+9), 1, FALSE); proto_tree_add_item(omron_status_tree, hf_omron_status_node_1, tvb, (offset+9), 1, FALSE); @@ -2253,7 +2253,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(omron_status_tree, hf_omron_status_node_6, tvb, (offset+9), 1, FALSE); proto_tree_add_item(omron_status_tree, hf_omron_status_node_7, tvb, (offset+9), 1, FALSE); - ti = proto_tree_add_item(status_flags_tree, hf_omron_status_flags, tvb, (offset+9), 3, FALSE); + ti = proto_tree_add_item(status_flags_tree, hf_omron_status_flags, tvb, (offset+9), 3, ENC_BIG_ENDIAN); omron_status_tree = proto_item_add_subtree(ti, ett_omron_status_block); proto_tree_add_item(omron_status_tree, hf_omron_status_1_node_0, tvb, (offset+10), 1, FALSE); proto_tree_add_item(omron_status_tree, hf_omron_status_1_node_1, tvb, (offset+10), 1, FALSE); @@ -2264,7 +2264,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(omron_status_tree, hf_omron_status_1_node_6, tvb, (offset+10), 1, FALSE); proto_tree_add_item(omron_status_tree, hf_omron_status_1_node_7, tvb, (offset+10), 1, FALSE); - ti = proto_tree_add_item(status_flags_tree, hf_omron_status_flags, tvb, (offset+9), 3, FALSE); + ti = proto_tree_add_item(status_flags_tree, hf_omron_status_flags, tvb, (offset+9), 3, ENC_BIG_ENDIAN); omron_status_tree = proto_item_add_subtree(ti, ett_omron_status_block); proto_tree_add_item(omron_status_tree, hf_omron_status_2_node_0, tvb, (offset+11), 1, FALSE); proto_tree_add_item(omron_status_tree, hf_omron_status_2_node_1, tvb, (offset+11), 1, FALSE); @@ -2287,7 +2287,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if(reported_length_remaining == 1) { - proto_tree_add_item(command_tree, hf_omron_parameter, tvb, offset, 1, FALSE); + proto_tree_add_item(command_tree, hf_omron_parameter, tvb, offset, 1, ENC_BIG_ENDIAN); offset = offset + 1; } } @@ -2296,16 +2296,16 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if(reported_length_remaining == 2) { - proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, FALSE); + proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, ENC_BIG_ENDIAN); offset = offset + 2; } else if(reported_length_remaining == 14) { - proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, FALSE); - proto_tree_add_item(command_tree, hf_omron_avg_cycle_time, tvb, (offset+2), 4, FALSE); - proto_tree_add_item(command_tree, hf_omron_max_cycle_time, tvb, (offset+6), 4, FALSE); - proto_tree_add_item(command_tree, hf_omron_min_cycle_time, tvb, (offset+10), 4, FALSE); + proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(command_tree, hf_omron_avg_cycle_time, tvb, (offset+2), 4, ENC_BIG_ENDIAN); + proto_tree_add_item(command_tree, hf_omron_max_cycle_time, tvb, (offset+6), 4, ENC_BIG_ENDIAN); + proto_tree_add_item(command_tree, hf_omron_min_cycle_time, tvb, (offset+10), 4, ENC_BIG_ENDIAN); offset = offset + 14; } } @@ -2320,14 +2320,14 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if(reported_length_remaining == 9) { - proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, FALSE); - proto_tree_add_item(command_tree, hf_omron_year, tvb, (offset+2), 1, FALSE); - proto_tree_add_item(command_tree, hf_omron_month, tvb, (offset+3), 1, FALSE); - proto_tree_add_item(command_tree, hf_omron_date, tvb, (offset+4), 1, FALSE); - proto_tree_add_item(command_tree, hf_omron_hour, tvb, (offset+5), 1, FALSE); - proto_tree_add_item(command_tree, hf_omron_minute, tvb, (offset+6), 1, FALSE); - proto_tree_add_item(command_tree, hf_omron_second, tvb, (offset+7), 1, FALSE); - proto_tree_add_item(command_tree, hf_omron_day, tvb, (offset+8), 1, FALSE); + proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(command_tree, hf_omron_year, tvb, (offset+2), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(command_tree, hf_omron_month, tvb, (offset+3), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(command_tree, hf_omron_date, tvb, (offset+4), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(command_tree, hf_omron_hour, tvb, (offset+5), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(command_tree, hf_omron_minute, tvb, (offset+6), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(command_tree, hf_omron_second, tvb, (offset+7), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(command_tree, hf_omron_day, tvb, (offset+8), 1, ENC_BIG_ENDIAN); offset = offset + 9; } } @@ -2340,16 +2340,16 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if(reported_length_remaining >= 5) { - proto_tree_add_item(command_tree, hf_omron_year, tvb, (offset), 1, FALSE); - proto_tree_add_item(command_tree, hf_omron_month, tvb, (offset+1), 1, FALSE); - proto_tree_add_item(command_tree, hf_omron_date, tvb, (offset+2), 1, FALSE); - proto_tree_add_item(command_tree, hf_omron_hour, tvb, (offset+3), 1, FALSE); - proto_tree_add_item(command_tree, hf_omron_minute, tvb, (offset+4), 1, FALSE); + proto_tree_add_item(command_tree, hf_omron_year, tvb, (offset), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(command_tree, hf_omron_month, tvb, (offset+1), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(command_tree, hf_omron_date, tvb, (offset+2), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(command_tree, hf_omron_hour, tvb, (offset+3), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(command_tree, hf_omron_minute, tvb, (offset+4), 1, ENC_BIG_ENDIAN); if(reported_length_remaining == 7) { - proto_tree_add_item(command_tree, hf_omron_second, tvb, (offset+5), 1, FALSE); - proto_tree_add_item(command_tree, hf_omron_day, tvb, (offset+6), 1, FALSE); + proto_tree_add_item(command_tree, hf_omron_second, tvb, (offset+5), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(command_tree, hf_omron_day, tvb, (offset+6), 1, ENC_BIG_ENDIAN); offset = offset + 2; } offset = offset + 5; @@ -2360,7 +2360,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if(reported_length_remaining == 2) { - proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, FALSE); + proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, ENC_BIG_ENDIAN); offset = offset + 2; } } @@ -2383,7 +2383,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if(reported_length_remaining > 2) { - proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, FALSE); + proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(command_tree, hf_omron_data, tvb, (offset+2), -1, ENC_NA); offset = offset + reported_length_remaining; } @@ -2397,8 +2397,8 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if(reported_length_remaining == 4) { - proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, FALSE); - proto_tree_add_item(command_tree, hf_omron_num_receptions, tvb, (offset+2), 2, FALSE); + proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(command_tree, hf_omron_num_receptions, tvb, (offset+2), 2, ENC_BIG_ENDIAN); offset = offset + 4; } } @@ -2428,7 +2428,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if((tvb_get_ntohs(tvb, offset) & 0xC000) == 0x8000) { /* "FAL/FALS READ" */ - proto_tree_add_item(command_tree, hf_omron_fals, tvb, offset, 2, FALSE); + proto_tree_add_item(command_tree, hf_omron_fals, tvb, offset, 2, ENC_BIG_ENDIAN); } else { @@ -2445,19 +2445,19 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if(reported_length_remaining == 2) { - proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, FALSE); + proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, ENC_BIG_ENDIAN); offset = offset + 2; } else if(reported_length_remaining == 20) { - proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, FALSE); - proto_tree_add_item(command_tree, hf_omron_fals, tvb, (offset+2), 2, FALSE); + proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(command_tree, hf_omron_fals, tvb, (offset+2), 2, ENC_BIG_ENDIAN); proto_tree_add_item(command_tree, hf_omron_error_message, tvb, (offset+4), 16, FALSE); offset = offset + 20; } else if(reported_length_remaining >= 4) { - proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, FALSE); + 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); @@ -2482,7 +2482,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if(reported_length_remaining == 2) { - proto_tree_add_item(command_tree, hf_omron_program_number, tvb, offset, 2, FALSE); + proto_tree_add_item(command_tree, hf_omron_program_number, tvb, offset, 2, ENC_BIG_ENDIAN); offset = offset + 2; } } @@ -2491,15 +2491,15 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if(reported_length_remaining == 2) { - proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, FALSE); + proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, ENC_BIG_ENDIAN); offset = offset + 2; } else if(reported_length_remaining == 5) { - proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, FALSE); - proto_tree_add_item(command_tree, hf_omron_unit_address, tvb, (offset+2), 1, FALSE); - proto_tree_add_item(command_tree, hf_omron_node_number, tvb, (offset+3), 1, FALSE); - proto_tree_add_item(command_tree, hf_omron_network_address, tvb, (offset+4), 1, FALSE); + proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(command_tree, hf_omron_unit_address, tvb, (offset+2), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(command_tree, hf_omron_node_number, tvb, (offset+3), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(command_tree, hf_omron_network_address, tvb, (offset+4), 1, ENC_BIG_ENDIAN); offset = offset + 5; } @@ -2513,7 +2513,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if(reported_length_remaining == 2) { - proto_tree_add_item(command_tree, hf_omron_program_number, tvb, offset, 2, FALSE); + proto_tree_add_item(command_tree, hf_omron_program_number, tvb, offset, 2, ENC_BIG_ENDIAN); offset = offset + 2; } } @@ -2522,7 +2522,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if(reported_length_remaining == 2) { - proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, FALSE); + proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, ENC_BIG_ENDIAN); offset = offset + 2; } } @@ -2536,7 +2536,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if(reported_length_remaining == 2) { - proto_tree_add_item(command_tree, hf_omron_program_number, tvb, offset, 2, FALSE); + proto_tree_add_item(command_tree, hf_omron_program_number, tvb, offset, 2, ENC_BIG_ENDIAN); offset = offset + 2; } } @@ -2545,7 +2545,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if(reported_length_remaining == 2) { - proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, FALSE); + proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, ENC_BIG_ENDIAN); offset = offset + 2; } } @@ -2559,7 +2559,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if(reported_length_remaining == 2) { - proto_tree_add_item(command_tree, hf_omron_error_reset_fals_no, tvb, offset, 2, FALSE); + proto_tree_add_item(command_tree, hf_omron_error_reset_fals_no, tvb, offset, 2, ENC_BIG_ENDIAN); offset = offset + 2; } } @@ -2568,7 +2568,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if(reported_length_remaining == 2) { - proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, FALSE); + proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, ENC_BIG_ENDIAN); offset = offset + 2; } } @@ -2582,8 +2582,8 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if(reported_length_remaining == 4) { - proto_tree_add_item(command_tree, hf_omron_beginning_record_no, tvb, offset, 2, FALSE); - proto_tree_add_item(command_tree, hf_omron_no_of_records, tvb, (offset+2), 2, FALSE); + proto_tree_add_item(command_tree, hf_omron_beginning_record_no, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(command_tree, hf_omron_no_of_records, tvb, (offset+2), 2, ENC_BIG_ENDIAN); offset = offset + 4; } } @@ -2592,10 +2592,10 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if(reported_length_remaining >= 8) { - proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, FALSE); - proto_tree_add_item(command_tree, hf_omron_max_no_of_stored_records, tvb, (offset+2), 2, FALSE); - proto_tree_add_item(command_tree, hf_omron_no_of_stored_records, tvb, (offset+4), 2, FALSE); - proto_tree_add_item(command_tree, hf_omron_no_of_records, tvb, (offset+6), 2, FALSE); + proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(command_tree, hf_omron_max_no_of_stored_records, tvb, (offset+2), 2, ENC_BIG_ENDIAN); + proto_tree_add_item(command_tree, hf_omron_no_of_stored_records, tvb, (offset+4), 2, ENC_BIG_ENDIAN); + proto_tree_add_item(command_tree, hf_omron_no_of_records, tvb, (offset+6), 2, ENC_BIG_ENDIAN); offset = offset + 8; reported_length_remaining = reported_length_remaining - 8; @@ -2604,14 +2604,14 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ti = proto_tree_add_text(command_tree, tvb, offset, 10, "Error log data"); error_log_tree = proto_item_add_subtree(ti, ett_omron_error_log_data); - proto_tree_add_item(error_log_tree, hf_omron_error_reset_fals_no, tvb, offset, 2, FALSE); - proto_tree_add_item(error_log_tree, hf_omron_error_reset_fals_no, tvb, (offset+2), 2, FALSE); - proto_tree_add_item(error_log_tree, hf_omron_minute, tvb, (offset+4), 1, FALSE); - proto_tree_add_item(error_log_tree, hf_omron_second, tvb, (offset+5), 1, FALSE); - proto_tree_add_item(error_log_tree, hf_omron_day, tvb, (offset+6), 1, FALSE); - proto_tree_add_item(error_log_tree, hf_omron_hour, tvb, (offset+7), 1, FALSE); - proto_tree_add_item(error_log_tree, hf_omron_year, tvb, (offset+8), 1, FALSE); - proto_tree_add_item(error_log_tree, hf_omron_month, tvb, (offset+9), 1, FALSE); + proto_tree_add_item(error_log_tree, hf_omron_error_reset_fals_no, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(error_log_tree, hf_omron_error_reset_fals_no, tvb, (offset+2), 2, ENC_BIG_ENDIAN); + proto_tree_add_item(error_log_tree, hf_omron_minute, tvb, (offset+4), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(error_log_tree, hf_omron_second, tvb, (offset+5), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(error_log_tree, hf_omron_day, tvb, (offset+6), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(error_log_tree, hf_omron_hour, tvb, (offset+7), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(error_log_tree, hf_omron_year, tvb, (offset+8), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(error_log_tree, hf_omron_month, tvb, (offset+9), 1, ENC_BIG_ENDIAN); offset = offset + 10; reported_length_remaining = reported_length_remaining - 10; @@ -2629,7 +2629,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if(reported_length_remaining == 2) { - proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, FALSE); + proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, ENC_BIG_ENDIAN); offset = offset + 2; } } @@ -2642,9 +2642,9 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if(reported_length_remaining == 6) { - proto_tree_add_item(command_tree, hf_omron_disk_no, tvb, offset, 2, FALSE); - proto_tree_add_item(command_tree, hf_omron_beginning_file_position, tvb, (offset+2), 2, FALSE); - proto_tree_add_item(command_tree, hf_omron_no_of_files, tvb, (offset+4), 2, FALSE); + proto_tree_add_item(command_tree, hf_omron_disk_no, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(command_tree, hf_omron_beginning_file_position, tvb, (offset+2), 2, ENC_BIG_ENDIAN); + proto_tree_add_item(command_tree, hf_omron_no_of_files, tvb, (offset+4), 2, ENC_BIG_ENDIAN); offset = offset + 6; } } @@ -2653,7 +2653,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if(reported_length_remaining >= 50) { - proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, FALSE); + proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, ENC_BIG_ENDIAN); ti = proto_tree_add_text(command_tree, tvb, (offset+2), 26, "Disk data"); omron_disk_data_tree = proto_item_add_subtree(ti, ett_omron_disk_data); @@ -2663,19 +2663,19 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_uint_format(omron_disk_data_tree, hf_omron_date_year, tvb, (offset+14), 1, omron_byte, "Year: %d", ((omron_byte>>1)+1980)); - proto_tree_add_item(omron_disk_data_tree, hf_omron_date_month, tvb, (offset+14), 4, FALSE); - proto_tree_add_item(omron_disk_data_tree, hf_omron_date_day, tvb, (offset+14), 4, FALSE); - proto_tree_add_item(omron_disk_data_tree, hf_omron_date_hour, tvb, (offset+14), 4, FALSE); - proto_tree_add_item(omron_disk_data_tree, hf_omron_date_minute, tvb, (offset+14), 4, FALSE); + proto_tree_add_item(omron_disk_data_tree, hf_omron_date_month, tvb, (offset+14), 4, ENC_BIG_ENDIAN); + proto_tree_add_item(omron_disk_data_tree, hf_omron_date_day, tvb, (offset+14), 4, ENC_BIG_ENDIAN); + proto_tree_add_item(omron_disk_data_tree, hf_omron_date_hour, tvb, (offset+14), 4, ENC_BIG_ENDIAN); + proto_tree_add_item(omron_disk_data_tree, hf_omron_date_minute, tvb, (offset+14), 4, ENC_BIG_ENDIAN); omron_byte = tvb_get_guint8(tvb, (offset+17)); proto_tree_add_uint_format(omron_disk_data_tree, hf_omron_date_second, tvb, (offset+17), 1, omron_byte, "Second: %d", ((omron_byte&0x1F)*2)); - proto_tree_add_item(omron_disk_data_tree, hf_omron_total_capacity, tvb, (offset+18), 4, FALSE); - proto_tree_add_item(omron_disk_data_tree, hf_omron_unused_capacity, tvb, (offset+22), 4, FALSE); - proto_tree_add_item(omron_disk_data_tree, hf_omron_total_no_files, tvb, (offset+26), 2, FALSE); - proto_tree_add_item(omron_disk_data_tree, hf_omron_no_files, tvb, (offset+28), 2, FALSE); + proto_tree_add_item(omron_disk_data_tree, hf_omron_total_capacity, tvb, (offset+18), 4, ENC_BIG_ENDIAN); + proto_tree_add_item(omron_disk_data_tree, hf_omron_unused_capacity, tvb, (offset+22), 4, ENC_BIG_ENDIAN); + proto_tree_add_item(omron_disk_data_tree, hf_omron_total_no_files, tvb, (offset+26), 2, ENC_BIG_ENDIAN); + proto_tree_add_item(omron_disk_data_tree, hf_omron_no_files, tvb, (offset+28), 2, ENC_BIG_ENDIAN); offset = offset + 30; reported_length_remaining = reported_length_remaining - 30; @@ -2691,16 +2691,16 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_uint_format(omron_file_data_tree, hf_omron_date_year, tvb, (offset+12), 1, omron_byte, "Year: %d", ((omron_byte>>1)+1980)); - proto_tree_add_item(omron_file_data_tree, hf_omron_date_month, tvb, (offset+12), 4, FALSE); - proto_tree_add_item(omron_file_data_tree, hf_omron_date_day, tvb, (offset+12), 4, FALSE); - proto_tree_add_item(omron_file_data_tree, hf_omron_date_hour, tvb, (offset+12), 4, FALSE); - proto_tree_add_item(omron_file_data_tree, hf_omron_date_minute, tvb, (offset+12), 4, FALSE); + proto_tree_add_item(omron_file_data_tree, hf_omron_date_month, tvb, (offset+12), 4, ENC_BIG_ENDIAN); + proto_tree_add_item(omron_file_data_tree, hf_omron_date_day, tvb, (offset+12), 4, ENC_BIG_ENDIAN); + proto_tree_add_item(omron_file_data_tree, hf_omron_date_hour, tvb, (offset+12), 4, ENC_BIG_ENDIAN); + proto_tree_add_item(omron_file_data_tree, hf_omron_date_minute, tvb, (offset+12), 4, ENC_BIG_ENDIAN); omron_byte = tvb_get_guint8(tvb, (offset+15)); proto_tree_add_uint_format(omron_file_data_tree, hf_omron_date_second, tvb, (offset+15), 1, omron_byte, "Second: %d", ((omron_byte&0x1F)*2)); - proto_tree_add_item(omron_file_data_tree, hf_omron_file_capacity, tvb, (offset+16), 4, FALSE); + proto_tree_add_item(omron_file_data_tree, hf_omron_file_capacity, tvb, (offset+16), 4, ENC_BIG_ENDIAN); offset = offset + 20; reported_length_remaining = reported_length_remaining - 20; @@ -2716,10 +2716,10 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if(reported_length_remaining == 20) { - proto_tree_add_item(command_tree, hf_omron_disk_no, tvb, offset, 2, FALSE); + proto_tree_add_item(command_tree, hf_omron_disk_no, tvb, offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(command_tree, hf_omron_filename, tvb, (offset+2), 12, FALSE); - proto_tree_add_item(command_tree, hf_omron_file_position, tvb, (offset+14), 4, FALSE); - proto_tree_add_item(command_tree, hf_omron_data_length, tvb, (offset+18), 2, FALSE); + proto_tree_add_item(command_tree, hf_omron_file_position, tvb, (offset+14), 4, ENC_BIG_ENDIAN); + proto_tree_add_item(command_tree, hf_omron_data_length, tvb, (offset+18), 2, ENC_BIG_ENDIAN); offset = offset + 20; } } @@ -2728,10 +2728,10 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if(reported_length_remaining >= 12) { - proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, FALSE); - proto_tree_add_item(command_tree, hf_omron_file_capacity, tvb, (offset+2), 4, FALSE); - proto_tree_add_item(command_tree, hf_omron_file_position, tvb, (offset+6), 4, FALSE); - proto_tree_add_item(command_tree, hf_omron_data_length, tvb, (offset+10), 2, FALSE); + proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(command_tree, hf_omron_file_capacity, tvb, (offset+2), 4, ENC_BIG_ENDIAN); + proto_tree_add_item(command_tree, hf_omron_file_position, tvb, (offset+6), 4, ENC_BIG_ENDIAN); + proto_tree_add_item(command_tree, hf_omron_data_length, tvb, (offset+10), 2, ENC_BIG_ENDIAN); if(reported_length_remaining > 12) { @@ -2749,11 +2749,11 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if(reported_length_remaining >= 22) { - proto_tree_add_item(command_tree, hf_omron_disk_no, tvb, offset, 2, FALSE); - proto_tree_add_item(command_tree, hf_omron_file_parameter_code, tvb, (offset+2), 2, FALSE); + proto_tree_add_item(command_tree, hf_omron_disk_no, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(command_tree, hf_omron_file_parameter_code, tvb, (offset+2), 2, ENC_BIG_ENDIAN); proto_tree_add_item(command_tree, hf_omron_filename, tvb, (offset+4), 12, FALSE); - proto_tree_add_item(command_tree, hf_omron_file_position, tvb, (offset+16), 4, FALSE); - proto_tree_add_item(command_tree, hf_omron_data_length, tvb, (offset+20), 2, FALSE); + proto_tree_add_item(command_tree, hf_omron_file_position, tvb, (offset+16), 4, ENC_BIG_ENDIAN); + proto_tree_add_item(command_tree, hf_omron_data_length, tvb, (offset+20), 2, ENC_BIG_ENDIAN); if(reported_length_remaining > 22) { proto_tree_add_item(command_tree, hf_omron_file_data, tvb, (offset+22), -1, ENC_NA); @@ -2766,7 +2766,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if(reported_length_remaining == 2) { - proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, FALSE); + proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, ENC_BIG_ENDIAN); offset = offset + 2; } } @@ -2779,7 +2779,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if(reported_length_remaining == 2) { - proto_tree_add_item(command_tree, hf_omron_disk_no, tvb, offset, 2, FALSE); + proto_tree_add_item(command_tree, hf_omron_disk_no, tvb, offset, 2, ENC_BIG_ENDIAN); offset = offset + 2; } } @@ -2787,7 +2787,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if(reported_length_remaining == 2) { - proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, FALSE); + proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, ENC_BIG_ENDIAN); offset = offset + 2; } } @@ -2800,8 +2800,8 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if(reported_length_remaining >= 16) { - proto_tree_add_item(command_tree, hf_omron_disk_no, tvb, offset, 2, FALSE); - proto_tree_add_item(command_tree, hf_omron_no_files, tvb, (offset+2), 2, FALSE); + proto_tree_add_item(command_tree, hf_omron_disk_no, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(command_tree, hf_omron_no_files, tvb, (offset+2), 2, ENC_BIG_ENDIAN); offset = offset + 4; reported_length_remaining = reported_length_remaining - 4; @@ -2818,8 +2818,8 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if(reported_length_remaining == 4) { - proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, FALSE); - proto_tree_add_item(command_tree, hf_omron_no_files, tvb, (offset+2), 2, FALSE); + proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(command_tree, hf_omron_no_files, tvb, (offset+2), 2, ENC_BIG_ENDIAN); offset = offset + 4; } } @@ -2832,8 +2832,8 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if(reported_length_remaining >= 4) { - proto_tree_add_item(command_tree, hf_omron_disk_no, tvb, offset, 2, FALSE); - proto_tree_add_item(command_tree, hf_omron_volume_parameter_code, tvb, (offset+2), 2, FALSE); + proto_tree_add_item(command_tree, hf_omron_disk_no, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(command_tree, hf_omron_volume_parameter_code, tvb, (offset+2), 2, ENC_BIG_ENDIAN); if(reported_length_remaining == 16) { @@ -2848,7 +2848,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if(reported_length_remaining == 2) { - proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, FALSE); + proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, ENC_BIG_ENDIAN); offset = offset + 2; } } @@ -2861,9 +2861,9 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if(reported_length_remaining == 28) { - proto_tree_add_item(command_tree, hf_omron_disk_no, tvb, offset, 2, FALSE); + proto_tree_add_item(command_tree, hf_omron_disk_no, tvb, offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(command_tree, hf_omron_filename, tvb, (offset+2), 12, FALSE); - proto_tree_add_item(command_tree, hf_omron_disk_no, tvb, (offset+14), 2, FALSE); + proto_tree_add_item(command_tree, hf_omron_disk_no, tvb, (offset+14), 2, ENC_BIG_ENDIAN); proto_tree_add_item(command_tree, hf_omron_filename, tvb, (offset+16), 12, FALSE); offset = offset + 28; } @@ -2873,7 +2873,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if(reported_length_remaining == 2) { - proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, FALSE); + proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, ENC_BIG_ENDIAN); offset = offset + 2; } } @@ -2886,7 +2886,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if(reported_length_remaining == 26) { - proto_tree_add_item(command_tree, hf_omron_disk_no, tvb, offset, 2, FALSE); + proto_tree_add_item(command_tree, hf_omron_disk_no, tvb, offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(command_tree, hf_omron_filename, tvb, (offset+2), 12, FALSE); proto_tree_add_item(command_tree, hf_omron_filename, tvb, (offset+14), 12, FALSE); offset = offset + 26; @@ -2897,7 +2897,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if(reported_length_remaining == 2) { - proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, FALSE); + proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, ENC_BIG_ENDIAN); offset = offset + 2; } } @@ -2910,7 +2910,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if(reported_length_remaining == 14) { - proto_tree_add_item(command_tree, hf_omron_disk_no, tvb, offset, 2, FALSE); + proto_tree_add_item(command_tree, hf_omron_disk_no, tvb, offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(command_tree, hf_omron_filename, tvb, (offset+2), 12, FALSE); offset = offset + 14; } @@ -2920,7 +2920,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if(reported_length_remaining == 2) { - proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, FALSE); + proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, ENC_BIG_ENDIAN); offset = offset + 2; } } @@ -2933,11 +2933,11 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if(reported_length_remaining == 22) { - proto_tree_add_item(command_tree, hf_omron_transfer_parameter_code, tvb, offset, 2, FALSE); - proto_tree_add_item(command_tree, hf_omron_command_memory_area_code, tvb, (offset+2), 1, FALSE); - proto_tree_add_item(command_tree, hf_omron_transfer_beginning_address, tvb, (offset+3), 3, FALSE); - proto_tree_add_item(command_tree, hf_omron_num_items, tvb, (offset+6), 2, FALSE); - proto_tree_add_item(command_tree, hf_omron_disk_no, tvb, (offset+8), 2, FALSE); + proto_tree_add_item(command_tree, hf_omron_transfer_parameter_code, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(command_tree, hf_omron_command_memory_area_code, tvb, (offset+2), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(command_tree, hf_omron_transfer_beginning_address, tvb, (offset+3), 3, ENC_BIG_ENDIAN); + proto_tree_add_item(command_tree, hf_omron_num_items, tvb, (offset+6), 2, ENC_BIG_ENDIAN); + proto_tree_add_item(command_tree, hf_omron_disk_no, tvb, (offset+8), 2, ENC_BIG_ENDIAN); proto_tree_add_item(command_tree, hf_omron_filename, tvb, (offset+10), 12, FALSE); offset = offset + 22; } @@ -2947,8 +2947,8 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if(reported_length_remaining == 4) { - proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, FALSE); - proto_tree_add_item(command_tree, hf_omron_num_items, tvb, (offset+2), 2, FALSE); + proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(command_tree, hf_omron_num_items, tvb, (offset+2), 2, ENC_BIG_ENDIAN); offset = offset + 4; } } @@ -2961,11 +2961,11 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if(reported_length_remaining == 22) { - proto_tree_add_item(command_tree, hf_omron_transfer_parameter_code, tvb, offset, 2, FALSE); - proto_tree_add_item(command_tree, hf_omron_parameter_area_code, tvb, (offset+2), 2, FALSE); - proto_tree_add_item(command_tree, hf_omron_address, tvb, (offset+4), 2, FALSE); - proto_tree_add_item(command_tree, hf_omron_num_words, tvb, (offset+6), 2, FALSE); - proto_tree_add_item(command_tree, hf_omron_disk_no, tvb, (offset+8), 2, FALSE); + proto_tree_add_item(command_tree, hf_omron_transfer_parameter_code, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(command_tree, hf_omron_parameter_area_code, tvb, (offset+2), 2, ENC_BIG_ENDIAN); + proto_tree_add_item(command_tree, hf_omron_address, tvb, (offset+4), 2, ENC_BIG_ENDIAN); + proto_tree_add_item(command_tree, hf_omron_num_words, tvb, (offset+6), 2, ENC_BIG_ENDIAN); + proto_tree_add_item(command_tree, hf_omron_disk_no, tvb, (offset+8), 2, ENC_BIG_ENDIAN); proto_tree_add_item(command_tree, hf_omron_filename, tvb, (offset+10), 12, FALSE); offset = offset + 22; } @@ -2975,8 +2975,8 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if(reported_length_remaining == 4) { - proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, FALSE); - proto_tree_add_item(command_tree, hf_omron_num_words, tvb, (offset+2), 2, FALSE); + proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(command_tree, hf_omron_num_words, tvb, (offset+2), 2, ENC_BIG_ENDIAN); offset = offset + 4; } } @@ -2989,11 +2989,11 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if(reported_length_remaining == 26) { - proto_tree_add_item(command_tree, hf_omron_transfer_parameter_code, tvb, offset, 2, FALSE); - proto_tree_add_item(command_tree, hf_omron_program_number, tvb, (offset+2), 2, FALSE); - proto_tree_add_item(command_tree, hf_omron_begin_word, tvb, (offset+4), 4, FALSE); - proto_tree_add_item(command_tree, hf_omron_number_of_bytes, tvb, (offset+8), 4, FALSE); - proto_tree_add_item(command_tree, hf_omron_disk_no, tvb, (offset+12), 2, FALSE); + proto_tree_add_item(command_tree, hf_omron_transfer_parameter_code, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(command_tree, hf_omron_program_number, tvb, (offset+2), 2, ENC_BIG_ENDIAN); + proto_tree_add_item(command_tree, hf_omron_begin_word, tvb, (offset+4), 4, ENC_BIG_ENDIAN); + proto_tree_add_item(command_tree, hf_omron_number_of_bytes, tvb, (offset+8), 4, ENC_BIG_ENDIAN); + proto_tree_add_item(command_tree, hf_omron_disk_no, tvb, (offset+12), 2, ENC_BIG_ENDIAN); proto_tree_add_item(command_tree, hf_omron_filename, tvb, (offset+14), 12, FALSE); offset = offset + 26; } @@ -3003,8 +3003,8 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if(reported_length_remaining == 6) { - proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, FALSE); - proto_tree_add_item(command_tree, hf_omron_number_of_bytes, tvb, (offset+2), 4, FALSE); + proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(command_tree, hf_omron_number_of_bytes, tvb, (offset+2), 4, ENC_BIG_ENDIAN); offset = offset + 6; } } @@ -3017,8 +3017,8 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if(reported_length_remaining == 3) { - proto_tree_add_item(command_tree, hf_omron_beginning_block_num, tvb, offset, 2, FALSE); - proto_tree_add_item(command_tree, hf_omron_num_blocks, tvb, (offset+2), 1, FALSE); + proto_tree_add_item(command_tree, hf_omron_beginning_block_num, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(command_tree, hf_omron_num_blocks, tvb, (offset+2), 1, ENC_BIG_ENDIAN); offset = offset + 3; } } @@ -3027,10 +3027,10 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if(reported_length_remaining >= 9) { - proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, FALSE); - proto_tree_add_item(command_tree, hf_omron_num_blocks_remaining, tvb, (offset+2), 2, FALSE); - proto_tree_add_item(command_tree, hf_omron_total_num_blocks, tvb, (offset+4), 2, FALSE); - proto_tree_add_item(command_tree, hf_omron_type, tvb, (offset+6), 1, FALSE); + proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(command_tree, hf_omron_num_blocks_remaining, tvb, (offset+2), 2, ENC_BIG_ENDIAN); + proto_tree_add_item(command_tree, hf_omron_total_num_blocks, tvb, (offset+4), 2, ENC_BIG_ENDIAN); + proto_tree_add_item(command_tree, hf_omron_type, tvb, (offset+6), 1, ENC_BIG_ENDIAN); offset = offset + 7; reported_length_remaining = reported_length_remaining - 7; @@ -3038,7 +3038,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { proto_tree_add_bitmask(command_tree, tvb, offset, hf_omron_data_type, ett_omron_data_type, data_type_fields, FALSE); - proto_tree_add_item(command_tree, hf_omron_control_data, tvb, (offset+1), 1, FALSE); + 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; } @@ -3053,7 +3053,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if(reported_length_remaining == 2) { - proto_tree_add_item(command_tree, hf_omron_block_num, tvb, offset, 2, FALSE); + proto_tree_add_item(command_tree, hf_omron_block_num, tvb, offset, 2, ENC_BIG_ENDIAN); offset = offset + 2; } } @@ -3062,10 +3062,10 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if(reported_length_remaining >= 4) { - proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, FALSE); + 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); - proto_tree_add_item(command_tree, hf_omron_control_data, tvb, (offset+3), 1, FALSE); + 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; } @@ -3081,8 +3081,8 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { proto_tree_add_bitmask(command_tree, tvb, offset, hf_omron_data_type, ett_omron_data_type, data_type_fields, FALSE); - proto_tree_add_item(command_tree, hf_omron_control_data, tvb, (offset+1), 1, FALSE); - proto_tree_add_item(command_tree, hf_omron_block_num, tvb, (offset+2), 2, FALSE); + 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); offset = offset + reported_length_remaining; } @@ -3092,7 +3092,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if(reported_length_remaining == 2) { - proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, FALSE); + proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, ENC_BIG_ENDIAN); offset = offset + 2; } } @@ -3106,15 +3106,15 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if(reported_length_remaining >= 8) { - proto_tree_add_item(command_tree, hf_omron_number_of_bits_flags, tvb, offset, 2, FALSE); + proto_tree_add_item(command_tree, hf_omron_number_of_bits_flags, tvb, offset, 2, ENC_BIG_ENDIAN); offset = offset + 2; reported_length_remaining = reported_length_remaining - 2; while (reported_length_remaining >= 6) { - proto_tree_add_item(command_tree, hf_omron_set_reset_specification, tvb, offset, 2, FALSE); - proto_tree_add_item(command_tree, hf_omron_command_memory_area_code, tvb, (offset+2), 1, FALSE); - proto_tree_add_item(command_tree, hf_omron_bit_flag, tvb, (offset+3), 3, FALSE); + proto_tree_add_item(command_tree, hf_omron_set_reset_specification, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(command_tree, hf_omron_command_memory_area_code, tvb, (offset+2), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(command_tree, hf_omron_bit_flag, tvb, (offset+3), 3, ENC_BIG_ENDIAN); offset = offset + 6; reported_length_remaining = reported_length_remaining - 6; @@ -3126,7 +3126,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if(reported_length_remaining == 2) { - proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, FALSE); + proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, ENC_BIG_ENDIAN); offset = offset + 2; } } @@ -3141,7 +3141,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if(reported_length_remaining == 2) { - proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, FALSE); + proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, ENC_BIG_ENDIAN); offset = offset + 2; } } @@ -3155,9 +3155,9 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if(reported_length_remaining == 6) { - proto_tree_add_item(command_tree, hf_omron_command_memory_area_code, tvb, offset, 1, FALSE); - proto_tree_add_item(command_tree, hf_omron_transfer_beginning_address, tvb, (offset+1), 3, FALSE); - proto_tree_add_item(command_tree, hf_omron_num_unit_uint16, tvb, (offset+4), 2, FALSE); + proto_tree_add_item(command_tree, hf_omron_command_memory_area_code, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(command_tree, hf_omron_transfer_beginning_address, tvb, (offset+1), 3, ENC_BIG_ENDIAN); + proto_tree_add_item(command_tree, hf_omron_num_unit_uint16, tvb, (offset+4), 2, ENC_BIG_ENDIAN); offset = offset + 6; } } @@ -3166,10 +3166,10 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if(reported_length_remaining >= 8) { - proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, FALSE); - proto_tree_add_item(command_tree, hf_omron_command_memory_area_code, tvb, (offset+2), 1, FALSE); - proto_tree_add_item(command_tree, hf_omron_transfer_beginning_address, tvb, (offset+3), 3, FALSE); - proto_tree_add_item(command_tree, hf_omron_num_unit_uint16, tvb, (offset+6), 2, FALSE); + proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(command_tree, hf_omron_command_memory_area_code, tvb, (offset+2), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(command_tree, hf_omron_transfer_beginning_address, tvb, (offset+3), 3, ENC_BIG_ENDIAN); + proto_tree_add_item(command_tree, hf_omron_num_unit_uint16, tvb, (offset+6), 2, ENC_BIG_ENDIAN); proto_tree_add_item(command_tree, hf_omron_data, tvb, (offset+8), -1, ENC_NA); offset = offset + reported_length_remaining; } @@ -3192,7 +3192,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if(reported_length_remaining == 2) { - proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, FALSE); + proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, ENC_BIG_ENDIAN); offset = offset + 2; } } @@ -3207,7 +3207,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if(reported_length_remaining == 2) { - proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, FALSE); + proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, ENC_BIG_ENDIAN); offset = offset + 2; } } @@ -3222,7 +3222,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if((reported_length_remaining > 2) && (reported_length_remaining <= (2+8))) { - proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, FALSE); + proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(command_tree, hf_omron_name_data, tvb, offset, -1, FALSE); offset = offset + reported_length_remaining; } diff --git a/epan/dissectors/packet-opsi.c b/epan/dissectors/packet-opsi.c index d5ab0810af..f9027ffc77 100644 --- a/epan/dissectors/packet-opsi.c +++ b/epan/dissectors/packet-opsi.c @@ -589,12 +589,12 @@ dissect_opsi_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) return; } - proto_tree_add_item(opsi_tree, hf_opsi_major_version, tvb, MAJOR_VERSION_OFFSET, 1, FALSE); - proto_tree_add_item(opsi_tree, hf_opsi_minor_version, tvb, MINOR_VERSION_OFFSET, 1, FALSE); - proto_tree_add_item(opsi_tree, hf_opsi_opcode, tvb, CODE_OFFSET, 1, FALSE); - proto_tree_add_item(opsi_tree, hf_opsi_hook_id, tvb, HOOK_ID_OFFSET, 1, FALSE); - proto_tree_add_item(opsi_tree, hf_opsi_length, tvb, PACKET_LENGTH_OFFSET, 2, FALSE); - proto_tree_add_item(opsi_tree, hf_opsi_session_id, tvb, SESSION_OFFSET, 2, FALSE); + proto_tree_add_item(opsi_tree, hf_opsi_major_version, tvb, MAJOR_VERSION_OFFSET, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(opsi_tree, hf_opsi_minor_version, tvb, MINOR_VERSION_OFFSET, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(opsi_tree, hf_opsi_opcode, tvb, CODE_OFFSET, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(opsi_tree, hf_opsi_hook_id, tvb, HOOK_ID_OFFSET, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(opsi_tree, hf_opsi_length, tvb, PACKET_LENGTH_OFFSET, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(opsi_tree, hf_opsi_session_id, tvb, SESSION_OFFSET, 2, ENC_BIG_ENDIAN); dissect_attributes(tvb, opsi_tree, HEADER_LENGTH, MIN(((int)tvb_length(tvb)-HEADER_LENGTH), (tvb_get_ntohs(tvb, PACKET_LENGTH_OFFSET)-HEADER_LENGTH))); } diff --git a/epan/dissectors/packet-packetbb.c b/epan/dissectors/packet-packetbb.c index f6ca248920..5f0735d95e 100644 --- a/epan/dissectors/packet-packetbb.c +++ b/epan/dissectors/packet-packetbb.c @@ -165,7 +165,7 @@ static int dissect_pbb_tlvblock(tvbuff_t *tvb, proto_tree *tree, guint offset, tlvBlock_item = proto_tree_add_item(tree, hf_packetbb_tlvblock, tvb, offset, tlvblockEnd - offset, ENC_NA); tlvblock_tree = proto_item_add_subtree(tlvBlock_item, ett_packetbb_tlvblock); - proto_tree_add_item(tlvblock_tree, hf_packetbb_tlvblock_length, tvb, offset, 2, FALSE); + proto_tree_add_item(tlvblock_tree, hf_packetbb_tlvblock_length, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; while (offset < tlvblockEnd) { @@ -216,10 +216,10 @@ static int dissect_pbb_tlvblock(tvbuff_t *tvb, proto_tree *tree, guint offset, } /* add type */ - proto_tree_add_item(tlv_tree, hf_packetbb_tlv_type, tvb, offset++, 1, FALSE); + proto_tree_add_item(tlv_tree, hf_packetbb_tlv_type, tvb, offset++, 1, ENC_BIG_ENDIAN); /* add flags */ - tlvFlags_item = proto_tree_add_item(tlv_tree, hf_packetbb_tlv_flags, tvb, offset, 1, FALSE); + tlvFlags_item = proto_tree_add_item(tlv_tree, hf_packetbb_tlv_flags, tvb, offset, 1, ENC_BIG_ENDIAN); tlv_flags_tree = proto_item_add_subtree(tlvFlags_item, ett_packetbb_tlv_flags); proto_tree_add_item(tlv_flags_tree, hf_packetbb_tlv_flags_hastypext, tvb, offset, 1, FALSE); @@ -232,7 +232,7 @@ static int dissect_pbb_tlvblock(tvbuff_t *tvb, proto_tree *tree, guint offset, if ((tlvFlags & TLV_HAS_TYPEEXT) != 0) { /* add ext-type */ - proto_tree_add_item(tlv_tree, hf_packetbb_tlv_typeext, tvb, offset++, 1, FALSE); + proto_tree_add_item(tlv_tree, hf_packetbb_tlv_typeext, tvb, offset++, 1, ENC_BIG_ENDIAN); } if (addrCount > 0) { @@ -429,10 +429,10 @@ static int dissect_pbb_addressblock(tvbuff_t *tvb, proto_tree *tree, guint offse proto_item_append_text(addr_item, " (%d addresses)", numAddr); /* add num-addr */ - proto_tree_add_item(addr_tree, hf_packetbb_addr_num, tvb, block_index, 1, FALSE); + proto_tree_add_item(addr_tree, hf_packetbb_addr_num, tvb, block_index, 1, ENC_BIG_ENDIAN); /* add flags */ - addrFlags_item = proto_tree_add_item(addr_tree, hf_packetbb_addr_flags, tvb, block_index+1, 1, FALSE); + addrFlags_item = proto_tree_add_item(addr_tree, hf_packetbb_addr_flags, tvb, block_index+1, 1, ENC_BIG_ENDIAN); addrFlags_tree = proto_item_add_subtree(addrFlags_item, ett_packetbb_addr_flags); proto_tree_add_item(addrFlags_tree, hf_packetbb_addr_flags_hashead, tvb, block_index+1, 1, FALSE); @@ -485,11 +485,11 @@ static int dissect_pbb_addressblock(tvbuff_t *tvb, proto_tree *tree, guint offse if ((address_flags & ADDR_HASSINGLEPRELEN) != 0) { prefix = tvb_get_guint8(tvb, prefix_index); - proto_tree_add_item(addrValue_tree, hf_packetbb_addr_value_prefix, tvb, prefix_index, 1, FALSE); + proto_tree_add_item(addrValue_tree, hf_packetbb_addr_value_prefix, tvb, prefix_index, 1, ENC_BIG_ENDIAN); } else if ((address_flags & ADDR_HASMULTIPRELEN) != 0) { prefix = tvb_get_guint8(tvb, prefix_index + i); - proto_tree_add_item(addrValue_tree, hf_packetbb_addr_value_prefix, tvb, prefix_index + i, 1, FALSE); + proto_tree_add_item(addrValue_tree, hf_packetbb_addr_value_prefix, tvb, prefix_index + i, 1, ENC_BIG_ENDIAN); } proto_item_append_text(addrValue_item, "/%d", prefix); } @@ -571,7 +571,7 @@ static int dissect_pbb_message(tvbuff_t *tvb, proto_tree *tree, guint offset) { header_tree = proto_item_add_subtree(header_item, ett_packetbb_msgheader); /* type */ - proto_tree_add_item(header_tree, hf_packetbb_msgheader_type, tvb, offset, 1, FALSE); + proto_tree_add_item(header_tree, hf_packetbb_msgheader_type, tvb, offset, 1, ENC_BIG_ENDIAN); /* flags */ headerFlags_item = proto_tree_add_uint(header_tree, hf_packetbb_msgheader_flags, @@ -591,7 +591,7 @@ static int dissect_pbb_message(tvbuff_t *tvb, proto_tree *tree, guint offset) { tvb, offset + 1, 1, (messageFlags & 0x0f) + 1); /* size */ - proto_tree_add_item(header_tree, hf_packetbb_msgheader_size, tvb, offset+2, 2, FALSE); + proto_tree_add_item(header_tree, hf_packetbb_msgheader_size, tvb, offset+2, 2, ENC_BIG_ENDIAN); offset += 4; @@ -604,17 +604,17 @@ static int dissect_pbb_message(tvbuff_t *tvb, proto_tree *tree, guint offset) { /* hop limit */ if ((messageFlags & MSG_HEADER_HASHOPLIMIT) != 0) { - proto_tree_add_item(header_tree, hf_packetbb_msgheader_hoplimit, tvb, offset++, 1, FALSE); + proto_tree_add_item(header_tree, hf_packetbb_msgheader_hoplimit, tvb, offset++, 1, ENC_BIG_ENDIAN); } /* hop count */ if ((messageFlags & MSG_HEADER_HASHOPCOUNT) != 0) { - proto_tree_add_item(header_tree, hf_packetbb_msgheader_hopcount, tvb, offset++, 1, FALSE); + proto_tree_add_item(header_tree, hf_packetbb_msgheader_hopcount, tvb, offset++, 1, ENC_BIG_ENDIAN); } /* sequence number */ if ((messageFlags & MSG_HEADER_HASSEQNR) != 0) { - proto_tree_add_item(header_tree, hf_packetbb_msgheader_seqnr, tvb, offset, 2, FALSE); + proto_tree_add_item(header_tree, hf_packetbb_msgheader_seqnr, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; } @@ -676,7 +676,7 @@ static int dissect_pbb_header(tvbuff_t *tvb, proto_tree *tree) { /* sequence number */ if ((packet_flags & PACKET_HEADER_HASSEQNR) != 0) { - proto_tree_add_item(header_tree, hf_packetbb_seqnr, tvb, 1, 2, FALSE); + proto_tree_add_item(header_tree, hf_packetbb_seqnr, tvb, 1, 2, ENC_BIG_ENDIAN); } if ((packet_flags & PACKET_HEADER_HASTLV) != 0) { diff --git a/epan/dissectors/packet-paltalk.c b/epan/dissectors/packet-paltalk.c index 9f502dbbe7..9b3c8a7cbd 100644 --- a/epan/dissectors/packet-paltalk.c +++ b/epan/dissectors/packet-paltalk.c @@ -104,9 +104,9 @@ dissect_paltalk_desegmented(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { ti = proto_tree_add_item(tree, proto_paltalk, tvb, 0, -1, FALSE); pt_tree = proto_item_add_subtree(ti, ett_paltalk); - proto_tree_add_item(pt_tree, hf_paltalk_pdu_type, tvb, 0, 2, FALSE); - proto_tree_add_item(pt_tree, hf_paltalk_version, tvb, 2, 2, FALSE); - proto_tree_add_item(pt_tree, hf_paltalk_length, tvb, 4, 2, FALSE); + proto_tree_add_item(pt_tree, hf_paltalk_pdu_type, tvb, 0, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(pt_tree, hf_paltalk_version, tvb, 2, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(pt_tree, hf_paltalk_length, tvb, 4, 2, ENC_BIG_ENDIAN); proto_tree_add_item(pt_tree, hf_paltalk_content, tvb, 6, tvb_get_ntohs(tvb, 4), ENC_NA); } } diff --git a/epan/dissectors/packet-pcnfsd.c b/epan/dissectors/packet-pcnfsd.c index 755771fa46..410b8642c3 100644 --- a/epan/dissectors/packet-pcnfsd.c +++ b/epan/dissectors/packet-pcnfsd.c @@ -284,7 +284,7 @@ dissect_pcnfsd2_auth_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, gtree = proto_item_add_subtree(gitem, ett_pcnfsd_gids); } if (gtree) { - proto_tree_add_item(gtree, hf_pcnfsd_gids_count, tvb, offset, 4, FALSE); + proto_tree_add_item(gtree, hf_pcnfsd_gids_count, tvb, offset, 4, ENC_BIG_ENDIAN); } offset += 4; for (gids_i = 0 ; gids_i < gids_count ; gids_i++) { diff --git a/epan/dissectors/packet-pdcp-lte.c b/epan/dissectors/packet-pdcp-lte.c index 1137878dc1..75f86fc5c1 100644 --- a/epan/dissectors/packet-pdcp-lte.c +++ b/epan/dissectors/packet-pdcp-lte.c @@ -678,25 +678,25 @@ static int dissect_pdcp_dynamic_chain(proto_tree *tree, /* ToS */ tos = tvb_get_guint8(tvb, offset); - proto_tree_add_item(dynamic_ipv4_tree, hf_pdcp_lte_rohc_dynamic_ipv4_tos, tvb, offset, 1, FALSE); + proto_tree_add_item(dynamic_ipv4_tree, hf_pdcp_lte_rohc_dynamic_ipv4_tos, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; /* TTL */ ttl = tvb_get_guint8(tvb, offset); - proto_tree_add_item(dynamic_ipv4_tree, hf_pdcp_lte_rohc_dynamic_ipv4_ttl, tvb, offset, 1, FALSE); + proto_tree_add_item(dynamic_ipv4_tree, hf_pdcp_lte_rohc_dynamic_ipv4_ttl, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; /* IP-ID */ id = tvb_get_guint8(tvb, offset); - proto_tree_add_item(dynamic_ipv4_tree, hf_pdcp_lte_rohc_dynamic_ipv4_id, tvb, offset, 1, FALSE); + proto_tree_add_item(dynamic_ipv4_tree, hf_pdcp_lte_rohc_dynamic_ipv4_id, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; /* IP flags */ rnd = (tvb_get_guint8(tvb, offset) & 0x40) >> 6; nbo = (tvb_get_guint8(tvb, offset) & 0x20) >> 5; - proto_tree_add_item(dynamic_ipv4_tree, hf_pdcp_lte_rohc_dynamic_ipv4_df, tvb, offset, 1, FALSE); - proto_tree_add_item(dynamic_ipv4_tree, hf_pdcp_lte_rohc_dynamic_ipv4_rnd, tvb, offset, 1, FALSE); - proto_tree_add_item(dynamic_ipv4_tree, hf_pdcp_lte_rohc_dynamic_ipv4_nbo, tvb, offset, 1, FALSE); + proto_tree_add_item(dynamic_ipv4_tree, hf_pdcp_lte_rohc_dynamic_ipv4_df, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(dynamic_ipv4_tree, hf_pdcp_lte_rohc_dynamic_ipv4_rnd, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(dynamic_ipv4_tree, hf_pdcp_lte_rohc_dynamic_ipv4_nbo, tvb, offset, 1, ENC_BIG_ENDIAN); /* TODO: general extension header list... */ offset += 3; @@ -723,14 +723,14 @@ static int dissect_pdcp_dynamic_chain(proto_tree *tree, /* 16-bit checksum */ checksum = tvb_get_ntohs(tvb, offset); - proto_tree_add_item(dynamic_udp_tree, hf_pdcp_lte_rohc_dynamic_udp_checksum, tvb, offset, 2, FALSE); + proto_tree_add_item(dynamic_udp_tree, hf_pdcp_lte_rohc_dynamic_udp_checksum, tvb, offset, 2, ENC_BIG_ENDIAN); offset +=2; if (p_pdcp_info->profile == 2) { guint16 seqnum; seqnum = tvb_get_ntohs(tvb, offset); - proto_tree_add_item(dynamic_udp_tree, hf_pdcp_lte_rohc_dynamic_udp_seqnum, tvb, offset, 2, FALSE); + proto_tree_add_item(dynamic_udp_tree, hf_pdcp_lte_rohc_dynamic_udp_seqnum, tvb, offset, 2, ENC_BIG_ENDIAN); offset +=2; /* Add summary to root item */ @@ -761,9 +761,9 @@ static int dissect_pdcp_dynamic_chain(proto_tree *tree, /* TODO: */ /* V | P | RX | CC */ rx = tvb_get_guint8(tvb, offset) & 0x10; - proto_tree_add_item(dynamic_rtp_tree, hf_pdcp_lte_rohc_dynamic_rtp_rx, tvb, offset, 1, FALSE); + proto_tree_add_item(dynamic_rtp_tree, hf_pdcp_lte_rohc_dynamic_rtp_rx, tvb, offset, 1, ENC_BIG_ENDIAN); /*contributing_csrcs = tvb_get_guint8(tvb, offset) & 0x0f;*/ - proto_tree_add_item(dynamic_rtp_tree, hf_pdcp_lte_rohc_dynamic_rtp_cc, tvb, offset, 1, FALSE); + proto_tree_add_item(dynamic_rtp_tree, hf_pdcp_lte_rohc_dynamic_rtp_cc, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; /* TODO: */ @@ -772,12 +772,12 @@ static int dissect_pdcp_dynamic_chain(proto_tree *tree, /* Sequence number */ sequence_number = tvb_get_ntohs(tvb, offset); - proto_tree_add_item(dynamic_rtp_tree, hf_pdcp_lte_rohc_dynamic_rtp_seqnum, tvb, offset, 2, FALSE); + proto_tree_add_item(dynamic_rtp_tree, hf_pdcp_lte_rohc_dynamic_rtp_seqnum, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; /* Timestamp (4 octets) */ timestamp = tvb_get_ntohl(tvb, offset); - proto_tree_add_item(dynamic_rtp_tree, hf_pdcp_lte_rohc_dynamic_rtp_timestamp, tvb, offset, 4, FALSE); + proto_tree_add_item(dynamic_rtp_tree, hf_pdcp_lte_rohc_dynamic_rtp_timestamp, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; /* TODO: CSRC list */ @@ -788,7 +788,7 @@ static int dissect_pdcp_dynamic_chain(proto_tree *tree, if (rx) { guint8 this_byte = tvb_get_guint8(tvb, offset); proto_item *reserved_ti = proto_tree_add_item(dynamic_rtp_tree, hf_pdcp_lte_rohc_dynamic_rtp_reserved3, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); /* Check reserved bits are 0 */ if ((this_byte & 0xe0) != 0) { @@ -796,12 +796,12 @@ static int dissect_pdcp_dynamic_chain(proto_tree *tree, "Reserved bits have value 0x%x - should be 0x0", (this_byte & 0xe0)); } - proto_tree_add_item(dynamic_rtp_tree, hf_pdcp_lte_rohc_dynamic_rtp_x, tvb, offset, 1, FALSE); - proto_tree_add_item(dynamic_rtp_tree, hf_pdcp_lte_rohc_dynamic_rtp_mode, tvb, offset, 1, FALSE); + proto_tree_add_item(dynamic_rtp_tree, hf_pdcp_lte_rohc_dynamic_rtp_x, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(dynamic_rtp_tree, hf_pdcp_lte_rohc_dynamic_rtp_mode, tvb, offset, 1, ENC_BIG_ENDIAN); tss = (this_byte & 0x02); - proto_tree_add_item(dynamic_rtp_tree, hf_pdcp_lte_rohc_dynamic_rtp_tss, tvb, offset, 1, FALSE); + proto_tree_add_item(dynamic_rtp_tree, hf_pdcp_lte_rohc_dynamic_rtp_tss, tvb, offset, 1, ENC_BIG_ENDIAN); tis = (this_byte & 0x01); - proto_tree_add_item(dynamic_rtp_tree, hf_pdcp_lte_rohc_dynamic_rtp_tis, tvb, offset, 1, FALSE); + proto_tree_add_item(dynamic_rtp_tree, hf_pdcp_lte_rohc_dynamic_rtp_tis, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; } @@ -848,11 +848,11 @@ static int dissect_pdcp_irdyn_packet(proto_tree *tree, } /* Profile */ - proto_tree_add_item(tree, hf_pdcp_lte_rohc_profile, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_pdcp_lte_rohc_profile, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; /* 8-bit CRC */ - proto_tree_add_item(tree, hf_pdcp_lte_rohc_ir_crc, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_pdcp_lte_rohc_ir_crc, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; /* Dissect dynamic chain */ @@ -880,7 +880,7 @@ static int dissect_pdcp_ir_packet(proto_tree *tree, /* Is dynamic chain present? */ dynamic_chain_present = tvb_get_guint8(tvb, offset) & 0x1; - proto_tree_add_item(tree, hf_pdcp_lte_rohc_d, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_pdcp_lte_rohc_d, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; /* Large CID */ @@ -889,11 +889,11 @@ static int dissect_pdcp_ir_packet(proto_tree *tree, } /* Profile */ - proto_tree_add_item(tree, hf_pdcp_lte_rohc_profile, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_pdcp_lte_rohc_profile, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; /* 8-bit CRC */ - proto_tree_add_item(tree, hf_pdcp_lte_rohc_ir_crc, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_pdcp_lte_rohc_ir_crc, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; /* IPv4 static part */ @@ -909,12 +909,12 @@ static int dissect_pdcp_ir_packet(proto_tree *tree, static_ipv4_tree = proto_item_add_subtree(root_ti, ett_pdcp_rohc_static_ipv4); /* IP version (must be 4) */ - proto_tree_add_item(static_ipv4_tree, hf_pdcp_lte_rohc_ip_version, tvb, offset, 1, FALSE); + proto_tree_add_item(static_ipv4_tree, hf_pdcp_lte_rohc_ip_version, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; /* Protocol */ protocol = tvb_get_guint8(tvb, offset); - proto_tree_add_item(static_ipv4_tree, hf_pdcp_lte_rohc_ip_protocol, tvb, offset, 1, FALSE); + proto_tree_add_item(static_ipv4_tree, hf_pdcp_lte_rohc_ip_protocol, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; /* Source address */ @@ -952,12 +952,12 @@ static int dissect_pdcp_ir_packet(proto_tree *tree, /* Source port */ source_port = tvb_get_ntohs(tvb, offset); - proto_tree_add_item(static_udp_tree, hf_pdcp_lte_rohc_static_udp_src_port, tvb, offset, 2, FALSE); + proto_tree_add_item(static_udp_tree, hf_pdcp_lte_rohc_static_udp_src_port, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; /* Dest port */ dest_port = tvb_get_ntohs(tvb, offset); - proto_tree_add_item(static_udp_tree, hf_pdcp_lte_rohc_static_udp_src_port, tvb, offset, 2, FALSE); + proto_tree_add_item(static_udp_tree, hf_pdcp_lte_rohc_static_udp_src_port, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; /* Set proper length for subtree */ @@ -979,7 +979,7 @@ static int dissect_pdcp_ir_packet(proto_tree *tree, /* SSRC */ ssrc = tvb_get_ntohl(tvb, offset); - proto_tree_add_item(static_rtp_tree, hf_pdcp_lte_rohc_static_rtp_ssrc, tvb, offset, 4, FALSE); + proto_tree_add_item(static_rtp_tree, hf_pdcp_lte_rohc_static_rtp_ssrc, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; /* Add summary to root item */ @@ -1015,7 +1015,7 @@ static int dissect_pdcp_feedback_feedback1(proto_tree *tree, /* TODO: profile-specific */ sn = tvb_get_guint8(tvb, offset); - proto_tree_add_item(tree, hf_pdcp_lte_rohc_feedback_feedback1, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_pdcp_lte_rohc_feedback_feedback1, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; col_append_fstr(pinfo->cinfo, COL_INFO, " (sn=%u)", sn); @@ -1054,13 +1054,13 @@ static int dissect_pdcp_feedback_feedback2(proto_tree *tree, /* Ack-type */ first_octet = tvb_get_guint8(tvb, offset); ack_type = (first_octet & 0xc0) >> 6; - proto_tree_add_item(tree, hf_pdcp_lte_rohc_feedback_ack_type, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_pdcp_lte_rohc_feedback_ack_type, tvb, offset, 1, ENC_BIG_ENDIAN); /* TODO: expert info on NACK? */ /* Mode */ mode = (first_octet & 0x30) >> 4; - proto_tree_add_item(tree, hf_pdcp_lte_rohc_feedback_mode, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_pdcp_lte_rohc_feedback_mode, tvb, offset, 1, ENC_BIG_ENDIAN); /* Show ACK-TYPE(Mode) in info column */ full_mode_name = val_to_str_const(mode, rohc_mode_vals, "Error"); @@ -1070,7 +1070,7 @@ static int dissect_pdcp_feedback_feedback2(proto_tree *tree, full_mode_name[0]); /* 11 bits of SN */ - proto_tree_add_item(tree, hf_pdcp_lte_rohc_feedback_sn, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_pdcp_lte_rohc_feedback_sn, tvb, offset, 2, ENC_BIG_ENDIAN); sn = tvb_get_ntohs(tvb, offset) & 0x7ff; offset += 2; @@ -1086,8 +1086,8 @@ static int dissect_pdcp_feedback_feedback2(proto_tree *tree, /* Preference setting controls showing option and lengths */ if (global_pdcp_show_feedback_option_tag_length) { - proto_tree_add_item(tree, hf_pdcp_lte_rohc_feedback_option, tvb, offset, 1, FALSE); - proto_tree_add_item(tree, hf_pdcp_lte_rohc_feedback_length, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_pdcp_lte_rohc_feedback_option, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_pdcp_lte_rohc_feedback_length, tvb, offset, 1, ENC_BIG_ENDIAN); } offset++; size_remaining--; @@ -1097,7 +1097,7 @@ static int dissect_pdcp_feedback_feedback2(proto_tree *tree, case 1: /* CRC */ one_byte_value = tvb_get_guint8(tvb, offset); - proto_tree_add_item(tree, hf_pdcp_lte_rohc_feedback_crc, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_pdcp_lte_rohc_feedback_crc, tvb, offset, 1, ENC_BIG_ENDIAN); col_append_fstr(pinfo->cinfo, COL_INFO, " CRC=%u ", one_byte_value); break; case 2: @@ -1109,13 +1109,13 @@ static int dissect_pdcp_feedback_feedback2(proto_tree *tree, case 4: /* SN */ one_byte_value = tvb_get_guint8(tvb, offset); - proto_tree_add_item(tree, hf_pdcp_lte_rohc_feedback_option_sn, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_pdcp_lte_rohc_feedback_option_sn, tvb, offset, 1, ENC_BIG_ENDIAN); col_append_fstr(pinfo->cinfo, COL_INFO, " SN=%u ", one_byte_value); break; case 5: /* Clock */ one_byte_value = tvb_get_guint8(tvb, offset); - proto_tree_add_item(tree, hf_pdcp_lte_rohc_feedback_option_clock, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_pdcp_lte_rohc_feedback_option_clock, tvb, offset, 1, ENC_BIG_ENDIAN); col_append_fstr(pinfo->cinfo, COL_INFO, " Clock=%u ", one_byte_value); break; case 6: @@ -1172,7 +1172,7 @@ static int dissect_pdcp_feedback_packet(proto_tree *tree, size = code; } else { - proto_tree_add_item(feedback_tree, hf_pdcp_lte_rohc_feedback_size, tvb, offset, 1, FALSE); + proto_tree_add_item(feedback_tree, hf_pdcp_lte_rohc_feedback_size, tvb, offset, 1, ENC_BIG_ENDIAN); size = tvb_get_guint8(tvb, offset); offset++; } @@ -1187,7 +1187,7 @@ static int dissect_pdcp_feedback_packet(proto_tree *tree, } else if ((size > 1) && ((tvb_get_guint8(tvb, offset) & 0xc0) == 0xc0)) { /* Add-CID here! */ - proto_tree_add_item(feedback_tree, hf_pdcp_lte_rohc_add_cid, tvb, offset, 1, FALSE); + proto_tree_add_item(feedback_tree, hf_pdcp_lte_rohc_add_cid, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; if (size == 2) { @@ -1225,7 +1225,7 @@ static int dissect_pdcp_r_0_packet(proto_tree *tree, /* 6 bits of sn */ sn = tvb_get_guint8(tvb, offset) & 0x3f; - proto_tree_add_item(tree, hf_pdcp_lte_rohc_r0_sn, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_pdcp_lte_rohc_r0_sn, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; /* Large CID */ @@ -1270,7 +1270,7 @@ static int dissect_pdcp_r_0_crc_packet(proto_tree *tree, proto_tree_add_uint(tree, hf_pdcp_lte_rohc_r0_crc_sn, tvb, offset, 1, sn); /* 7 bit CRC */ - proto_tree_add_item(tree, hf_pdcp_lte_rohc_r0_crc_crc, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_pdcp_lte_rohc_r0_crc_crc, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; /* Show SN in info column */ @@ -1296,10 +1296,10 @@ static int dissect_pdcp_uo_0_packet(proto_tree *tree, /* SN */ sn = (tvb_get_guint8(tvb, offset) & 0x78) >> 3; - proto_tree_add_item(tree, hf_pdcp_lte_rohc_uo0_sn, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_pdcp_lte_rohc_uo0_sn, tvb, offset, 1, ENC_BIG_ENDIAN); /* CRC (3 bits) */ - proto_tree_add_item(tree, hf_pdcp_lte_rohc_uo0_crc, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_pdcp_lte_rohc_uo0_crc, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; @@ -1367,7 +1367,7 @@ static int dissect_pdcp_r_1_ts_or_id_packet(proto_tree *tree, /* T determines frame type */ T = tvb_get_guint8(tvb, ++offset) >> 7; - proto_tree_add_item(tree, hf_pdcp_lte_rohc_type1_t, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_pdcp_lte_rohc_type1_t, tvb, offset, 1, ENC_BIG_ENDIAN); if (T) { col_append_str(pinfo->cinfo, COL_INFO, " R-1-TS"); proto_item_append_text(root_item, " (R-1-TS)"); @@ -1440,7 +1440,7 @@ static int dissect_pdcp_uo_1_ts_or_id_packet(proto_tree *tree, /* T determines frame type */ T = tvb_get_guint8(tvb, ++offset) >> 5; - proto_tree_add_item(tree, hf_pdcp_lte_rohc_type0_t, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_pdcp_lte_rohc_type0_t, tvb, offset, 1, ENC_BIG_ENDIAN); if (T) { col_append_str(pinfo->cinfo, COL_INFO, " UO-1-TS"); proto_item_append_text(root_item, " (UO-1-TS)"); @@ -1493,14 +1493,14 @@ static int dissect_pdcp_uor_2_packet(proto_tree *tree, if (p_pdcp_info->profile == 1) { /* M */ - proto_tree_add_item(tree, hf_pdcp_lte_rohc_m, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_pdcp_lte_rohc_m, tvb, offset, 1, ENC_BIG_ENDIAN); /* SN (6 bits) */ - proto_tree_add_item(tree, hf_pdcp_lte_rohc_uor2_sn, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_pdcp_lte_rohc_uor2_sn, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; /* X (one bit) */ - proto_tree_add_item(tree, hf_pdcp_lte_rohc_uor2_x, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_pdcp_lte_rohc_uor2_x, tvb, offset, 1, ENC_BIG_ENDIAN); /* TODO: CRC */ offset++; @@ -1532,7 +1532,7 @@ static int dissect_pdcp_uor_2_ts_or_id_packet(proto_tree *tree, /* T determines frame type */ T = tvb_get_guint8(tvb, offset) >> 7; - proto_tree_add_item(tree, hf_pdcp_lte_rohc_type2_t, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_pdcp_lte_rohc_type2_t, tvb, offset, 1, ENC_BIG_ENDIAN); if (T) { col_append_str(pinfo->cinfo, COL_INFO, " U0R-2-TS"); @@ -1957,7 +1957,7 @@ static void dissect_pdcp_lte(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree /* 5-bit sequence number */ seqnum = tvb_get_guint8(tvb, offset) & 0x1f; seqnum_set = TRUE; - proto_tree_add_item(pdcp_tree, hf_pdcp_lte_seq_num_5, tvb, offset, 1, FALSE); + proto_tree_add_item(pdcp_tree, hf_pdcp_lte_seq_num_5, tvb, offset, 1, ENC_BIG_ENDIAN); write_pdu_label_and_info(root_ti, pinfo, " sn=%-2u ", seqnum); offset++; @@ -1991,7 +1991,7 @@ static void dissect_pdcp_lte(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree /* Last 4 bytes are MAC */ mac = tvb_get_ntohl(tvb, offset); - proto_tree_add_item(pdcp_tree, hf_pdcp_lte_mac, tvb, offset, 4, FALSE); + proto_tree_add_item(pdcp_tree, hf_pdcp_lte_mac, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; col_append_fstr(pinfo->cinfo, COL_INFO, " MAC=0x%08x (%u bytes data)", @@ -2005,7 +2005,7 @@ static void dissect_pdcp_lte(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree gboolean pdu_type = (tvb_get_guint8(tvb, offset) & 0x80) >> 7; /* Data/Control flag */ - proto_tree_add_item(pdcp_tree, hf_pdcp_lte_data_control, tvb, offset, 1, FALSE); + proto_tree_add_item(pdcp_tree, hf_pdcp_lte_data_control, tvb, offset, 1, ENC_BIG_ENDIAN); if (pdu_type == 1) { /*****************************/ @@ -2015,7 +2015,7 @@ static void dissect_pdcp_lte(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree if (p_pdcp_info->seqnum_length == PDCP_SN_LENGTH_7_BITS) { seqnum = tvb_get_guint8(tvb, offset) & 0x7f; seqnum_set = TRUE; - proto_tree_add_item(pdcp_tree, hf_pdcp_lte_seq_num_7, tvb, offset, 1, FALSE); + proto_tree_add_item(pdcp_tree, hf_pdcp_lte_seq_num_7, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; } else if (p_pdcp_info->seqnum_length == PDCP_SN_LENGTH_12_BITS) { @@ -2023,7 +2023,7 @@ static void dissect_pdcp_lte(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree guint8 reserved_value; /* 3 reserved bits */ - ti = proto_tree_add_item(pdcp_tree, hf_pdcp_lte_reserved3, tvb, offset, 1, FALSE); + ti = proto_tree_add_item(pdcp_tree, hf_pdcp_lte_reserved3, tvb, offset, 1, ENC_BIG_ENDIAN); reserved_value = (tvb_get_guint8(tvb, offset) & 0x70) >> 4; /* Complain if not 0 */ @@ -2036,7 +2036,7 @@ static void dissect_pdcp_lte(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree /* 12-bit sequence number */ seqnum = tvb_get_ntohs(tvb, offset) & 0x0fff; seqnum_set = TRUE; - proto_tree_add_item(pdcp_tree, hf_pdcp_lte_seq_num_12, tvb, offset, 2, FALSE); + proto_tree_add_item(pdcp_tree, hf_pdcp_lte_seq_num_12, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; } else { @@ -2050,7 +2050,7 @@ static void dissect_pdcp_lte(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree /*******************************/ /* User-plane Control messages */ guint8 control_pdu_type = (tvb_get_guint8(tvb, offset) & 0x70) >> 4; - proto_tree_add_item(pdcp_tree, hf_pdcp_lte_control_pdu_type, tvb, offset, 1, FALSE); + proto_tree_add_item(pdcp_tree, hf_pdcp_lte_control_pdu_type, tvb, offset, 1, ENC_BIG_ENDIAN); switch (control_pdu_type) { case 0: /* PDCP status report */ @@ -2065,7 +2065,7 @@ static void dissect_pdcp_lte(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree fms = tvb_get_ntohs(tvb, offset) & 0x0fff; sn = (fms + 1) % 4096; proto_tree_add_item(pdcp_tree, hf_pdcp_lte_fms, tvb, - offset, 2, FALSE); + offset, 2, ENC_BIG_ENDIAN); offset += 2; /* Bitmap tree */ @@ -2216,7 +2216,7 @@ static void dissect_pdcp_lte(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree !p_pdcp_info->large_cid_present) { if (((tvb_get_guint8(tvb, offset) >> 4) & 0x0f) == 0x0e) { - proto_tree_add_item(rohc_tree, hf_pdcp_lte_rohc_add_cid, tvb, offset, 1, FALSE); + proto_tree_add_item(rohc_tree, hf_pdcp_lte_rohc_add_cid, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; } else { @@ -2341,13 +2341,13 @@ static void dissect_pdcp_lte(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree /* IP-ID */ if (p_pdcp_info->rnd && ip_id_needed) { - proto_tree_add_item(rohc_tree, hf_pdcp_lte_rohc_ip_id, tvb, offset, 2, FALSE); + proto_tree_add_item(rohc_tree, hf_pdcp_lte_rohc_ip_id, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; } /* UDP Checksum */ if (p_pdcp_info->udp_checkum_present && udp_checksum_needed) { - proto_tree_add_item(rohc_tree, hf_pdcp_lte_rohc_udp_checksum, tvb, offset, 2, FALSE); + proto_tree_add_item(rohc_tree, hf_pdcp_lte_rohc_udp_checksum, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; } diff --git a/epan/dissectors/packet-pgm.c b/epan/dissectors/packet-pgm.c index 09ab7886ac..fbaf5f2152 100644 --- a/epan/dissectors/packet-pgm.c +++ b/epan/dissectors/packet-pgm.c @@ -897,9 +897,9 @@ dissect_pgm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) cursor = ptvcursor_new(pgm_tree, tvb, 0); - hidden_item = proto_tree_add_item(pgm_tree, hf_pgm_port, tvb, 0, 2, FALSE); + hidden_item = proto_tree_add_item(pgm_tree, hf_pgm_port, tvb, 0, 2, ENC_BIG_ENDIAN); PROTO_ITEM_SET_HIDDEN(hidden_item); - hidden_item = proto_tree_add_item(pgm_tree, hf_pgm_port, tvb, 2, 2, FALSE); + hidden_item = proto_tree_add_item(pgm_tree, hf_pgm_port, tvb, 2, 2, ENC_BIG_ENDIAN); PROTO_ITEM_SET_HIDDEN(hidden_item); ptvcursor_add(cursor, hf_pgm_main_sport, 2, FALSE); ptvcursor_add(cursor, hf_pgm_main_dport, 2, FALSE); diff --git a/epan/dissectors/packet-pim.c b/epan/dissectors/packet-pim.c index 9df585beaf..168cbc23c9 100644 --- a/epan/dissectors/packet-pim.c +++ b/epan/dissectors/packet-pim.c @@ -176,7 +176,7 @@ dissect_pimv1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, offset, 2, pim_cksum); offset += 2; - proto_tree_add_item(pim_tree, hf_pim_version, tvb, offset, 1, FALSE); + proto_tree_add_item(pim_tree, hf_pim_version, tvb, offset, 1, ENC_BIG_ENDIAN); return offset+tvb_length_remaining(tvb, offset); } @@ -227,7 +227,7 @@ dissect_pimv1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, } offset += 2; - proto_tree_add_item(pim_tree, hf_pim_version, tvb, offset, 1, FALSE); + proto_tree_add_item(pim_tree, hf_pim_version, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; offset += 3; /* skip reserved stuff */ @@ -244,7 +244,7 @@ dissect_pimv1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, { guint16 holdtime; - proto_tree_add_item(pimopt_tree, hf_pim_mode, tvb, offset, 1, FALSE); + proto_tree_add_item(pimopt_tree, hf_pim_mode, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 2; holdtime = tvb_get_ntohs(tvb, offset); @@ -376,7 +376,7 @@ dissect_pimv1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, offset += 1; ngroup = tvb_get_guint8(tvb, offset); - proto_tree_add_item(pimopt_tree, hf_pim_numgroups, tvb, offset, 1, FALSE); + proto_tree_add_item(pimopt_tree, hf_pim_numgroups, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; for (i = 0; i < ngroup; i++) { @@ -398,7 +398,7 @@ dissect_pimv1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, njoin = tvb_get_ntohs(tvb, offset); nprune = tvb_get_ntohs(tvb, offset + 2); tisub = proto_tree_add_item(grouptree, hf_pim_numjoins, tvb, - offset, 2, FALSE); + offset, 2, ENC_BIG_ENDIAN); subtree = proto_item_add_subtree(tisub, ett_pim); off = offset + 4; for (j = 0; j < njoin; j++) { @@ -409,7 +409,7 @@ dissect_pimv1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, } tisub = proto_tree_add_item(grouptree, hf_pim_numprunes, tvb, - offset + 2, 2, FALSE); + offset + 2, 2, ENC_BIG_ENDIAN); subtree = proto_item_add_subtree(tisub, ett_pim); for (j = 0; j < nprune; j++) { s = dissect_pimv1_addr(tvb, off); @@ -473,7 +473,7 @@ dissect_pimv1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, "Metric Preference: %u", pref); offset += 4; - proto_tree_add_item(pimopt_tree, hf_pim_metric, tvb, offset, 4, FALSE); + proto_tree_add_item(pimopt_tree, hf_pim_metric, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; break; } @@ -657,8 +657,8 @@ dissect_pim(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { ti = proto_tree_add_item(tree, proto_pim, tvb, offset, -1, FALSE); pim_tree = proto_item_add_subtree(ti, ett_pim); - proto_tree_add_item(pim_tree, hf_pim_version, tvb, offset, 1, FALSE); - proto_tree_add_item(pim_tree, hf_pim_type, tvb, offset, 1, FALSE); + proto_tree_add_item(pim_tree, hf_pim_version, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(pim_tree, hf_pim_type, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(pim_tree, hf_pim_res_bytes, tvb, offset + 1, 1, ENC_NA); pim_cksum = tvb_get_ntohs(tvb, offset + 2); length = tvb_length(tvb); @@ -769,8 +769,8 @@ dissect_pim(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { "Option %u: %s", hello_opt, val_to_str(hello_opt, pim_opt_vals, "Unknown: %u")); opt_tree = proto_item_add_subtree(opt_item, ett_pim_opt); - proto_tree_add_item(opt_tree, hf_pim_optiontype, tvb, offset, 2, FALSE); - proto_tree_add_item(opt_tree, hf_pim_optionlength, tvb, offset + 2, 2, FALSE); + proto_tree_add_item(opt_tree, hf_pim_optiontype, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(opt_tree, hf_pim_optionlength, tvb, offset + 2, 2, ENC_BIG_ENDIAN); switch(hello_opt) { case 1: /* Hello Hold Time Option */ @@ -786,8 +786,8 @@ dissect_pim(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { case 2: /* LAN Prune Delay Option */ proto_tree_add_item(opt_tree, hf_pim_t, tvb, offset + 4, 1, FALSE); - proto_tree_add_item(opt_tree, hf_pim_propagation_delay, tvb, offset + 4, 2, FALSE); - proto_tree_add_item(opt_tree, hf_pim_override_interval, tvb, offset + 6, 2, FALSE); + proto_tree_add_item(opt_tree, hf_pim_propagation_delay, tvb, offset + 4, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(opt_tree, hf_pim_override_interval, tvb, offset + 6, 2, ENC_BIG_ENDIAN); proto_item_append_text(opt_item, ": T = %u, Propagation Delay = %ums, Override Interval = %ums", tvb_get_guint8(tvb, offset + 4) & 0x80 ? 1 : 0, @@ -796,19 +796,19 @@ dissect_pim(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { break; case 19: /* DR priority */ - proto_tree_add_item(opt_tree, hf_pim_dr_priority, tvb, offset + 4, 4, FALSE); + proto_tree_add_item(opt_tree, hf_pim_dr_priority, tvb, offset + 4, 4, ENC_BIG_ENDIAN); proto_item_append_text(opt_item, ": %u", tvb_get_ntohl(tvb, offset + 4)); break; case 20: /* Generation ID */ - proto_tree_add_item(opt_tree, hf_pim_generation_id, tvb, offset + 4, 4, FALSE); + proto_tree_add_item(opt_tree, hf_pim_generation_id, tvb, offset + 4, 4, ENC_BIG_ENDIAN); proto_item_append_text(opt_item, ": %u", tvb_get_ntohl(tvb, offset + 4)); break; case 21: /* State Refresh Capable Option */ - proto_tree_add_item(opt_tree, hf_pim_state_refresh_version, tvb, offset + 4, 1, FALSE); - proto_tree_add_item(opt_tree, hf_pim_state_refresh_interval, tvb, offset + 5, 1, FALSE); - proto_tree_add_item(opt_tree, hf_pim_state_refresh_reserved, tvb, offset + 6, 2, FALSE); + proto_tree_add_item(opt_tree, hf_pim_state_refresh_version, tvb, offset + 4, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(opt_tree, hf_pim_state_refresh_interval, tvb, offset + 5, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(opt_tree, hf_pim_state_refresh_reserved, tvb, offset + 6, 2, ENC_BIG_ENDIAN); proto_item_append_text(opt_item, ": Version = %u, Interval = %us", tvb_get_guint8(tvb, offset + 4), tvb_get_guint8(tvb, offset + 5)); @@ -974,7 +974,7 @@ dissect_pim(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { offset += 1; /* skip reserved field */ ngroup = tvb_get_guint8(tvb, offset); - proto_tree_add_item(pimopt_tree, hf_pim_numgroups, tvb, offset, 1, FALSE); + proto_tree_add_item(pimopt_tree, hf_pim_numgroups, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; holdtime = tvb_get_ntohs(tvb, offset); @@ -996,7 +996,7 @@ dissect_pim(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { njoin = tvb_get_ntohs(tvb, offset); nprune = tvb_get_ntohs(tvb, offset + 2); tisub = proto_tree_add_item(grouptree, hf_pim_numjoins, tvb, - offset, 2, FALSE); + offset, 2, ENC_BIG_ENDIAN); subtree = proto_item_add_subtree(tisub, ett_pim); off = offset + 4; for (j = 0; j < njoin; j++) { @@ -1009,7 +1009,7 @@ dissect_pim(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { } tisub = proto_tree_add_item(grouptree, hf_pim_numprunes, tvb, - offset + 2, 2, FALSE); + offset + 2, 2, ENC_BIG_ENDIAN); subtree = proto_item_add_subtree(tisub, ett_pim); for (j = 0; j < nprune; j++) { s = dissect_pim_addr(tvb, off, pimv2_source, &advance); @@ -1118,7 +1118,7 @@ dissect_pim(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { "Metric Preference: %u", pref); offset += 4; - proto_tree_add_item(pimopt_tree, hf_pim_metric, tvb, offset, 4, FALSE); + proto_tree_add_item(pimopt_tree, hf_pim_metric, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; break; } @@ -1197,7 +1197,7 @@ dissect_pim(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { "Metric Preference: %u", pref); offset += 4; - proto_tree_add_item(pimopt_tree, hf_pim_metric, tvb, offset, 4, FALSE); + proto_tree_add_item(pimopt_tree, hf_pim_metric, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; proto_tree_add_text(pimopt_tree, tvb, offset, 1, diff --git a/epan/dissectors/packet-pingpongprotocol.c b/epan/dissectors/packet-pingpongprotocol.c index bf52508720..8cc8e1cdfa 100644 --- a/epan/dissectors/packet-pingpongprotocol.c +++ b/epan/dissectors/packet-pingpongprotocol.c @@ -99,7 +99,7 @@ dissect_pingpongprotocol_ping_message(tvbuff_t *message_tvb, proto_tree *message { guint16 ping_data_length; - proto_tree_add_item(message_tree, hf_ping_messageno, message_tvb, PING_MESSAGENO_OFFSET, PING_MESSAGENO_LENGTH, FALSE); + proto_tree_add_item(message_tree, hf_ping_messageno, message_tvb, PING_MESSAGENO_OFFSET, PING_MESSAGENO_LENGTH, ENC_BIG_ENDIAN); ping_data_length = tvb_get_ntohs(message_tvb, MESSAGE_LENGTH_OFFSET) - PING_DATA_OFFSET; if (ping_data_length > 0) @@ -111,8 +111,8 @@ dissect_pingpongprotocol_pong_message(tvbuff_t *message_tvb, proto_tree *message { guint16 pong_data_length; - proto_tree_add_item(message_tree, hf_pong_messageno, message_tvb, PONG_MESSAGENO_OFFSET, PONG_MESSAGENO_LENGTH, FALSE); - proto_tree_add_item(message_tree, hf_pong_replyno, message_tvb, PONG_REPLYNO_OFFSET, PONG_REPLYNO_LENGTH, FALSE); + proto_tree_add_item(message_tree, hf_pong_messageno, message_tvb, PONG_MESSAGENO_OFFSET, PONG_MESSAGENO_LENGTH, ENC_BIG_ENDIAN); + proto_tree_add_item(message_tree, hf_pong_replyno, message_tvb, PONG_REPLYNO_OFFSET, PONG_REPLYNO_LENGTH, ENC_BIG_ENDIAN); pong_data_length = tvb_get_ntohs(message_tvb, MESSAGE_LENGTH_OFFSET) - PONG_DATA_OFFSET; if (pong_data_length > 0) { @@ -130,9 +130,9 @@ dissect_pingpongprotocol_message(tvbuff_t *message_tvb, packet_info *pinfo, prot if (pinfo && (check_col(pinfo->cinfo, COL_INFO))) { col_add_fstr(pinfo->cinfo, COL_INFO, "%s ", val_to_str(type, message_type_values, "Unknown PingPongProtocol type")); } - proto_tree_add_item(pingpongprotocol_tree, hf_message_type, message_tvb, MESSAGE_TYPE_OFFSET, MESSAGE_TYPE_LENGTH, FALSE); - proto_tree_add_item(pingpongprotocol_tree, hf_message_flags, message_tvb, MESSAGE_FLAGS_OFFSET, MESSAGE_FLAGS_LENGTH, FALSE); - proto_tree_add_item(pingpongprotocol_tree, hf_message_length, message_tvb, MESSAGE_LENGTH_OFFSET, MESSAGE_LENGTH_LENGTH, FALSE); + proto_tree_add_item(pingpongprotocol_tree, hf_message_type, message_tvb, MESSAGE_TYPE_OFFSET, MESSAGE_TYPE_LENGTH, ENC_BIG_ENDIAN); + proto_tree_add_item(pingpongprotocol_tree, hf_message_flags, message_tvb, MESSAGE_FLAGS_OFFSET, MESSAGE_FLAGS_LENGTH, ENC_BIG_ENDIAN); + proto_tree_add_item(pingpongprotocol_tree, hf_message_length, message_tvb, MESSAGE_LENGTH_OFFSET, MESSAGE_LENGTH_LENGTH, ENC_BIG_ENDIAN); switch (type) { case PINGPONG_PING_MESSAGE_TYPE: dissect_pingpongprotocol_ping_message(message_tvb, pingpongprotocol_tree); diff --git a/epan/dissectors/packet-pktc.c b/epan/dissectors/packet-pktc.c index 05e804f09e..97bccfbbda 100644 --- a/epan/dissectors/packet-pktc.c +++ b/epan/dissectors/packet-pktc.c @@ -203,11 +203,11 @@ dissect_pktc_app_specific_data(packet_info *pinfo _U_, proto_tree *parent_tree, offset+=len; /* boots */ - proto_tree_add_item(tree, hf_pktc_snmpEngineBoots, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_pktc_snmpEngineBoots, tvb, offset, 4, ENC_BIG_ENDIAN); offset+=4; /* time */ - proto_tree_add_item(tree, hf_pktc_snmpEngineTime, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_pktc_snmpEngineTime, tvb, offset, 4, ENC_BIG_ENDIAN); offset+=4; /* usmUserName Length */ @@ -234,7 +234,7 @@ dissect_pktc_app_specific_data(packet_info *pinfo _U_, proto_tree *parent_tree, case KMMID_AP_REPLY: case KMMID_REKEY: /* Security Parameter Index (SPI) */ - proto_tree_add_item(tree, hf_pktc_ipsec_spi, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_pktc_ipsec_spi, tvb, offset, 4, ENC_BIG_ENDIAN); offset+=4; break; @@ -279,12 +279,12 @@ dissect_pktc_list_of_ciphersuites(packet_info *pinfo _U_, proto_tree *parent_tre case DOI_SNMPv3: for(i=0;i<len;i++){ /* SNMPv3 authentication algorithm */ - proto_tree_add_item(tree, hf_pktc_snmpAuthenticationAlgorithm, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_pktc_snmpAuthenticationAlgorithm, tvb, offset, 1, ENC_BIG_ENDIAN); proto_item_append_text(tree, " %s", val_to_str(tvb_get_guint8(tvb, offset), snmp_authentication_algorithm_vals, "%0x")); offset+=1; /* SNMPv3 encryption transform id */ - proto_tree_add_item(tree, hf_pktc_snmpEncryptionTransformID, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_pktc_snmpEncryptionTransformID, tvb, offset, 1, ENC_BIG_ENDIAN); proto_item_append_text(tree, "/%s", val_to_str(tvb_get_guint8(tvb, offset), snmp_transform_id_vals, "%0x")); offset+=1; } @@ -292,12 +292,12 @@ dissect_pktc_list_of_ciphersuites(packet_info *pinfo _U_, proto_tree *parent_tre case DOI_IPSEC: for(i=0;i<len;i++){ /* IPsec authentication algorithm */ - proto_tree_add_item(tree, hf_pktc_ipsecAuthenticationAlgorithm, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_pktc_ipsecAuthenticationAlgorithm, tvb, offset, 1, ENC_BIG_ENDIAN); proto_item_append_text(tree, " %s", val_to_str(tvb_get_guint8(tvb, offset), ipsec_authentication_algorithm_vals, "%0x")); offset+=1; /* IPsec encryption transform id */ - proto_tree_add_item(tree, hf_pktc_ipsecEncryptionTransformID, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_pktc_ipsecEncryptionTransformID, tvb, offset, 1, ENC_BIG_ENDIAN); proto_item_append_text(tree, "/%s", val_to_str(tvb_get_guint8(tvb, offset), ipsec_transform_id_vals, "%0x")); offset+=1; } @@ -385,7 +385,7 @@ dissect_pktc_ap_reply(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int o offset+=4; /* grace period */ - proto_tree_add_item(tree, hf_pktc_grace_period, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_pktc_grace_period, tvb, offset, 4, ENC_BIG_ENDIAN); offset+=4; /* re-establish flag */ @@ -446,11 +446,11 @@ dissect_pktc_rekey(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offs offset=dissect_pktc_list_of_ciphersuites(pinfo, tree, tvb, offset, doi); /* sec param lifetime */ - proto_tree_add_item(tree, hf_pktc_sec_param_lifetime, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_pktc_sec_param_lifetime, tvb, offset, 4, ENC_BIG_ENDIAN); offset+=4; /* grace period */ - proto_tree_add_item(tree, hf_pktc_grace_period, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_pktc_grace_period, tvb, offset, 4, ENC_BIG_ENDIAN); offset+=4; /* re-establish flag */ diff --git a/epan/dissectors/packet-pktgen.c b/epan/dissectors/packet-pktgen.c index f2caa4e372..e90f2fe878 100644 --- a/epan/dissectors/packet-pktgen.c +++ b/epan/dissectors/packet-pktgen.c @@ -97,19 +97,19 @@ static gboolean dissect_pktgen(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr /* add items to the subtree */ - proto_tree_add_item(pktgen_tree, hf_pktgen_magic, tvb, offset, 4, FALSE); + proto_tree_add_item(pktgen_tree, hf_pktgen_magic, tvb, offset, 4, ENC_BIG_ENDIAN); offset+=4; - proto_tree_add_item(pktgen_tree, hf_pktgen_seqnum, tvb, offset, 4, FALSE); + proto_tree_add_item(pktgen_tree, hf_pktgen_seqnum, tvb, offset, 4, ENC_BIG_ENDIAN); offset+=4; tstamp.secs = tvb_get_ntohl(tvb, offset); - tmp = proto_tree_add_item(pktgen_tree, hf_pktgen_tvsec, tvb, offset, 4, FALSE); + tmp = proto_tree_add_item(pktgen_tree, hf_pktgen_tvsec, tvb, offset, 4, ENC_BIG_ENDIAN); PROTO_ITEM_SET_GENERATED(tmp); offset+=4; tstamp.nsecs = tvb_get_ntohl(tvb, offset) /* microsecond on the wire so... */ * 1000; - tmp = proto_tree_add_item(pktgen_tree, hf_pktgen_tvusec, tvb, offset, 4, FALSE); + tmp = proto_tree_add_item(pktgen_tree, hf_pktgen_tvusec, tvb, offset, 4, ENC_BIG_ENDIAN); PROTO_ITEM_SET_GENERATED(tmp); offset+=4; diff --git a/epan/dissectors/packet-pnrp.c b/epan/dissectors/packet-pnrp.c index 683f25082d..9f549f195a 100644 --- a/epan/dissectors/packet-pnrp.c +++ b/epan/dissectors/packet-pnrp.c @@ -419,25 +419,25 @@ static int dissect_pnrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) pnrp_header_tree = proto_item_add_subtree(pnrp_header_item, ett_pnrp_header); /* Add Field ID should be 0c0010 */ - proto_tree_add_item(pnrp_header_tree,hf_pnrp_header_fieldID,tvb,offset,2,FALSE); + proto_tree_add_item(pnrp_header_tree,hf_pnrp_header_fieldID,tvb,offset,2,ENC_BIG_ENDIAN); offset += 2; /* Add Length should be 0x000C */ - proto_tree_add_item(pnrp_header_tree,hf_pnrp_header_length,tvb,offset,2,FALSE); + proto_tree_add_item(pnrp_header_tree,hf_pnrp_header_length,tvb,offset,2,ENC_BIG_ENDIAN); offset += 2; /* Add Ident should be 0x51 */ - proto_tree_add_item(pnrp_header_tree,hf_pnrp_header_ident,tvb,offset,1,FALSE); + proto_tree_add_item(pnrp_header_tree,hf_pnrp_header_ident,tvb,offset,1,ENC_BIG_ENDIAN); offset += 1; /* Add Major Version */ - proto_tree_add_item(pnrp_header_tree,hf_pnrp_header_versionMajor,tvb,offset,1,FALSE); + proto_tree_add_item(pnrp_header_tree,hf_pnrp_header_versionMajor,tvb,offset,1,ENC_BIG_ENDIAN); offset += 1; /* Add Minor Version */ - proto_tree_add_item(pnrp_header_tree,hf_pnrp_header_versionMinor,tvb,offset,1,FALSE); + proto_tree_add_item(pnrp_header_tree,hf_pnrp_header_versionMinor,tvb,offset,1,ENC_BIG_ENDIAN); offset += 1; /* Add Message Type */ - proto_tree_add_item(pnrp_header_tree,hf_pnrp_header_messageType,tvb,offset,1,FALSE); + proto_tree_add_item(pnrp_header_tree,hf_pnrp_header_messageType,tvb,offset,1,ENC_BIG_ENDIAN); offset += 1; /* Add Message ID */ - proto_tree_add_item(pnrp_header_tree,hf_pnrp_header_messageID,tvb,offset,4,FALSE); + proto_tree_add_item(pnrp_header_tree,hf_pnrp_header_messageID,tvb,offset,4,ENC_BIG_ENDIAN); offset += 4; @@ -457,8 +457,8 @@ static int dissect_pnrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { pnrp_message_item = proto_tree_add_text(pnrp_tree, tvb, offset, 4, "Message with invalid length %u (< 4)", data_length); pnrp_message_tree = proto_item_add_subtree(pnrp_message_item, ett_pnrp_message); - proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_type, tvb, offset, 2, FALSE); - proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_length, tvb, offset + 2, 2, FALSE); + 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); } offset += 4; /* Don't continue parsing this message segment */ @@ -472,9 +472,9 @@ static int dissect_pnrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) pnrp_message_item = proto_tree_add_text(pnrp_tree, tvb, offset, data_length, "Message ACK ID: "); pnrp_message_tree = proto_item_add_subtree(pnrp_message_item, ett_pnrp_message); - proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_type, tvb, offset , 2, FALSE); - proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_length, tvb, offset + 2, 2, FALSE); - proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_headerack, tvb, offset + 4, data_length -4, FALSE); + 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); + proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_headerack, tvb, offset + 4, data_length -4, ENC_BIG_ENDIAN); } offset += data_length; @@ -486,8 +486,8 @@ static int dissect_pnrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) pnrp_message_item = proto_tree_add_text(pnrp_tree, tvb, offset, data_length, "Validate PNRP ID: "); pnrp_message_tree = proto_item_add_subtree(pnrp_message_item, ett_pnrp_message); - proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_type, tvb, offset , 2, FALSE); - proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_length, tvb, offset + 2, 2, FALSE); + 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); /* We can have a large number of pnrp IDs here */ dissect_pnrp_ids(tvb,offset+4,data_length-4,pnrp_message_tree); @@ -501,8 +501,8 @@ static int dissect_pnrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) pnrp_message_item = proto_tree_add_text(pnrp_tree, tvb, offset, data_length, "Flags Field: "); pnrp_message_tree = proto_item_add_subtree(pnrp_message_item, ett_pnrp_message); - proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_type, tvb, offset , 2, FALSE); - proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_length, tvb, offset + 2, 2, FALSE); + 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); 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); @@ -549,8 +549,8 @@ static int dissect_pnrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) pnrp_message_item = proto_tree_add_text(pnrp_tree, tvb, offset, data_length, "Flood Control: "); pnrp_message_tree = proto_item_add_subtree(pnrp_message_item, ett_pnrp_message); - proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_type, tvb, offset , 2, FALSE); - proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_length, tvb, offset + 2, 2, FALSE); + 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); /* D - Bit */ @@ -570,10 +570,10 @@ static int dissect_pnrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) pnrp_message_item = proto_tree_add_text(pnrp_tree, tvb, offset, data_length, "Solicit Controls: "); pnrp_message_tree = proto_item_add_subtree(pnrp_message_item, ett_pnrp_message); - proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_type, tvb, offset , 2, FALSE); - proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_length, tvb, offset + 2, 2, FALSE); + 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); proto_tree_add_text(pnrp_message_tree, tvb, offset + 4, 1, "Reserved : %d",tvb_get_guint8(tvb,offset+4)); - proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_solicitType, tvb, offset + 5, 1, FALSE); + proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_solicitType, tvb, offset + 5, 1, ENC_BIG_ENDIAN); proto_tree_add_text(pnrp_message_tree, tvb, offset + 6, 2, "Reserved : %d",tvb_get_ntohs(tvb,offset+6)); } offset += data_length +2; /* Padding involved */ @@ -584,16 +584,16 @@ static int dissect_pnrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) pnrp_message_item = proto_tree_add_text(pnrp_tree, tvb, offset, data_length, "Lookup Control: "); pnrp_message_tree = proto_item_add_subtree(pnrp_message_item, ett_pnrp_message); - proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_type, tvb, offset , 2, FALSE); - proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_length, tvb, offset + 2, 2, FALSE); + 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); /* Precision Bytes */ - proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_lookupControls_precision, tvb, offset + 6, 2, FALSE); + proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_lookupControls_precision, tvb, offset + 6, 2, ENC_BIG_ENDIAN); /* Resolve Criteria */ - proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_lookupControls_resolveCriteria, tvb, offset + 8, 1, FALSE); + proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_lookupControls_resolveCriteria, tvb, offset + 8, 1, ENC_BIG_ENDIAN); /* Reason Code */ - proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_lookupControls_reasonCode, tvb, offset + 9, 1, FALSE); + proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_lookupControls_reasonCode, tvb, offset + 9, 1, ENC_BIG_ENDIAN); /* Reserved */ proto_tree_add_text(pnrp_message_tree, tvb, offset + 10, 2, "Reserved : %d",tvb_get_ntohs(tvb,offset+10)); @@ -607,8 +607,8 @@ static int dissect_pnrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) pnrp_message_item = proto_tree_add_text(pnrp_tree, tvb, offset, data_length, "Target PNRP ID: "); pnrp_message_tree = proto_item_add_subtree(pnrp_message_item, ett_pnrp_message); - proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_type, tvb, offset , 2, FALSE); - proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_length, tvb, offset + 2, 2, FALSE); + 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); dissect_pnrp_ids(tvb, offset+4, data_length-4, pnrp_message_tree); } @@ -621,8 +621,8 @@ static int dissect_pnrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) pnrp_message_item = proto_tree_add_text(pnrp_tree, tvb, offset, data_length, "Extended Payload: "); pnrp_message_tree = proto_item_add_subtree(pnrp_message_item, ett_pnrp_message); - proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_type, tvb, offset , 2, FALSE); - proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_length, tvb, offset + 2, 2, FALSE); + 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); /* TODO: Do actual parsing */ } @@ -634,12 +634,12 @@ static int dissect_pnrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) pnrp_message_item = proto_tree_add_text(pnrp_tree, tvb, offset, data_length, "PNRP ID Array: "); pnrp_message_tree = proto_item_add_subtree(pnrp_message_item, ett_pnrp_message); - proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_type, tvb, offset , 2, FALSE); - proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_length, tvb, offset + 2, 2, FALSE); - proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_idArray_NumEntries, tvb, offset + 4, 2, FALSE); - proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_idArray_Length, tvb, offset + 6, 2, FALSE); - proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_ElementFieldType, tvb, offset + 8, 2, FALSE); - proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_idarray_Entrylength, tvb, offset + 10, 2, FALSE); + 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); + proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_idArray_NumEntries, tvb, offset + 4, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_idArray_Length, tvb, offset + 6, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_ElementFieldType, tvb, offset + 8, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_idarray_Entrylength, tvb, offset + 10, 2, ENC_BIG_ENDIAN); dissect_pnrp_ids(tvb,offset+12,data_length-12,pnrp_message_tree); } @@ -651,8 +651,8 @@ static int dissect_pnrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) pnrp_message_item = proto_tree_add_text(pnrp_tree, tvb, offset, data_length, "CERT Chain: "); pnrp_message_tree = proto_item_add_subtree(pnrp_message_item, ett_pnrp_message); - proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_type, tvb, offset , 2, FALSE); - proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_length, tvb, offset + 2, 2, FALSE); + 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); proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_certChain, tvb, offset + 4, data_length-4, FALSE); } @@ -674,16 +674,16 @@ static int dissect_pnrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) pnrp_message_item = proto_tree_add_text(pnrp_tree, tvb, offset, data_length, "Classifier: "); pnrp_message_tree = proto_item_add_subtree(pnrp_message_item, ett_pnrp_message); - proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_type, tvb, offset , 2, FALSE); - proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_length, tvb, offset + 2, 2, FALSE); + 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); /* NumEntries */ - proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_classifier_unicodeCount, tvb, offset + 4, 2, FALSE); + proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_classifier_unicodeCount, tvb, offset + 4, 2, ENC_BIG_ENDIAN); /* Array Length: 8+(NumEntries*EntryLength */ - proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_classifier_arrayLength, tvb, offset + 6, 2, FALSE); + proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_classifier_arrayLength, tvb, offset + 6, 2, ENC_BIG_ENDIAN); /* Element Field Type: WCHAR */ - proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_type, tvb, offset+8 , 2, FALSE); + proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_type, tvb, offset+8 , 2, ENC_BIG_ENDIAN); /* Entry Length: Must be 0x0002 */ - proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_classifier_entryLength, tvb, offset + 10, 2, FALSE); + proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_classifier_entryLength, tvb, offset + 10, 2, ENC_BIG_ENDIAN); /* The actual classifier String */ proto_tree_add_text(pnrp_message_tree, tvb, offset + 12, tvb_get_ntohs(tvb,offset+6)-8, "Classifier: %s",tvb_get_ephemeral_faked_unicode(tvb, offset + 12, (tvb_get_ntohs(tvb,offset+6)-8)/2, FALSE)); } @@ -706,8 +706,8 @@ static int dissect_pnrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) pnrp_message_item = proto_tree_add_text(pnrp_tree, tvb, offset, data_length, "Hashed Nonce: "); pnrp_message_tree = proto_item_add_subtree(pnrp_message_item, ett_pnrp_message); - proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_type, tvb, offset , 2, FALSE); - proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_length, tvb, offset + 2, 2, FALSE); + 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); proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_hashednonce, tvb, offset + 4, data_length-4, ENC_NA); } @@ -721,8 +721,8 @@ static int dissect_pnrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) pnrp_message_item = proto_tree_add_text(pnrp_tree, tvb, offset, data_length, "Nonce: "); pnrp_message_tree = proto_item_add_subtree(pnrp_message_item, ett_pnrp_message); - proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_type, tvb, offset , 2, FALSE); - proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_length, tvb, offset + 2, 2, FALSE); + 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); proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_nonce, tvb, offset + 4, data_length-4, ENC_NA); } @@ -735,10 +735,10 @@ static int dissect_pnrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) pnrp_message_item = proto_tree_add_text(pnrp_tree, tvb, offset, data_length, "Split controls: "); pnrp_message_tree = proto_item_add_subtree(pnrp_message_item, ett_pnrp_message); - proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_type, tvb, offset , 2, FALSE); - proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_length, tvb, offset + 2, 2, FALSE); + 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); /* Size of Authority Buffer */ - proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_splitControls_authorityBuffer, tvb, offset + 4, 2, FALSE); + proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_splitControls_authorityBuffer, tvb, offset + 4, 2, ENC_BIG_ENDIAN); /* Byte offset */ proto_tree_add_text(pnrp_message_tree, tvb, offset + 6, 2, "Offset : %d",tvb_get_ntohs(tvb,offset+6)); @@ -754,8 +754,8 @@ static int dissect_pnrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) pnrp_message_item = proto_tree_add_text(pnrp_tree, tvb, offset, data_length, "Routing Entry: "); pnrp_message_tree = proto_item_add_subtree(pnrp_message_item, ett_pnrp_message); - proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_type, tvb, offset , 2, FALSE); - proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_length, tvb, offset + 2, 2, FALSE); + 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); dissect_route_entry(tvb,offset+4, tvb_get_ntohs(tvb,offset+2)-4, pnrp_message_tree); } @@ -778,8 +778,8 @@ static int dissect_pnrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) pnrp_message_item = proto_tree_add_text(pnrp_tree, tvb, offset, data_length, "Validate CPA: "); pnrp_message_tree = proto_item_add_subtree(pnrp_message_item, ett_pnrp_message); - proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_type, tvb, offset , 2, FALSE); - proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_length, tvb, offset + 2, 2, FALSE); + 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); /* Do the actual parsing in own method */ dissect_encodedCPA_structure(tvb, offset+4, data_length-4, pnrp_message_tree); @@ -795,16 +795,16 @@ static int dissect_pnrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) pnrp_message_item = proto_tree_add_text(pnrp_tree, tvb, offset, data_length, "IPv6 Endpoint Array: "); pnrp_message_tree = proto_item_add_subtree(pnrp_message_item, ett_pnrp_message); - proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_type, tvb, offset , 2, FALSE); - proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_length, tvb, offset + 2, 2, FALSE); + 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); /* Number of route entries */ - proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_ipv6EndpointArray_NumberOfEntries, tvb, offset + 4, 2, FALSE); + proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_ipv6EndpointArray_NumberOfEntries, tvb, offset + 4, 2, ENC_BIG_ENDIAN); /* Array length */ - proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_ipv6EndpointArray_ArrayLength, tvb, offset + 6, 2, FALSE); + proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_ipv6EndpointArray_ArrayLength, tvb, offset + 6, 2, ENC_BIG_ENDIAN); /* Element Field Type */ - proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_type, tvb, offset+8 , 2, FALSE); + proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_type, tvb, offset+8 , 2, ENC_BIG_ENDIAN); /* Entry Length: must be 0x0012 (18 bytes) */ - proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_ipv6EndpointArray_EntryLength, tvb, offset + 10, 2, FALSE); + proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_ipv6EndpointArray_EntryLength, tvb, offset + 10, 2, ENC_BIG_ENDIAN); /* Flagged Path */ dissect_ipv6_endpoint_structure(tvb, offset+12, tvb_get_ntohs(tvb,offset+6)-8,pnrp_message_tree); } @@ -818,8 +818,8 @@ static int dissect_pnrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) data_length, "Type: %s, length: %u", val_to_str(field_type, fieldID, "Unknown (0x%04x)"), data_length); pnrp_message_tree = proto_item_add_subtree(pnrp_message_item, ett_pnrp_message); - proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_type, tvb, offset , 2, FALSE); - proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_length, tvb, offset + 2, 2, FALSE); + 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); if(data_length > 4) { proto_tree_add_text(pnrp_message_tree, tvb, offset + 4, data_length -4, "Data"); @@ -861,19 +861,19 @@ static void dissect_route_entry(tvbuff_t *tvb, gint offset, gint length, proto_t proto_tree_add_item(tree, hf_pnrp_message_pnrpID, tvb, offset+tmp_offset, 32, ENC_NA); tmp_offset +=32; /* Add PNRP Major Version */ - proto_tree_add_item(tree,hf_pnrp_header_versionMajor,tvb,offset+tmp_offset,1,FALSE); + proto_tree_add_item(tree,hf_pnrp_header_versionMajor,tvb,offset+tmp_offset,1,ENC_BIG_ENDIAN); tmp_offset += 1; /* Add Minor Version */ - proto_tree_add_item(tree,hf_pnrp_header_versionMinor,tvb,offset+tmp_offset,1,FALSE); + proto_tree_add_item(tree,hf_pnrp_header_versionMinor,tvb,offset+tmp_offset,1,ENC_BIG_ENDIAN); tmp_offset +=1; /* Port Number */ - proto_tree_add_item(tree,hf_pnrp_message_routeEntry_portNumber,tvb,offset+tmp_offset,2,FALSE); + proto_tree_add_item(tree,hf_pnrp_message_routeEntry_portNumber,tvb,offset+tmp_offset,2,ENC_BIG_ENDIAN); tmp_offset +=2; /* Flags */ - proto_tree_add_item(tree,hf_pnrp_message_routeEntry_flags,tvb,offset+tmp_offset,1,FALSE); + proto_tree_add_item(tree,hf_pnrp_message_routeEntry_flags,tvb,offset+tmp_offset,1,ENC_BIG_ENDIAN); tmp_offset +=1; /* Address count */ - proto_tree_add_item(tree,hf_pnrp_message_routeEntry_addressCount,tvb,offset+tmp_offset,1,FALSE); + proto_tree_add_item(tree,hf_pnrp_message_routeEntry_addressCount,tvb,offset+tmp_offset,1,ENC_BIG_ENDIAN); tmp_offset +=1; /* IPv6 Addresses */ dissect_ipv6_address(tvb, offset+tmp_offset, length -tmp_offset, tree); @@ -914,15 +914,15 @@ static void dissect_encodedCPA_structure(tvbuff_t *tvb, gint offset, gint length pnrp_encodedCPA_tree = proto_item_add_subtree(pnrp_encodedCPA_item, ett_pnrp_message_encodedCPA); /* Length information */ - proto_tree_add_item(pnrp_encodedCPA_tree, hf_pnrp_encodedCPA_length, tvb, offset, 2, FALSE); + proto_tree_add_item(pnrp_encodedCPA_tree, hf_pnrp_encodedCPA_length, tvb, offset, 2, ENC_BIG_ENDIAN); /* CPA Minor Version */ - proto_tree_add_item(pnrp_encodedCPA_tree, hf_pnrp_encodedCPA_minorVersion, tvb, offset+2, 1, FALSE); + proto_tree_add_item(pnrp_encodedCPA_tree, hf_pnrp_encodedCPA_minorVersion, tvb, offset+2, 1, ENC_BIG_ENDIAN); /* CPA Major Version */ - proto_tree_add_item(pnrp_encodedCPA_tree, hf_pnrp_encodedCPA_majorVersion, tvb, offset+3, 1, FALSE); + proto_tree_add_item(pnrp_encodedCPA_tree, hf_pnrp_encodedCPA_majorVersion, tvb, offset+3, 1, ENC_BIG_ENDIAN); /* PNRP Minor Version */ - proto_tree_add_item(pnrp_encodedCPA_tree, hf_pnrp_header_versionMinor, tvb, offset+4, 1, FALSE); + proto_tree_add_item(pnrp_encodedCPA_tree, hf_pnrp_header_versionMinor, tvb, offset+4, 1, ENC_BIG_ENDIAN); /* PNRP Major Version */ - proto_tree_add_item(pnrp_encodedCPA_tree, hf_pnrp_header_versionMajor, tvb, offset+5, 1, FALSE); + 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); flagsField = tvb_get_guint8(tvb,offset+6); diff --git a/epan/dissectors/packet-portmap.c b/epan/dissectors/packet-portmap.c index 0232401ca9..8ca4224c18 100644 --- a/epan/dissectors/packet-portmap.c +++ b/epan/dissectors/packet-portmap.c @@ -106,7 +106,7 @@ dissect_getport_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, /* version */ version = tvb_get_ntohl(tvb, offset+4); proto_tree_add_item(tree, hf_portmap_version, tvb, - offset+4, 4, FALSE); + offset+4, 4, ENC_BIG_ENDIAN); if (check_col(pinfo->cinfo, COL_INFO)) { col_append_fstr(pinfo->cinfo, COL_INFO, " V:%d", version); @@ -127,7 +127,7 @@ dissect_getport_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, /* port */ proto_tree_add_item(tree, hf_portmap_port, tvb, - offset+12, 4, FALSE); + offset+12, 4, ENC_BIG_ENDIAN); return offset+16; } @@ -188,14 +188,14 @@ dissect_set_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, offset, 4, prog, "Program: %s (%d)", rpc_prog_name(prog), prog); proto_tree_add_item(tree, hf_portmap_version, tvb, - offset+4, 4, FALSE); + offset+4, 4, ENC_BIG_ENDIAN); proto = tvb_get_ntohl(tvb, offset+8); proto_tree_add_uint_format(tree, hf_portmap_proto,tvb, offset+8, 4, proto, "Proto: %s (%d)", ipprotostr(proto), proto); proto_tree_add_item(tree, hf_portmap_port, tvb, - offset+12, 4, FALSE); + offset+12, 4, ENC_BIG_ENDIAN); } return offset+16; @@ -216,14 +216,14 @@ dissect_unset_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, offset, 4, prog, "Program: %s (%d)", rpc_prog_name(prog), prog); proto_tree_add_item(tree, hf_portmap_version, tvb, - offset+4, 4, FALSE); + offset+4, 4, ENC_BIG_ENDIAN); proto = tvb_get_ntohl(tvb, offset+8); proto_tree_add_uint(tree, hf_portmap_proto, tvb, offset+8, 4, proto); proto_tree_add_item(tree, hf_portmap_port, tvb, - offset+12, 4, FALSE); + offset+12, 4, ENC_BIG_ENDIAN); } return offset+16; @@ -330,7 +330,7 @@ dissect_callit_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, if ( tree ) { proto_tree_add_item(tree, hf_portmap_port, tvb, - offset, 4, FALSE); + offset, 4, ENC_BIG_ENDIAN); } offset += 4; diff --git a/epan/dissectors/packet-ppi-sensor.c b/epan/dissectors/packet-ppi-sensor.c index 43d80bce0f..b5446fb3c4 100644 --- a/epan/dissectors/packet-ppi-sensor.c +++ b/epan/dissectors/packet-ppi-sensor.c @@ -216,7 +216,7 @@ dissect_ppi_sensor(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { proto_tree_add_uint(ppi_sensor_tree, hf_ppi_sensor_version, tvb, offset, 1, version); proto_tree_add_item(ppi_sensor_tree, hf_ppi_sensor_pad, - tvb, offset + 1, 1, FALSE); + tvb, offset + 1, 1, ENC_BIG_ENDIAN); ti = proto_tree_add_uint(ppi_sensor_tree, hf_ppi_sensor_length, tvb, offset + 2, 2, length); /*fixed ppi-geotagging-header fields finished, move onto the fields marked present*/ diff --git a/epan/dissectors/packet-ppi.c b/epan/dissectors/packet-ppi.c index 8ca904b89f..580a28be09 100644 --- a/epan/dissectors/packet-ppi.c +++ b/epan/dissectors/packet-ppi.c @@ -769,20 +769,20 @@ dissect_ppi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvb, 0, tot_len, "PPI version %u, %u bytes", version, tot_len); ppi_tree = proto_item_add_subtree(ti, ett_ppi_pph); proto_tree_add_item(ppi_tree, hf_ppi_head_version, - tvb, offset, 1, TRUE); + tvb, offset, 1, ENC_LITTLE_ENDIAN); ti = proto_tree_add_item(ppi_tree, hf_ppi_head_flags, - tvb, offset + 1, 1, TRUE); + tvb, offset + 1, 1, ENC_LITTLE_ENDIAN); ppi_flags_tree = proto_item_add_subtree(ti, ett_ppi_flags); proto_tree_add_item(ppi_flags_tree, hf_ppi_head_flag_alignment, tvb, offset + 1, 1, TRUE); proto_tree_add_item(ppi_flags_tree, hf_ppi_head_flag_reserved, - tvb, offset + 1, 1, TRUE); + tvb, offset + 1, 1, ENC_LITTLE_ENDIAN); proto_tree_add_item(ppi_tree, hf_ppi_head_len, - tvb, offset + 2, 2, TRUE); + tvb, offset + 2, 2, ENC_LITTLE_ENDIAN); proto_tree_add_item(ppi_tree, hf_ppi_head_dlt, - tvb, offset + 4, 4, TRUE); + tvb, offset + 4, 4, ENC_LITTLE_ENDIAN); } tot_len -= PPI_V0_HEADER_LEN; diff --git a/epan/dissectors/packet-ppp.c b/epan/dissectors/packet-ppp.c index 6f1b8d00f4..eae7616742 100644 --- a/epan/dissectors/packet-ppp.c +++ b/epan/dissectors/packet-ppp.c @@ -3366,7 +3366,7 @@ dissect_vsnp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) vsnp_item = proto_tree_add_item(tree, proto_vsnp, tvb, 0, -1, FALSE); vsnp_tree = proto_item_add_subtree(vsnp_item, ett_vsnp); - proto_tree_add_item(vsnp_tree, hf_vsnp_pdnid, tvb, offset, 1, FALSE); + proto_tree_add_item(vsnp_tree, hf_vsnp_pdnid, tvb, offset, 1, ENC_BIG_ENDIAN); } next_tvb = tvb_new_subset(tvb, 1, -1, -1); @@ -3814,10 +3814,10 @@ dissect_iphc_crtp_fh(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) flags = (tvb_get_guint8(tvb, 2) & IPHC_CRTP_FH_FLAG_MASK) >> IPHC_CRTP_FH_FLAG_POS; /* flags field */ - proto_tree_add_item(fh_tree, hf_iphc_crtp_fh_flags, tvb, 2, 1, FALSE); + proto_tree_add_item(fh_tree, hf_iphc_crtp_fh_flags, tvb, 2, 1, ENC_BIG_ENDIAN); /* generation field */ - proto_tree_add_item(fh_tree, hf_iphc_crtp_gen, tvb, 2, 1, FALSE); + proto_tree_add_item(fh_tree, hf_iphc_crtp_gen, tvb, 2, 1, ENC_BIG_ENDIAN); /* calculate length of IP header, assume IPv4 */ ip_hdr_len = (tvb_get_guint8(tvb, 0) & 0x0f) * 4; @@ -3845,15 +3845,15 @@ dissect_iphc_crtp_fh(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case IPHC_CRTP_FH_CID8: offset_cid = 3; offset_seq = ip_hdr_len + 5; - proto_tree_add_item(fh_tree, hf_iphc_crtp_cid8, tvb, offset_cid, 1, FALSE); - proto_tree_add_item(fh_tree, hf_iphc_crtp_seq, tvb, offset_seq, 1, FALSE); + proto_tree_add_item(fh_tree, hf_iphc_crtp_cid8, tvb, offset_cid, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(fh_tree, hf_iphc_crtp_seq, tvb, offset_seq, 1, ENC_BIG_ENDIAN); break; case IPHC_CRTP_FH_CID16: offset_seq = 3; offset_cid = ip_hdr_len + 4; - proto_tree_add_item(fh_tree, hf_iphc_crtp_seq, tvb, offset_seq, 1, FALSE); - proto_tree_add_item(fh_tree, hf_iphc_crtp_cid16, tvb, offset_cid, 2, FALSE); + proto_tree_add_item(fh_tree, hf_iphc_crtp_seq, tvb, offset_seq, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(fh_tree, hf_iphc_crtp_cid16, tvb, offset_cid, 2, ENC_BIG_ENDIAN); break; } @@ -3907,8 +3907,8 @@ dissect_iphc_crtp_cudp16(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) hdr_length = 3; - proto_tree_add_item(cudp_tree, hf_iphc_crtp_cid16, tvb, 0, 2, FALSE); - proto_tree_add_item(cudp_tree, hf_iphc_crtp_seq, tvb, 2, 1, FALSE); + proto_tree_add_item(cudp_tree, hf_iphc_crtp_cid16, tvb, 0, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(cudp_tree, hf_iphc_crtp_seq, tvb, 2, 1, ENC_BIG_ENDIAN); offset += hdr_length; length -= hdr_length; @@ -3942,8 +3942,8 @@ dissect_iphc_crtp_cudp8(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) hdr_length = 2; - proto_tree_add_item(cudp_tree, hf_iphc_crtp_cid8, tvb, 0, 1, FALSE); - proto_tree_add_item(cudp_tree, hf_iphc_crtp_seq, tvb, 1, 1, FALSE); + proto_tree_add_item(cudp_tree, hf_iphc_crtp_cid8, tvb, 0, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(cudp_tree, hf_iphc_crtp_seq, tvb, 1, 1, ENC_BIG_ENDIAN); offset += hdr_length; length -= hdr_length; @@ -3976,8 +3976,8 @@ dissect_iphc_crtp_cs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) cs_tree = proto_item_add_subtree(ti, ett_iphc_crtp); - proto_tree_add_item(cs_tree, hf_iphc_crtp_cs_flags, tvb, 0, 1, FALSE); - proto_tree_add_item(cs_tree, hf_iphc_crtp_cs_cnt, tvb, 1, 1, FALSE); + proto_tree_add_item(cs_tree, hf_iphc_crtp_cs_flags, tvb, 0, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(cs_tree, hf_iphc_crtp_cs_cnt, tvb, 1, 1, ENC_BIG_ENDIAN); /* calculate required length */ flags = tvb_get_guint8(tvb, 0); @@ -3999,9 +3999,9 @@ dissect_iphc_crtp_cs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(cs_tree, hf, tvb, offset, cid_size, FALSE); offset += cid_size; proto_tree_add_item(cs_tree, hf_iphc_crtp_cs_invalid, tvb, offset, 1, FALSE); - proto_tree_add_item(cs_tree, hf_iphc_crtp_seq, tvb, offset, 1, FALSE); + proto_tree_add_item(cs_tree, hf_iphc_crtp_seq, tvb, offset, 1, ENC_BIG_ENDIAN); ++offset; - proto_tree_add_item(cs_tree, hf_iphc_crtp_gen, tvb, offset, 1, FALSE); + proto_tree_add_item(cs_tree, hf_iphc_crtp_gen, tvb, offset, 1, ENC_BIG_ENDIAN); ++offset; } } /* if tree */ @@ -4088,12 +4088,12 @@ dissect_mp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_text(hdr_tree, tvb, 0, 1, "%s", decode_boolean_bitfield(flags, MP_FRAG_RESERVED_SHORT, sizeof(flags) * 8, "reserved", "reserved")); - proto_tree_add_item(mp_tree, hf_mp_short_sequence_num, tvb, 0, 2, FALSE); + proto_tree_add_item(mp_tree, hf_mp_short_sequence_num, tvb, 0, 2, ENC_BIG_ENDIAN); } else { proto_tree_add_text(hdr_tree, tvb, 0, 1, "%s", decode_boolean_bitfield(flags, MP_FRAG_RESERVED, sizeof(flags) * 8, "reserved", "reserved")); - proto_tree_add_item(mp_tree, hf_mp_sequence_num, tvb, 1, 3, FALSE); + proto_tree_add_item(mp_tree, hf_mp_sequence_num, tvb, 1, 3, ENC_BIG_ENDIAN); } } @@ -4145,8 +4145,8 @@ dissect_ppp_hdlc_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ti = proto_tree_add_item(tree, proto_ppp, tvb, 0, -1, FALSE); fh_tree = proto_item_add_subtree(ti, ett_ppp); if (byte0 == 0xff) { - proto_tree_add_item(fh_tree, hf_ppp_address, tvb, 0, 1, FALSE); - proto_tree_add_item(fh_tree, hf_ppp_control, tvb, 1, 1, FALSE); + proto_tree_add_item(fh_tree, hf_ppp_address, tvb, 0, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(fh_tree, hf_ppp_control, tvb, 1, 1, ENC_BIG_ENDIAN); } } @@ -4473,15 +4473,15 @@ dissect_pap( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) { ti = proto_tree_add_item(tree, proto_pap, tvb, 0, -1, FALSE); fh_tree = proto_item_add_subtree(ti, ett_pap); /* Code */ - proto_tree_add_item(fh_tree, hf_pap_code, tvb, offset, 1, FALSE); + proto_tree_add_item(fh_tree, hf_pap_code, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; /* Identifier */ - proto_tree_add_item(fh_tree, hf_pap_identifier, tvb, offset, 1, FALSE); + proto_tree_add_item(fh_tree, hf_pap_identifier, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; /* Length */ - proto_tree_add_item(fh_tree, hf_pap_length, tvb, offset, 2, FALSE); + proto_tree_add_item(fh_tree, hf_pap_length, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; @@ -4490,7 +4490,7 @@ dissect_pap( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) { switch(code){ case CONFREQ: - proto_tree_add_item(data_tree, hf_pap_peer_id_length, tvb, offset, 1, FALSE); + proto_tree_add_item(data_tree, hf_pap_peer_id_length, tvb, offset, 1, ENC_BIG_ENDIAN); peer_id_length = tvb_get_guint8(tvb, offset); offset +=1; @@ -4498,7 +4498,7 @@ dissect_pap( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) { peer_id = tvb_format_text(tvb, offset, peer_id_length); offset += peer_id_length; - proto_tree_add_item(data_tree, hf_pap_password_length, tvb, offset, 1, FALSE); + proto_tree_add_item(data_tree, hf_pap_password_length, tvb, offset, 1, ENC_BIG_ENDIAN); password_length = tvb_get_guint8(tvb, offset); offset +=1; @@ -4510,7 +4510,7 @@ dissect_pap( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) { break; case CONFACK: case CONFNAK: - proto_tree_add_item(data_tree, hf_pap_message_length, tvb, offset, 1, FALSE); + proto_tree_add_item(data_tree, hf_pap_message_length, tvb, offset, 1, ENC_BIG_ENDIAN); message_length = tvb_get_guint8(tvb, offset); offset +=1; @@ -4556,10 +4556,10 @@ dissect_chap( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) { fh_tree = proto_item_add_subtree(ti, ett_chap); /* Code */ - proto_tree_add_item(fh_tree, hf_chap_code, tvb, 0, 1, FALSE); + proto_tree_add_item(fh_tree, hf_chap_code, tvb, 0, 1, ENC_BIG_ENDIAN); /* Identifier */ - proto_tree_add_item(fh_tree, hf_chap_identifier, tvb, 1, 1, FALSE); + proto_tree_add_item(fh_tree, hf_chap_identifier, tvb, 1, 1, ENC_BIG_ENDIAN); } /* Length - make sure it's valid */ @@ -4574,7 +4574,7 @@ dissect_chap( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) { } proto_item_set_len(ti, length); if(tree) { - proto_tree_add_item(fh_tree, hf_chap_length, tvb, 2, 2, FALSE); + proto_tree_add_item(fh_tree, hf_chap_length, tvb, 2, 2, ENC_BIG_ENDIAN); } /* Offset moved to after length field */ @@ -4606,7 +4606,7 @@ dissect_chap( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) { length); return; } - proto_tree_add_item(field_tree, hf_chap_value_size, tvb, offset, 1, FALSE); + proto_tree_add_item(field_tree, hf_chap_value_size, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; /* Value */ diff --git a/epan/dissectors/packet-pppoe.c b/epan/dissectors/packet-pppoe.c index 9137bf01d0..8595e25f41 100644 --- a/epan/dissectors/packet-pppoe.c +++ b/epan/dissectors/packet-pppoe.c @@ -344,8 +344,8 @@ dissect_pppoe_subtags_dslf(tvbuff_t *tvb, packet_info *pinfo _U_, int offset, pr /* Tag value and data length */ if (global_pppoe_show_tags_and_lengths) { - proto_tree_add_item(pppoe_tree, hf_pppoed_tag_vspec_tag, tvb, tagstart, 1, FALSE); - proto_tree_add_item(pppoe_tree, hf_pppoed_tag_length_8, tvb, tagstart+1, 1, FALSE); + proto_tree_add_item(pppoe_tree, hf_pppoed_tag_vspec_tag, tvb, tagstart, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(pppoe_tree, hf_pppoed_tag_length_8, tvb, tagstart+1, 1, ENC_BIG_ENDIAN); } /* Show tag data */ @@ -393,11 +393,11 @@ dissect_pppoe_subtags_dslf(tvbuff_t *tvb, packet_info *pinfo _U_, int offset, pr } encaps_tree = proto_item_add_subtree(ti, ett_pppoed_tag_vspec_dslf_access_loop_encaps); proto_tree_add_item(encaps_tree, hf_pppoed_tag_vspec_access_loop_encap_data_link, - tvb, tagstart+2, 1, FALSE); + tvb, tagstart+2, 1, ENC_BIG_ENDIAN); proto_tree_add_item(encaps_tree, hf_pppoed_tag_vspec_access_loop_encap_encap_1, - tvb, tagstart+3, 1, FALSE); + tvb, tagstart+3, 1, ENC_BIG_ENDIAN); proto_tree_add_item(encaps_tree, hf_pppoed_tag_vspec_access_loop_encap_encap_2, - tvb, tagstart+4, 1, FALSE); + tvb, tagstart+4, 1, ENC_BIG_ENDIAN); break; default: @@ -407,8 +407,8 @@ dissect_pppoe_subtags_dslf(tvbuff_t *tvb, packet_info *pinfo _U_, int offset, pr show tag value if we didn't do it above */ if (!global_pppoe_show_tags_and_lengths) { - proto_tree_add_item(pppoe_tree, hf_pppoed_tag, tvb, tagstart, 1, FALSE); - proto_tree_add_item(pppoe_tree, hf_pppoed_tag_length_8, tvb, tagstart+1, 1, FALSE); + proto_tree_add_item(pppoe_tree, hf_pppoed_tag, tvb, tagstart, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(pppoe_tree, hf_pppoed_tag_length_8, tvb, tagstart+1, 1, ENC_BIG_ENDIAN); } proto_tree_add_item(pppoe_tree, hf_pppoed_tag_unknown_data, tvb, tagstart+1, poe_tag_length, ENC_NA); @@ -454,9 +454,9 @@ dissect_pppoe_tags(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *tr /* Tag value and data length */ if (global_pppoe_show_tags_and_lengths) { - proto_tree_add_item(pppoe_tree, hf_pppoed_tag, tvb, tagstart, 2, FALSE); + proto_tree_add_item(pppoe_tree, hf_pppoed_tag, tvb, tagstart, 2, ENC_BIG_ENDIAN); pppoe_tree_tag_length_item = - proto_tree_add_item(pppoe_tree, hf_pppoed_tag_length, tvb, tagstart+2, 2, FALSE); + proto_tree_add_item(pppoe_tree, hf_pppoed_tag_length, tvb, tagstart+2, 2, ENC_BIG_ENDIAN); } /* Show tag data */ @@ -491,7 +491,7 @@ dissect_pppoe_tags(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *tr if (poe_tag_length >= 4) { proto_tree_add_item(pppoe_tree, hf_pppoed_tag_vendor_id, tvb, - tagstart+4, 4, FALSE); + tagstart+4, 4, ENC_BIG_ENDIAN); } if (poe_tag_length > 4) { @@ -512,9 +512,9 @@ dissect_pppoe_tags(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *tr if (poe_tag_length == 4) { proto_tree_add_item(pppoe_tree, hf_pppoed_tag_credits_fcn, tvb, - tagstart+4, 2, FALSE); + tagstart+4, 2, ENC_BIG_ENDIAN); proto_tree_add_item(pppoe_tree, hf_pppoed_tag_credits_bcn, tvb, - tagstart+6, 2, FALSE); + tagstart+6, 2, ENC_BIG_ENDIAN); } else { proto_tree_add_item(pppoe_tree, hf_pppoed_tag_credits, tvb, tagstart+4, poe_tag_length, ENC_NA); @@ -526,21 +526,21 @@ dissect_pppoe_tags(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *tr poe_rsv = tvb_get_ntohs(tvb, tagstart+4); proto_tree_add_item(pppoe_tree, hf_pppoed_tag_mdr_units, tvb, - tagstart+4, 2, FALSE); + tagstart+4, 2, ENC_BIG_ENDIAN); proto_tree_add_item(pppoe_tree, hf_pppoed_tag_cdr_units, tvb, - tagstart+4, 2, FALSE); + tagstart+4, 2, ENC_BIG_ENDIAN); proto_tree_add_item(pppoe_tree, hf_pppoed_tag_metrics_r, tvb, tagstart+4, 2, FALSE); proto_tree_add_item(pppoe_tree, hf_pppoed_tag_metrics_rlq, tvb, - tagstart+6, 1, FALSE); + tagstart+6, 1, ENC_BIG_ENDIAN); proto_tree_add_item(pppoe_tree, hf_pppoed_tag_metrics_resource, tvb, - tagstart+7, 1, FALSE); + tagstart+7, 1, ENC_BIG_ENDIAN); proto_tree_add_item(pppoe_tree, hf_pppoed_tag_metrics_latency, tvb, - tagstart+8, 2, FALSE); + tagstart+8, 2, ENC_BIG_ENDIAN); /* CDR */ ti = proto_tree_add_item(pppoe_tree, hf_pppoed_tag_metrics_curr_drate, tvb, - tagstart+10, 2, FALSE); + tagstart+10, 2, ENC_BIG_ENDIAN); switch ((poe_rsv & PPPOE_CDR_MASK) >> 1) { @@ -560,7 +560,7 @@ dissect_pppoe_tags(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *tr /* MDR */ ti = proto_tree_add_item(pppoe_tree, hf_pppoed_tag_metrics_max_drate, tvb, - tagstart+12, 2, FALSE); + tagstart+12, 2, ENC_BIG_ENDIAN); switch ((poe_rsv & PPPOE_MDR_MASK) >> 3) { @@ -586,7 +586,7 @@ dissect_pppoe_tags(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *tr case PPPOE_TAG_SEQ_NUM: if (poe_tag_length == 2) { proto_tree_add_item(pppoe_tree, hf_pppoed_tag_seq_num, tvb, - tagstart+4, poe_tag_length, FALSE); + tagstart+4, poe_tag_length, ENC_BIG_ENDIAN); } else { if (global_pppoe_show_tags_and_lengths) { proto_item_append_text(pppoe_tree_tag_length_item, " [Wrong: should be 2]"); @@ -605,7 +605,7 @@ dissect_pppoe_tags(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *tr case PPPOE_TAG_CRED_SCALE: if (poe_tag_length == 2) { proto_tree_add_item(pppoe_tree, hf_pppoed_tag_cred_scale, tvb, - tagstart+4, poe_tag_length, FALSE); + tagstart+4, poe_tag_length, ENC_BIG_ENDIAN); } else { if (global_pppoe_show_tags_and_lengths) { proto_item_append_text(pppoe_tree_tag_length_item, " [Wrong: should be 2]"); @@ -669,8 +669,8 @@ dissect_pppoe_tags(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *tr do it above */ if (!global_pppoe_show_tags_and_lengths) { - proto_tree_add_item(pppoe_tree, hf_pppoed_tag, tvb, tagstart, 2, FALSE); - proto_tree_add_item(pppoe_tree, hf_pppoed_tag_length, tvb, tagstart+2, 2, FALSE); + proto_tree_add_item(pppoe_tree, hf_pppoed_tag, tvb, tagstart, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(pppoe_tree, hf_pppoed_tag_length, tvb, tagstart+2, 2, ENC_BIG_ENDIAN); } proto_tree_add_item(pppoe_tree, hf_pppoed_tag_unknown_data, tvb, tagstart+2, poe_tag_length, ENC_NA); @@ -712,11 +712,11 @@ static void dissect_pppoed(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) pppoe_tree = proto_item_add_subtree(ti, ett_pppoed); /* Dissect fixed fields */ - proto_tree_add_item(pppoe_tree, hf_pppoe_version, tvb, 0, 1, FALSE); - proto_tree_add_item(pppoe_tree, hf_pppoe_type, tvb, 0, 1, FALSE); - proto_tree_add_item(pppoe_tree, hf_pppoe_code, tvb, 1, 1, FALSE); - proto_tree_add_item(pppoe_tree, hf_pppoe_session_id, tvb, 2, 2, FALSE); - proto_tree_add_item(pppoe_tree, hf_pppoe_payload_length, tvb, 4, 2, FALSE); + proto_tree_add_item(pppoe_tree, hf_pppoe_version, tvb, 0, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(pppoe_tree, hf_pppoe_type, tvb, 0, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(pppoe_tree, hf_pppoe_code, tvb, 1, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(pppoe_tree, hf_pppoe_session_id, tvb, 2, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(pppoe_tree, hf_pppoe_payload_length, tvb, 4, 2, ENC_BIG_ENDIAN); } /* Now dissect any tags */ @@ -1075,11 +1075,11 @@ static void dissect_pppoes(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ti = proto_tree_add_item(tree, proto_pppoes, tvb, 0, 6, FALSE); pppoe_tree = proto_item_add_subtree(ti, ett_pppoe); - proto_tree_add_item(pppoe_tree, hf_pppoe_version, tvb, 0, 1, FALSE); - proto_tree_add_item(pppoe_tree, hf_pppoe_type, tvb, 0, 1, FALSE); - proto_tree_add_item(pppoe_tree, hf_pppoe_code, tvb, 1, 1, FALSE); - proto_tree_add_item(pppoe_tree, hf_pppoe_session_id, tvb, 2, 2, FALSE); - ti = proto_tree_add_item(pppoe_tree, hf_pppoe_payload_length, tvb, 4, 2, FALSE); + proto_tree_add_item(pppoe_tree, hf_pppoe_version, tvb, 0, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(pppoe_tree, hf_pppoe_type, tvb, 0, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(pppoe_tree, hf_pppoe_code, tvb, 1, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(pppoe_tree, hf_pppoe_session_id, tvb, 2, 2, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(pppoe_tree, hf_pppoe_payload_length, tvb, 4, 2, ENC_BIG_ENDIAN); if (PPPOE_TAG_CREDITS == tvb_get_ntohs(tvb, 6)) @@ -1095,9 +1095,9 @@ static void dissect_pppoes(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (poe_tag_length == 4) { proto_tree_add_item(pppoe_tree, hf_pppoes_tag_credits_fcn, tvb, - tagstart+4, 2, FALSE); + tagstart+4, 2, ENC_BIG_ENDIAN); proto_tree_add_item(pppoe_tree, hf_pppoes_tag_credits_bcn, tvb, - tagstart+6, 2, FALSE); + tagstart+6, 2, ENC_BIG_ENDIAN); } else { proto_tree_add_item(pppoe_tree, hf_pppoed_tag_credits, tvb, tagstart+4, poe_tag_length, ENC_NA); diff --git a/epan/dissectors/packet-pptp.c b/epan/dissectors/packet-pptp.c index 89f9f448b1..97bb09af4c 100644 --- a/epan/dissectors/packet-pptp.c +++ b/epan/dissectors/packet-pptp.c @@ -231,16 +231,16 @@ dissect_cntrl_req(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree_add_item(tree, hf_pptp_reserved, tvb, offset, 2, ENC_NA); offset += 2; - proto_tree_add_item(tree, hf_pptp_framing_capabilities, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_pptp_framing_capabilities, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(tree, hf_pptp_bearer_capabilities, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_pptp_bearer_capabilities, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(tree, hf_pptp_maximum_channels, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_pptp_maximum_channels, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(tree, hf_pptp_firmware_revision, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_pptp_firmware_revision, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(tree, hf_pptp_host_name, tvb, offset, 64, FALSE); @@ -259,22 +259,22 @@ dissect_cntrl_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, tvb_get_guint8(tvb, offset), tvb_get_guint8(tvb, offset + 1)); offset += 2; - proto_tree_add_item(tree, hf_pptp_control_result, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_pptp_control_result, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(tree, hf_pptp_error, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_pptp_error, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(tree, hf_pptp_framing_capabilities, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_pptp_framing_capabilities, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(tree, hf_pptp_bearer_capabilities, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_pptp_bearer_capabilities, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(tree, hf_pptp_maximum_channels, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_pptp_maximum_channels, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(tree, hf_pptp_firmware_revision, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_pptp_firmware_revision, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(tree, hf_pptp_host_name, tvb, offset, 64, FALSE); @@ -288,7 +288,7 @@ static void dissect_stop_req(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item(tree, hf_pptp_reason, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_pptp_reason, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; proto_tree_add_item(tree, hf_pptp_reserved, tvb, offset, 1, ENC_NA); @@ -302,10 +302,10 @@ dissect_stop_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item(tree, hf_pptp_stop_result, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_pptp_stop_result, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(tree, hf_pptp_error, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_pptp_error, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; proto_tree_add_item(tree, hf_pptp_reserved, tvb, offset, 2, ENC_NA);; @@ -316,7 +316,7 @@ static void dissect_echo_req(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item(tree, hf_pptp_identifier, tvb, offset, 4, FALSE);; + proto_tree_add_item(tree, hf_pptp_identifier, tvb, offset, 4, ENC_BIG_ENDIAN);; } static void @@ -324,13 +324,13 @@ dissect_echo_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item(tree, hf_pptp_identifier, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_pptp_identifier, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(tree, hf_pptp_echo_result, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_pptp_echo_result, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(tree, hf_pptp_error, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_pptp_error, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; proto_tree_add_item(tree, hf_pptp_reserved, tvb, offset, 2, ENC_NA); @@ -343,28 +343,28 @@ dissect_out_req(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree_add_item(tree, hf_pptp_call_id, tvb, offset, 2, FALSE); offset += 2; - proto_tree_add_item(tree, hf_pptp_call_serial_number, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_pptp_call_serial_number, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(tree, hf_pptp_minimum_bps, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_pptp_minimum_bps, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(tree, hf_pptp_maximum_bps, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_pptp_maximum_bps, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(tree, hf_pptp_bearer_type, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_pptp_bearer_type, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(tree, hf_pptp_framing_type, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_pptp_framing_type, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; proto_tree_add_item(tree, hf_pptp_packet_receive_window_size, tvb, offset, 2, FALSE); offset += 2; - proto_tree_add_item(tree, hf_pptp_packet_processing_delay, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_pptp_packet_processing_delay, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(tree, hf_pptp_phone_number_length, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_pptp_phone_number_length, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(tree, hf_pptp_reserved, tvb, offset, 2, ENC_NA); @@ -384,16 +384,16 @@ dissect_out_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree_add_item(tree, hf_pptp_call_id, tvb, offset, 2, FALSE); offset += 2; - proto_tree_add_item(tree, hf_pptp_peer_call_id, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_pptp_peer_call_id, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(tree, hf_pptp_out_result, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_pptp_out_result, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(tree, hf_pptp_error, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_pptp_error, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(tree, hf_pptp_cause, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_pptp_cause, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(tree, hf_pptp_connect_speed, tvb, offset, 4, FALSE); @@ -402,10 +402,10 @@ dissect_out_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree_add_item(tree, hf_pptp_packet_receive_window_size, tvb, offset, 2, FALSE); offset += 2; - proto_tree_add_item(tree, hf_pptp_packet_processing_delay, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_pptp_packet_processing_delay, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(tree, hf_pptp_physical_channel_id, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_pptp_physical_channel_id, tvb, offset, 4, ENC_BIG_ENDIAN); } static void @@ -416,19 +416,19 @@ dissect_in_req(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree_add_item(tree, hf_pptp_call_id, tvb, offset, 2, FALSE); offset += 2; - proto_tree_add_item(tree, hf_pptp_call_serial_number, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_pptp_call_serial_number, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(tree, hf_pptp_bearer_type, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_pptp_bearer_type, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(tree, hf_pptp_physical_channel_id, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_pptp_physical_channel_id, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(tree, hf_pptp_dialed_number_length, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_pptp_dialed_number_length, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(tree, hf_pptp_dialing_number_length, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_pptp_dialing_number_length, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(tree, hf_pptp_dialed_number, tvb, offset, 64, FALSE); @@ -447,19 +447,19 @@ dissect_in_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree_add_item(tree, hf_pptp_call_id, tvb, offset, 2, FALSE); offset += 2; - proto_tree_add_item(tree, hf_pptp_peer_call_id, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_pptp_peer_call_id, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(tree, hf_pptp_in_result, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_pptp_in_result, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(tree, hf_pptp_error, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_pptp_error, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; proto_tree_add_item(tree, hf_pptp_packet_receive_window_size, tvb, offset, 2, FALSE); offset += 2; - proto_tree_add_item(tree, hf_pptp_packet_processing_delay, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_pptp_packet_processing_delay, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(tree, hf_pptp_reserved, tvb, offset, 2, ENC_NA); @@ -469,7 +469,7 @@ static void dissect_in_connected(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item(tree, hf_pptp_peer_call_id, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_pptp_peer_call_id, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(tree, hf_pptp_reserved, tvb, offset, 2, ENC_NA); @@ -481,10 +481,10 @@ dissect_in_connected(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree_add_item(tree, hf_pptp_packet_receive_window_size, tvb, offset, 2, FALSE); offset += 2; - proto_tree_add_item(tree, hf_pptp_packet_processing_delay, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_pptp_packet_processing_delay, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(tree, hf_pptp_framing_type, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_pptp_framing_type, tvb, offset, 4, ENC_BIG_ENDIAN); } static void @@ -504,13 +504,13 @@ dissect_disc_notify(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree_add_item(tree, hf_pptp_call_id, tvb, offset, 2, FALSE); offset += 2; - proto_tree_add_item(tree, hf_pptp_disc_result, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_pptp_disc_result, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(tree, hf_pptp_error, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_pptp_error, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(tree, hf_pptp_cause, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_pptp_cause, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(tree, hf_pptp_reserved, tvb, offset, 2, ENC_NA); @@ -523,44 +523,44 @@ static void dissect_error_notify(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item(tree, hf_pptp_peer_call_id, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_pptp_peer_call_id, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(tree, hf_pptp_reserved, tvb, offset, 2, ENC_NA); offset += 2; - proto_tree_add_item(tree, hf_pptp_crc_errors, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_pptp_crc_errors, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(tree, hf_pptp_framing_errors, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_pptp_framing_errors, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(tree, hf_pptp_hardware_overruns, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_pptp_hardware_overruns, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(tree, hf_pptp_buffer_overruns, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_pptp_buffer_overruns, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(tree, hf_pptp_timeout_errors, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_pptp_timeout_errors, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(tree, hf_pptp_alignment_errors, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_pptp_alignment_errors, tvb, offset, 4, ENC_BIG_ENDIAN); } static void dissect_set_link(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item(tree, hf_pptp_peer_call_id, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_pptp_peer_call_id, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(tree, hf_pptp_reserved, tvb, offset, 2, ENC_NA); offset += 2; - proto_tree_add_item(tree, hf_pptp_send_accm, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_pptp_send_accm, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(tree, hf_pptp_receive_accm, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_pptp_receive_accm, tvb, offset, 4, ENC_BIG_ENDIAN); } static void @@ -586,13 +586,13 @@ dissect_pptp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ti = proto_tree_add_item(tree, proto_pptp, tvb, offset, len, FALSE); pptp_tree = proto_item_add_subtree(ti, ett_pptp); - proto_tree_add_item(pptp_tree, hf_pptp_length, tvb, offset, 2, FALSE); + proto_tree_add_item(pptp_tree, hf_pptp_length, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(pptp_tree, hf_pptp_message_type, tvb, offset, 2, FALSE); + proto_tree_add_item(pptp_tree, hf_pptp_message_type, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - item = proto_tree_add_item(pptp_tree, hf_pptp_magic_cookie, tvb, offset, 4, FALSE); + item = proto_tree_add_item(pptp_tree, hf_pptp_magic_cookie, tvb, offset, 4, ENC_BIG_ENDIAN); if (tvb_get_ntohl(tvb, offset) == MAGIC_COOKIE) proto_item_append_text(item," (correct)"); @@ -603,7 +603,7 @@ dissect_pptp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset += 4; - proto_tree_add_item(pptp_tree, hf_pptp_control_message_type, tvb, offset, 2, FALSE); + proto_tree_add_item(pptp_tree, hf_pptp_control_message_type, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(pptp_tree, hf_pptp_reserved, tvb, offset, 2, ENC_NA); diff --git a/epan/dissectors/packet-prp.c b/epan/dissectors/packet-prp.c index 3d3dc895b1..d767605134 100644 --- a/epan/dissectors/packet-prp.c +++ b/epan/dissectors/packet-prp.c @@ -146,13 +146,13 @@ dissect_prp_supervision_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre prp_tree = proto_item_add_subtree(ti, ett_prp_supervision_frame); proto_tree_add_item(prp_tree, hf_prp_supervision_frame_version, - tvb, PRP_VERSION_OFFSET, PRP_VERSION_LENGTH, FALSE); + tvb, PRP_VERSION_OFFSET, PRP_VERSION_LENGTH, ENC_BIG_ENDIAN); proto_tree_add_item(prp_tree, hf_prp_supervision_frame_type, - tvb, PRP_TYPE_OFFSET, PRP_TYPE_LENGTH, FALSE); + tvb, PRP_TYPE_OFFSET, PRP_TYPE_LENGTH, ENC_BIG_ENDIAN); proto_tree_add_item(prp_tree, hf_prp_supervision_frame_length, - tvb, PRP_LENGTH_OFFSET, PRP_LENGTH_LENGTH, FALSE); + tvb, PRP_LENGTH_OFFSET, PRP_LENGTH_LENGTH, ENC_BIG_ENDIAN); proto_tree_add_item(prp_tree, hf_prp_supervision_frame_source_mac_address_A, tvb, PRP_SOURCEMACADDRESSA_OFFSET, PRP_SOURCE_LENGTH, @@ -168,10 +168,10 @@ dissect_prp_supervision_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre if((tlv2 == 0x1e06) || (tlv2 == 0x1f06)) { proto_tree_add_item(prp_tree, hf_prp_supervision_frame_type2, - tvb, PRP_TYPE2_OFFSET, PRP_TYPE_LENGTH, FALSE); + tvb, PRP_TYPE2_OFFSET, PRP_TYPE_LENGTH, ENC_BIG_ENDIAN); proto_tree_add_item(prp_tree, hf_prp_supervision_frame_length2, - tvb, PRP_LENGTH2_OFFSET, PRP_LENGTH_LENGTH, FALSE); + tvb, PRP_LENGTH2_OFFSET, PRP_LENGTH_LENGTH, ENC_BIG_ENDIAN); if(tlv2 == 0x1e06) { @@ -251,13 +251,13 @@ dissect_prp_redundancy_control_trailer(tvbuff_t *tvb, packet_info *pinfo _U_, pr prp_tree = proto_item_add_subtree(ti, ett_prp_redundancy_control_trailer); proto_tree_add_item(prp_tree, hf_prp_redundancy_control_trailer_sequence_nr, - tvb, (trailer_offset-4), 2, FALSE); + tvb, (trailer_offset-4), 2, ENC_BIG_ENDIAN); proto_tree_add_item(prp_tree, hf_prp_redundancy_control_trailer_lan, - tvb, (trailer_offset-2), 2, FALSE); + tvb, (trailer_offset-2), 2, ENC_BIG_ENDIAN); proto_tree_add_item(prp_tree, hf_prp_redundancy_control_trailer_size, - tvb, (trailer_offset-2), 2, FALSE); + tvb, (trailer_offset-2), 2, ENC_BIG_ENDIAN); } } diff --git a/epan/dissectors/packet-ptp.c b/epan/dissectors/packet-ptp.c index 12d2ad0505..35b596ffdd 100644 --- a/epan/dissectors/packet-ptp.c +++ b/epan/dissectors/packet-ptp.c @@ -1607,59 +1607,59 @@ dissect_ptp_v1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ptp_tree = proto_item_add_subtree(ti, ett_ptp); proto_tree_add_item(ptp_tree, - hf_ptp_versionptp, tvb, PTP_VERSIONPTP_OFFSET, 2, FALSE); + hf_ptp_versionptp, tvb, PTP_VERSIONPTP_OFFSET, 2, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, - hf_ptp_versionnetwork, tvb, PTP_VERSIONNETWORK_OFFSET, 2, FALSE); + hf_ptp_versionnetwork, tvb, PTP_VERSIONNETWORK_OFFSET, 2, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_subdomain, tvb, PTP_SUBDOMAIN_OFFSET, 16, FALSE); proto_tree_add_item(ptp_tree, - hf_ptp_messagetype, tvb, PTP_MESSAGETYPE_OFFSET, 1, FALSE); + hf_ptp_messagetype, tvb, PTP_MESSAGETYPE_OFFSET, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, - hf_ptp_sourcecommunicationtechnology, tvb, PTP_SOURCECOMMUNICATIONTECHNOLOGY_OFFSET, 1, FALSE); + hf_ptp_sourcecommunicationtechnology, tvb, PTP_SOURCECOMMUNICATIONTECHNOLOGY_OFFSET, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_sourceuuid, tvb, PTP_SOURCEUUID_OFFSET, 6, FALSE); proto_tree_add_item(ptp_tree, - hf_ptp_sourceportid, tvb, PTP_SOURCEPORTID_OFFSET, 2, FALSE); + hf_ptp_sourceportid, tvb, PTP_SOURCEPORTID_OFFSET, 2, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, - hf_ptp_sequenceid, tvb, PTP_SEQUENCEID_OFFSET, 2, FALSE); + hf_ptp_sequenceid, tvb, PTP_SEQUENCEID_OFFSET, 2, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, - hf_ptp_control, tvb, PTP_CONTROL_OFFSET, 1, FALSE); + hf_ptp_control, tvb, PTP_CONTROL_OFFSET, 1, ENC_BIG_ENDIAN); /*Subtree for the flag-field*/ if(tree){ flags_ti = proto_tree_add_item(ptp_tree, - hf_ptp_flags, tvb, PTP_FLAGS_OFFSET, 2, FALSE); + hf_ptp_flags, tvb, PTP_FLAGS_OFFSET, 2, ENC_BIG_ENDIAN); ptp_flags_tree = proto_item_add_subtree(flags_ti, ett_ptp_flags); proto_tree_add_item(ptp_flags_tree, - hf_ptp_flags_li61, tvb, PTP_FLAGS_LI61_OFFSET, 2, FALSE); + hf_ptp_flags_li61, tvb, PTP_FLAGS_LI61_OFFSET, 2, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_flags_tree, - hf_ptp_flags_li59, tvb, PTP_FLAGS_LI59_OFFSET, 2, FALSE); + hf_ptp_flags_li59, tvb, PTP_FLAGS_LI59_OFFSET, 2, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_flags_tree, - hf_ptp_flags_boundary_clock, tvb, PTP_FLAGS_BOUNDARY_CLOCK_OFFSET, 2, FALSE); + hf_ptp_flags_boundary_clock, tvb, PTP_FLAGS_BOUNDARY_CLOCK_OFFSET, 2, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_flags_tree, - hf_ptp_flags_assist, tvb, PTP_FLAGS_ASSIST_OFFSET, 2, FALSE); + hf_ptp_flags_assist, tvb, PTP_FLAGS_ASSIST_OFFSET, 2, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_flags_tree, - hf_ptp_flags_ext_sync, tvb, PTP_FLAGS_EXT_SYNC_OFFSET, 2, FALSE); + hf_ptp_flags_ext_sync, tvb, PTP_FLAGS_EXT_SYNC_OFFSET, 2, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_flags_tree, - hf_ptp_flags_parent, tvb, PTP_FLAGS_PARENT_STATS_OFFSET, 2, FALSE); + hf_ptp_flags_parent, tvb, PTP_FLAGS_PARENT_STATS_OFFSET, 2, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_flags_tree, - hf_ptp_flags_sync_burst, tvb, PTP_FLAGS_SYNC_BURST_OFFSET, 2, FALSE); + hf_ptp_flags_sync_burst, tvb, PTP_FLAGS_SYNC_BURST_OFFSET, 2, ENC_BIG_ENDIAN); } /* The rest of the ptp-dissector depends on the control-field */ @@ -1679,77 +1679,77 @@ dissect_ptp_v1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(ptp_time_tree, hf_ptp_sdr_origintimestamp_seconds, tvb, - PTP_SDR_ORIGINTIMESTAMP_SECONDS_OFFSET, 4, FALSE); + PTP_SDR_ORIGINTIMESTAMP_SECONDS_OFFSET, 4, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_time_tree, hf_ptp_sdr_origintimestamp_nanoseconds, tvb, - PTP_SDR_ORIGINTIMESTAMP_NANOSECONDS_OFFSET, 4, FALSE); + PTP_SDR_ORIGINTIMESTAMP_NANOSECONDS_OFFSET, 4, ENC_BIG_ENDIAN); } proto_tree_add_item(ptp_tree, - hf_ptp_sdr_epochnumber, tvb, PTP_SDR_EPOCHNUMBER_OFFSET, 2, FALSE); + hf_ptp_sdr_epochnumber, tvb, PTP_SDR_EPOCHNUMBER_OFFSET, 2, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, - hf_ptp_sdr_currentutcoffset, tvb, PTP_SDR_CURRENTUTCOFFSET_OFFSET, 2, FALSE); + hf_ptp_sdr_currentutcoffset, tvb, PTP_SDR_CURRENTUTCOFFSET_OFFSET, 2, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_sdr_grandmastercommunicationtechnology, tvb, - PTP_SDR_GRANDMASTERCOMMUNICATIONTECHNOLOGY_OFFSET, 1, FALSE); + PTP_SDR_GRANDMASTERCOMMUNICATIONTECHNOLOGY_OFFSET, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_sdr_grandmasterclockuuid, tvb, PTP_SDR_GRANDMASTERCLOCKUUID_OFFSET, 6, FALSE); proto_tree_add_item(ptp_tree, - hf_ptp_sdr_grandmasterportid, tvb, PTP_SDR_GRANDMASTERPORTID_OFFSET, 2, FALSE); + hf_ptp_sdr_grandmasterportid, tvb, PTP_SDR_GRANDMASTERPORTID_OFFSET, 2, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, - hf_ptp_sdr_grandmastersequenceid, tvb, PTP_SDR_GRANDMASTERSEQUENCEID_OFFSET, 2, FALSE); + hf_ptp_sdr_grandmastersequenceid, tvb, PTP_SDR_GRANDMASTERSEQUENCEID_OFFSET, 2, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_sdr_grandmasterclockstratum, tvb, - PTP_SDR_GRANDMASTERCLOCKSTRATUM_OFFSET, 1, FALSE); + PTP_SDR_GRANDMASTERCLOCKSTRATUM_OFFSET, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_sdr_grandmasterclockidentifier, tvb, PTP_SDR_GRANDMASTERCLOCKIDENTIFIER_OFFSET, 4, FALSE); proto_tree_add_item(ptp_tree, hf_ptp_sdr_grandmasterclockvariance, tvb, - PTP_SDR_GRANDMASTERCLOCKVARIANCE_OFFSET, 2, FALSE); + PTP_SDR_GRANDMASTERCLOCKVARIANCE_OFFSET, 2, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, - hf_ptp_sdr_grandmasterpreferred, tvb, PTP_SDR_GRANDMASTERPREFERRED_OFFSET, 1, FALSE); + hf_ptp_sdr_grandmasterpreferred, tvb, PTP_SDR_GRANDMASTERPREFERRED_OFFSET, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_sdr_grandmasterisboundaryclock, tvb, - PTP_SDR_GRANDMASTERISBOUNDARYCLOCK_OFFSET, 1, FALSE); + PTP_SDR_GRANDMASTERISBOUNDARYCLOCK_OFFSET, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, - hf_ptp_sdr_syncinterval, tvb, PTP_SDR_SYNCINTERVAL_OFFSET, 1, FALSE); + hf_ptp_sdr_syncinterval, tvb, PTP_SDR_SYNCINTERVAL_OFFSET, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, - hf_ptp_sdr_localclockvariance, tvb, PTP_SDR_LOCALCLOCKVARIANCE_OFFSET, 2, FALSE); + hf_ptp_sdr_localclockvariance, tvb, PTP_SDR_LOCALCLOCKVARIANCE_OFFSET, 2, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, - hf_ptp_sdr_localstepsremoved, tvb, PTP_SDR_LOCALSTEPSREMOVED_OFFSET, 2, FALSE); + hf_ptp_sdr_localstepsremoved, tvb, PTP_SDR_LOCALSTEPSREMOVED_OFFSET, 2, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, - hf_ptp_sdr_localclockstratum, tvb, PTP_SDR_LOCALCLOCKSTRATUM_OFFSET, 1, FALSE); + hf_ptp_sdr_localclockstratum, tvb, PTP_SDR_LOCALCLOCKSTRATUM_OFFSET, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_sdr_localclockidentifier, tvb, PTP_SDR_LOCALCLOCKIDENTIFIER_OFFSET, 4, FALSE); proto_tree_add_item(ptp_tree, hf_ptp_sdr_parentcommunicationtechnology, tvb, - PTP_SDR_PARENTCOMMUNICATIONTECHNOLOGY_OFFSET, 1, FALSE); + PTP_SDR_PARENTCOMMUNICATIONTECHNOLOGY_OFFSET, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_sdr_parentuuid, tvb, PTP_SDR_PARENTUUID_OFFSET, 6, FALSE); proto_tree_add_item(ptp_tree, - hf_ptp_sdr_parentportfield, tvb, PTP_SDR_PARENTPORTFIELD_OFFSET, 2, FALSE); + hf_ptp_sdr_parentportfield, tvb, PTP_SDR_PARENTPORTFIELD_OFFSET, 2, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_sdr_estimatedmastervariance, tvb, - PTP_SDR_ESTIMATEDMASTERVARIANCE_OFFSET, 2, FALSE); + PTP_SDR_ESTIMATEDMASTERVARIANCE_OFFSET, 2, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, - hf_ptp_sdr_estimatedmasterdrift, tvb, PTP_SDR_ESTIMATEDMASTERDRIFT_OFFSET, 4, FALSE); + hf_ptp_sdr_estimatedmasterdrift, tvb, PTP_SDR_ESTIMATEDMASTERDRIFT_OFFSET, 4, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_sdr_utcreasonable, tvb, PTP_SDR_UTCREASONABLE_OFFSET, 1, FALSE); @@ -1757,7 +1757,7 @@ dissect_ptp_v1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } case PTP_FOLLOWUP_MESSAGE:{ proto_tree_add_item(ptp_tree, - hf_ptp_fu_associatedsequenceid, tvb, PTP_FU_ASSOCIATEDSEQUENCEID_OFFSET, 2, FALSE); + hf_ptp_fu_associatedsequenceid, tvb, PTP_FU_ASSOCIATEDSEQUENCEID_OFFSET, 2, ENC_BIG_ENDIAN); /*Subtree for the timestamp-field*/ ts.secs = tvb_get_ntohl(tvb, PTP_FU_PRECISEORIGINTIMESTAMP_SECONDS_OFFSET); @@ -1770,10 +1770,10 @@ dissect_ptp_v1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ptp_time_tree = proto_item_add_subtree(time_ti, ett_ptp_time); proto_tree_add_item(ptp_time_tree, hf_ptp_fu_preciseorigintimestamp_seconds, tvb, - PTP_FU_PRECISEORIGINTIMESTAMP_SECONDS_OFFSET, 4, FALSE); + PTP_FU_PRECISEORIGINTIMESTAMP_SECONDS_OFFSET, 4, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_time_tree, hf_ptp_fu_preciseorigintimestamp_nanoseconds, tvb, - PTP_FU_PRECISEORIGINTIMESTAMP_NANOSECONDS_OFFSET, 4, FALSE); + PTP_FU_PRECISEORIGINTIMESTAMP_NANOSECONDS_OFFSET, 4, ENC_BIG_ENDIAN); } break; } @@ -1789,60 +1789,60 @@ dissect_ptp_v1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ptp_time_tree = proto_item_add_subtree(time_ti, ett_ptp_time); proto_tree_add_item(ptp_time_tree, hf_ptp_dr_delayreceipttimestamp_seconds, tvb, - PTP_DR_DELAYRECEIPTTIMESTAMP_SECONDS_OFFSET, 4, FALSE); + PTP_DR_DELAYRECEIPTTIMESTAMP_SECONDS_OFFSET, 4, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_time_tree, hf_ptp_dr_delayreceipttimestamp_nanoseconds, tvb, - PTP_DR_DELAYRECEIPTTIMESTAMP_NANOSECONDS_OFFSET, 4, FALSE); + PTP_DR_DELAYRECEIPTTIMESTAMP_NANOSECONDS_OFFSET, 4, ENC_BIG_ENDIAN); } proto_tree_add_item(ptp_tree, hf_ptp_dr_requestingsourcecommunicationtechnology, tvb, - PTP_DR_REQUESTINGSOURCECOMMUNICATIONTECHNOLOGY_OFFSET, 1, FALSE); + PTP_DR_REQUESTINGSOURCECOMMUNICATIONTECHNOLOGY_OFFSET, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_dr_requestingsourceuuid, tvb, PTP_DR_REQUESTINGSOURCEUUID_OFFSET, 6, FALSE); proto_tree_add_item(ptp_tree, - hf_ptp_dr_requestingsourceportid, tvb, PTP_DR_REQUESTINGSOURCEPORTID_OFFSET, 2, FALSE); + hf_ptp_dr_requestingsourceportid, tvb, PTP_DR_REQUESTINGSOURCEPORTID_OFFSET, 2, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_dr_requestingsourcesequenceid, tvb, - PTP_DR_REQUESTINGSOURCESEQUENCEID_OFFSET, 2, FALSE); + PTP_DR_REQUESTINGSOURCESEQUENCEID_OFFSET, 2, ENC_BIG_ENDIAN); break; } case PTP_MANAGEMENT_MESSAGE:{ proto_tree_add_item(ptp_tree, hf_ptp_mm_targetcommunicationtechnology, tvb, - PTP_MM_TARGETCOMMUNICATIONTECHNOLOGY_OFFSET, 1, FALSE); + PTP_MM_TARGETCOMMUNICATIONTECHNOLOGY_OFFSET, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_mm_targetuuid, tvb, PTP_MM_TARGETUUID_OFFSET, 6, FALSE); proto_tree_add_item(ptp_tree, - hf_ptp_mm_targetportid, tvb, PTP_MM_TARGETPORTID_OFFSET, 2, FALSE); + hf_ptp_mm_targetportid, tvb, PTP_MM_TARGETPORTID_OFFSET, 2, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, - hf_ptp_mm_startingboundaryhops, tvb, PTP_MM_STARTINGBOUNDARYHOPS_OFFSET, 2, FALSE); + hf_ptp_mm_startingboundaryhops, tvb, PTP_MM_STARTINGBOUNDARYHOPS_OFFSET, 2, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, - hf_ptp_mm_boundaryhops, tvb, PTP_MM_BOUNDARYHOPS_OFFSET, 2, FALSE); + hf_ptp_mm_boundaryhops, tvb, PTP_MM_BOUNDARYHOPS_OFFSET, 2, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, - hf_ptp_mm_managementmessagekey, tvb, PTP_MM_MANAGEMENTMESSAGEKEY_OFFSET, 1, FALSE); + hf_ptp_mm_managementmessagekey, tvb, PTP_MM_MANAGEMENTMESSAGEKEY_OFFSET, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, - hf_ptp_mm_parameterlength, tvb, PTP_MM_PARAMETERLENGTH_OFFSET, 2, FALSE); + hf_ptp_mm_parameterlength, tvb, PTP_MM_PARAMETERLENGTH_OFFSET, 2, ENC_BIG_ENDIAN); switch(ptp_mm_messagekey){ case PTP_MM_CLOCK_IDENTITY:{ proto_tree_add_item(ptp_tree, hf_ptp_mm_clock_identity_clockcommunicationtechnology, tvb, - PTP_MM_CLOCK_IDENTITY_CLOCKCOMMUNICATIONTECHNOLOGY_OFFSET, 1, FALSE); + PTP_MM_CLOCK_IDENTITY_CLOCKCOMMUNICATIONTECHNOLOGY_OFFSET, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_mm_clock_identity_clockuuidfield, tvb, PTP_MM_CLOCK_IDENTITY_CLOCKUUIDFIELD_OFFSET, 6, FALSE); proto_tree_add_item(ptp_tree, hf_ptp_mm_clock_identity_clockportfield, tvb, - PTP_MM_CLOCK_IDENTITY_CLOCKPORTFIELD_OFFSET, 2, FALSE); + PTP_MM_CLOCK_IDENTITY_CLOCKPORTFIELD_OFFSET, 2, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_mm_clock_identity_manufactureridentity, tvb, PTP_MM_CLOCK_IDENTITY_MANUFACTURERIDENTITY_OFFSET, 48, ENC_NA); @@ -1850,7 +1850,7 @@ dissect_ptp_v1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } case PTP_MM_INITIALIZE_CLOCK:{ proto_tree_add_item(ptp_tree, hf_ptp_mm_initialize_clock_initialisationkey, tvb, - PTP_MM_INITIALIZE_CLOCK_INITIALISATIONKEY_OFFSET, 2, FALSE); + PTP_MM_INITIALIZE_CLOCK_INITIALISATIONKEY_OFFSET, 2, ENC_BIG_ENDIAN); break; } case PTP_MM_SET_SUBDOMAIN:{ @@ -1861,22 +1861,22 @@ dissect_ptp_v1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case PTP_MM_DEFAULT_DATA_SET:{ proto_tree_add_item(ptp_tree, hf_ptp_mm_default_data_set_clockcommunicationtechnology, tvb, PTP_MM_DEFAULT_DATA_SET_CLOCKCOMMUNICATIONTECHNOLOGY_OFFSET, - 1, FALSE); + 1, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_mm_default_data_set_clockuuidfield, tvb, PTP_MM_DEFAULT_DATA_SET_CLOCKUUIDFIELD_OFFSET, 6, FALSE); proto_tree_add_item(ptp_tree, hf_ptp_mm_default_data_set_clockportfield, tvb, - PTP_MM_DEFAULT_DATA_SET_CLOCKPORTFIELD_OFFSET, 2, FALSE); + PTP_MM_DEFAULT_DATA_SET_CLOCKPORTFIELD_OFFSET, 2, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_mm_default_data_set_clockstratum, tvb, - PTP_MM_DEFAULT_DATA_SET_CLOCKSTRATUM_OFFSET, 1, FALSE); + PTP_MM_DEFAULT_DATA_SET_CLOCKSTRATUM_OFFSET, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_mm_default_data_set_clockidentifier, tvb, PTP_MM_DEFAULT_DATA_SET_CLOCKIDENTIFIER_OFFSET, 4, ENC_NA); proto_tree_add_item(ptp_tree, hf_ptp_mm_default_data_set_clockvariance, tvb, - PTP_MM_DEFAULT_DATA_SET_CLOCKVARIANCE_OFFSET, 2, FALSE); + PTP_MM_DEFAULT_DATA_SET_CLOCKVARIANCE_OFFSET, 2, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_mm_default_data_set_clockfollowupcapable, tvb, PTP_MM_DEFAULT_DATA_SET_CLOCKFOLLOWUPCAPABLE_OFFSET, 1, FALSE); @@ -1894,33 +1894,33 @@ dissect_ptp_v1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) PTP_MM_DEFAULT_DATA_SET_ISBOUNDARYCLOCK_OFFSET, 1, FALSE); proto_tree_add_item(ptp_tree, hf_ptp_mm_default_data_set_syncinterval, tvb, - PTP_MM_DEFAULT_DATA_SET_SYNCINTERVAL_OFFSET, 1, FALSE); + PTP_MM_DEFAULT_DATA_SET_SYNCINTERVAL_OFFSET, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_mm_default_data_set_subdomainname, tvb, PTP_MM_DEFAULT_DATA_SET_SUBDOMAINNAME_OFFSET, 16, FALSE); proto_tree_add_item(ptp_tree, hf_ptp_mm_default_data_set_numberports, tvb, - PTP_MM_DEFAULT_DATA_SET_NUMBERPORTS_OFFSET, 2, FALSE); + PTP_MM_DEFAULT_DATA_SET_NUMBERPORTS_OFFSET, 2, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_mm_default_data_set_numberforeignrecords, tvb, - PTP_MM_DEFAULT_DATA_SET_NUMBERFOREIGNRECORDS_OFFSET, 2, FALSE); + PTP_MM_DEFAULT_DATA_SET_NUMBERFOREIGNRECORDS_OFFSET, 2, ENC_BIG_ENDIAN); break; } case PTP_MM_UPDATE_DEFAULT_DATA_SET:{ proto_tree_add_item(ptp_tree, hf_ptp_mm_update_default_data_set_clockstratum, tvb, - PTP_MM_UPDATE_DEFAULT_DATA_SET_CLOCKSTRATUM_OFFSET, 1, FALSE); + PTP_MM_UPDATE_DEFAULT_DATA_SET_CLOCKSTRATUM_OFFSET, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_mm_update_default_data_set_clockidentifier, tvb, PTP_MM_UPDATE_DEFAULT_DATA_SET_CLOCKIDENTIFIER_OFFSET, 4, ENC_NA); proto_tree_add_item(ptp_tree, hf_ptp_mm_update_default_data_set_clockvariance, tvb, - PTP_MM_UPDATE_DEFAULT_DATA_SET_CLOCKVARIANCE_OFFSET, 2, FALSE); + PTP_MM_UPDATE_DEFAULT_DATA_SET_CLOCKVARIANCE_OFFSET, 2, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_mm_update_default_data_set_preferred, tvb, PTP_MM_UPDATE_DEFAULT_DATA_SET_PREFERRED_OFFSET, 1, FALSE); proto_tree_add_item(ptp_tree, hf_ptp_mm_update_default_data_set_syncinterval, tvb, - PTP_MM_UPDATE_DEFAULT_DATA_SET_SYNCINTERVAL_OFFSET, 1, FALSE); + PTP_MM_UPDATE_DEFAULT_DATA_SET_SYNCINTERVAL_OFFSET, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_mm_update_default_data_set_subdomainname, tvb, PTP_MM_UPDATE_DEFAULT_DATA_SET_SUBDOMAINNAME_OFFSET, 16, FALSE); @@ -1928,7 +1928,7 @@ dissect_ptp_v1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } case PTP_MM_CURRENT_DATA_SET:{ proto_tree_add_item(ptp_tree, hf_ptp_mm_current_data_set_stepsremoved, tvb, - PTP_MM_CURRENT_DATA_SET_STEPSREMOVED_OFFSET, 2, FALSE); + PTP_MM_CURRENT_DATA_SET_STEPSREMOVED_OFFSET, 2, ENC_BIG_ENDIAN); /* Subtree for offset from master*/ ts.secs = tvb_get_ntohl(tvb, PTP_MM_CURRENT_DATA_SET_OFFSETFROMMASTERSECONDS_OFFSET); @@ -1947,11 +1947,11 @@ dissect_ptp_v1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(ptp_time_tree, hf_ptp_mm_current_data_set_offsetfrommasterseconds, tvb, - PTP_MM_CURRENT_DATA_SET_OFFSETFROMMASTERSECONDS_OFFSET, 4, FALSE); + PTP_MM_CURRENT_DATA_SET_OFFSETFROMMASTERSECONDS_OFFSET, 4, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_time_tree, hf_ptp_mm_current_data_set_offsetfrommasternanoseconds, tvb, - PTP_MM_CURRENT_DATA_SET_OFFSETFROMMASTERNANOSECONDS_OFFSET, 4, FALSE); + PTP_MM_CURRENT_DATA_SET_OFFSETFROMMASTERNANOSECONDS_OFFSET, 4, ENC_BIG_ENDIAN); } /* Subtree for offset from master*/ @@ -1967,28 +1967,28 @@ dissect_ptp_v1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ptp_time2_tree = proto_item_add_subtree(time2_ti, ett_ptp_time2); proto_tree_add_item(ptp_time2_tree, hf_ptp_mm_current_data_set_onewaydelayseconds, - tvb, PTP_MM_CURRENT_DATA_SET_ONEWAYDELAYSECONDS_OFFSET, 4, FALSE); + tvb, PTP_MM_CURRENT_DATA_SET_ONEWAYDELAYSECONDS_OFFSET, 4, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_time2_tree, hf_ptp_mm_current_data_set_onewaydelaynanoseconds, - tvb, PTP_MM_CURRENT_DATA_SET_ONEWAYDELAYNANOSECONDS_OFFSET, 4, FALSE); + tvb, PTP_MM_CURRENT_DATA_SET_ONEWAYDELAYNANOSECONDS_OFFSET, 4, ENC_BIG_ENDIAN); } break; } case PTP_MM_PARENT_DATA_SET:{ proto_tree_add_item(ptp_tree, hf_ptp_mm_parent_data_set_parentcommunicationtechnology, tvb, PTP_MM_PARENT_DATA_SET_PARENTCOMMUNICATIONTECHNOLOGY_OFFSET, - 1, FALSE); + 1, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_mm_parent_data_set_parentuuid, tvb, PTP_MM_PARENT_DATA_SET_PARENTUUID_OFFSET, 6, FALSE); proto_tree_add_item(ptp_tree, hf_ptp_mm_parent_data_set_parentportid, tvb, - PTP_MM_PARENT_DATA_SET_PARENTPORTID_OFFSET, 2, FALSE); + PTP_MM_PARENT_DATA_SET_PARENTPORTID_OFFSET, 2, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_mm_parent_data_set_parentlastsyncsequencenumber, tvb, PTP_MM_PARENT_DATA_SET_PARENTLASTSYNCSEQUENCENUMBER_OFFSET, - 2, FALSE); + 2, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_mm_parent_data_set_parentfollowupcapable, tvb, PTP_MM_PARENT_DATA_SET_PARENTFOLLOWUPCAPABLE_OFFSET, 1, FALSE); @@ -1997,16 +1997,16 @@ dissect_ptp_v1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) PTP_MM_PARENT_DATA_SET_PARENTEXTERNALTIMING_OFFSET, 1, FALSE); proto_tree_add_item(ptp_tree, hf_ptp_mm_parent_data_set_parentvariance, tvb, - PTP_MM_PARENT_DATA_SET_PARENTVARIANCE_OFFSET, 2, FALSE); + PTP_MM_PARENT_DATA_SET_PARENTVARIANCE_OFFSET, 2, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_mm_parent_data_set_parentstats, tvb, PTP_MM_PARENT_DATA_SET_PARENTSTATS_OFFSET, 1, FALSE); proto_tree_add_item(ptp_tree, hf_ptp_mm_parent_data_set_observedvariance, tvb, - PTP_MM_PARENT_DATA_SET_OBSERVEDVARIANCE_OFFSET, 2, FALSE); + PTP_MM_PARENT_DATA_SET_OBSERVEDVARIANCE_OFFSET, 2, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_mm_parent_data_set_observeddrift, tvb, - PTP_MM_PARENT_DATA_SET_OBSERVEDDRIFT_OFFSET, 4, FALSE); + PTP_MM_PARENT_DATA_SET_OBSERVEDDRIFT_OFFSET, 4, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_mm_parent_data_set_utcreasonable, tvb, PTP_MM_PARENT_DATA_SET_UTCREASONABLE_OFFSET, 1, FALSE); @@ -2014,22 +2014,22 @@ dissect_ptp_v1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(ptp_tree, hf_ptp_mm_parent_data_set_grandmastercommunicationtechnology, tvb, PTP_MM_PARENT_DATA_SET_GRANDMASTERCOMMUNICATIONTECHNOLOGY_OFFSET, 1, - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_mm_parent_data_set_grandmasteruuidfield, tvb, PTP_MM_PARENT_DATA_SET_GRANDMASTERUUIDFIELD_OFFSET, 6, FALSE); proto_tree_add_item(ptp_tree, hf_ptp_mm_parent_data_set_grandmasterportidfield, tvb, - PTP_MM_PARENT_DATA_SET_GRANDMASTERPORTIDFIELD_OFFSET, 2, FALSE); + PTP_MM_PARENT_DATA_SET_GRANDMASTERPORTIDFIELD_OFFSET, 2, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_mm_parent_data_set_grandmasterstratum, tvb, - PTP_MM_PARENT_DATA_SET_GRANDMASTERSTRATUM_OFFSET, 1, FALSE); + PTP_MM_PARENT_DATA_SET_GRANDMASTERSTRATUM_OFFSET, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_mm_parent_data_set_grandmasteridentifier, tvb, PTP_MM_PARENT_DATA_SET_GRANDMASTERIDENTIFIER_OFFSET, 4, ENC_NA); proto_tree_add_item(ptp_tree, hf_ptp_mm_parent_data_set_grandmastervariance, tvb, - PTP_MM_PARENT_DATA_SET_GRANDMASTERVARIANCE_OFFSET, 2, FALSE); + PTP_MM_PARENT_DATA_SET_GRANDMASTERVARIANCE_OFFSET, 2, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_mm_parent_data_set_grandmasterpreferred, tvb, PTP_MM_PARENT_DATA_SET_GRANDMASTERPREFERRED_OFFSET, 1, FALSE); @@ -2038,43 +2038,43 @@ dissect_ptp_v1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) PTP_MM_PARENT_DATA_SET_GRANDMASTERISBOUNDARYCLOCK_OFFSET, 1, FALSE); proto_tree_add_item(ptp_tree, hf_ptp_mm_parent_data_set_grandmastersequencenumber, tvb, - PTP_MM_PARENT_DATA_SET_GRANDMASTERSEQUENCENUMBER_OFFSET, 2, FALSE); + PTP_MM_PARENT_DATA_SET_GRANDMASTERSEQUENCENUMBER_OFFSET, 2, ENC_BIG_ENDIAN); break; } case PTP_MM_PORT_DATA_SET:{ proto_tree_add_item(ptp_tree, hf_ptp_mm_port_data_set_returnedportnumber, tvb, - PTP_MM_PORT_DATA_SET_RETURNEDPORTNUMBER_OFFSET, 2, FALSE); + PTP_MM_PORT_DATA_SET_RETURNEDPORTNUMBER_OFFSET, 2, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_mm_port_data_set_portstate, tvb, - PTP_MM_PORT_DATA_SET_PORTSTATE_OFFSET, 1, FALSE); + PTP_MM_PORT_DATA_SET_PORTSTATE_OFFSET, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_mm_port_data_set_lastsynceventsequencenumber, tvb, - PTP_MM_PORT_DATA_SET_LASTSYNCEVENTSEQUENCENUMBER_OFFSET, 2, FALSE); + PTP_MM_PORT_DATA_SET_LASTSYNCEVENTSEQUENCENUMBER_OFFSET, 2, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_mm_port_data_set_lastgeneraleventsequencenumber, tvb, PTP_MM_PORT_DATA_SET_LASTGENERALEVENTSEQUENCENUMBER_OFFSET, - 2, FALSE); + 2, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_mm_port_data_set_portcommunicationtechnology, tvb, - PTP_MM_PORT_DATA_SET_PORTCOMMUNICATIONTECHNOLOGY_OFFSET, 1, FALSE); + PTP_MM_PORT_DATA_SET_PORTCOMMUNICATIONTECHNOLOGY_OFFSET, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_mm_port_data_set_portuuidfield, tvb, PTP_MM_PORT_DATA_SET_PORTUUIDFIELD_OFFSET, 6, FALSE); proto_tree_add_item(ptp_tree, hf_ptp_mm_port_data_set_portidfield, tvb, - PTP_MM_PORT_DATA_SET_PORTIDFIELD_OFFSET, 2, FALSE); + PTP_MM_PORT_DATA_SET_PORTIDFIELD_OFFSET, 2, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_mm_port_data_set_burstenabled, tvb, PTP_MM_PORT_DATA_SET_BURSTENABLED_OFFSET, 1, FALSE); proto_tree_add_item(ptp_tree, hf_ptp_mm_port_data_set_subdomainaddressoctets, tvb, - PTP_MM_PORT_DATA_SET_SUBDOMAINADDRESSOCTETS_OFFSET, 1, FALSE); + PTP_MM_PORT_DATA_SET_SUBDOMAINADDRESSOCTETS_OFFSET, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_mm_port_data_set_eventportaddressoctets, tvb, - PTP_MM_PORT_DATA_SET_EVENTPORTADDRESSOCTETS_OFFSET, 1, FALSE); + PTP_MM_PORT_DATA_SET_EVENTPORTADDRESSOCTETS_OFFSET, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_mm_port_data_set_generalportaddressoctets, tvb, - PTP_MM_PORT_DATA_SET_GENERALPORTADDRESSOCTETS_OFFSET, 1, FALSE); + PTP_MM_PORT_DATA_SET_GENERALPORTADDRESSOCTETS_OFFSET, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_mm_port_data_set_subdomainaddress, tvb, PTP_MM_PORT_DATA_SET_SUBDOMAINADDRESS_OFFSET, 4, ENC_NA); @@ -2102,15 +2102,15 @@ dissect_ptp_v1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(ptp_time_tree, hf_ptp_mm_global_time_data_set_localtimeseconds, tvb, - PTP_MM_GLOBAL_TIME_DATA_SET_LOCALTIMESECONDS_OFFSET, 4, FALSE); + PTP_MM_GLOBAL_TIME_DATA_SET_LOCALTIMESECONDS_OFFSET, 4, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_time_tree, hf_ptp_mm_global_time_data_set_localtimenanoseconds, - tvb, PTP_MM_GLOBAL_TIME_DATA_SET_LOCALTIMENANOSECONDS_OFFSET, 4, FALSE); + tvb, PTP_MM_GLOBAL_TIME_DATA_SET_LOCALTIMENANOSECONDS_OFFSET, 4, ENC_BIG_ENDIAN); } proto_tree_add_item(ptp_tree, hf_ptp_mm_global_time_data_set_currentutcoffset, tvb, - PTP_MM_GLOBAL_TIME_DATA_SET_CURRENTUTCOFFSET_OFFSET, 2, FALSE); + PTP_MM_GLOBAL_TIME_DATA_SET_CURRENTUTCOFFSET_OFFSET, 2, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_mm_global_time_data_set_leap59, tvb, PTP_MM_GLOBAL_TIME_DATA_SET_LEAP59_OFFSET, 1, FALSE); @@ -2119,13 +2119,13 @@ dissect_ptp_v1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) PTP_MM_GLOBAL_TIME_DATA_SET_LEAP61_OFFSET, 1, FALSE); proto_tree_add_item(ptp_tree, hf_ptp_mm_global_time_data_set_epochnumber, tvb, - PTP_MM_GLOBAL_TIME_DATA_SET_EPOCHNUMBER_OFFSET, 2, FALSE); + PTP_MM_GLOBAL_TIME_DATA_SET_EPOCHNUMBER_OFFSET, 2, ENC_BIG_ENDIAN); break; } case PTP_MM_UPDATE_GLOBAL_TIME_PROPERTIES:{ proto_tree_add_item(ptp_tree, hf_ptp_mm_update_global_time_properties_currentutcoffset, tvb, PTP_MM_UPDATE_GLOBAL_TIME_PROPERTIES_CURRENTUTCOFFSET_OFFSET, - 2, FALSE); + 2, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_mm_update_global_time_properties_leap59, tvb, PTP_MM_UPDATE_GLOBAL_TIME_PROPERTIES_LEAP59_OFFSET, 1, FALSE); @@ -2134,39 +2134,39 @@ dissect_ptp_v1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) PTP_MM_UPDATE_GLOBAL_TIME_PROPERTIES_LEAP61_OFFSET, 1, FALSE); proto_tree_add_item(ptp_tree, hf_ptp_mm_get_foreign_data_set_recordkey, tvb, - PTP_MM_UPDATE_GLOBAL_TIME_PROPERTIES_EPOCHNUMBER_OFFSET, 2, FALSE); + PTP_MM_UPDATE_GLOBAL_TIME_PROPERTIES_EPOCHNUMBER_OFFSET, 2, ENC_BIG_ENDIAN); break; } case PTP_MM_GET_FOREIGN_DATA_SET:{ proto_tree_add_item(ptp_tree, hf_ptp_mm_get_foreign_data_set_recordkey, tvb, - PTP_MM_GET_FOREIGN_DATA_SET_RECORDKEY_OFFSET, 2, FALSE); + PTP_MM_GET_FOREIGN_DATA_SET_RECORDKEY_OFFSET, 2, ENC_BIG_ENDIAN); break; } case PTP_MM_FOREIGN_DATA_SET:{ proto_tree_add_item(ptp_tree, hf_ptp_mm_foreign_data_set_returnedportnumber, tvb, - PTP_MM_FOREIGN_DATA_SET_RETURNEDPORTNUMBER_OFFSET, 2, FALSE); + PTP_MM_FOREIGN_DATA_SET_RETURNEDPORTNUMBER_OFFSET, 2, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_mm_foreign_data_set_returnedrecordnumber, tvb, - PTP_MM_FOREIGN_DATA_SET_RETURNEDRECORDNUMBER_OFFSET, 2, FALSE); + PTP_MM_FOREIGN_DATA_SET_RETURNEDRECORDNUMBER_OFFSET, 2, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_mm_foreign_data_set_foreignmastercommunicationtechnology, tvb, PTP_MM_FOREIGN_DATA_SET_FOREIGNMASTERCOMMUNICATIONTECHNOLOGY_OFFSET, 1, - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_mm_foreign_data_set_foreignmasteruuidfield, tvb, PTP_MM_FOREIGN_DATA_SET_FOREIGNMASTERUUIDFIELD_OFFSET, 6, FALSE); proto_tree_add_item(ptp_tree, hf_ptp_mm_foreign_data_set_foreignmasterportidfield, tvb, - PTP_MM_FOREIGN_DATA_SET_FOREIGNMASTERPORTIDFIELD_OFFSET, 2, FALSE); + PTP_MM_FOREIGN_DATA_SET_FOREIGNMASTERPORTIDFIELD_OFFSET, 2, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_mm_foreign_data_set_foreignmastersyncs, tvb, - PTP_MM_FOREIGN_DATA_SET_FOREIGNMASTERSYNCS_OFFSET, 2, FALSE); + PTP_MM_FOREIGN_DATA_SET_FOREIGNMASTERSYNCS_OFFSET, 2, ENC_BIG_ENDIAN); break; } case PTP_MM_SET_SYNC_INTERVAL:{ proto_tree_add_item(ptp_tree, hf_ptp_mm_set_sync_interval_syncinterval, tvb, - PTP_MM_SET_SYNC_INTERVAL_SYNCINTERVAL_OFFSET, 2, FALSE); + PTP_MM_SET_SYNC_INTERVAL_SYNCINTERVAL_OFFSET, 2, ENC_BIG_ENDIAN); break; } case PTP_MM_SET_TIME:{ @@ -2182,10 +2182,10 @@ dissect_ptp_v1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ptp_time_tree = proto_item_add_subtree(time_ti, ett_ptp_time); proto_tree_add_item(ptp_time_tree, hf_ptp_mm_set_time_localtimeseconds, tvb, - PTP_MM_SET_TIME_LOCALTIMESECONDS_OFFSET, 4, FALSE); + PTP_MM_SET_TIME_LOCALTIMESECONDS_OFFSET, 4, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_time_tree, hf_ptp_mm_set_time_localtimenanoseconds, - tvb, PTP_MM_SET_TIME_LOCALTIMENANOSECONDS_OFFSET, 4, FALSE); + tvb, PTP_MM_SET_TIME_LOCALTIMENANOSECONDS_OFFSET, 4, ENC_BIG_ENDIAN); } break; } @@ -2332,7 +2332,7 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ptp_tree = proto_item_add_subtree(ti, ett_ptp_v2); transportspecific_ti = proto_tree_add_item(ptp_tree, - hf_ptp_v2_transportspecific, tvb, PTP_V2_TRANSPORT_SPECIFIC_MESSAGE_ID_OFFSET, 1, FALSE); + hf_ptp_v2_transportspecific, tvb, PTP_V2_TRANSPORT_SPECIFIC_MESSAGE_ID_OFFSET, 1, ENC_BIG_ENDIAN); ptp_transportspecific_tree = proto_item_add_subtree(transportspecific_ti, ett_ptp_v2_transportspecific); @@ -2348,20 +2348,20 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } proto_tree_add_item(ptp_tree, - hf_ptp_v2_messageid, tvb, PTP_V2_TRANSPORT_SPECIFIC_MESSAGE_ID_OFFSET, 1, FALSE); + hf_ptp_v2_messageid, tvb, PTP_V2_TRANSPORT_SPECIFIC_MESSAGE_ID_OFFSET, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, - hf_ptp_v2_versionptp, tvb, PTP_V2_VERSIONPTP_OFFSET, 1, FALSE); + hf_ptp_v2_versionptp, tvb, PTP_V2_VERSIONPTP_OFFSET, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, - hf_ptp_v2_messagelength, tvb, PTP_V2_MESSAGE_LENGTH_OFFSET, 2, FALSE); + hf_ptp_v2_messagelength, tvb, PTP_V2_MESSAGE_LENGTH_OFFSET, 2, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, - hf_ptp_v2_domainnumber, tvb, PTP_V2_DOMAIN_NUMBER_OFFSET, 1, FALSE); + hf_ptp_v2_domainnumber, tvb, PTP_V2_DOMAIN_NUMBER_OFFSET, 1, ENC_BIG_ENDIAN); flags_ti = proto_tree_add_item(ptp_tree, - hf_ptp_v2_flags, tvb, PTP_V2_FLAGS_OFFSET, 2, FALSE); + hf_ptp_v2_flags, tvb, PTP_V2_FLAGS_OFFSET, 2, ENC_BIG_ENDIAN); ptp_flags_tree = proto_item_add_subtree(flags_ti, ett_ptp_v2_flags); @@ -2406,19 +2406,19 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) dissect_ptp_v2_timeInterval(tvb, &temp, ptp_tree, "correction", hf_ptp_v2_correction, hf_ptp_v2_correctionsubns); proto_tree_add_item(ptp_tree, - hf_ptp_v2_clockidentity, tvb, PTP_V2_CLOCKIDENTITY_OFFSET, 8, FALSE); + hf_ptp_v2_clockidentity, tvb, PTP_V2_CLOCKIDENTITY_OFFSET, 8, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, - hf_ptp_v2_sourceportid, tvb, PTP_V2_SOURCEPORTID_OFFSET, 2, FALSE); + hf_ptp_v2_sourceportid, tvb, PTP_V2_SOURCEPORTID_OFFSET, 2, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, - hf_ptp_v2_sequenceid, tvb, PTP_V2_SEQUENCEID_OFFSET, 2, FALSE); + hf_ptp_v2_sequenceid, tvb, PTP_V2_SEQUENCEID_OFFSET, 2, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, - hf_ptp_v2_control, tvb, PTP_V2_CONTROL_OFFSET, 1, FALSE); + hf_ptp_v2_control, tvb, PTP_V2_CONTROL_OFFSET, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, - hf_ptp_v2_logmessageperiod, tvb, PTP_V2_LOGMESSAGEPERIOD_OFFSET, 1, FALSE); + hf_ptp_v2_logmessageperiod, tvb, PTP_V2_LOGMESSAGEPERIOD_OFFSET, 1, ENC_BIG_ENDIAN); switch(ptp_v2_messageid){ case PTP_V2_ANNOUNCE_MESSAGE:{ @@ -2437,38 +2437,38 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) timeStamp = timeStamp | tvb_get_ntohs(tvb, PTP_V2_AN_ORIGINTIMESTAMPSECONDS_OFFSET+4); proto_tree_add_item(ptp_tree, hf_ptp_v2_an_origintimestamp_seconds, tvb, - PTP_V2_AN_ORIGINTIMESTAMPSECONDS_OFFSET, 6, FALSE); + PTP_V2_AN_ORIGINTIMESTAMPSECONDS_OFFSET, 6, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_v2_an_origintimestamp_nanoseconds, tvb, - PTP_V2_AN_ORIGINTIMESTAMPNANOSECONDS_OFFSET, 4, FALSE); + PTP_V2_AN_ORIGINTIMESTAMPNANOSECONDS_OFFSET, 4, ENC_BIG_ENDIAN); } proto_tree_add_item(ptp_tree, hf_ptp_v2_an_origincurrentutcoffset, tvb, - PTP_V2_AN_ORIGINCURRENTUTCOFFSET_OFFSET, 2, FALSE); + PTP_V2_AN_ORIGINCURRENTUTCOFFSET_OFFSET, 2, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_v2_an_priority1, tvb, - PTP_V2_AN_PRIORITY_1_OFFSET, 1, FALSE); + PTP_V2_AN_PRIORITY_1_OFFSET, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_v2_an_grandmasterclockclass, tvb, - PTP_V2_AN_GRANDMASTERCLOCKCLASS_OFFSET, 1, FALSE); + PTP_V2_AN_GRANDMASTERCLOCKCLASS_OFFSET, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_v2_an_grandmasterclockaccuracy, tvb, - PTP_V2_AN_GRANDMASTERCLOCKACCURACY_OFFSET, 1, FALSE); + PTP_V2_AN_GRANDMASTERCLOCKACCURACY_OFFSET, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_v2_an_grandmasterclockvariance, tvb, - PTP_V2_AN_GRANDMASTERCLOCKVARIANCE_OFFSET, 2, FALSE); + PTP_V2_AN_GRANDMASTERCLOCKVARIANCE_OFFSET, 2, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_v2_an_priority2, tvb, - PTP_V2_AN_PRIORITY_2_OFFSET, 1, FALSE); + PTP_V2_AN_PRIORITY_2_OFFSET, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_v2_an_grandmasterclockidentity, tvb, - PTP_V2_AN_GRANDMASTERCLOCKIDENTITY_OFFSET, 8, FALSE); + PTP_V2_AN_GRANDMASTERCLOCKIDENTITY_OFFSET, 8, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_v2_an_localstepsremoved, tvb, - PTP_V2_AN_LOCALSTEPSREMOVED_OFFSET, 2, FALSE); + PTP_V2_AN_LOCALSTEPSREMOVED_OFFSET, 2, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, - hf_ptp_v2_an_timesource, tvb, PTP_V2_AN_TIMESOURCE_OFFSET, 1, FALSE); + hf_ptp_v2_an_timesource, tvb, PTP_V2_AN_TIMESOURCE_OFFSET, 1, ENC_BIG_ENDIAN); tlv_total_length = 0; while (tvb_reported_length_remaining(tvb, PTP_V2_AN_TLV_OFFSET + tlv_total_length) >= 2) @@ -2494,14 +2494,14 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvb, PTP_V2_AN_TLV_OFFSET + tlv_total_length + PTP_V2_AN_TLV_TYPE_OFFSET, 2, - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tlv_tree, hf_ptp_v2_an_tlv_lengthfield, tvb, PTP_V2_AN_TLV_OFFSET + tlv_total_length + PTP_V2_AN_TLV_LENGTHFIELD_OFFSET, 2, - FALSE); + ENC_BIG_ENDIAN); switch (tlv_type) { @@ -2512,21 +2512,21 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvb, PTP_V2_AN_TLV_OFFSET + tlv_total_length + PTP_V2_AN_TLV_ATOI_KEYFIELD_OFFSET, 1, - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tlv_tree, hf_ptp_v2_atoi_tlv_currentoffset, tvb, PTP_V2_AN_TLV_OFFSET + tlv_total_length + PTP_V2_AN_TLV_ATOI_CURRENTOFFSET_OFFSET, 4, - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tlv_tree, hf_ptp_v2_atoi_tlv_jumpseconds, tvb, PTP_V2_AN_TLV_OFFSET + tlv_total_length + PTP_V2_AN_TLV_ATOI_JUMPSECONDS_OFFSET, 4, - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tlv_tree, hf_ptp_v2_atoi_tlv_timeofnextjump, @@ -2552,7 +2552,7 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { proto_tree_add_item(ptp_tlv_tree, hf_ptp_v2_an_tlv_pathsequence, tvb, PTP_V2_AN_TLV_OFFSET + PTP_AS_AN_TLV_PATH_TRACE_OFFSET + path_seq_total_length, - 8, FALSE); + 8, ENC_BIG_ENDIAN); } break; @@ -2582,10 +2582,10 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) timeStamp = timeStamp | tvb_get_ntohs(tvb, PTP_V2_SDR_ORIGINTIMESTAMPSECONDS_OFFSET+4); proto_tree_add_item(ptp_tree, hf_ptp_v2_sdr_origintimestamp_seconds, tvb, - PTP_V2_SDR_ORIGINTIMESTAMPSECONDS_OFFSET, 6, FALSE); + PTP_V2_SDR_ORIGINTIMESTAMPSECONDS_OFFSET, 6, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_v2_sdr_origintimestamp_nanoseconds, tvb, - PTP_V2_SDR_ORIGINTIMESTAMPNANOSECONDS_OFFSET, 4, FALSE); + PTP_V2_SDR_ORIGINTIMESTAMPNANOSECONDS_OFFSET, 4, ENC_BIG_ENDIAN); break; } @@ -2600,10 +2600,10 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) timeStamp = timeStamp | tvb_get_ntohs(tvb, PTP_V2_FU_PRECISEORIGINTIMESTAMPSECONDS_OFFSET+4); proto_tree_add_item(ptp_tree, hf_ptp_v2_fu_preciseorigintimestamp_seconds, tvb, - PTP_V2_FU_PRECISEORIGINTIMESTAMPSECONDS_OFFSET, 6, FALSE); + PTP_V2_FU_PRECISEORIGINTIMESTAMPSECONDS_OFFSET, 6, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_v2_fu_preciseorigintimestamp_nanoseconds, tvb, - PTP_V2_FU_PRECISEORIGINTIMESTAMPNANOSECONDS_OFFSET, 4, FALSE); + PTP_V2_FU_PRECISEORIGINTIMESTAMPNANOSECONDS_OFFSET, 4, ENC_BIG_ENDIAN); /* In 802.1AS there is a Follow_UP information TLV in the Follow Up Message */ if(ptp_v2_transport_specific & PTP_V2_TRANSPORTSPECIFIC_ASPACKET_BITMASK){ @@ -2626,42 +2626,42 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvb, PTP_AS_FU_TLV_INFORMATION_OFFSET + PTP_AS_FU_TLV_TYPE_OFFSET, 2, - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tlv_tree, hf_ptp_as_fu_tlv_lengthfield, tvb, PTP_AS_FU_TLV_INFORMATION_OFFSET + PTP_AS_FU_TLV_LENGTHFIELD_OFFSET, 2, - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tlv_tree, hf_ptp_as_fu_tlv_organization_id, tvb, PTP_AS_FU_TLV_INFORMATION_OFFSET + PTP_AS_FU_TLV_ORGANIZATIONID_OFFSET, 3, - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tlv_tree, hf_ptp_as_fu_tlv_organization_subtype, tvb, PTP_AS_FU_TLV_INFORMATION_OFFSET + PTP_AS_FU_TLV_ORGANIZATIONSUBTYPE_OFFSET, 3, - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tlv_tree, hf_ptp_as_fu_tlv_cumulative_offset, tvb, PTP_AS_FU_TLV_INFORMATION_OFFSET + PTP_AS_FU_TLV_CUMULATIVESCALEDRATEOFFSET_OFFSET, 4, - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tlv_tree, hf_ptp_as_fu_tlv_gm_base_indicator, tvb, PTP_AS_FU_TLV_INFORMATION_OFFSET + PTP_AS_FU_TLV_GMTIMEBASEINDICATOR_OFFSET, 2, - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tlv_tree, hf_ptp_as_fu_tlv_last_gm_phase_change, @@ -2675,7 +2675,7 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvb, PTP_AS_FU_TLV_INFORMATION_OFFSET + PTP_AS_FU_TLV_SCALEDLASTGMFREQCHANGE_OFFSET, 4, - FALSE); + ENC_BIG_ENDIAN); } @@ -2688,16 +2688,16 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) timeStamp = timeStamp | tvb_get_ntohs(tvb, PTP_V2_DR_RECEIVETIMESTAMPSECONDS_OFFSET+4); proto_tree_add_item(ptp_tree, hf_ptp_v2_dr_receivetimestamp_seconds, tvb, - PTP_V2_DR_RECEIVETIMESTAMPSECONDS_OFFSET, 6, FALSE); + PTP_V2_DR_RECEIVETIMESTAMPSECONDS_OFFSET, 6, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_v2_dr_receivetimestamp_nanoseconds, tvb, - PTP_V2_DR_RECEIVETIMESTAMPNANOSECONDS_OFFSET, 4, FALSE); + PTP_V2_DR_RECEIVETIMESTAMPNANOSECONDS_OFFSET, 4, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_v2_dr_requestingportidentity, tvb, - PTP_V2_DR_REQUESTINGPORTIDENTITY_OFFSET, 8, FALSE); + PTP_V2_DR_REQUESTINGPORTIDENTITY_OFFSET, 8, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_v2_dr_requestingsourceportid, tvb, - PTP_V2_DR_REQUESTINGSOURCEPORTID_OFFSET, 2, FALSE); + PTP_V2_DR_REQUESTINGSOURCEPORTID_OFFSET, 2, ENC_BIG_ENDIAN); break; } @@ -2711,10 +2711,10 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) timeStamp = timeStamp | tvb_get_ntohs(tvb, PTP_V2_PDRQ_ORIGINTIMESTAMPSECONDS_OFFSET+4); proto_tree_add_item(ptp_tree, hf_ptp_v2_pdrq_origintimestamp_seconds, tvb, - PTP_V2_PDRQ_ORIGINTIMESTAMPSECONDS_OFFSET, 6, FALSE); + PTP_V2_PDRQ_ORIGINTIMESTAMPSECONDS_OFFSET, 6, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_v2_pdrq_origintimestamp_nanoseconds, tvb, - PTP_V2_PDRQ_ORIGINTIMESTAMPNANOSECONDS_OFFSET, 4, FALSE); + PTP_V2_PDRQ_ORIGINTIMESTAMPNANOSECONDS_OFFSET, 4, ENC_BIG_ENDIAN); } break; @@ -2726,16 +2726,16 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) timeStamp = timeStamp | tvb_get_ntohs(tvb, PTP_V2_PDRS_REQUESTRECEIPTTIMESTAMPSECONDS_OFFSET+4); proto_tree_add_item(ptp_tree, hf_ptp_v2_pdrs_requestreceipttimestamp_seconds, tvb, - PTP_V2_PDRS_REQUESTRECEIPTTIMESTAMPSECONDS_OFFSET, 6, FALSE); + PTP_V2_PDRS_REQUESTRECEIPTTIMESTAMPSECONDS_OFFSET, 6, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_v2_pdrs_requestreceipttimestamp_nanoseconds, tvb, - PTP_V2_PDRS_REQUESTRECEIPTTIMESTAMPNANOSECONDS_OFFSET, 4, FALSE); + PTP_V2_PDRS_REQUESTRECEIPTTIMESTAMPNANOSECONDS_OFFSET, 4, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_v2_pdrs_requestingportidentity, tvb, - PTP_V2_PDRS_REQUESTINGPORTIDENTITY_OFFSET, 8, FALSE); + PTP_V2_PDRS_REQUESTINGPORTIDENTITY_OFFSET, 8, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_v2_pdrs_requestingsourceportid, tvb, - PTP_V2_PDRS_REQUESTINGSOURCEPORTID_OFFSET, 2, FALSE); + PTP_V2_PDRS_REQUESTINGSOURCEPORTID_OFFSET, 2, ENC_BIG_ENDIAN); break; } @@ -2746,17 +2746,17 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) timeStamp = timeStamp | tvb_get_ntohs(tvb, PTP_V2_PDFU_RESPONSEORIGINTIMESTAMPSECONDS_OFFSET+4); proto_tree_add_item(ptp_tree, hf_ptp_v2_pdfu_responseorigintimestamp_seconds, tvb, - PTP_V2_PDFU_RESPONSEORIGINTIMESTAMPSECONDS_OFFSET, 6, FALSE); + PTP_V2_PDFU_RESPONSEORIGINTIMESTAMPSECONDS_OFFSET, 6, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_v2_pdfu_responseorigintimestamp_nanoseconds, tvb, - PTP_V2_PDFU_RESPONSEORIGINTIMESTAMPNANOSECONDS_OFFSET, 4, FALSE); + PTP_V2_PDFU_RESPONSEORIGINTIMESTAMPNANOSECONDS_OFFSET, 4, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_v2_pdfu_requestingportidentity, tvb, - PTP_V2_PDFU_REQUESTINGPORTIDENTITY_OFFSET, 8, FALSE); + PTP_V2_PDFU_REQUESTINGPORTIDENTITY_OFFSET, 8, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_v2_pdfu_requestingsourceportid, tvb, - PTP_V2_PDFU_REQUESTINGSOURCEPORTID_OFFSET, 2, FALSE); + PTP_V2_PDFU_REQUESTINGSOURCEPORTID_OFFSET, 2, ENC_BIG_ENDIAN); break; } @@ -2767,10 +2767,10 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree *ptp_tlv_tree, *sig_tlv_flags_tree; proto_tree_add_item(ptp_tree, hf_ptp_v2_sig_targetportidentity, tvb, - PTP_V2_SIG_TARGETPORTIDENTITY_OFFSET, 8, FALSE); + PTP_V2_SIG_TARGETPORTIDENTITY_OFFSET, 8, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_v2_sig_targetportid, tvb, - PTP_V2_SIG_TARGETPORTID_OFFSET, 2, FALSE); + PTP_V2_SIG_TARGETPORTID_OFFSET, 2, ENC_BIG_ENDIAN); /* In 802.1AS there is a Message Interval Request TLV in the Signalling Message */ if(ptp_v2_transport_specific & PTP_V2_TRANSPORTSPECIFIC_ASPACKET_BITMASK){ @@ -2793,56 +2793,56 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvb, PTP_AS_SIG_TLV_MESSAGEINTERVALREQUEST_OFFSET + PTP_AS_SIG_TLV_TYPE_OFFSET, 2, - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tlv_tree, hf_ptp_as_sig_tlv_lengthfield, tvb, PTP_AS_SIG_TLV_MESSAGEINTERVALREQUEST_OFFSET + PTP_AS_SIG_TLV_LENGTHFIELD_OFFSET, 2, - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tlv_tree, hf_ptp_as_sig_tlv_organization_id, tvb, PTP_AS_SIG_TLV_MESSAGEINTERVALREQUEST_OFFSET + PTP_AS_SIG_TLV_ORGANIZATIONID_OFFSET, 3, - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tlv_tree, hf_ptp_as_sig_tlv_organization_subtype, tvb, PTP_AS_SIG_TLV_MESSAGEINTERVALREQUEST_OFFSET + PTP_AS_SIG_TLV_ORGANIZATIONSUBTYPE_OFFSET, 3, - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tlv_tree, hf_ptp_as_sig_tlv_link_delay_interval, tvb, PTP_AS_SIG_TLV_MESSAGEINTERVALREQUEST_OFFSET + PTP_AS_SIG_TLV_LINKDELAYINTERVAL_OFFSET, 1, - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tlv_tree, hf_ptp_as_sig_tlv_time_sync_interval, tvb, PTP_AS_SIG_TLV_MESSAGEINTERVALREQUEST_OFFSET + PTP_AS_SIG_TLV_TIMESYNCINTERVAL_OFFSET, 1, - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tlv_tree, hf_ptp_as_sig_tlv_announce_interval, tvb, PTP_AS_SIG_TLV_MESSAGEINTERVALREQUEST_OFFSET + PTP_AS_SIG_TLV_ANNOUNCEINTERVAL_OFFSET, 1, - FALSE); + ENC_BIG_ENDIAN); sig_tlv_flags_ti = proto_tree_add_item(ptp_tlv_tree, hf_ptp_as_sig_tlv_flags, tvb, PTP_AS_SIG_TLV_MESSAGEINTERVALREQUEST_OFFSET + PTP_AS_SIG_TLV_FLAGS_OFFSET, 1, - FALSE); + ENC_BIG_ENDIAN); sig_tlv_flags_tree = proto_item_add_subtree(sig_tlv_flags_ti, ett_ptp_as_sig_tlv_flags); @@ -2864,10 +2864,10 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) else { proto_tree_add_item(ptp_tree, hf_ptp_v2_mm_tlvType, tvb, - PTP_V2_SIG_TARGETPORTID_OFFSET+2, 2, FALSE); + PTP_V2_SIG_TARGETPORTID_OFFSET+2, 2, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_v2_mm_lengthField, tvb, - PTP_V2_SIG_TARGETPORTID_OFFSET+4, 2, FALSE); + PTP_V2_SIG_TARGETPORTID_OFFSET+4, 2, ENC_BIG_ENDIAN); /*tlv_type = tvb_get_ntohs (tvb, PTP_V2_MM_TLV_TYPE_OFFSET);*/ tlv_length = tvb_get_ntohs (tvb, PTP_V2_MM_TLV_LENGTHFIELD_OFFSET); @@ -2888,26 +2888,26 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint16 tlv_type, tlv_length; proto_tree_add_item(ptp_tree, hf_ptp_v2_mm_targetportidentity, tvb, - PTP_V2_MM_TARGETPORTIDENTITY_OFFSET, 8, FALSE); + PTP_V2_MM_TARGETPORTIDENTITY_OFFSET, 8, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_v2_mm_targetportid, tvb, - PTP_V2_MM_TARGETPORTID_OFFSET, 2, FALSE); + PTP_V2_MM_TARGETPORTID_OFFSET, 2, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_v2_mm_startingboundaryhops, tvb, - PTP_V2_MM_STARTINGBOUNDARYHOPS_OFFSET, 1, FALSE); + PTP_V2_MM_STARTINGBOUNDARYHOPS_OFFSET, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_v2_mm_boundaryhops, tvb, - PTP_V2_MM_BOUNDARYHOPS_OFFSET, 1, FALSE); + PTP_V2_MM_BOUNDARYHOPS_OFFSET, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_v2_mm_action, tvb, - PTP_V2_MM_ACTION_OFFSET, 1, FALSE); + PTP_V2_MM_ACTION_OFFSET, 1, ENC_BIG_ENDIAN); /* management TLV */ proto_tree_add_item(ptp_tree, hf_ptp_v2_mm_tlvType, tvb, - PTP_V2_MM_TLV_TYPE_OFFSET, 2, FALSE); + PTP_V2_MM_TLV_TYPE_OFFSET, 2, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_v2_mm_lengthField, tvb, - PTP_V2_MM_TLV_LENGTHFIELD_OFFSET, 2, FALSE); + PTP_V2_MM_TLV_LENGTHFIELD_OFFSET, 2, ENC_BIG_ENDIAN); tlv_type = tvb_get_ntohs (tvb, PTP_V2_MM_TLV_TYPE_OFFSET); tlv_length = tvb_get_ntohs (tvb, PTP_V2_MM_TLV_LENGTHFIELD_OFFSET); @@ -2920,7 +2920,7 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint16 Offset = PTP_V2_MM_TLV_DATAFIELD_OFFSET; proto_tree_add_item(ptp_tree, hf_ptp_v2_mm_managementId, tvb, - PTP_V2_MM_TLV_MANAGEMENTID_OFFSET, 2, FALSE); + PTP_V2_MM_TLV_MANAGEMENTID_OFFSET, 2, ENC_BIG_ENDIAN); ptp_v2_managementId = tvb_get_ntohs (tvb, PTP_V2_MM_TLV_MANAGEMENTID_OFFSET); @@ -2945,7 +2945,7 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { guint16 N = 0, S = 0; clockType_ti = proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_clockType, tvb, - Offset, 2, FALSE); + Offset, 2, ENC_BIG_ENDIAN); ptp_clockType_tree = proto_item_add_subtree(clockType_ti, ett_ptp_v2_clockType); /* ClockType Subtree */ @@ -2972,7 +2972,7 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) hf_ptp_v2_mm_physicalLayerProtocol, hf_ptp_v2_mm_physicalLayerProtocol_length); proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_physicalAddressLength, tvb, - Offset, 2, FALSE); + Offset, 2, ENC_BIG_ENDIAN); S = tvb_get_ntohs (tvb, Offset); Offset +=2; @@ -2989,10 +2989,10 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ptp_protocolAddress_tree = proto_item_add_subtree(protocolAddress_ti, ett_ptp_v2_protocolAddress); /* physicalLayerProtocol subtree */ proto_tree_add_item(ptp_protocolAddress_tree, hf_ptp_v2_mm_protocolAddress_networkProtocol, tvb, - Offset, 2, FALSE); + Offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_protocolAddress_tree, hf_ptp_v2_mm_protocolAddress_length, tvb, - Offset+2, 2, FALSE); + Offset+2, 2, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_protocolAddress_tree, hf_ptp_v2_mm_protocolAddress, tvb, Offset+4, N, ENC_NA); @@ -3054,7 +3054,7 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case PTP_V2_MM_ID_INITIALIZE: { proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_initializationKey, tvb, - Offset, 2, FALSE); + Offset, 2, ENC_BIG_ENDIAN); break; } case PTP_V2_MM_ID_FAULT_LOG: @@ -3066,7 +3066,7 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) num = tvb_get_ntohs (tvb, Offset); proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_numberOfFaultRecords, tvb, - Offset, 2, FALSE); + Offset, 2, ENC_BIG_ENDIAN); Offset +=2; for (i = 1; i <= num; i++) @@ -3077,7 +3077,7 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ptpError_subtree = proto_item_add_subtree(ptpError_ti, ett_ptp_v2_faultRecord); proto_tree_add_item(ptpError_subtree, hf_ptp_v2_mm_faultRecordLength, tvb, - Offset, 2, FALSE); + Offset, 2, ENC_BIG_ENDIAN); Offset +=2; timeStamp = tvb_get_ntohl(tvb, Offset); @@ -3085,14 +3085,14 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) timeStamp = timeStamp | tvb_get_ntohs(tvb, Offset+4); proto_tree_add_item(ptpError_subtree, hf_ptp_v2_mm_faultTime_s, tvb, - Offset, 6, FALSE); + Offset, 6, ENC_BIG_ENDIAN); Offset +=6; proto_tree_add_item(ptpError_subtree, hf_ptp_v2_mm_faultTime_ns, tvb, - Offset, 4, FALSE); + Offset, 4, ENC_BIG_ENDIAN); Offset +=4; proto_tree_add_item(ptpError_subtree, hf_ptp_v2_mm_severityCode, tvb, - Offset, 1, FALSE); + Offset, 1, ENC_BIG_ENDIAN); Offset +=1; dissect_ptp_v2_text (tvb, &Offset, ptpError_subtree, @@ -3130,28 +3130,28 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) PTP_V2_MM_RESERVED1, 1, ENC_NA); proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_numberPorts, tvb, - PTP_V2_MM_NUMBERPORTS, 2, FALSE); + PTP_V2_MM_NUMBERPORTS, 2, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_priority1, tvb, - PTP_V2_MM_PRIORITY1, 1, FALSE); + PTP_V2_MM_PRIORITY1, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_clockclass, tvb, - PTP_V2_MM_CLOCKQUALITY, 1, FALSE); + PTP_V2_MM_CLOCKQUALITY, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_clockaccuracy, tvb, - PTP_V2_MM_CLOCKQUALITY+1, 1, FALSE); + PTP_V2_MM_CLOCKQUALITY+1, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_clockvariance, tvb, - PTP_V2_MM_CLOCKQUALITY+2, 2, FALSE); + PTP_V2_MM_CLOCKQUALITY+2, 2, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_priority2, tvb, - PTP_V2_MM_PRIORITY2, 1, FALSE); + PTP_V2_MM_PRIORITY2, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_clockidentity, tvb, - PTP_V2_MM_CLOCKIDENTITY, 8, FALSE); + PTP_V2_MM_CLOCKIDENTITY, 8, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_domainNumber, tvb, - PTP_V2_MM_DOMAINNUMBER, 1, FALSE); + PTP_V2_MM_DOMAINNUMBER, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_reserved, tvb, PTP_V2_MM_RESERVED2, 1, ENC_NA); @@ -3160,7 +3160,7 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case PTP_V2_MM_ID_CURRENT_DATA_SET: { proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_stepsRemoved, tvb, - Offset, 2, FALSE); + Offset, 2, ENC_BIG_ENDIAN); Offset +=2; dissect_ptp_v2_timeInterval(tvb, &Offset, ptp_managementData_tree, @@ -3172,10 +3172,10 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case PTP_V2_MM_ID_PARENT_DATA_SET: { proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_parentIdentity, tvb, - Offset, 8, FALSE); + Offset, 8, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_parentPort, tvb, - Offset+8, 2, FALSE); + Offset+8, 2, ENC_BIG_ENDIAN); Offset +=10; proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_parentStats, tvb, @@ -3187,40 +3187,40 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) Offset +=1; proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_observedParentOffsetScaledLogVariance, tvb, - Offset, 2, FALSE); + Offset, 2, ENC_BIG_ENDIAN); Offset +=2; proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_observedParentClockPhaseChangeRate, tvb, - Offset, 4, FALSE); + Offset, 4, ENC_BIG_ENDIAN); Offset +=4; proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_grandmasterPriority1, tvb, - Offset, 1, FALSE); + Offset, 1, ENC_BIG_ENDIAN); Offset +=1; proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_grandmasterclockclass, tvb, - Offset, 1, FALSE); + Offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_grandmasterclockaccuracy, tvb, - Offset+1, 1, FALSE); + Offset+1, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_grandmasterclockvariance, tvb, - Offset+2, 2, FALSE); + Offset+2, 2, ENC_BIG_ENDIAN); Offset += 4; proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_grandmasterPriority2, tvb, - Offset, 1, FALSE); + Offset, 1, ENC_BIG_ENDIAN); Offset +=1; proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_grandmasterIdentity, tvb, - Offset, 8, FALSE); + Offset, 8, ENC_BIG_ENDIAN); break; } case PTP_V2_MM_ID_TIME_PROPERTIES_DATA_SET: { proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_currentUtcOffset, tvb, - Offset, 2, FALSE); + Offset, 2, ENC_BIG_ENDIAN); Offset +=2; proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_LI_61, tvb, @@ -3238,53 +3238,53 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) Offset +=1; proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_timesource, tvb, - Offset, 1, FALSE); + Offset, 1, ENC_BIG_ENDIAN); break; } case PTP_V2_MM_ID_PORT_DATA_SET: { proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_clockidentity, tvb, - Offset, 8, FALSE); + Offset, 8, ENC_BIG_ENDIAN); Offset +=8; proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_PortNumber, tvb, - Offset, 2, FALSE); + Offset, 2, ENC_BIG_ENDIAN); Offset +=2; proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_portState, tvb, - Offset, 1, FALSE); + Offset, 1, ENC_BIG_ENDIAN); Offset +=1; proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_logMinDelayReqInterval, tvb, - Offset, 1, FALSE); + Offset, 1, ENC_BIG_ENDIAN); Offset +=1; dissect_ptp_v2_timeInterval(tvb, &Offset, ptp_managementData_tree, "Peer mean path delay", hf_ptp_v2_mm_peerMeanPathDelay_ns, hf_ptp_v2_mm_peerMeanPathDelay_subns); proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_logAnnounceInterval, tvb, - Offset, 1, FALSE); + Offset, 1, ENC_BIG_ENDIAN); Offset +=1; proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_announceReceiptTimeout, tvb, - Offset, 1, FALSE); + Offset, 1, ENC_BIG_ENDIAN); Offset +=1; proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_logSyncInterval, tvb, - Offset, 1, FALSE); + Offset, 1, ENC_BIG_ENDIAN); Offset +=1; proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_delayMechanism, tvb, - Offset, 1, FALSE); + Offset, 1, ENC_BIG_ENDIAN); Offset +=1; proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_logMinPdelayReqInterval, tvb, - Offset, 1, FALSE); + Offset, 1, ENC_BIG_ENDIAN); Offset +=1; proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_versionNumber, tvb, - Offset, 1, FALSE); + Offset, 1, ENC_BIG_ENDIAN); Offset +=1; break; @@ -3292,7 +3292,7 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case PTP_V2_MM_ID_PRIORITY1: { proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_priority1, tvb, - Offset, 1, FALSE); + Offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_reserved, tvb, Offset+1, 1, ENC_NA); break; @@ -3300,7 +3300,7 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case PTP_V2_MM_ID_PRIORITY2: { proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_priority2, tvb, - Offset, 1, FALSE); + Offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_reserved, tvb, Offset+1, 1, ENC_NA); break; @@ -3308,7 +3308,7 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case PTP_V2_MM_ID_DOMAIN: { proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_domainNumber, tvb, - Offset, 1, FALSE); + Offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_reserved, tvb, Offset+1, 1, ENC_NA); break; @@ -3324,7 +3324,7 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case PTP_V2_MM_ID_LOG_ANNOUNCE_INTERVAL: { proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_logAnnounceInterval, tvb, - Offset, 1, FALSE); + Offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_reserved, tvb, Offset+1, 1, ENC_NA); @@ -3333,7 +3333,7 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case PTP_V2_MM_ID_ANNOUNCE_RECEIPT_TIMEOUT: { proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_announceReceiptTimeout, tvb, - Offset, 1, FALSE); + Offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_reserved, tvb, Offset+1, 1, ENC_NA); @@ -3342,7 +3342,7 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case PTP_V2_MM_ID_LOG_SYNC_INTERVAL: { proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_logSyncInterval, tvb, - Offset, 1, FALSE); + Offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_reserved, tvb, Offset+1, 1, ENC_NA); @@ -3351,7 +3351,7 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case PTP_V2_MM_ID_VERSION_NUMBER: { proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_versionNumber, tvb, - Offset, 1, FALSE); + Offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_reserved, tvb, Offset+1, 1, ENC_NA); @@ -3374,17 +3374,17 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) timeStamp = timeStamp | tvb_get_ntohs(tvb, Offset+4); proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_currentTime_s, tvb, - Offset, 6, FALSE); + Offset, 6, ENC_BIG_ENDIAN); Offset +=6; proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_currentTime_ns, tvb, - Offset, 4, FALSE); + Offset, 4, ENC_BIG_ENDIAN); break; } case PTP_V2_MM_ID_CLOCK_ACCURACY: { proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_clockAccuracy, tvb, - Offset, 1, FALSE); + Offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_reserved, tvb, Offset+1, 1, ENC_NA); break; @@ -3392,7 +3392,7 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case PTP_V2_MM_ID_UTC_PROPERTIES: { proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_currentUtcOffset, tvb, - Offset, 2, FALSE); + Offset, 2, ENC_BIG_ENDIAN); Offset +=2; proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_LI_61, tvb, @@ -3427,7 +3427,7 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) Offset +=1; proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_timesource, tvb, - Offset, 1, FALSE); + Offset, 1, ENC_BIG_ENDIAN); break; } @@ -3448,7 +3448,7 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) for (i = 1; i <= (tlv_length / 8); i++) { proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_clockidentity, tvb, - Offset, 8, FALSE); + Offset, 8, ENC_BIG_ENDIAN); } break; @@ -3497,7 +3497,7 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case PTP_V2_MM_ID_ALTERNATE_TIME_OFFSET_ENABLE: { proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_keyField, tvb, - Offset, 1, FALSE); + Offset, 1, ENC_BIG_ENDIAN); Offset +=1; proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_atEN, tvb, @@ -3509,7 +3509,7 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case PTP_V2_MM_ID_ALTERNATE_TIME_OFFSET_NAME: { proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_keyField, tvb, - Offset, 1, FALSE); + Offset, 1, ENC_BIG_ENDIAN); Offset +=1; dissect_ptp_v2_text (tvb, &Offset, ptp_managementData_tree, @@ -3526,7 +3526,7 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case PTP_V2_MM_ID_ALTERNATE_TIME_OFFSET_MAX_KEY: { proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_maxKey, tvb, - Offset, 1, FALSE); + Offset, 1, ENC_BIG_ENDIAN); Offset +=1; proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_reserved, tvb, @@ -3541,11 +3541,11 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) Offset +=1; proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_numberOfAlternateMasters, tvb, - Offset, 1, FALSE); + Offset, 1, ENC_BIG_ENDIAN); Offset +=1; proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_logAlternateMulticastSyncInterval, tvb, - Offset, 1, FALSE); + Offset, 1, ENC_BIG_ENDIAN); Offset +=1; proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_reserved, tvb, @@ -3555,15 +3555,15 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case PTP_V2_MM_ID_ALTERNATE_TIME_OFFSET_PROPERTIES: { proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_keyField, tvb, - Offset, 1, FALSE); + Offset, 1, ENC_BIG_ENDIAN); Offset +=1; proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_currentOffset, tvb, - Offset, 4, FALSE); + Offset, 4, ENC_BIG_ENDIAN); Offset +=4; proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_jumpSeconds, tvb, - Offset, 4, FALSE); + Offset, 4, ENC_BIG_ENDIAN); Offset +=4; timeStamp = tvb_get_ntohl(tvb, Offset); @@ -3581,30 +3581,30 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case PTP_V2_MM_ID_TC_DEFAULT_DATA_SET: { proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_clockidentity, tvb, - Offset, 8, FALSE); + Offset, 8, ENC_BIG_ENDIAN); Offset +=8; proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_numberPorts, tvb, - Offset, 2, FALSE); + Offset, 2, ENC_BIG_ENDIAN); Offset +=2; proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_delayMechanism, tvb, - Offset, 1, FALSE); + Offset, 1, ENC_BIG_ENDIAN); Offset +=1; proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_primaryDomain, tvb, - Offset, 1, FALSE); + Offset, 1, ENC_BIG_ENDIAN); break; } case PTP_V2_MM_ID_TC_PORT_DATA_SET: { proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_clockidentity, tvb, - Offset, 8, FALSE); + Offset, 8, ENC_BIG_ENDIAN); Offset +=8; proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_PortNumber, tvb, - Offset, 2, FALSE); + Offset, 2, ENC_BIG_ENDIAN); Offset +=2; proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_faultyFlag, tvb, @@ -3612,7 +3612,7 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) Offset +=1; proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_logMinPdelayReqInterval, tvb, - Offset, 1, FALSE); + Offset, 1, ENC_BIG_ENDIAN); Offset +=1; dissect_ptp_v2_timeInterval(tvb, &Offset, ptp_managementData_tree, @@ -3622,7 +3622,7 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case PTP_V2_MM_ID_PRIMARY_DOMAIN: { proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_primaryDomain, tvb, - Offset, 1, FALSE); + Offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_reserved, tvb, Offset+1, 1, ENC_NA); @@ -3631,7 +3631,7 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case PTP_V2_MM_ID_DELAY_MECHANISM: { proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_delayMechanism, tvb, - Offset, 1, FALSE); + Offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_reserved, tvb, Offset+1, 1, ENC_NA); @@ -3640,7 +3640,7 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case PTP_V2_MM_ID_LOG_MIN_PDELAY_REQ_INTERVAL: { proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_logMinPdelayReqInterval, tvb, - Offset, 1, FALSE); + Offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_reserved, tvb, Offset+1, 1, ENC_NA); @@ -3660,11 +3660,11 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint16 Offset = PTP_V2_MM_TLV_MANAGEMENTERRORID_OFFSET; proto_tree_add_item(ptp_tree, hf_ptp_v2_mm_managementErrorId, tvb, - Offset, 2, FALSE); + Offset, 2, ENC_BIG_ENDIAN); Offset +=2; proto_tree_add_item(ptp_tree, hf_ptp_v2_mm_managementId, tvb, - Offset, 2, FALSE); + Offset, 2, ENC_BIG_ENDIAN); Offset +=2; proto_tree_add_item(ptp_tree, hf_ptp_v2_mm_reserved, tvb, diff --git a/epan/dissectors/packet-pvfs2.c b/epan/dissectors/packet-pvfs2.c index 8542757dc1..ff04b5e5fa 100644 --- a/epan/dissectors/packet-pvfs2.c +++ b/epan/dissectors/packet-pvfs2.c @@ -3132,7 +3132,7 @@ dissect_pvfs_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, pvfs_htree = proto_item_add_subtree(hitem, ett_pvfs_hdr); /* Magic number */ - proto_tree_add_item(pvfs_htree, hf_pvfs_magic_nr, tvb, offset, 4, TRUE); + proto_tree_add_item(pvfs_htree, hf_pvfs_magic_nr, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; /* TCP message mode (32-bit) */ diff --git a/epan/dissectors/packet-pw-atm.c b/epan/dissectors/packet-pw-atm.c index 0581b43c50..4d17121545 100644 --- a/epan/dissectors/packet-pw-atm.c +++ b/epan/dissectors/packet-pw-atm.c @@ -1215,7 +1215,7 @@ void dissect_control_word(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree { proto_item* item; /* bits 0..3 */ - item = proto_tree_add_item(tree2, hf_cw_bits03, tvb, 0, 1, FALSE); + item = proto_tree_add_item(tree2, hf_cw_bits03, tvb, 0, 1, ENC_BIG_ENDIAN); if (pd->props & PWC_CW_BAD_BITS03) { /* add item to tree (and show it) only if its value is wrong*/ @@ -1230,7 +1230,7 @@ void dissect_control_word(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree /* flags */ if (MODE_N1(pd->mode)) { - item = proto_tree_add_item(tree2, hf_pref_cw_flags, tvb, 0, 1, FALSE); + item = proto_tree_add_item(tree2, hf_pref_cw_flags, tvb, 0, 1, ENC_BIG_ENDIAN); if (pd->props & PWC_CW_BAD_FLAGS) { expert_add_info_format(pinfo, item, PI_MALFORMED, PI_ERROR @@ -1268,12 +1268,12 @@ void dissect_control_word(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree if (MODE_11_OR_AAL5_PDU(pd->mode)) { item = proto_tree_add_item(tree2 - ,hf_generic_cw_rsv, tvb, 0, 1, FALSE); + ,hf_generic_cw_rsv, tvb, 0, 1, ENC_BIG_ENDIAN); } else { /*preferred cw*/ item = proto_tree_add_item(tree2 - ,hf_pref_cw_rsv, tvb, 1, 1, FALSE); + ,hf_pref_cw_rsv, tvb, 1, 1, ENC_BIG_ENDIAN); } if (pd->props & PWC_CW_BAD_RSV) @@ -1332,12 +1332,12 @@ void dissect_control_word(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree /* sequence number */ proto_tree_add_item(tree2, hf_cw_seq, tvb - ,MODE_11_OR_AAL5_PDU(pd->mode) ? 1 : 2, 2, FALSE); + ,MODE_11_OR_AAL5_PDU(pd->mode) ? 1 : 2, 2, ENC_BIG_ENDIAN); /* atm-specific byte */ if (MODE_11(pd->mode)) { - proto_tree_add_item(tree2, hf_gen_cw_atmbyte, tvb, 3, 1, FALSE); + proto_tree_add_item(tree2, hf_gen_cw_atmbyte, tvb, 3, 1, ENC_BIG_ENDIAN); /* * no need to highlight item in the tree, therefore * expert_add_info_format() is not used here. diff --git a/epan/dissectors/packet-pw-cesopsn.c b/epan/dissectors/packet-pw-cesopsn.c index 5e3d7f227a..a81a410683 100644 --- a/epan/dissectors/packet-pw-cesopsn.c +++ b/epan/dissectors/packet-pw-cesopsn.c @@ -278,7 +278,7 @@ void dissect_pw_cesopsn( tvbuff_t * tvb_original proto_item* item3; if (properties & PWC_CW_BAD_BITS03) /*display only if value is wrong*/ { - item3 = proto_tree_add_item(tree3, hf_cw_bits03, tvb, 0, 1, FALSE); + item3 = proto_tree_add_item(tree3, hf_cw_bits03, tvb, 0, 1, ENC_BIG_ENDIAN); expert_add_info_format(pinfo, item3, PI_MALFORMED, PI_ERROR ,"Bits 0..3 of Control Word must be 0"); } @@ -290,9 +290,9 @@ void dissect_pw_cesopsn( tvbuff_t * tvb_original ,"Reserved combination of L and Modifier bits"); } - proto_tree_add_item(tree3, hf_cw_r, tvb, 0, 1, FALSE); + proto_tree_add_item(tree3, hf_cw_r, tvb, 0, 1, ENC_BIG_ENDIAN); - item3 = proto_tree_add_item(tree3, hf_cw_frg, tvb, 1, 1, FALSE); + item3 = proto_tree_add_item(tree3, hf_cw_frg, tvb, 1, 1, ENC_BIG_ENDIAN); if (properties & PWC_CW_BAD_FRAG) { expert_add_info_format(pinfo, item3, PI_MALFORMED, PI_ERROR @@ -300,7 +300,7 @@ void dissect_pw_cesopsn( tvbuff_t * tvb_original " for basic CESoPSN mode"); } - item3 = proto_tree_add_item(tree3, hf_cw_len, tvb, 1, 1, FALSE); + item3 = proto_tree_add_item(tree3, hf_cw_len, tvb, 1, 1, ENC_BIG_ENDIAN); if (properties & PWC_CW_BAD_PAYLEN_LT_0) { expert_add_info_format(pinfo, item3, PI_MALFORMED, PI_ERROR @@ -320,7 +320,7 @@ void dissect_pw_cesopsn( tvbuff_t * tvb_original ,(int)packet_size); } - proto_tree_add_item(tree3, hf_cw_seq, tvb, 2, 2, FALSE); + proto_tree_add_item(tree3, hf_cw_seq, tvb, 2, 2, ENC_BIG_ENDIAN); } } diff --git a/epan/dissectors/packet-pw-fr.c b/epan/dissectors/packet-pw-fr.c index 1105fb3ace..58265ca813 100644 --- a/epan/dissectors/packet-pw-fr.c +++ b/epan/dissectors/packet-pw-fr.c @@ -192,18 +192,18 @@ dissect_pw_fr( tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree ) if (packet_quality & PQ_CW_BAD_BITS03) /*display only if value is wrong*/ { - item = proto_tree_add_item(subtree, hf_cw_bits03, tvb, 0, 1, FALSE); + item = proto_tree_add_item(subtree, hf_cw_bits03, tvb, 0, 1, ENC_BIG_ENDIAN); expert_add_info_format(pinfo, item, PI_MALFORMED, PI_ERROR, "Bits 0..3 of Control Word must be 0"); } - (void)proto_tree_add_item( subtree, hf_cw_fecn, tvb, 0, 1, FALSE ); - (void)proto_tree_add_item( subtree, hf_cw_becn, tvb, 0, 1, FALSE ); - (void)proto_tree_add_item( subtree, hf_cw_de, tvb, 0, 1, FALSE ); - (void)proto_tree_add_item( subtree, hf_cw_cr, tvb, 0, 1, FALSE ); - (void)proto_tree_add_item( subtree, hf_cw_frg, tvb, 1, 1, FALSE ); + (void)proto_tree_add_item( subtree, hf_cw_fecn, tvb, 0, 1, ENC_BIG_ENDIAN ); + (void)proto_tree_add_item( subtree, hf_cw_becn, tvb, 0, 1, ENC_BIG_ENDIAN ); + (void)proto_tree_add_item( subtree, hf_cw_de, tvb, 0, 1, ENC_BIG_ENDIAN ); + (void)proto_tree_add_item( subtree, hf_cw_cr, tvb, 0, 1, ENC_BIG_ENDIAN ); + (void)proto_tree_add_item( subtree, hf_cw_frg, tvb, 1, 1, ENC_BIG_ENDIAN ); - item = proto_tree_add_item( subtree, hf_cw_len, tvb, 1, 1, FALSE ); + item = proto_tree_add_item( subtree, hf_cw_len, tvb, 1, 1, ENC_BIG_ENDIAN ); if (packet_quality & PQ_CW_BAD_LEN_GT_PACKET) { expert_add_info_format(pinfo, item, PI_MALFORMED, PI_ERROR, @@ -223,7 +223,7 @@ dissect_pw_fr( tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree ) (int)(payload_size+encaps_size)); } - proto_tree_add_item( subtree, hf_cw_seq, tvb, 2, 2, FALSE ); + proto_tree_add_item( subtree, hf_cw_seq, tvb, 2, 2, ENC_BIG_ENDIAN ); if (payload_padding > 0) { diff --git a/epan/dissectors/packet-pw-satop.c b/epan/dissectors/packet-pw-satop.c index 02a2d55cf5..455129f767 100644 --- a/epan/dissectors/packet-pw-satop.c +++ b/epan/dissectors/packet-pw-satop.c @@ -275,29 +275,29 @@ void dissect_pw_satop(tvbuff_t * tvb_original proto_item* item3; if (properties & PWC_CW_BAD_BITS03) /*display only if value is wrong*/ { - item3 = proto_tree_add_item(tree3, hf_cw_bits03, tvb, 0, 1, FALSE); + item3 = proto_tree_add_item(tree3, hf_cw_bits03, tvb, 0, 1, ENC_BIG_ENDIAN); expert_add_info_format(pinfo, item3, PI_MALFORMED, PI_ERROR ,"Bits 0..3 of Control Word must be 0"); } - proto_tree_add_item(tree3, hf_cw_l , tvb, 0, 1, FALSE); - proto_tree_add_item(tree3, hf_cw_r , tvb, 0, 1, FALSE); + proto_tree_add_item(tree3, hf_cw_l , tvb, 0, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree3, hf_cw_r , tvb, 0, 1, ENC_BIG_ENDIAN); - item3 = proto_tree_add_item(tree3, hf_cw_rsv, tvb, 0, 1, FALSE); + item3 = proto_tree_add_item(tree3, hf_cw_rsv, tvb, 0, 1, ENC_BIG_ENDIAN); if (properties & PWC_CW_BAD_RSV) { expert_add_info_format(pinfo, item3, PI_MALFORMED, PI_ERROR ,"RSV bits of Control Word must be 0"); } - item3 = proto_tree_add_item(tree3, hf_cw_frg, tvb, 1, 1, FALSE); + item3 = proto_tree_add_item(tree3, hf_cw_frg, tvb, 1, 1, ENC_BIG_ENDIAN); if (properties & PWC_CW_BAD_FRAG) { expert_add_info_format(pinfo, item3, PI_MALFORMED, PI_ERROR ,"Fragmentation of payload is not allowed for SAToP"); } - item3 = proto_tree_add_item(tree3, hf_cw_len, tvb, 1, 1, FALSE); + item3 = proto_tree_add_item(tree3, hf_cw_len, tvb, 1, 1, ENC_BIG_ENDIAN); if (properties & PWC_CW_BAD_PAYLEN_LT_0) { expert_add_info_format(pinfo, item3, PI_MALFORMED, PI_ERROR @@ -317,7 +317,7 @@ void dissect_pw_satop(tvbuff_t * tvb_original ,(int)packet_size); } - proto_tree_add_item(tree3, hf_cw_seq, tvb, 2, 2, FALSE); + proto_tree_add_item(tree3, hf_cw_seq, tvb, 2, 2, ENC_BIG_ENDIAN); } } } diff --git a/epan/dissectors/packet-q931.c b/epan/dissectors/packet-q931.c index 5a20758f6e..b503332889 100644 --- a/epan/dissectors/packet-q931.c +++ b/epan/dissectors/packet-q931.c @@ -517,7 +517,7 @@ dissect_q931_segmented_message_ie(tvbuff_t *tvb, int offset, int len, "Not first segment: %u segments remaining", tvb_get_guint8(tvb, offset) & 0x7F); } - proto_tree_add_item(tree, hf_q931_segment_type, tvb, offset + 1, 1, FALSE); + proto_tree_add_item(tree, hf_q931_segment_type, tvb, offset + 1, 1, ENC_BIG_ENDIAN); } /* @@ -1554,9 +1554,9 @@ dissect_q931_channel_identification_ie(tvbuff_t *tvb, int offset, int len, proto_tree_add_item(tree, hf_q931_channel_dchan, tvb, offset, 1, FALSE); if (octet & Q931_NOT_BASIC_CHANNEL) { - proto_tree_add_item(tree, hf_q931_channel_selection_pri, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_q931_channel_selection_pri, tvb, offset, 1, ENC_BIG_ENDIAN); } else { - proto_tree_add_item(tree, hf_q931_channel_selection_bri, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_q931_channel_selection_bri, tvb, offset, 1, ENC_BIG_ENDIAN); } offset += 1; len -= 1; @@ -1602,7 +1602,7 @@ dissect_q931_channel_identification_ie(tvbuff_t *tvb, int offset, int len, return; } proto_tree_add_item(tree, hf_q931_channel_map, tvb, offset, 1, FALSE); - proto_tree_add_item(tree, hf_q931_channel_element_type, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_q931_channel_element_type, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; len -= 1; @@ -1624,7 +1624,7 @@ dissect_q931_channel_identification_ie(tvbuff_t *tvb, int offset, int len, octet2 = tvb_get_guint8(tvb, offset); proto_tree_add_item(tree, hf_q931_extension_ind, tvb, offset, 1, FALSE); - proto_tree_add_item(tree,hf_q931_channel_number,tvb,offset,1,FALSE); + proto_tree_add_item(tree,hf_q931_channel_number,tvb,offset,1,ENC_BIG_ENDIAN); offset += 1; len -= 1; @@ -2635,9 +2635,9 @@ dissect_q931_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, } if (q931_tree != NULL){ if (prot_discr == NLPID_DMS) - proto_tree_add_item(q931_tree, hf_q931_maintenance_message_type, tvb, offset, 1, FALSE); + proto_tree_add_item(q931_tree, hf_q931_maintenance_message_type, tvb, offset, 1, ENC_BIG_ENDIAN); else - proto_tree_add_item(q931_tree, hf_q931_message_type, tvb, offset, 1, FALSE); + proto_tree_add_item(q931_tree, hf_q931_message_type, tvb, offset, 1, ENC_BIG_ENDIAN); } offset += 1; diff --git a/epan/dissectors/packet-qllc.c b/epan/dissectors/packet-qllc.c index 2813665e48..a1c4970035 100644 --- a/epan/dissectors/packet-qllc.c +++ b/epan/dissectors/packet-qllc.c @@ -103,7 +103,7 @@ dissect_qllc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) * COMMAND or a RESPONSE */ addr = tvb_get_guint8(tvb, 0); if (tree) { - proto_tree_add_item(qllc_tree, hf_qllc_address, tvb, 0, 1, FALSE); + proto_tree_add_item(qllc_tree, hf_qllc_address, tvb, 0, 1, ENC_BIG_ENDIAN); } /* The address field equals X'FF' in commands (except QRR) diff --git a/epan/dissectors/packet-quake.c b/epan/dissectors/packet-quake.c index 9f083b0905..776bee4f27 100644 --- a/epan/dissectors/packet-quake.c +++ b/epan/dissectors/packet-quake.c @@ -166,7 +166,7 @@ dissect_quake_CCREQ_CONNECT offset += proto_item_get_len(ti); proto_tree_add_item(tree, hf_quake_CCREQ_CONNECT_version, - tvb, offset, 1, TRUE); + tvb, offset, 1, ENC_LITTLE_ENDIAN); } } @@ -185,7 +185,7 @@ dissect_quake_CCREQ_SERVER_INFO tvb, offset, -1, TRUE); offset += proto_item_get_len(ti); proto_tree_add_item(tree, hf_quake_CCREQ_SERVER_INFO_version, - tvb, offset, 1, TRUE); + tvb, offset, 1, ENC_LITTLE_ENDIAN); } } @@ -196,7 +196,7 @@ dissect_quake_CCREQ_PLAYER_INFO { if (tree) { proto_tree_add_item(tree, hf_quake_CCREQ_PLAYER_INFO_player, - tvb, 0, 1, TRUE); + tvb, 0, 1, ENC_LITTLE_ENDIAN); } } @@ -266,13 +266,13 @@ dissect_quake_CCREP_SERVER_INFO offset += proto_item_get_len(ti); proto_tree_add_item(tree, hf_quake_CCREP_SERVER_INFO_num_player, - tvb, offset, 1, TRUE); + tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 1; proto_tree_add_item(tree, hf_quake_CCREP_SERVER_INFO_max_player, - tvb, offset, 1, TRUE); + tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 1; proto_tree_add_item(tree, hf_quake_CCREQ_SERVER_INFO_version, - tvb, offset, 1, TRUE); + tvb, offset, 1, ENC_LITTLE_ENDIAN); } } @@ -293,7 +293,7 @@ dissect_quake_CCREP_PLAYER_INFO if (tree) { proto_tree_add_item(tree, hf_quake_CCREQ_PLAYER_INFO_player, - tvb, offset, 1, TRUE); + tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 1; ti = proto_tree_add_item(tree, hf_quake_CCREP_PLAYER_INFO_name, @@ -317,10 +317,10 @@ dissect_quake_CCREP_PLAYER_INFO tvb, offset, 1, color_pants); offset += 4; proto_tree_add_item(tree, hf_quake_CCREP_PLAYER_INFO_frags, - tvb, offset, 4, TRUE); + tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; proto_tree_add_item(tree, hf_quake_CCREP_PLAYER_INFO_connect_time, - tvb, offset, 4, TRUE); + tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; proto_tree_add_item(tree, hf_quake_CCREP_PLAYER_INFO_address, diff --git a/epan/dissectors/packet-radiotap.c b/epan/dissectors/packet-radiotap.c index e33cfb9b6b..6800d20aea 100644 --- a/epan/dissectors/packet-radiotap.c +++ b/epan/dissectors/packet-radiotap.c @@ -1375,7 +1375,7 @@ dissect_radiotap(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) proto_tree_add_uint(radiotap_tree, hf_radiotap_version, tvb, 0, 1, version); proto_tree_add_item(radiotap_tree, hf_radiotap_pad, - tvb, 1, 1, FALSE); + tvb, 1, 1, ENC_BIG_ENDIAN); proto_tree_add_uint(radiotap_tree, hf_radiotap_length, tvb, 2, 2, length); } @@ -1535,9 +1535,9 @@ dissect_radiotap(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) offset, 3, NULL, "Vendor: %s", manuf_name); proto_tree_add_item(ven_tree, hf_radiotap_ven_subns, - tvb, offset + 3, 1, FALSE); + tvb, offset + 3, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ven_tree, hf_radiotap_ven_skip, tvb, - offset + 4, 2, TRUE); + offset + 4, 2, ENC_LITTLE_ENDIAN); proto_tree_add_item(ven_tree, hf_radiotap_ven_data, tvb, offset + 6, iter.this_arg_size - 6, ENC_NA); @@ -1564,7 +1564,7 @@ dissect_radiotap(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) if (tree) { ft = proto_tree_add_item(radiotap_tree, hf_radiotap_flags, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); flags_tree = proto_item_add_subtree(ft, ett_radiotap_flags); @@ -1727,10 +1727,10 @@ dissect_radiotap(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) case IEEE80211_RADIOTAP_FHSS: proto_tree_add_item(radiotap_tree, hf_radiotap_fhss_hopset, tvb, - offset, 1, FALSE); + offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(radiotap_tree, hf_radiotap_fhss_pattern, tvb, - offset, 1, FALSE); + offset, 1, ENC_BIG_ENDIAN); break; case IEEE80211_RADIOTAP_DBM_ANTSIGNAL: @@ -1771,13 +1771,13 @@ dissect_radiotap(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) case IEEE80211_RADIOTAP_TX_ATTENUATION: proto_tree_add_item(radiotap_tree, hf_radiotap_tx_attenuation, tvb, - offset, 2, FALSE); + offset, 2, ENC_BIG_ENDIAN); break; case IEEE80211_RADIOTAP_DB_TX_ATTENUATION: proto_tree_add_item(radiotap_tree, hf_radiotap_db_tx_attenuation, tvb, - offset, 2, FALSE); + offset, 2, ENC_BIG_ENDIAN); break; case IEEE80211_RADIOTAP_DBM_TX_POWER: diff --git a/epan/dissectors/packet-radius_packetcable.c b/epan/dissectors/packet-radius_packetcable.c index 1661294e03..d4e61e1b5b 100644 --- a/epan/dissectors/packet-radius_packetcable.c +++ b/epan/dissectors/packet-radius_packetcable.c @@ -251,7 +251,7 @@ static void decode_packetcable_bcid (tvbuff_t *tvb, proto_tree *tree, int offset guint8 packetcable_buf[64]; proto_tree_add_item(tree, hf_packetcable_bcid_timestamp, - tvb, offset, 4, FALSE); + tvb, offset, 4, ENC_BIG_ENDIAN); tvb_memcpy(tvb, packetcable_buf, offset + 4, 8); packetcable_buf[8] = '\0'; proto_tree_add_text(tree, tvb, offset + 4, 8, "Element ID: %s", packetcable_buf); @@ -260,7 +260,7 @@ static void decode_packetcable_bcid (tvbuff_t *tvb, proto_tree *tree, int offset "Time Zone: DST: %c, Offset: %s", tvb_get_guint8(tvb, offset + 12), packetcable_buf); proto_tree_add_item(tree, hf_packetcable_bcid_event_counter, - tvb, offset + 20, 4, FALSE); + tvb, offset + 20, 4, ENC_BIG_ENDIAN); } static const gchar* dissect_packetcable_em_hdr(proto_tree* tree, tvbuff_t* tvb, packet_info *pinfo _U_) { @@ -268,38 +268,38 @@ static const gchar* dissect_packetcable_em_hdr(proto_tree* tree, tvbuff_t* tvb, proto_item *ti; proto_tree *obj_tree; - proto_tree_add_item(tree, hf_packetcable_em_header_version_id, tvb, 0, 2, FALSE); + proto_tree_add_item(tree, hf_packetcable_em_header_version_id, tvb, 0, 2, ENC_BIG_ENDIAN); ti = proto_tree_add_text(tree, tvb, 2, 24, "BCID"); obj_tree = proto_item_add_subtree(ti, ett_radius_vendor_packetcable_bcid); decode_packetcable_bcid(tvb, obj_tree, 2); - proto_tree_add_item(tree, hf_packetcable_em_header_event_message_type, tvb, 26, 2, FALSE); - proto_tree_add_item(tree, hf_packetcable_em_header_element_type, tvb, 28, 2, FALSE); + proto_tree_add_item(tree, hf_packetcable_em_header_event_message_type, tvb, 26, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_packetcable_em_header_element_type, tvb, 28, 2, ENC_BIG_ENDIAN); tvb_memcpy(tvb, packetcable_buf, 30, 8); packetcable_buf[8] = '\0'; proto_tree_add_text(tree, tvb, 30, 8, "Element ID: %s", packetcable_buf ); tvb_memcpy(tvb, packetcable_buf, 39, 7); packetcable_buf[7] = '\0'; proto_tree_add_text(tree, tvb, 38, 8, "Time Zone: DST: %c, Offset: %s", tvb_get_guint8(tvb, 38), packetcable_buf); - proto_tree_add_item(tree, hf_packetcable_em_header_sequence_number, tvb, 46, 4, FALSE); + proto_tree_add_item(tree, hf_packetcable_em_header_sequence_number, tvb, 46, 4, ENC_BIG_ENDIAN); tvb_memcpy(tvb, packetcable_buf, 50, 18); packetcable_buf[18] = '\0'; proto_tree_add_text(tree, tvb, 50, 18, "Event Time: %s", packetcable_buf); - ti = proto_tree_add_item(tree, hf_packetcable_em_header_status, tvb, 68, 4, FALSE); + ti = proto_tree_add_item(tree, hf_packetcable_em_header_status, tvb, 68, 4, ENC_BIG_ENDIAN); obj_tree = proto_item_add_subtree(ti, ett_radius_vendor_packetcable_status); - proto_tree_add_item(obj_tree, hf_packetcable_em_header_status_error_indicator, tvb, 68, 4, FALSE); - proto_tree_add_item(obj_tree, hf_packetcable_em_header_status_event_origin, tvb, 68, 4, FALSE); - proto_tree_add_item(obj_tree, hf_packetcable_em_header_status_event_message_proxied, tvb, 68, 4, FALSE); + proto_tree_add_item(obj_tree, hf_packetcable_em_header_status_error_indicator, tvb, 68, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(obj_tree, hf_packetcable_em_header_status_event_origin, tvb, 68, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(obj_tree, hf_packetcable_em_header_status_event_message_proxied, tvb, 68, 4, ENC_BIG_ENDIAN); - proto_tree_add_item(tree, hf_packetcable_em_header_priority, tvb, 72, 1, FALSE); - proto_tree_add_item(tree, hf_packetcable_em_header_attribute_count, tvb, 73, 2, FALSE); - proto_tree_add_item(tree, hf_packetcable_em_header_event_object, tvb, 75, 1, FALSE); + proto_tree_add_item(tree, hf_packetcable_em_header_priority, tvb, 72, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_packetcable_em_header_attribute_count, tvb, 73, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_packetcable_em_header_event_object, tvb, 75, 1, ENC_BIG_ENDIAN); return ""; } static const gchar* dissect_packetcable_call_term_cause(proto_tree* tree, tvbuff_t* tvb, packet_info *pinfo _U_) { proto_tree_add_item(tree, hf_packetcable_call_termination_cause_source_document, - tvb, 0, 2, FALSE); + tvb, 0, 2, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_packetcable_call_termination_cause_code, - tvb, 2, 4, FALSE); + tvb, 2, 4, ENC_BIG_ENDIAN); return ""; } @@ -311,9 +311,9 @@ static const gchar* dissect_packetcable_rel_call_billing_correlation(proto_tree* static const gchar* dissect_packetcable_trunk_group_id(proto_tree* tree, tvbuff_t* tvb, packet_info *pinfo _U_) { proto_tree_add_item(tree, hf_packetcable_trunk_group_id_trunk_type, - tvb, 0, 2, FALSE); + tvb, 0, 2, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_packetcable_trunk_group_id_trunk_number, - tvb, 2, 4, FALSE); + tvb, 2, 4, ENC_BIG_ENDIAN); return ""; } @@ -321,12 +321,12 @@ static const gchar* dissect_packetcable_qos_descriptor(proto_tree* tree, tvbuff_ guint8 packetcable_buf[64]; guint32 intval; guint32 packetcable_qos_flags = tvb_get_ntohl(tvb, 0); - proto_item* ti = proto_tree_add_item(tree, hf_packetcable_qos_status, tvb, 0, 4, FALSE); + proto_item* ti = proto_tree_add_item(tree, hf_packetcable_qos_status, tvb, 0, 4, ENC_BIG_ENDIAN); proto_tree* obj_tree = proto_item_add_subtree(ti, ett_radius_vendor_packetcable_qos_status); guint packetcable_qos_off = 20; - proto_tree_add_item(obj_tree, hf_packetcable_qos_status_indication, tvb, 0, 4, FALSE); + proto_tree_add_item(obj_tree, hf_packetcable_qos_status_indication, tvb, 0, 4, ENC_BIG_ENDIAN); for (intval = 0; intval < PACKETCABLE_QOS_DESC_BITFIELDS; intval++) { proto_tree_add_item(obj_tree, hf_packetcable_qos_desc_flags[intval], tvb, 0, 4, FALSE); @@ -349,7 +349,7 @@ static const gchar* dissect_packetcable_qos_descriptor(proto_tree* tree, tvbuff_ } static const gchar* dissect_packetcable_time_adjustment(proto_tree* tree, tvbuff_t* tvb, packet_info *pinfo _U_) { - proto_tree_add_item(tree, hf_packetcable_time_adjustment, tvb, 0, 8, FALSE); + proto_tree_add_item(tree, hf_packetcable_time_adjustment, tvb, 0, 8, ENC_BIG_ENDIAN); return ""; } @@ -366,7 +366,7 @@ static const gchar* dissect_packetcable_redirected_from_info(proto_tree* tree, t "Original-Called-Party: %s", packetcable_buf); proto_tree_add_item(tree, hf_packetcable_redirected_from_info_number_of_redirections, - tvb, 40, 2, FALSE); + tvb, 40, 2, ENC_BIG_ENDIAN); return ""; } @@ -381,9 +381,9 @@ static const gchar* dissect_packetcable_time_electr_surv_ind(proto_tree* tree, t proto_tree_add_item(tree, hf_packetcable_electronic_surveillance_indication_df_ccc_address, tvb, 4, 4, FALSE); proto_tree_add_item(tree, hf_packetcable_electronic_surveillance_indication_cdc_port, - tvb, 8, 2, FALSE); + tvb, 8, 2, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_packetcable_electronic_surveillance_indication_ccc_port, - tvb, 10, 2, FALSE); + tvb, 10, 2, ENC_BIG_ENDIAN); proto_tree_add_text(tree, tvb, 12, tvb_length(tvb) - 12, "DF-DF-Key"); return ""; @@ -402,7 +402,7 @@ static const gchar* dissect_packetcable_term_dsply_info(proto_tree* tree, tvbuff guint8 bitmask = tvb_get_guint8(tvb, 2); guint intval = 1; proto_item* ti = proto_tree_add_item(tree, hf_packetcable_terminal_display_info_terminal_display_status_bitmask, - tvb, 0, 1, FALSE); + tvb, 0, 1, ENC_BIG_ENDIAN); proto_tree* obj_tree = proto_item_add_subtree(ti, ett_packetcable_term_dsply); proto_tree_add_item(obj_tree, hf_packetcable_terminal_display_info_sbm_general_display, diff --git a/epan/dissectors/packet-rdm.c b/epan/dissectors/packet-rdm.c index c4802d0ea7..bbac672b2e 100644 --- a/epan/dissectors/packet-rdm.c +++ b/epan/dissectors/packet-rdm.c @@ -96,16 +96,16 @@ dissect_rdm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree *rdm_tree = proto_item_add_subtree(ti, ett_rdm); proto_tree_add_item(rdm_tree, hf_rdm_start_code, tvb, - offset, 1, FALSE); + offset, 1, ENC_BIG_ENDIAN); offset++; proto_tree_add_item(rdm_tree, hf_rdm_sub_start_code, tvb, - offset, 1, FALSE); + offset, 1, ENC_BIG_ENDIAN); offset++; message_length = tvb_get_guint8(tvb, offset); proto_tree_add_item(rdm_tree, hf_rdm_message_length, tvb, - offset, 1, FALSE); + offset, 1, ENC_BIG_ENDIAN); offset++; proto_tree_add_item(rdm_tree, hf_rdm_dest_uid, tvb, @@ -117,32 +117,32 @@ dissect_rdm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset += 6; proto_tree_add_item(rdm_tree, hf_rdm_transaction_number, tvb, - offset, 1, FALSE); + offset, 1, ENC_BIG_ENDIAN); offset++; proto_tree_add_item(rdm_tree, hf_rdm_response_type, tvb, - offset, 1, FALSE); + offset, 1, ENC_BIG_ENDIAN); offset++; proto_tree_add_item(rdm_tree, hf_rdm_message_count, tvb, - offset, 1, FALSE); + offset, 1, ENC_BIG_ENDIAN); offset++; proto_tree_add_item(rdm_tree, hf_rdm_sub_device, tvb, - offset, 2, FALSE); + offset, 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(rdm_tree, hf_rdm_command_class, tvb, - offset, 1, FALSE); + offset, 1, ENC_BIG_ENDIAN); offset++; proto_tree_add_item(rdm_tree, hf_rdm_parameter_id, tvb, - offset, 2, FALSE); + offset, 2, ENC_BIG_ENDIAN); offset += 2; parameter_data_length = tvb_get_guint8(tvb, offset); proto_tree_add_item(rdm_tree, hf_rdm_parameter_data_length, tvb, - offset, 1, FALSE); + offset, 1, ENC_BIG_ENDIAN); offset++; if (parameter_data_length > 0) { @@ -160,7 +160,7 @@ dissect_rdm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) checksum_shouldbe = rdm_checksum(tvb, offset); checksum = tvb_get_ntohs(tvb, offset); item = proto_tree_add_item(rdm_tree, hf_rdm_checksum, tvb, - offset, 2, FALSE); + offset, 2, ENC_BIG_ENDIAN); if (checksum == checksum_shouldbe) { proto_item_append_text(item, " [correct]"); } else { diff --git a/epan/dissectors/packet-rdt.c b/epan/dissectors/packet-rdt.c index 502eb347cf..bd2bd10e34 100644 --- a/epan/dissectors/packet-rdt.c +++ b/epan/dissectors/packet-rdt.c @@ -440,24 +440,24 @@ guint dissect_rdt_data_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre is_reliable_flag); flags_tree1 = proto_item_add_subtree(ti, ett_rdt_data_flags1); - proto_tree_add_item(flags_tree1, hf_rdt_len_included, tvb, offset, 1, FALSE); - proto_tree_add_item(flags_tree1, hf_rdt_data_need_reliable, tvb, offset, 1, FALSE); - proto_tree_add_item(flags_tree1, hf_rdt_data_stream_id, tvb, offset, 1, FALSE); - proto_tree_add_item(flags_tree1, hf_rdt_data_is_reliable, tvb, offset, 1, FALSE); + proto_tree_add_item(flags_tree1, hf_rdt_len_included, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(flags_tree1, hf_rdt_data_need_reliable, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(flags_tree1, hf_rdt_data_stream_id, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(flags_tree1, hf_rdt_data_is_reliable, tvb, offset, 1, ENC_BIG_ENDIAN); } offset++; /* Sequence number */ sequence_number = tvb_get_ntohs(tvb, offset); - proto_tree_add_item(tree, hf_rdt_sequence_number, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_rdt_sequence_number, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; /* Length field is optional */ if (length_included_flag) { packet_length = tvb_get_ntohs(tvb, offset); - proto_tree_add_item(tree, hf_rdt_packet_length, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_rdt_packet_length, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; /* Check that there are as many bytes as reported */ @@ -488,29 +488,29 @@ guint dissect_rdt_data_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre /* Create subtree for flags and add fields */ flags_tree2 = proto_item_add_subtree(ti, ett_rdt_data_flags2); - proto_tree_add_item(flags_tree2, hf_rdt_data_backtoback, tvb, offset, 1, FALSE); - proto_tree_add_item(flags_tree2, hf_rdt_data_slowdata, tvb, offset, 1, FALSE); - proto_tree_add_item(flags_tree2, hf_rdt_data_asmrule, tvb, offset, 1, FALSE); + proto_tree_add_item(flags_tree2, hf_rdt_data_backtoback, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(flags_tree2, hf_rdt_data_slowdata, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(flags_tree2, hf_rdt_data_asmrule, tvb, offset, 1, ENC_BIG_ENDIAN); } offset++; /* Timestamp */ timestamp = tvb_get_ntohl(tvb, offset); - proto_tree_add_item(tree, hf_rdt_timestamp, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_rdt_timestamp, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; /* Stream ID expansion */ if (stream_id == 31) { stream_id = tvb_get_ntohs(tvb, offset); - proto_tree_add_item(tree, hf_rdt_stream_id_ex, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_rdt_stream_id_ex, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; } /* Total reliable */ if (need_reliable_flag) { - proto_tree_add_item(tree, hf_rdt_total_reliable, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_rdt_total_reliable, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; } @@ -518,7 +518,7 @@ guint dissect_rdt_data_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre if (asm_rule_number == 63) { asm_rule_number = tvb_get_ntohs(tvb, offset); - proto_tree_add_item(tree, hf_rdt_asmrule_ex, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_rdt_asmrule_ex, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; } @@ -568,24 +568,24 @@ guint dissect_rdt_asm_action_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tre stream_id); flags_tree = proto_item_add_subtree(ti, ett_rdt_aact_flags); - proto_tree_add_item(flags_tree, hf_rdt_len_included, tvb, offset, 1, FALSE); - proto_tree_add_item(flags_tree, hf_rdt_aact_stream_id, tvb, offset, 1, FALSE); + proto_tree_add_item(flags_tree, hf_rdt_len_included, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(flags_tree, hf_rdt_aact_stream_id, tvb, offset, 1, ENC_BIG_ENDIAN); } offset++; /* Packet type */ - proto_tree_add_item(tree, hf_rdt_packet_type, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_rdt_packet_type, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; rel_seqno = tvb_get_ntohs(tvb, offset); - proto_tree_add_item(tree, hf_rdt_aact_reliable_seqno, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_rdt_aact_reliable_seqno, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; /* Length field is optional */ if (length_included_flag) { packet_length = tvb_get_ntohs(tvb, offset); - proto_tree_add_item(tree, hf_rdt_packet_length, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_rdt_packet_length, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; /* Check that there are as many bytes as reported */ @@ -600,7 +600,7 @@ guint dissect_rdt_asm_action_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tre if (stream_id == 31) { stream_id = tvb_get_ntohs(tvb, offset); - proto_tree_add_item(tree, hf_rdt_stream_id_ex, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_rdt_stream_id_ex, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; } @@ -644,19 +644,19 @@ guint dissect_rdt_bandwidth_report_packet(tvbuff_t *tvb, packet_info *pinfo, pro length_included_flag); flags_tree = proto_item_add_subtree(ti, ett_rdt_bandwidth_report_flags); - proto_tree_add_item(flags_tree, hf_rdt_len_included, tvb, offset, 1, FALSE); + proto_tree_add_item(flags_tree, hf_rdt_len_included, tvb, offset, 1, ENC_BIG_ENDIAN); } offset++; /* Packet type */ - proto_tree_add_item(tree, hf_rdt_packet_type, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_rdt_packet_type, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; /* Length field is optional */ if (length_included_flag) { packet_length = tvb_get_ntohs(tvb, offset); - proto_tree_add_item(tree, hf_rdt_packet_length, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_rdt_packet_length, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; /* Check that there are as many bytes as reported */ @@ -667,11 +667,11 @@ guint dissect_rdt_bandwidth_report_packet(tvbuff_t *tvb, packet_info *pinfo, pro packet_length = tvb_length_remaining(tvb, start_offset); } - proto_tree_add_item(tree, hf_rdt_brpt_interval, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_rdt_brpt_interval, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(tree, hf_rdt_brpt_bandwidth, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_rdt_brpt_bandwidth, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(tree, hf_rdt_brpt_sequence, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_rdt_brpt_sequence, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; col_append_str(pinfo->cinfo, COL_INFO, "BANDWIDTH-REPORT: "); @@ -712,20 +712,20 @@ guint dissect_rdt_ack_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree lost_high_flag); flags_tree = proto_item_add_subtree(ti, ett_rdt_ack_flags); - proto_tree_add_item(flags_tree, hf_rdt_len_included, tvb, offset, 1, FALSE); - proto_tree_add_item(flags_tree, hf_rdt_ack_lost_high, tvb, offset, 1, FALSE); + proto_tree_add_item(flags_tree, hf_rdt_len_included, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(flags_tree, hf_rdt_ack_lost_high, tvb, offset, 1, ENC_BIG_ENDIAN); } offset++; /* Packet type */ - proto_tree_add_item(tree, hf_rdt_packet_type, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_rdt_packet_type, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; /* Length field is optional */ if (length_included_flag) { packet_length = tvb_get_ntohs(tvb, offset); - proto_tree_add_item(tree, hf_rdt_packet_length, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_rdt_packet_length, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; /* Check that there are as many bytes as reported */ @@ -758,7 +758,7 @@ guint dissect_rdt_rtt_request_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tr offset++; /* Packet type */ - proto_tree_add_item(tree, hf_rdt_packet_type, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_rdt_packet_type, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; col_append_str(pinfo->cinfo, COL_INFO, "RTT-REQUEST: "); @@ -773,12 +773,12 @@ guint dissect_rdt_rtt_response_packet(tvbuff_t *tvb, packet_info *pinfo, proto_t offset++; /* Packet type */ - proto_tree_add_item(tree, hf_rdt_packet_type, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_rdt_packet_type, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(tree, hf_rdt_rtrp_ts_sec, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_rdt_rtrp_ts_sec, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(tree, hf_rdt_rtrp_ts_usec, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_rdt_rtrp_ts_usec, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; col_append_str(pinfo->cinfo, COL_INFO, "RTT-RESPONSE: "); @@ -793,12 +793,12 @@ guint dissect_rdt_congestion_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tre offset++; /* Packet type */ - proto_tree_add_item(tree, hf_rdt_packet_type, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_rdt_packet_type, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(tree, hf_rdt_cong_xmit_mult, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_rdt_cong_xmit_mult, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(tree, hf_rdt_cong_recv_mult, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_rdt_cong_recv_mult, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; col_append_str(pinfo->cinfo, COL_INFO, "CONGESTION: "); @@ -836,44 +836,44 @@ guint dissect_rdt_stream_end_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tre ext_flag); flags_tree = proto_item_add_subtree(ti, ett_rdt_stre_flags); - proto_tree_add_item(flags_tree, hf_rdt_stre_need_reliable, tvb, offset, 1, FALSE); - proto_tree_add_item(flags_tree, hf_rdt_stre_stream_id, tvb, offset, 1, FALSE); - proto_tree_add_item(flags_tree, hf_rdt_stre_packet_sent, tvb, offset, 1, FALSE); - proto_tree_add_item(flags_tree, hf_rdt_stre_ext_flag, tvb, offset, 1, FALSE); + proto_tree_add_item(flags_tree, hf_rdt_stre_need_reliable, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(flags_tree, hf_rdt_stre_stream_id, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(flags_tree, hf_rdt_stre_packet_sent, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(flags_tree, hf_rdt_stre_ext_flag, tvb, offset, 1, ENC_BIG_ENDIAN); } offset++; /* Packet type */ - proto_tree_add_item(tree, hf_rdt_packet_type, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_rdt_packet_type, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(tree, hf_rdt_stre_seqno, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_rdt_stre_seqno, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(tree, hf_rdt_timestamp, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_rdt_timestamp, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; /* Stream ID expansion */ if (stream_id == 31) { stream_id = tvb_get_ntohs(tvb, offset); - proto_tree_add_item(tree, hf_rdt_stream_id_ex, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_rdt_stream_id_ex, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; } /* Total reliable */ if (need_reliable) { - proto_tree_add_item(tree, hf_rdt_total_reliable, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_rdt_total_reliable, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; } if (ext_flag) { - proto_tree_add_item(tree, hf_rdt_stre_dummy_flags1, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_rdt_stre_dummy_flags1, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(tree, hf_rdt_stre_dummy_type, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_rdt_stre_dummy_type, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(tree, hf_rdt_stre_reason_code, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_rdt_stre_reason_code, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; /* XXX: Remainder is reason_text */ offset += tvb_length_remaining(tvb, offset); @@ -907,19 +907,19 @@ guint dissect_rdt_report_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t length_included_flag); flags_tree = proto_item_add_subtree(ti, ett_rdt_report_flags); - proto_tree_add_item(flags_tree, hf_rdt_len_included, tvb, offset, 1, FALSE); + proto_tree_add_item(flags_tree, hf_rdt_len_included, tvb, offset, 1, ENC_BIG_ENDIAN); } offset++; /* Packet type */ - proto_tree_add_item(tree, hf_rdt_packet_type, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_rdt_packet_type, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; /* Length field is optional */ if (length_included_flag) { packet_length = tvb_get_ntohs(tvb, offset); - proto_tree_add_item(tree, hf_rdt_packet_length, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_rdt_packet_length, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; /* Check that there are as many bytes as reported */ @@ -969,19 +969,19 @@ guint dissect_rdt_latency_report_packet(tvbuff_t *tvb, packet_info *pinfo, proto length_included_flag); flags_tree = proto_item_add_subtree(ti, ett_rdt_latency_report_flags); - proto_tree_add_item(flags_tree, hf_rdt_len_included, tvb, offset, 1, FALSE); + proto_tree_add_item(flags_tree, hf_rdt_len_included, tvb, offset, 1, ENC_BIG_ENDIAN); } offset++; /* Packet type */ - proto_tree_add_item(tree, hf_rdt_packet_type, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_rdt_packet_type, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; /* Length field is optional */ if (length_included_flag) { packet_length = tvb_get_ntohs(tvb, offset); - proto_tree_add_item(tree, hf_rdt_packet_length, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_rdt_packet_length, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; /* Check that there are as many bytes as reported */ @@ -993,7 +993,7 @@ guint dissect_rdt_latency_report_packet(tvbuff_t *tvb, packet_info *pinfo, proto } server_out_time = tvb_get_ntohl(tvb, offset); - proto_tree_add_item(tree, hf_rdt_lrpt_server_out_time, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_rdt_lrpt_server_out_time, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; col_append_fstr(pinfo->cinfo, COL_INFO, "LATENCY-REPORT: t=%u ", server_out_time); @@ -1032,18 +1032,18 @@ guint dissect_rdt_transport_info_request_packet(tvbuff_t *tvb, packet_info *pinf request_buffer_info_flag); flags_tree = proto_item_add_subtree(ti, ett_rdt_tirq_flags); - proto_tree_add_item(flags_tree, hf_rdt_tirq_request_rtt_info, tvb, offset, 1, FALSE); - proto_tree_add_item(flags_tree, hf_rdt_tirq_request_buffer_info, tvb, offset, 1, FALSE); + proto_tree_add_item(flags_tree, hf_rdt_tirq_request_rtt_info, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(flags_tree, hf_rdt_tirq_request_buffer_info, tvb, offset, 1, ENC_BIG_ENDIAN); } offset++; /* Packet type */ - proto_tree_add_item(tree, hf_rdt_packet_type, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_rdt_packet_type, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; if (request_rtt_info_flag) { - proto_tree_add_item(tree, hf_rdt_tirq_request_time_msec, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_rdt_tirq_request_time_msec, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; } @@ -1079,25 +1079,25 @@ guint dissect_rdt_transport_info_response_packet(tvbuff_t *tvb, packet_info *pin has_buffer_info); flags_tree = proto_item_add_subtree(ti, ett_rdt_tirp_flags); - proto_tree_add_item(flags_tree, hf_rdt_tirp_has_rtt_info, tvb, offset, 1, FALSE); - proto_tree_add_item(flags_tree, hf_rdt_tirp_is_delayed, tvb, offset, 1, FALSE); - proto_tree_add_item(flags_tree, hf_rdt_tirp_has_buffer_info, tvb, offset, 1, FALSE); + proto_tree_add_item(flags_tree, hf_rdt_tirp_has_rtt_info, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(flags_tree, hf_rdt_tirp_is_delayed, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(flags_tree, hf_rdt_tirp_has_buffer_info, tvb, offset, 1, ENC_BIG_ENDIAN); } offset++; /* Packet type */ - proto_tree_add_item(tree, hf_rdt_packet_type, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_rdt_packet_type, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; /* RTT info */ if (has_rtt_info) { - proto_tree_add_item(tree, hf_rdt_tirp_request_time_msec, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_rdt_tirp_request_time_msec, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; if (is_delayed) { - proto_tree_add_item(tree, hf_rdt_tirp_response_time_msec, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_rdt_tirp_response_time_msec, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; } } @@ -1109,7 +1109,7 @@ guint dissect_rdt_transport_info_response_packet(tvbuff_t *tvb, packet_info *pin /* Read number of buffers */ guint16 buffer_info_count = tvb_get_ntohs(tvb, offset); - proto_tree_add_item(tree, hf_rdt_tirp_buffer_info_count, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_rdt_tirp_buffer_info_count, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; for (n=0; n < buffer_info_count; n++) @@ -1125,13 +1125,13 @@ guint dissect_rdt_transport_info_response_packet(tvbuff_t *tvb, packet_info *pin buffer_info_tree = proto_item_add_subtree(ti2, ett_rdt_tirp_buffer_info); /* Read individual buffer info */ - proto_tree_add_item(buffer_info_tree, hf_rdt_tirp_buffer_info_stream_id, tvb, offset, 2, FALSE); + proto_tree_add_item(buffer_info_tree, hf_rdt_tirp_buffer_info_stream_id, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(buffer_info_tree, hf_rdt_tirp_buffer_info_lowest_timestamp, tvb, offset, 4, FALSE); + proto_tree_add_item(buffer_info_tree, hf_rdt_tirp_buffer_info_lowest_timestamp, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(buffer_info_tree, hf_rdt_tirp_buffer_info_highest_timestamp, tvb, offset, 4, FALSE); + proto_tree_add_item(buffer_info_tree, hf_rdt_tirp_buffer_info_highest_timestamp, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(buffer_info_tree, hf_rdt_tirp_buffer_info_bytes_buffered, tvb, offset, 4, FALSE); + proto_tree_add_item(buffer_info_tree, hf_rdt_tirp_buffer_info_bytes_buffered, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; } } @@ -1167,19 +1167,19 @@ guint dissect_rdt_bw_probing_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tre length_included_flag); flags_tree = proto_item_add_subtree(ti, ett_rdt_bw_probing_flags); - proto_tree_add_item(flags_tree, hf_rdt_len_included, tvb, offset, 1, FALSE); + proto_tree_add_item(flags_tree, hf_rdt_len_included, tvb, offset, 1, ENC_BIG_ENDIAN); } offset++; /* Packet type */ - proto_tree_add_item(tree, hf_rdt_packet_type, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_rdt_packet_type, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; /* Length field is optional */ if (length_included_flag) { packet_length = tvb_get_ntohs(tvb, offset); - proto_tree_add_item(tree, hf_rdt_packet_length, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_rdt_packet_length, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; /* Check that there are as many bytes as reported */ @@ -1190,9 +1190,9 @@ guint dissect_rdt_bw_probing_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tre packet_length = tvb_length_remaining(tvb, start_offset); } - proto_tree_add_item(tree, hf_rdt_bwpp_seqno, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_rdt_bwpp_seqno, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(tree, hf_rdt_timestamp, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_rdt_timestamp, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 4; col_append_str(pinfo->cinfo, COL_INFO, "BW-PROBING: "); @@ -1211,11 +1211,11 @@ guint dissect_rdt_bw_probing_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tre guint dissect_rdt_unknown_control(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint offset) { /* Flags in first byte */ - proto_tree_add_item(tree, hf_rdt_unk_flags1, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_rdt_unk_flags1, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; /* Packet type */ - proto_tree_add_item(tree, hf_rdt_packet_type, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_rdt_packet_type, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; /* The remaining data is unparsed. */ diff --git a/epan/dissectors/packet-redback.c b/epan/dissectors/packet-redback.c index 07676be356..5b1c106447 100644 --- a/epan/dissectors/packet-redback.c +++ b/epan/dissectors/packet-redback.c @@ -72,13 +72,13 @@ dissect_redback(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ti = proto_tree_add_item(tree, proto_redback, tvb, 0, -1, FALSE); rbtree = proto_item_add_subtree(ti, ett_redback); - proto_tree_add_item(rbtree, hf_redback_context, tvb, 0, 4, FALSE); - proto_tree_add_item(rbtree, hf_redback_flags, tvb, 4, 4, FALSE); - proto_tree_add_item(rbtree, hf_redback_circuit, tvb, 8, 8, FALSE); - proto_tree_add_item(rbtree, hf_redback_length, tvb, 16, 2, FALSE); - proto_tree_add_item(rbtree, hf_redback_protocol, tvb, 18, 2, FALSE); - proto_tree_add_item(rbtree, hf_redback_dataoffset, tvb, 20, 2, FALSE); - proto_tree_add_item(rbtree, hf_redback_l3offset, tvb, 22, 2, FALSE); + proto_tree_add_item(rbtree, hf_redback_context, tvb, 0, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(rbtree, hf_redback_flags, tvb, 4, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(rbtree, hf_redback_circuit, tvb, 8, 8, ENC_BIG_ENDIAN); + proto_tree_add_item(rbtree, hf_redback_length, tvb, 16, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(rbtree, hf_redback_protocol, tvb, 18, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(rbtree, hf_redback_dataoffset, tvb, 20, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(rbtree, hf_redback_l3offset, tvb, 22, 2, ENC_BIG_ENDIAN); if (dataoff > 24) { proto_tree_add_item(rbtree, hf_redback_padding, tvb, 24, dataoff-24, ENC_NA); diff --git a/epan/dissectors/packet-redbackli.c b/epan/dissectors/packet-redbackli.c index afb96f6c82..20cad26a58 100644 --- a/epan/dissectors/packet-redbackli.c +++ b/epan/dissectors/packet-redbackli.c @@ -98,15 +98,15 @@ redbackli_dissect_avp(guint8 avptype, guint8 avplen, tvbuff_t *tvb, gint offset, switch(avptype) { case(RB_AVP_SEQNO): proto_tree_add_item(st, hf_redbackli_seqno, tvb, - offset+2, avplen, FALSE); + offset+2, avplen, ENC_BIG_ENDIAN); break; case(RB_AVP_LIID): proto_tree_add_item(st, hf_redbackli_liid, tvb, - offset+2, avplen, FALSE); + offset+2, avplen, ENC_BIG_ENDIAN); break; case(RB_AVP_SESSID): proto_tree_add_item(st, hf_redbackli_sessid, tvb, - offset+2, avplen, FALSE); + offset+2, avplen, ENC_BIG_ENDIAN); break; case(RB_AVP_LABEL): proto_tree_add_item(st, hf_redbackli_label, tvb, diff --git a/epan/dissectors/packet-reload-framing.c b/epan/dissectors/packet-reload-framing.c index f30b6d6cc1..f3cd3a6b61 100644 --- a/epan/dissectors/packet-reload-framing.c +++ b/epan/dissectors/packet-reload-framing.c @@ -269,7 +269,7 @@ dissect_reload_framing_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr /* * Message dissection */ - proto_tree_add_item(reload_framing_tree, hf_reload_framing_type, tvb, offset , 1, FALSE); + proto_tree_add_item(reload_framing_tree, hf_reload_framing_type, tvb, offset , 1, ENC_BIG_ENDIAN); offset += 1; switch (type) { @@ -277,9 +277,9 @@ dissect_reload_framing_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr { tvbuff_t *next_tvb; - proto_tree_add_item(reload_framing_tree, hf_reload_framing_sequence, tvb, offset , 4, FALSE); + proto_tree_add_item(reload_framing_tree, hf_reload_framing_sequence, tvb, offset , 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(reload_framing_tree, hf_reload_framing_message_length, tvb, offset, 3, FALSE); + proto_tree_add_item(reload_framing_tree, hf_reload_framing_message_length, tvb, offset, 3, ENC_BIG_ENDIAN); offset += 3; next_tvb = tvb_new_subset(tvb, offset, effective_length - offset, message_length); if (reload_handle == NULL) { @@ -291,9 +291,9 @@ dissect_reload_framing_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr break; case ACK: - proto_tree_add_item(reload_framing_tree, hf_reload_framing_ack_sequence, tvb, offset , 4, FALSE); + proto_tree_add_item(reload_framing_tree, hf_reload_framing_ack_sequence, tvb, offset , 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(reload_framing_tree, hf_reload_framing_received, tvb, offset , 4, FALSE); + proto_tree_add_item(reload_framing_tree, hf_reload_framing_received, tvb, offset , 4, ENC_BIG_ENDIAN); break; default: diff --git a/epan/dissectors/packet-reload.c b/epan/dissectors/packet-reload.c index e916040331..5f2ae4697f 100644 --- a/epan/dissectors/packet-reload.c +++ b/epan/dissectors/packet-reload.c @@ -594,7 +594,7 @@ dissect_destination(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint16 if (destination_type & 0x80) { /* simple compressed case */ destination_length = 2; - proto_tree_add_item(tree, hf_reload_destination_compressed, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_reload_destination_compressed, tvb, offset, 2, ENC_BIG_ENDIAN); return 2; } else { @@ -607,7 +607,7 @@ dissect_destination(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint16 destination_tree = proto_item_add_subtree(ti_destination, ett_reload_destination); proto_item_append_text(ti_destination, " (%s)", val_to_str(destination_type, destinationtypes, "Unknown")); - proto_tree_add_item(destination_tree, hf_reload_destination_type, tvb, offset, 1, FALSE); + proto_tree_add_item(destination_tree, hf_reload_destination_type, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_uint(destination_tree, hf_reload_destination_length, tvb, offset+1, 1, destination_length); if (2 + destination_length > length) { expert_add_info_format(pinfo, ti_destination, PI_PROTOCOL, PI_ERROR, "Truncated destination field"); @@ -679,7 +679,7 @@ dissect_probe_information(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, g ti_probe_information = proto_tree_add_item(tree, hf_reload_probe_information, tvb, offset, 2 + probe_length, ENC_NA); probe_information_tree = proto_item_add_subtree(ti_probe_information, ett_reload_probe_information); - proto_tree_add_item(probe_information_tree, hf_reload_probe_information_type, tvb, offset, 1, FALSE); + proto_tree_add_item(probe_information_tree, hf_reload_probe_information_type, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_uint(probe_information_tree, hf_reload_opaque_length_uint8, tvb, offset + 1, 1, probe_length); switch(type) { @@ -688,21 +688,21 @@ dissect_probe_information(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, g expert_add_info_format(pinfo, ti_probe_information, PI_PROTOCOL, PI_ERROR, "Truncated responsible set info"); return 2 + probe_length; } - proto_tree_add_item(probe_information_tree, hf_reload_responsible_set, tvb, offset + 2, 4, FALSE); + proto_tree_add_item(probe_information_tree, hf_reload_responsible_set, tvb, offset + 2, 4, ENC_BIG_ENDIAN); break; case PROBEINFORMATIONTYPE_NUMRESOURCES: if (probe_length < 4) { expert_add_info_format(pinfo, ti_probe_information, PI_PROTOCOL, PI_ERROR, "Truncated num resource info"); return 2 + probe_length; } - proto_tree_add_item(probe_information_tree, hf_reload_num_resources, tvb, offset + 2, 4, FALSE); + proto_tree_add_item(probe_information_tree, hf_reload_num_resources, tvb, offset + 2, 4, ENC_BIG_ENDIAN); break; case PROBEINFORMATIONTYPE_UPTIME: if (probe_length < 4) { expert_add_info_format(pinfo, ti_probe_information, PI_PROTOCOL, PI_ERROR, "Truncated uptime info"); return 2 + probe_length; } - proto_tree_add_item(probe_information_tree, hf_reload_uptime, tvb, offset + 2, 4, FALSE); + proto_tree_add_item(probe_information_tree, hf_reload_uptime, tvb, offset + 2, 4, ENC_BIG_ENDIAN); break; default: break; @@ -726,19 +726,19 @@ dissect_ipaddressport(tvbuff_t *tvb, proto_tree *tree, guint16 offset) ipaddressport_type = tvb_get_guint8(tvb, offset); proto_item_append_text(ti_ipaddressport, " %s ", val_to_str(ipaddressport_type, ipaddressporttypes,"Unknown Type")); ipaddressport_tree = proto_item_add_subtree(ti_ipaddressport, ett_reload_ipaddressport); - proto_tree_add_item(ipaddressport_tree, hf_reload_ipaddressport_type, tvb, offset, 1, FALSE); + proto_tree_add_item(ipaddressport_tree, hf_reload_ipaddressport_type, tvb, offset, 1, ENC_BIG_ENDIAN); offset +=1; proto_tree_add_uint(ipaddressport_tree, hf_reload_ipaddressport_length, tvb, offset, 1, ipaddressport_length); offset +=1; switch (ipaddressport_type) { case IPADDRESSPORTTYPE_IPV4: proto_tree_add_item(ipaddressport_tree, hf_reload_ipv4addr, tvb, offset, 4, FALSE); - proto_tree_add_item(ipaddressport_tree, hf_reload_port, tvb, offset + 4, 2, FALSE); + proto_tree_add_item(ipaddressport_tree, hf_reload_port, tvb, offset + 4, 2, ENC_BIG_ENDIAN); break; case IPADDRESSPORTTYPE_IPV6: proto_tree_add_item(ipaddressport_tree, hf_reload_ipv6addr, tvb, offset, 16, FALSE); - proto_tree_add_item(ipaddressport_tree, hf_reload_port, tvb, offset + 16, 2, FALSE); + proto_tree_add_item(ipaddressport_tree, hf_reload_port, tvb, offset + 16, 2, ENC_BIG_ENDIAN); break; default: @@ -818,7 +818,7 @@ dissect_icecandidates(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint icecandidate_offset += 2 + ipaddressport_length; proto_tree_add_item(icecandidate_tree, hf_reload_overlaylink_type, tvb, - offset+local_offset+icecandidates_offset+icecandidate_offset, 1, FALSE); + offset+local_offset+icecandidates_offset+icecandidate_offset, 1, ENC_BIG_ENDIAN); icecandidate_offset += 1; icecandidate_offset += dissect_opaque(tvb, pinfo,icecandidate_tree, hf_reload_icecandidate_foundation,offset+local_offset+icecandidates_offset + icecandidate_offset, 1, -1); @@ -827,10 +827,10 @@ dissect_icecandidates(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint guint32 priority; priority = tvb_get_ntohl(tvb, offset+local_offset + icecandidates_offset); - proto_tree_add_item(icecandidate_tree, hf_reload_icecandidate_priority, tvb, offset+local_offset + icecandidates_offset, 4, FALSE); + proto_tree_add_item(icecandidate_tree, hf_reload_icecandidate_priority, tvb, offset+local_offset + icecandidates_offset, 4, ENC_BIG_ENDIAN); icecandidate_offset += 4; proto_tree_add_item(icecandidate_tree, hf_reload_icecandidate_type, tvb, - offset+local_offset+icecandidates_offset+icecandidate_offset, 1, FALSE); + offset+local_offset+icecandidates_offset+icecandidate_offset, 1, ENC_BIG_ENDIAN); proto_item_append_text(ti_icecandidate, ": %s, priority=%d", val_to_str(candtype, candtypes, "Unknown"), priority); } icecandidate_offset += 1; @@ -986,9 +986,9 @@ dissect_storeddata(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint16 proto_tree_add_uint(storeddata_tree, hf_reload_storeddata_length, tvb, offset + local_offset, 4, storeddata_length); local_offset += 4; - proto_tree_add_item(storeddata_tree, hf_reload_storeddata_storage_time, tvb, offset + local_offset, 8, FALSE); + proto_tree_add_item(storeddata_tree, hf_reload_storeddata_storage_time, tvb, offset + local_offset, 8, ENC_BIG_ENDIAN); local_offset += 8; - proto_tree_add_item(storeddata_tree, hf_reload_storeddata_lifetime, tvb, offset + local_offset, 4, FALSE); + proto_tree_add_item(storeddata_tree, hf_reload_storeddata_lifetime, tvb, offset + local_offset, 4, ENC_BIG_ENDIAN); /* Can not parse the value and signature fields, as we do not know what is the data model for a given kind id */ return (storeddata_length + 4); @@ -1011,9 +1011,9 @@ dissect_kinddata(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint16 of ti_kinddata = proto_tree_add_item(tree, hf_reload_kinddata, tvb, offset, 12+values_length, ENC_NA); kinddata_tree = proto_item_add_subtree(ti_kinddata, ett_reload_kinddata); - proto_tree_add_item(kinddata_tree, hf_reload_kindid, tvb, offset+local_offset, 4, FALSE); + proto_tree_add_item(kinddata_tree, hf_reload_kindid, tvb, offset+local_offset, 4, ENC_BIG_ENDIAN); local_offset += 4; - proto_tree_add_item(kinddata_tree, hf_reload_kinddata_generation_counter, tvb, offset+local_offset, 8, FALSE); + proto_tree_add_item(kinddata_tree, hf_reload_kinddata_generation_counter, tvb, offset+local_offset, 8, ENC_BIG_ENDIAN); local_offset += 8; proto_tree_add_uint(kinddata_tree, hf_reload_kinddata_values_length, tvb, offset +local_offset, 4, values_length); local_offset += 4; @@ -1070,9 +1070,9 @@ dissect_storereq(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint16 of /* Parse from start */ local_offset = 0; local_offset += dissect_opaque(tvb, pinfo, storereq_tree, hf_reload_resource_id, offset +local_offset, 1, length); - proto_tree_add_item(storereq_tree, hf_reload_store_replica_num, tvb, offset + local_offset, 1, FALSE); + proto_tree_add_item(storereq_tree, hf_reload_store_replica_num, tvb, offset + local_offset, 1, ENC_BIG_ENDIAN); local_offset += 1; - proto_tree_add_item(storereq_tree, hf_reload_store_kind_data_length, tvb, offset + local_offset, 4, FALSE); + proto_tree_add_item(storereq_tree, hf_reload_store_kind_data_length, tvb, offset + local_offset, 4, ENC_BIG_ENDIAN); local_offset += 4; { guint32 kind_data_offset = 0; @@ -1347,15 +1347,15 @@ dissect_reload_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) reload_forwarding_tree = proto_item_add_subtree(ti, ett_reload_forwarding); proto_tree_add_uint(reload_forwarding_tree, hf_reload_token, tvb, 0, 4, relo_token); - proto_tree_add_item(reload_forwarding_tree, hf_reload_overlay, tvb, 4, 4, FALSE); - proto_tree_add_item(reload_forwarding_tree, hf_reload_configuration_sequence, tvb, 8, 2, FALSE); + proto_tree_add_item(reload_forwarding_tree, hf_reload_overlay, tvb, 4, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(reload_forwarding_tree, hf_reload_configuration_sequence, tvb, 8, 2, ENC_BIG_ENDIAN); { guint8 version = tvb_get_guint8(tvb,10); proto_tree_add_uint_format_value(reload_forwarding_tree, hf_reload_version, tvb, 10, 1, version, "%u.%u", (version & 0xF0)>>4, (version & 0xF)); } - proto_tree_add_item(reload_forwarding_tree, hf_reload_ttl, tvb, 11, 1, FALSE); + proto_tree_add_item(reload_forwarding_tree, hf_reload_ttl, tvb, 11, 1, ENC_BIG_ENDIAN); { proto_item *ti_fragment; proto_tree *fragment_tree; @@ -1384,8 +1384,8 @@ dissect_reload_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* msg_length is already parsed */ proto_tree_add_uint(reload_forwarding_tree, hf_reload_length, tvb, 16, 4, msg_length); - proto_tree_add_item(reload_forwarding_tree, hf_reload_trans_id, tvb, 20, 8, FALSE); - proto_tree_add_item(reload_forwarding_tree, hf_reload_max_response_length, tvb, 28, 4, FALSE); + proto_tree_add_item(reload_forwarding_tree, hf_reload_trans_id, tvb, 20, 8, ENC_BIG_ENDIAN); + proto_tree_add_item(reload_forwarding_tree, hf_reload_max_response_length, tvb, 28, 4, ENC_BIG_ENDIAN); /* variable lengths fields lengths are already parsed */ proto_tree_add_uint(reload_forwarding_tree, hf_reload_via_list_length, tvb, 32, 2, via_list_length); proto_tree_add_uint(reload_forwarding_tree, hf_reload_destination_list_length, tvb, 34, 2, destination_list_length); @@ -1441,7 +1441,7 @@ dissect_reload_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_item_append_text(ti_option, " type=%s, flags=%02x, length=%d", val_to_str(option_type, forwardingoptiontypes, "Unknown"), option_flags, option_length); option_tree = proto_item_add_subtree(ti_option, ett_reload_forwarding_option); - proto_tree_add_item(option_tree, hf_reload_forwarding_option_type, tvb, offset+local_offset, 1, FALSE); + proto_tree_add_item(option_tree, hf_reload_forwarding_option_type, tvb, offset+local_offset, 1, ENC_BIG_ENDIAN); { proto_item *ti_flags; proto_tree *flags_tree; @@ -1580,7 +1580,7 @@ dissect_reload_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { int probe_offset = 0; while (probe_offset < info_list_length) { - proto_tree_add_item(probereq_tree, hf_reload_probe_information_type, tvb, offset + 1 + probe_offset, 1, FALSE); + proto_tree_add_item(probereq_tree, hf_reload_probe_information_type, tvb, offset + 1 + probe_offset, 1, ENC_BIG_ENDIAN); probe_offset += 1; } } @@ -1634,7 +1634,7 @@ dissect_reload_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) appattach_tree = proto_item_add_subtree(ti_appattach, ett_reload_appattach); local_offset += dissect_opaque(tvb, pinfo,appattach_tree, hf_reload_ufrag,offset+local_offset, 1, message_body_length-local_offset); local_offset += dissect_opaque(tvb, pinfo,appattach_tree, hf_reload_password,offset+local_offset, 1, message_body_length-local_offset); - proto_tree_add_item(appattach_tree, hf_reload_application, tvb, offset+local_offset, 2, FALSE); + proto_tree_add_item(appattach_tree, hf_reload_application, tvb, offset+local_offset, 2, ENC_BIG_ENDIAN); local_offset += 2; local_offset += dissect_opaque(tvb, pinfo,appattach_tree, hf_reload_role,offset+local_offset, 1, message_body_length-local_offset); dissect_icecandidates(tvb, pinfo, appattach_tree, offset+local_offset, message_body_length-local_offset); @@ -1652,8 +1652,8 @@ dissect_reload_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) expert_add_info_format(pinfo, ti_message_contents, PI_PROTOCOL, PI_ERROR, "Truncated ping answer"); } else { - proto_tree_add_item(message_body_tree, hf_reload_ping_response_id, tvb, offset, 8, FALSE); - proto_tree_add_item(message_body_tree, hf_reload_ping_time, tvb, offset + 8, 8, FALSE); + proto_tree_add_item(message_body_tree, hf_reload_ping_response_id, tvb, offset, 8, ENC_BIG_ENDIAN); + proto_tree_add_item(message_body_tree, hf_reload_ping_time, tvb, offset + 8, 8, ENC_BIG_ENDIAN); } } } @@ -1728,9 +1728,9 @@ dissect_reload_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ti_storekindresponse = proto_tree_add_item(storeans_kind_responses_tree, hf_reload_storekindresponse, tvb, offset+2+local_offset, 4+ 8 + 2 + replicas_length, ENC_NA); storekindresponse_tree = proto_item_add_subtree(ti_storekindresponse, ett_reload_storekindresponse); - proto_tree_add_item(storekindresponse_tree, hf_reload_kindid, tvb, offset+2+local_offset, 4, FALSE); + proto_tree_add_item(storekindresponse_tree, hf_reload_kindid, tvb, offset+2+local_offset, 4, ENC_BIG_ENDIAN); local_offset += 4; - proto_tree_add_item(storekindresponse_tree, hf_reload_kinddata_generation_counter, tvb, offset+2+local_offset, 8, FALSE); + proto_tree_add_item(storekindresponse_tree, hf_reload_kinddata_generation_counter, tvb, offset+2+local_offset, 8, ENC_BIG_ENDIAN); local_offset += 8; { guint16 replicas_length; @@ -1805,7 +1805,7 @@ dissect_reload_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { guint8 kinds_offset = 0; while (kinds_offset < kinds_length) { - proto_tree_add_item(message_body_tree, hf_reload_kindid, tvb, offset+find_offset+kinds_offset, 4, FALSE); + proto_tree_add_item(message_body_tree, hf_reload_kindid, tvb, offset+find_offset+kinds_offset, 4, ENC_BIG_ENDIAN); kinds_offset += 4; } @@ -1835,7 +1835,7 @@ dissect_reload_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ti_findkinddata = proto_tree_add_item(message_body_tree, hf_reload_findkinddata, tvb, offset + 2 + results_offset, findkinddata_length, ENC_NA); findkinddata_tree = proto_item_add_subtree(ti_findkinddata, ett_reload_findkinddata); - proto_tree_add_item(findkinddata_tree, hf_reload_kindid, tvb, offset + 2 + results_offset, 4, FALSE); + proto_tree_add_item(findkinddata_tree, hf_reload_kindid, tvb, offset + 2 + results_offset, 4, ENC_BIG_ENDIAN); dissect_opaque(tvb, pinfo, findkinddata_tree, hf_reload_resource_id, offset + 2 + results_offset + 4, 1, results_length - 4 - results_offset); results_offset += findkinddata_length; @@ -1889,7 +1889,7 @@ dissect_reload_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ti_error = proto_tree_add_item(message_body_tree, hf_reload_error_response, tvb, offset, 2 + 2 + error_length, ENC_NA); error_tree = proto_item_add_subtree(ti_error, ett_reload_error_response); - proto_tree_add_item(error_tree, hf_reload_error_response_code, tvb, offset, 2, FALSE); + proto_tree_add_item(error_tree, hf_reload_error_response_code, tvb, offset, 2, ENC_BIG_ENDIAN); dissect_opaque(tvb, pinfo, error_tree, hf_reload_error_response_info, offset+2, 2, -1); proto_item_append_text(error_tree, ": %s (%s)", val_to_str(error_code, errorcodes, "Unknown"), tvb_get_ephemeral_string(tvb, offset+4, error_length)); } @@ -1898,7 +1898,7 @@ dissect_reload_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree *extension_tree; guint16 extension_offset = 0; - proto_tree_add_item(message_contents_tree, hf_reload_message_extensions_length, tvb, offset, 4, FALSE); + proto_tree_add_item(message_contents_tree, hf_reload_message_extensions_length, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; while (extension_offset < extensions_length) { proto_item *ti_extension; @@ -1909,7 +1909,7 @@ dissect_reload_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } ti_extension = proto_tree_add_item(message_contents_tree, hf_reload_message_extension, tvb, offset+ extension_offset, 3 + 4 + extension_content_length, ENC_NA); extension_tree = proto_item_add_subtree(ti_extension, ett_reload_message_extension); - proto_tree_add_item(extension_tree, hf_reload_message_extension_type, tvb, offset+ extension_offset, 2, FALSE); + proto_tree_add_item(extension_tree, hf_reload_message_extension_type, tvb, offset+ extension_offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(extension_tree, hf_reload_message_extension_critical, tvb, offset+ extension_offset + 2, 1, FALSE); dissect_opaque(tvb, pinfo, extension_tree, hf_reload_message_extension_content, offset + extension_offset + 3, 4, -1); extension_offset += 3 + 4 + extension_content_length; @@ -1965,7 +1965,7 @@ dissect_reload_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) certificate_tree = proto_item_add_subtree(ti_certificate, ett_reload_certificate); proto_tree_add_item(certificate_tree, hf_reload_certificate_type, tvb, - offset + security_block_offset + certificate_offset, 1, FALSE); + offset + security_block_offset + certificate_offset, 1, ENC_BIG_ENDIAN); switch (tvb_get_guint8(tvb, offset + security_block_offset + certificate_offset)) { case 0: { asn1_ctx_t asn1_ctx; @@ -1998,10 +1998,10 @@ dissect_reload_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ENC_NA); signature_tree = proto_item_add_subtree(ti_signature, ett_reload_signature); proto_tree_add_item(signature_tree, hf_reload_hash_algorithm, tvb, - offset + security_block_offset, 1, FALSE); + offset + security_block_offset, 1, ENC_BIG_ENDIAN); security_block_offset += 1; proto_tree_add_item(signature_tree, hf_reload_signature_algorithm, tvb, - offset + security_block_offset, 1, FALSE); + offset + security_block_offset, 1, ENC_BIG_ENDIAN); security_block_offset += 1; /* SignatureIdentity */ { @@ -2016,7 +2016,7 @@ dissect_reload_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) signatureidentity_tree = proto_item_add_subtree(ti_signatureidentity, ett_reload_signature_identity); identity_type = tvb_get_guint8(tvb, offset + security_block_offset); proto_tree_add_item(signatureidentity_tree, hf_reload_signature_identity_type, tvb, - offset + security_block_offset, 1, FALSE); + offset + security_block_offset, 1, ENC_BIG_ENDIAN); security_block_offset += 1; proto_tree_add_uint(signatureidentity_tree, hf_reload_signature_identity_length, tvb, offset + security_block_offset, 2, signatureidentityvalue_length); @@ -2041,7 +2041,7 @@ dissect_reload_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ENC_NA); signatureidentityvalue_tree = proto_item_add_subtree(ti_signatureidentityvalue, ett_reload_signature_identity_value); proto_tree_add_item(signatureidentityvalue_tree, hf_reload_hash_algorithm, tvb, - offset + security_block_offset +signatureidentityvalue_offset, 1, FALSE); + offset + security_block_offset +signatureidentityvalue_offset, 1, ENC_BIG_ENDIAN); dissect_opaque(tvb, pinfo, signatureidentityvalue_tree, hf_reload_signature_identity_value_certificate_hash, offset + security_block_offset + signatureidentityvalue_offset+1, 1, -1); signatureidentityvalue_offset += 1 + 1 + certificate_hash_length; } diff --git a/epan/dissectors/packet-retix-bpdu.c b/epan/dissectors/packet-retix-bpdu.c index 27de9f7a0f..9ff4f199f1 100644 --- a/epan/dissectors/packet-retix-bpdu.c +++ b/epan/dissectors/packet-retix-bpdu.c @@ -80,9 +80,9 @@ dissect_retix_bpdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(retix_bpdu_tree, hf_retix_bpdu_bridge_mac, tvb, 10, 6, FALSE); - proto_tree_add_item(retix_bpdu_tree, hf_retix_bpdu_max_age, tvb, 20, 2, FALSE); - proto_tree_add_item(retix_bpdu_tree, hf_retix_bpdu_hello_time, tvb, 22, 2, FALSE); - proto_tree_add_item(retix_bpdu_tree, hf_retix_bpdu_forward_delay, tvb, 24, 2, FALSE); + proto_tree_add_item(retix_bpdu_tree, hf_retix_bpdu_max_age, tvb, 20, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(retix_bpdu_tree, hf_retix_bpdu_hello_time, tvb, 22, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(retix_bpdu_tree, hf_retix_bpdu_forward_delay, tvb, 24, 2, ENC_BIG_ENDIAN); } diff --git a/epan/dissectors/packet-rip.c b/epan/dissectors/packet-rip.c index 18c647bb62..bf955af527 100644 --- a/epan/dissectors/packet-rip.c +++ b/epan/dissectors/packet-rip.c @@ -193,10 +193,10 @@ dissect_unspec_rip_vektor(tvbuff_t *tvb, int offset, guint8 version, metric); rip_vektor_tree = proto_item_add_subtree(ti, ett_rip_vec); - proto_tree_add_item(rip_vektor_tree, hf_rip_family, tvb, offset, 2, FALSE); + proto_tree_add_item(rip_vektor_tree, hf_rip_family, tvb, offset, 2, ENC_BIG_ENDIAN); if (version == RIPv2) { proto_tree_add_item(rip_vektor_tree, hf_rip_route_tag, tvb, offset+2, 2, - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item(rip_vektor_tree, hf_rip_netmask, tvb, offset+8, 4, FALSE); proto_tree_add_item(rip_vektor_tree, hf_rip_next_hop, tvb, offset+12, 4, @@ -220,10 +220,10 @@ dissect_ip_rip_vektor(tvbuff_t *tvb, int offset, guint8 version, tvb_ip_to_str(tvb, offset+4), metric); rip_vektor_tree = proto_item_add_subtree(ti, ett_rip_vec); - proto_tree_add_item(rip_vektor_tree, hf_rip_family, tvb, offset, 2, FALSE); + proto_tree_add_item(rip_vektor_tree, hf_rip_family, tvb, offset, 2, ENC_BIG_ENDIAN); if (version == RIPv2) { proto_tree_add_item(rip_vektor_tree, hf_rip_route_tag, tvb, offset+2, 2, - FALSE); + ENC_BIG_ENDIAN); } proto_tree_add_item(rip_vektor_tree, hf_rip_ip, tvb, offset+4, 4, FALSE); diff --git a/epan/dissectors/packet-ripng.c b/epan/dissectors/packet-ripng.c index 56d9a68164..e276f73171 100644 --- a/epan/dissectors/packet-ripng.c +++ b/epan/dissectors/packet-ripng.c @@ -78,11 +78,11 @@ dissect_ripng(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { ripng_tree = proto_item_add_subtree(ti, ett_ripng); /* Command */ - proto_tree_add_item(ripng_tree, hf_ripng_cmd, tvb, offset, 1, FALSE); + proto_tree_add_item(ripng_tree, hf_ripng_cmd, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; /* Version */ - proto_tree_add_item(ripng_tree, hf_ripng_version, tvb, offset, 1, FALSE); + proto_tree_add_item(ripng_tree, hf_ripng_version, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; /* Reserved */ @@ -105,7 +105,7 @@ dissect_ripng(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { offset += 2; /* Prefix Length */ - proto_tree_add_item(rte_tree, hf_ripng_rte_prefix_length, tvb, offset, 1, FALSE); + proto_tree_add_item(rte_tree, hf_ripng_rte_prefix_length, tvb, offset, 1, ENC_BIG_ENDIAN); proto_item_append_text(rte_ti, "/%u", tvb_get_guint8(tvb, offset)); offset += 1; diff --git a/epan/dissectors/packet-rlc-lte.c b/epan/dissectors/packet-rlc-lte.c index 0487398a27..23499d5cac 100644 --- a/epan/dissectors/packet-rlc-lte.c +++ b/epan/dissectors/packet-rlc-lte.c @@ -661,7 +661,7 @@ static int dissect_rlc_lte_extension_header(tvbuff_t *tvb, packet_info *pinfo _U isOdd = (s_number_of_extensions % 2); if (isOdd) { proto_tree_add_item(tree, hf_rlc_lte_extension_padding, - tvb, offset++, 1, FALSE); + tvb, offset++, 1, ENC_BIG_ENDIAN); } return offset; @@ -1777,7 +1777,7 @@ static void dissect_rlc_lte_um(tvbuff_t *tvb, packet_info *pinfo, /* Check 3 Reserved bits */ reserved = (tvb_get_guint8(tvb, offset) & 0xe0) >> 5; - ti = proto_tree_add_item(um_header_tree, hf_rlc_lte_um_fixed_reserved, tvb, offset, 1, FALSE); + ti = proto_tree_add_item(um_header_tree, hf_rlc_lte_um_fixed_reserved, tvb, offset, 1, ENC_BIG_ENDIAN); if (reserved != 0) { expert_add_info_format(pinfo, ti, PI_MALFORMED, PI_ERROR, "RLC UM Fixed header Reserved bits not zero (found 0x%x)", reserved); @@ -1926,7 +1926,7 @@ static void dissect_rlc_lte_am_status_pdu(tvbuff_t *tvb, /* Control PDU Type (CPT) */ cpt = (tvb_get_guint8(tvb, offset) & 0xf0) >> 4; - ti = proto_tree_add_item(tree, hf_rlc_lte_am_cpt, tvb, offset, 1, FALSE); + ti = proto_tree_add_item(tree, hf_rlc_lte_am_cpt, tvb, offset, 1, ENC_BIG_ENDIAN); if (cpt != 0) { /* Protest and stop - only know about STATUS PDUs */ expert_add_info_format(pinfo, ti, PI_MALFORMED, PI_ERROR, @@ -2107,7 +2107,7 @@ static void dissect_rlc_lte_am(tvbuff_t *tvb, packet_info *pinfo, /* First bit is Data/Control flag */ is_data = (tvb_get_guint8(tvb, offset) & 0x80) >> 7; - proto_tree_add_item(am_header_tree, hf_rlc_lte_am_data_control, tvb, offset, 1, FALSE); + proto_tree_add_item(am_header_tree, hf_rlc_lte_am_data_control, tvb, offset, 1, ENC_BIG_ENDIAN); tap_info->isControlPDU = !is_data; if (!is_data) { @@ -2127,7 +2127,7 @@ static void dissect_rlc_lte_am(tvbuff_t *tvb, packet_info *pinfo, /* Re-segmentation Flag (RF) field */ is_resegmented = (tvb_get_guint8(tvb, offset) & 0x40) >> 6; - proto_tree_add_item(am_header_tree, hf_rlc_lte_am_rf, tvb, offset, 1, FALSE); + proto_tree_add_item(am_header_tree, hf_rlc_lte_am_rf, tvb, offset, 1, ENC_BIG_ENDIAN); tap_info->isResegmented = is_resegmented; write_pdu_label_and_info(top_ti, NULL, pinfo, @@ -2135,7 +2135,7 @@ static void dissect_rlc_lte_am(tvbuff_t *tvb, packet_info *pinfo, /* Polling bit */ polling = (tvb_get_guint8(tvb, offset) & 0x20) >> 5; - proto_tree_add_item(am_header_tree, hf_rlc_lte_am_p, tvb, offset, 1, FALSE); + proto_tree_add_item(am_header_tree, hf_rlc_lte_am_p, tvb, offset, 1, ENC_BIG_ENDIAN); write_pdu_label_and_info(top_ti, NULL, pinfo, (polling) ? " (P) " : " "); if (polling) { @@ -2144,15 +2144,15 @@ static void dissect_rlc_lte_am(tvbuff_t *tvb, packet_info *pinfo, /* Framing Info */ framing_info = (tvb_get_guint8(tvb, offset) & 0x18) >> 3; - proto_tree_add_item(am_header_tree, hf_rlc_lte_am_fi, tvb, offset, 1, FALSE); + proto_tree_add_item(am_header_tree, hf_rlc_lte_am_fi, tvb, offset, 1, ENC_BIG_ENDIAN); /* Extension bit */ fixed_extension = (tvb_get_guint8(tvb, offset) & 0x04) >> 2; - proto_tree_add_item(am_header_tree, hf_rlc_lte_am_fixed_e, tvb, offset, 1, FALSE); + proto_tree_add_item(am_header_tree, hf_rlc_lte_am_fixed_e, tvb, offset, 1, ENC_BIG_ENDIAN); /* Sequence Number */ sn = tvb_get_ntohs(tvb, offset) & 0x03ff; - proto_tree_add_item(am_header_tree, hf_rlc_lte_am_fixed_sn, tvb, offset, 2, FALSE); + proto_tree_add_item(am_header_tree, hf_rlc_lte_am_fixed_sn, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; tap_info->sequenceNumber = sn; @@ -2164,11 +2164,11 @@ static void dissect_rlc_lte_am(tvbuff_t *tvb, packet_info *pinfo, guint16 segmentOffset; /* Last Segment Field (LSF) */ - proto_tree_add_item(am_header_tree, hf_rlc_lte_am_segment_lsf, tvb, offset, 1, FALSE); + proto_tree_add_item(am_header_tree, hf_rlc_lte_am_segment_lsf, tvb, offset, 1, ENC_BIG_ENDIAN); /* SO */ segmentOffset = tvb_get_ntohs(tvb, offset) & 0x7fff; - proto_tree_add_item(am_header_tree, hf_rlc_lte_am_segment_so, tvb, offset, 2, FALSE); + proto_tree_add_item(am_header_tree, hf_rlc_lte_am_segment_so, tvb, offset, 2, ENC_BIG_ENDIAN); write_pdu_label_and_info(top_ti, am_header_ti, pinfo, " SO=%u ", segmentOffset); offset += 2; } diff --git a/epan/dissectors/packet-rlm.c b/epan/dissectors/packet-rlm.c index 62e60e4fe4..3641208f43 100644 --- a/epan/dissectors/packet-rlm.c +++ b/epan/dissectors/packet-rlm.c @@ -166,11 +166,11 @@ dissect_rlm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) 16, "Cisco Session Management"); */ ti = proto_tree_add_item(tree, proto_rlm, tvb, 0, 8, FALSE); rlm_tree = proto_item_add_subtree(ti, ett_rlm); - proto_tree_add_item(rlm_tree, hf_rlm_version, tvb, 0, 1, FALSE); + proto_tree_add_item(rlm_tree, hf_rlm_version, tvb, 0, 1, ENC_BIG_ENDIAN); proto_tree_add_uint_format(rlm_tree, hf_rlm_type, tvb, 1, 1, rlm_type, "Type: %u (%s)", rlm_type, type_str); - proto_tree_add_item(rlm_tree, hf_rlm_unknown, tvb, 2, 2, FALSE); - proto_tree_add_item(rlm_tree, hf_rlm_tid, tvb, 4, 2, FALSE); - proto_tree_add_item(rlm_tree, hf_rlm_unknown2, tvb, 6, 2, FALSE); + proto_tree_add_item(rlm_tree, hf_rlm_unknown, tvb, 2, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(rlm_tree, hf_rlm_tid, tvb, 4, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(rlm_tree, hf_rlm_unknown2, tvb, 6, 2, ENC_BIG_ENDIAN); } return TRUE; diff --git a/epan/dissectors/packet-rlogin.c b/epan/dissectors/packet-rlogin.c index 797a7ba676..8b0c7acbee 100644 --- a/epan/dissectors/packet-rlogin.c +++ b/epan/dissectors/packet-rlogin.c @@ -225,7 +225,7 @@ static void rlogin_display(rlogin_hash_entry_t *hash_info, /* Show control byte */ proto_tree_add_item(rlogin_tree, hf_control_message, tvb, - urgent_offset, 1, FALSE); + urgent_offset, 1, ENC_BIG_ENDIAN); control_byte = tvb_get_guint8(tvb, urgent_offset); if (check_col(pinfo->cinfo, COL_INFO)) { @@ -242,12 +242,12 @@ static void rlogin_display(rlogin_hash_entry_t *hash_info, if (pinfo->srcport == RLOGIN_PORT) /* from server */ { proto_tree_add_item(rlogin_tree, hf_startup_info_received_flag, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); } else { proto_tree_add_item(rlogin_tree, hf_client_startup_flag, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); } ++offset; } @@ -346,23 +346,23 @@ static void rlogin_display(rlogin_hash_entry_t *hash_info, /* Character rows */ rows = tvb_get_ntohs(tvb, offset); proto_tree_add_item(window_tree, hf_window_info_rows, tvb, - offset, 2, FALSE); + offset, 2, ENC_BIG_ENDIAN); offset += 2; /* Characters per row */ columns = tvb_get_ntohs(tvb, offset); proto_tree_add_item(window_tree, hf_window_info_cols, tvb, - offset, 2, FALSE); + offset, 2, ENC_BIG_ENDIAN); offset += 2; /* x pixels */ proto_tree_add_item(window_tree, hf_window_info_x_pixels, tvb, - offset, 2, FALSE); + offset, 2, ENC_BIG_ENDIAN); offset += 2; /* y pixels */ proto_tree_add_item(window_tree, hf_window_info_y_pixels, tvb, - offset, 2, FALSE); + offset, 2, ENC_BIG_ENDIAN); offset += 2; /* Show setting highlights in info column */ diff --git a/epan/dissectors/packet-rmcp.c b/epan/dissectors/packet-rmcp.c index eda373477a..e9e6d6f408 100644 --- a/epan/dissectors/packet-rmcp.c +++ b/epan/dissectors/packet-rmcp.c @@ -123,8 +123,8 @@ dissect_rmcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) class_str); rmcp_tree = proto_item_add_subtree(ti, ett_rmcp); - proto_tree_add_item(rmcp_tree, hf_rmcp_version, tvb, 0, 1, TRUE); - proto_tree_add_item(rmcp_tree, hf_rmcp_sequence, tvb, 2, 1, TRUE); + proto_tree_add_item(rmcp_tree, hf_rmcp_version, tvb, 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(rmcp_tree, hf_rmcp_sequence, tvb, 2, 1, ENC_LITTLE_ENDIAN); tf = proto_tree_add_text(rmcp_tree, tvb, 3, 1, "Type: %s, Class: %s", val_to_str(type, rmcp_type_vals, "Unknown (0x%02x)"), @@ -132,8 +132,8 @@ dissect_rmcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) field_tree = proto_item_add_subtree(tf, ett_rmcp_typeclass); - proto_tree_add_item(field_tree, hf_rmcp_class, tvb, 3, 1, TRUE); - proto_tree_add_item(field_tree, hf_rmcp_type, tvb, 3, 1, TRUE); + proto_tree_add_item(field_tree, hf_rmcp_class, tvb, 3, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(field_tree, hf_rmcp_type, tvb, 3, 1, ENC_LITTLE_ENDIAN); } if (!type){ /* do not expect a data block for an ACK */ @@ -166,9 +166,9 @@ dissect_rsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) "RMCP Security-extension Protocol"); rsp_tree = proto_item_add_subtree(ti, ett_rsp); - proto_tree_add_item(rsp_tree, hf_rsp_session_id, tvb, offset, 4, FALSE); + proto_tree_add_item(rsp_tree, hf_rsp_session_id, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(rsp_tree, hf_rsp_sequence, tvb, offset, 4, FALSE); + proto_tree_add_item(rsp_tree, hf_rsp_sequence, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; } diff --git a/epan/dissectors/packet-rmi.c b/epan/dissectors/packet-rmi.c index e76e3484c6..af87f046fe 100644 --- a/epan/dissectors/packet-rmi.c +++ b/epan/dissectors/packet-rmi.c @@ -184,9 +184,9 @@ dissect_rmi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_uint(rmi_tree, hf_rmi_magic, tvb, offset, 4, tvb_get_ntohl(tvb,0)); proto_tree_add_item(rmi_tree, hf_rmi_version, - tvb, offset + 4, 2, FALSE); + tvb, offset + 4, 2, ENC_BIG_ENDIAN); proto_tree_add_item(rmi_tree, hf_rmi_protocol, - tvb, offset + 6, 1, FALSE); + tvb, offset + 6, 1, ENC_BIG_ENDIAN); break; case RMI_INPUTSTREAM: message = tvb_get_guint8(tvb, 0); @@ -258,9 +258,9 @@ dissect_ser(tvbuff_t *tvb, proto_tree *tree) ti = proto_tree_add_item(tree, proto_ser, tvb, 0, -1, FALSE); ser_tree = proto_item_add_subtree(ti, ett_ser); proto_tree_add_item(ser_tree, hf_ser_magic, - tvb, offset, 2, FALSE); + tvb, offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(ser_tree, hf_ser_version, - tvb, offset + 2, 2, FALSE); + tvb, offset + 2, 2, ENC_BIG_ENDIAN); } } diff --git a/epan/dissectors/packet-rmp.c b/epan/dissectors/packet-rmp.c index 27e14dd208..9ca8cd77fb 100644 --- a/epan/dissectors/packet-rmp.c +++ b/epan/dissectors/packet-rmp.c @@ -125,13 +125,13 @@ dissect_rmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) switch (type) { case RMP_BOOT_REQ: proto_tree_add_item(rmp_tree, - hf_rmp_retcode, tvb, 1, 1, FALSE); + hf_rmp_retcode, tvb, 1, 1, ENC_BIG_ENDIAN); proto_tree_add_item(rmp_tree, - hf_rmp_seqnum, tvb, 2, 4, FALSE); + hf_rmp_seqnum, tvb, 2, 4, ENC_BIG_ENDIAN); proto_tree_add_item(rmp_tree, - hf_rmp_sessionid, tvb, 6, 2, FALSE); + hf_rmp_sessionid, tvb, 6, 2, ENC_BIG_ENDIAN); proto_tree_add_item(rmp_tree, - hf_rmp_version, tvb, 8, 2, FALSE); + hf_rmp_version, tvb, 8, 2, ENC_BIG_ENDIAN); proto_tree_add_item(rmp_tree, hf_rmp_machtype, tvb, 10, 20, FALSE); /* The remaining fields are optional */ @@ -148,13 +148,13 @@ dissect_rmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case RMP_BOOT_REPL: proto_tree_add_item(rmp_tree, - hf_rmp_retcode, tvb, 1, 1, FALSE); + hf_rmp_retcode, tvb, 1, 1, ENC_BIG_ENDIAN); proto_tree_add_item(rmp_tree, - hf_rmp_seqnum, tvb, 2, 4, FALSE); + hf_rmp_seqnum, tvb, 2, 4, ENC_BIG_ENDIAN); proto_tree_add_item(rmp_tree, - hf_rmp_sessionid, tvb, 6, 2, FALSE); + hf_rmp_sessionid, tvb, 6, 2, ENC_BIG_ENDIAN); proto_tree_add_item(rmp_tree, - hf_rmp_version, tvb, 8, 2, FALSE); + hf_rmp_version, tvb, 8, 2, ENC_BIG_ENDIAN); len = tvb_get_guint8(tvb, 10); proto_tree_add_item(rmp_tree, hf_rmp_filename, tvb, 10, 1, FALSE); @@ -166,13 +166,13 @@ dissect_rmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case RMP_READ_REQ: proto_tree_add_item(rmp_tree, - hf_rmp_retcode, tvb, 1, 1, FALSE); + hf_rmp_retcode, tvb, 1, 1, ENC_BIG_ENDIAN); proto_tree_add_item(rmp_tree, - hf_rmp_offset, tvb, 2, 4, FALSE); + hf_rmp_offset, tvb, 2, 4, ENC_BIG_ENDIAN); proto_tree_add_item(rmp_tree, - hf_rmp_sessionid, tvb, 6, 2, FALSE); + hf_rmp_sessionid, tvb, 6, 2, ENC_BIG_ENDIAN); proto_tree_add_item(rmp_tree, - hf_rmp_size, tvb, 8, 2, FALSE); + hf_rmp_size, tvb, 8, 2, ENC_BIG_ENDIAN); if(tvb_offset_exists(tvb, 10)) call_dissector(data_handle, tvb_new_subset_remaining(tvb, 10), @@ -181,22 +181,22 @@ dissect_rmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case RMP_READ_REPL: proto_tree_add_item(rmp_tree, - hf_rmp_retcode, tvb, 1, 1, FALSE); + hf_rmp_retcode, tvb, 1, 1, ENC_BIG_ENDIAN); proto_tree_add_item(rmp_tree, - hf_rmp_offset, tvb, 2, 4, FALSE); + hf_rmp_offset, tvb, 2, 4, ENC_BIG_ENDIAN); proto_tree_add_item(rmp_tree, - hf_rmp_sessionid, tvb, 6, 2, FALSE); + hf_rmp_sessionid, tvb, 6, 2, ENC_BIG_ENDIAN); call_dissector(data_handle, tvb_new_subset_remaining(tvb, 8), pinfo, rmp_tree); break; case RMP_BOOT_DONE: proto_tree_add_item(rmp_tree, - hf_rmp_retcode, tvb, 1, 1, FALSE); + hf_rmp_retcode, tvb, 1, 1, ENC_BIG_ENDIAN); proto_tree_add_text(rmp_tree, tvb, 2, 4, "Reserved"); proto_tree_add_item(rmp_tree, - hf_rmp_sessionid, tvb, 6, 2, FALSE); + hf_rmp_sessionid, tvb, 6, 2, ENC_BIG_ENDIAN); if(tvb_offset_exists(tvb, 8)) call_dissector(data_handle, tvb_new_subset_remaining(tvb, 6), diff --git a/epan/dissectors/packet-rohc.c b/epan/dissectors/packet-rohc.c index 57fc8449d2..d41cfd18aa 100644 --- a/epan/dissectors/packet-rohc.c +++ b/epan/dissectors/packet-rohc.c @@ -397,7 +397,7 @@ dissect_rohc_ir_rtp_profile_dynamic(tvbuff_t *tvb, proto_tree *tree, int offset, proto_tree_add_item(sub_tree, hf_rohc_rtp_checksum, tvb, offset, 2, ENC_BIG_ENDIAN); offset+=2; if (p_rohc_info->profile == 2) { - proto_tree_add_item(sub_tree, hf_rohc_dynamic_udp_seqnum, tvb, offset, 2, FALSE); + proto_tree_add_item(sub_tree, hf_rohc_dynamic_udp_seqnum, tvb, offset, 2, ENC_BIG_ENDIAN); offset +=2; proto_item_set_len(item, offset - start_offset); proto_tree_add_text(tree, tvb, offset, -1, "RTP data"); diff --git a/epan/dissectors/packet-rpl.c b/epan/dissectors/packet-rpl.c index b3eb4f80e7..c46f48a35d 100644 --- a/epan/dissectors/packet-rpl.c +++ b/epan/dissectors/packet-rpl.c @@ -163,7 +163,7 @@ dissect_rpl_container(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case 0x4003: proto_tree_add_item(tree, hf_rpl_corrval, - tvb, offset, 4, FALSE); + tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; break; @@ -175,25 +175,25 @@ dissect_rpl_container(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case 0x4007: proto_tree_add_item(tree, hf_rpl_sap, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); offset ++; break; case 0x4009: proto_tree_add_item(tree, hf_rpl_maxframe, - tvb, offset, 2, FALSE); + tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; break; case 0x400a: proto_tree_add_item(tree, hf_rpl_connclass, - tvb, offset, 2, FALSE); + tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; break; case 0x400b: proto_tree_add_item(tree, hf_rpl_respval, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); offset ++; break; @@ -205,7 +205,7 @@ dissect_rpl_container(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case 0x4011: proto_tree_add_item(tree, hf_rpl_sequence, - tvb, offset, 4, FALSE); + tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; break; @@ -220,19 +220,19 @@ dissect_rpl_container(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvb, offset, 8, ENC_NA); offset += 8; proto_tree_add_item(tree, hf_rpl_equipment, - tvb, offset, 2, FALSE); + tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(tree, hf_rpl_memsize, - tvb, offset, 2, FALSE); + tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(tree, hf_rpl_bsmversion, - tvb, offset, 2, FALSE); + tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(tree, hf_rpl_ec, tvb, offset, 6, ENC_NA); offset += 6; proto_tree_add_item(tree, hf_rpl_adapterid, - tvb, offset, 2, FALSE); + tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(tree, hf_rpl_shortname, tvb, offset, 10, ENC_NA); @@ -241,13 +241,13 @@ dissect_rpl_container(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case 0xc014: proto_tree_add_item(tree, hf_rpl_laddress, - tvb, offset, 4, FALSE); + tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; proto_tree_add_item(tree, hf_rpl_xaddress, - tvb, offset, 4, FALSE); + tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; proto_tree_add_item(tree, hf_rpl_flags, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); offset ++; break; diff --git a/epan/dissectors/packet-rsip.c b/epan/dissectors/packet-rsip.c index cf81135f17..48a606d29c 100644 --- a/epan/dissectors/packet-rsip.c +++ b/epan/dissectors/packet-rsip.c @@ -275,9 +275,9 @@ rsip_parameter(tvbuff_t *tvb, proto_tree *rsip_tree, int off, int eoff) p_tree = proto_item_add_subtree(pti, ett_rsip_param); proto_tree_add_item(p_tree, hf_rsip_parameter_type, tvb, - off, 1, FALSE); + off, 1, ENC_BIG_ENDIAN); proto_tree_add_item(p_tree, hf_rsip_parameter_length, tvb, - off + 1, 2, FALSE); + off + 1, 2, ENC_BIG_ENDIAN); consumed = 3; if (paramlen == 0) @@ -290,7 +290,7 @@ rsip_parameter(tvbuff_t *tvb, proto_tree *rsip_tree, int off, int eoff) switch (paramtype) { case 1: /* Address */ proto_tree_add_item(v_tree, hf_rsip_parameter_address_type, - tvb, off + 3, 1, FALSE); + tvb, off + 3, 1, ENC_BIG_ENDIAN); addrtype = tvb_get_guint8(tvb, off + 3); @@ -350,7 +350,7 @@ rsip_parameter(tvbuff_t *tvb, proto_tree *rsip_tree, int off, int eoff) break; case 2: /* Ports */ proto_tree_add_item(v_tree, hf_rsip_parameter_ports_number, - tvb, off + 3, 1, FALSE); + tvb, off + 3, 1, ENC_BIG_ENDIAN); number = tvb_get_guint8(tvb, off + 3); if (paramlen == 1) { switch (number) { @@ -370,7 +370,7 @@ rsip_parameter(tvbuff_t *tvb, proto_tree *rsip_tree, int off, int eoff) if (number == 1) { proto_tree_add_item(v_tree, hf_rsip_parameter_ports_port_number, - tvb, off + 4, 2, FALSE); + tvb, off + 4, 2, ENC_BIG_ENDIAN); } else { paramleft = paramlen - 1; if (paramleft == 2) { @@ -387,7 +387,7 @@ rsip_parameter(tvbuff_t *tvb, proto_tree *rsip_tree, int off, int eoff) i += 2, paramleft -= 2) proto_tree_add_item(v_tree, hf_rsip_parameter_ports_port_number, - tvb, i, 2, FALSE); + tvb, i, 2, ENC_BIG_ENDIAN); proto_item_append_text(pti, ": List of %d Ports", number); } @@ -397,28 +397,28 @@ rsip_parameter(tvbuff_t *tvb, proto_tree *rsip_tree, int off, int eoff) case 3: /* Lease Time */ /* XXX if paramlen != 4 we've got a protocol violation */ proto_tree_add_item(v_tree, hf_rsip_parameter_lease_time, - tvb, off + 3, paramlen, FALSE); + tvb, off + 3, paramlen, ENC_BIG_ENDIAN); leasetm = tvb_get_ntohl(tvb, off + 3); proto_item_append_text(pti, ": %d seconds", leasetm); break; case 4: /* Client ID */ /* XXX if paramlen != 4 we've got a protocol violation */ proto_tree_add_item(v_tree, hf_rsip_parameter_client_id, - tvb, off + 3, paramlen, FALSE); + tvb, off + 3, paramlen, ENC_BIG_ENDIAN); cid = tvb_get_ntohl(tvb, off + 3); proto_item_append_text(pti, ": %d", cid); break; case 5: /* Bind ID */ /* XXX if paramlen != 4 we've got a protocol violation */ proto_tree_add_item(v_tree, hf_rsip_parameter_bind_id, - tvb, off + 3, paramlen, FALSE); + tvb, off + 3, paramlen, ENC_BIG_ENDIAN); bid = tvb_get_ntohl(tvb, off + 3); proto_item_append_text(pti, ": %d", bid); break; case 6: /* Tunnel Type */ /* XXX if paramlen != 1 we've got a protocol violation */ proto_tree_add_item(v_tree, hf_rsip_parameter_tunnel_type, - tvb, off + 3, paramlen, FALSE); + tvb, off + 3, paramlen, ENC_BIG_ENDIAN); tuntype = tvb_get_guint8(tvb, off + 3); proto_item_append_text(pti, ": %s", val_to_str(tuntype, tunnel_type_vals, @@ -427,7 +427,7 @@ rsip_parameter(tvbuff_t *tvb, proto_tree *rsip_tree, int off, int eoff) case 7: /* RSIP Method */ /* XXX if paramlen != 1 we've got a protocol violation */ proto_tree_add_item(v_tree, hf_rsip_parameter_method, - tvb, off + 3, paramlen, FALSE); + tvb, off + 3, paramlen, ENC_BIG_ENDIAN); method = tvb_get_guint8(tvb, off + 3); proto_item_append_text(pti, ": %s", val_to_str(method, method_vals, @@ -436,7 +436,7 @@ rsip_parameter(tvbuff_t *tvb, proto_tree *rsip_tree, int off, int eoff) case 8: /* Error */ /* XXX if paramlen != 2 we've got a protocol violation */ proto_tree_add_item(v_tree, hf_rsip_parameter_error, - tvb, off + 3, paramlen, FALSE); + tvb, off + 3, paramlen, ENC_BIG_ENDIAN); error = tvb_get_ntohs(tvb, off + 3); proto_item_append_text(pti, ": %s", val_to_str(error, error_number_vals, "Undefined Error (%d)")); @@ -444,14 +444,14 @@ rsip_parameter(tvbuff_t *tvb, proto_tree *rsip_tree, int off, int eoff) case 9: /* Flow Policy */ /* XXX if paramlen != 2 we've got a protocol violation */ proto_tree_add_item(v_tree, - hf_rsip_parameter_flow_policy_local, tvb, off + 3, 1, FALSE); + hf_rsip_parameter_flow_policy_local, tvb, off + 3, 1, ENC_BIG_ENDIAN); flowpolicy = tvb_get_guint8(tvb, off + 3); proto_item_append_text(pti, ": %s", val_to_str(flowpolicy, lcl_flow_policy_vals, "Undefined Local Flow Policy (%d)")); proto_tree_add_item(v_tree, hf_rsip_parameter_flow_policy_remote, tvb, off + 4, 1, - FALSE); + ENC_BIG_ENDIAN); flowpolicy = tvb_get_guint8(tvb, off + 4); proto_item_append_text(pti, "/%s", val_to_str(flowpolicy, rmt_flow_policy_vals, @@ -460,34 +460,34 @@ rsip_parameter(tvbuff_t *tvb, proto_tree *rsip_tree, int off, int eoff) case 10: /* Indicator */ /* XXX if paramlen != 2 we've got a protocol violation */ proto_tree_add_item(v_tree, hf_rsip_parameter_indicator, tvb, - off + 3, 2, FALSE); + off + 3, 2, ENC_BIG_ENDIAN); ind = tvb_get_ntohs(tvb, off + 3); proto_item_append_text(pti, ": %d", ind); break; case 11: /* Message Counter */ /* XXX if paramlen != 4 we've got a protocol violation */ proto_tree_add_item(v_tree, hf_rsip_parameter_message_counter, - tvb, off + 3, 4, FALSE); + tvb, off + 3, 4, ENC_BIG_ENDIAN); msgc = tvb_get_ntohl(tvb, off + 3); proto_item_append_text(pti, ": %d", msgc); break; case 12: /* Vendor Specific */ proto_tree_add_item(v_tree, hf_rsip_parameter_vendor_specific_vendor_id, tvb, off + 3, - 2, FALSE); + 2, ENC_BIG_ENDIAN); proto_tree_add_item(v_tree, hf_rsip_parameter_vendor_specific_subtype, tvb, off + 5, - 2, FALSE); + 2, ENC_BIG_ENDIAN); proto_tree_add_item(v_tree, hf_rsip_parameter_vendor_specific_value, tvb, off + 9, paramlen - 4, ENC_NA); break; case 22: /* SPI */ proto_tree_add_item(v_tree, hf_rsip_parameter_spi_number, tvb, - off + 3, 2, FALSE); + off + 3, 2, ENC_BIG_ENDIAN); /* XXX need loop? */ proto_tree_add_item(v_tree, hf_rsip_parameter_spi, tvb, - off + 5, 4, FALSE); + off + 5, 4, ENC_BIG_ENDIAN); break; default: break; @@ -1002,11 +1002,11 @@ dissect_rsip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) rsip_tree = proto_item_add_subtree(ti, ett_rsip); proto_tree_add_item(rsip_tree, - hf_rsip_version, tvb, 0, 1, FALSE); + hf_rsip_version, tvb, 0, 1, ENC_BIG_ENDIAN); proto_tree_add_item(rsip_tree, - hf_rsip_message_type, tvb, 1, 1, FALSE); + hf_rsip_message_type, tvb, 1, 1, ENC_BIG_ENDIAN); proto_tree_add_item(rsip_tree, - hf_rsip_message_length, tvb, 2, 2, FALSE); + hf_rsip_message_length, tvb, 2, 2, ENC_BIG_ENDIAN); eoff = tvb_reported_length(tvb); diff --git a/epan/dissectors/packet-rtcp.c b/epan/dissectors/packet-rtcp.c index 8e959a112a..67d38bd8cb 100644 --- a/epan/dissectors/packet-rtcp.c +++ b/epan/dissectors/packet-rtcp.c @@ -742,25 +742,25 @@ static int dissect_rtcp_nack( tvbuff_t *tvb, int offset, proto_tree *tree ) { /* Packet type = FIR (H261) */ - proto_tree_add_item( tree, hf_rtcp_rc, tvb, offset, 1, FALSE ); + proto_tree_add_item( tree, hf_rtcp_rc, tvb, offset, 1, ENC_BIG_ENDIAN ); offset++; /* Packet type, 8 bits = APP */ - proto_tree_add_item( tree, hf_rtcp_pt, tvb, offset, 1, FALSE ); + proto_tree_add_item( tree, hf_rtcp_pt, tvb, offset, 1, ENC_BIG_ENDIAN ); offset++; /* Packet length in 32 bit words minus one */ offset = dissect_rtcp_length_field(tree, tvb, offset); /* SSRC */ - proto_tree_add_item( tree, hf_rtcp_ssrc_source, tvb, offset, 4, FALSE ); + proto_tree_add_item( tree, hf_rtcp_ssrc_source, tvb, offset, 4, ENC_BIG_ENDIAN ); offset += 4; /* FSN, 16 bits */ - proto_tree_add_item( tree, hf_rtcp_fsn, tvb, offset, 2, FALSE ); + proto_tree_add_item( tree, hf_rtcp_fsn, tvb, offset, 2, ENC_BIG_ENDIAN ); offset += 2; /* BLP, 16 bits */ - proto_tree_add_item( tree, hf_rtcp_blp, tvb, offset, 2, FALSE ); + proto_tree_add_item( tree, hf_rtcp_blp, tvb, offset, 2, ENC_BIG_ENDIAN ); offset += 2; return offset; @@ -783,19 +783,19 @@ dissect_rtcp_rtpfb_tmmbr( tvbuff_t *tvb, int offset, proto_tree *rtcp_tree, prot fci_tree = proto_item_add_subtree( ti, ett_ssrc ); /* SSRC 32 bit*/ - proto_tree_add_item( fci_tree, hf_rtcp_rtpfb_tmbbr_fci_ssrc, tvb, offset, 4, FALSE ); + proto_tree_add_item( fci_tree, hf_rtcp_rtpfb_tmbbr_fci_ssrc, tvb, offset, 4, ENC_BIG_ENDIAN ); offset += 4; /* Exp 6 bit*/ - proto_tree_add_item( fci_tree, hf_rtcp_rtpfb_tmbbr_fci_exp, tvb, offset, 1, FALSE ); + proto_tree_add_item( fci_tree, hf_rtcp_rtpfb_tmbbr_fci_exp, tvb, offset, 1, ENC_BIG_ENDIAN ); exp = (tvb_get_guint8(tvb, offset) & 0xfc) >> 2; /* Mantissa 17 bit*/ - proto_tree_add_item( fci_tree, hf_rtcp_rtpfb_tmbbr_fci_mantissa, tvb, offset, 3, FALSE ); + proto_tree_add_item( fci_tree, hf_rtcp_rtpfb_tmbbr_fci_mantissa, tvb, offset, 3, ENC_BIG_ENDIAN ); mantissa = (tvb_get_ntohl( tvb, offset) & 0x3fffe00) >> 9; bitrate = mantissa << exp; proto_tree_add_string_format_value( fci_tree, hf_rtcp_rtpfb_tmbbr_fci_bitrate, tvb, offset, 3, "", "%u", bitrate); offset += 3; /* Overhead */ - proto_tree_add_item( fci_tree, hf_rtcp_rtpfb_tmbbr_fci_measuredoverhead, tvb, offset, 1, FALSE ); + proto_tree_add_item( fci_tree, hf_rtcp_rtpfb_tmbbr_fci_measuredoverhead, tvb, offset, 1, ENC_BIG_ENDIAN ); offset += 1; if (top_item != NULL) { @@ -862,12 +862,12 @@ dissect_rtcp_rtpfb( tvbuff_t *tvb, int offset, proto_tree *rtcp_tree, proto_item /* Transport layer FB message */ /* Feedback message type (FMT): 5 bits */ - proto_tree_add_item( rtcp_tree, hf_rtcp_rtpfb_fmt, tvb, offset, 1, FALSE ); + proto_tree_add_item( rtcp_tree, hf_rtcp_rtpfb_fmt, tvb, offset, 1, ENC_BIG_ENDIAN ); rtcp_rtpfb_fmt = (tvb_get_guint8(tvb, offset) & 0x1f); offset++; /* Packet type, 8 bits */ - proto_tree_add_item( rtcp_tree, hf_rtcp_pt, tvb, offset, 1, FALSE ); + proto_tree_add_item( rtcp_tree, hf_rtcp_pt, tvb, offset, 1, ENC_BIG_ENDIAN ); offset++; /* Packet length in 32 bit words MINUS one, 16 bits */ @@ -875,11 +875,11 @@ dissect_rtcp_rtpfb( tvbuff_t *tvb, int offset, proto_tree *rtcp_tree, proto_item offset = dissect_rtcp_length_field(rtcp_tree, tvb, offset); /* SSRC of packet sender, 32 bits */ - proto_tree_add_item( rtcp_tree, hf_rtcp_ssrc_sender, tvb, offset, 4, FALSE ); + proto_tree_add_item( rtcp_tree, hf_rtcp_ssrc_sender, tvb, offset, 4, ENC_BIG_ENDIAN ); offset += 4; /* SSRC of media source, 32 bits */ - proto_tree_add_item( rtcp_tree, hf_rtcp_ssrc_media_source, tvb, offset, 4, FALSE ); + proto_tree_add_item( rtcp_tree, hf_rtcp_ssrc_media_source, tvb, offset, 4, ENC_BIG_ENDIAN ); offset += 4; /* Transport-Layer Feedback Message Elements */ @@ -914,12 +914,12 @@ dissect_rtcp_psfb( tvbuff_t *tvb, int offset, proto_tree *rtcp_tree, /* Payload-specific FB message */ /* Feedback message type (FMT): 5 bits */ - proto_tree_add_item( rtcp_tree, hf_rtcp_psfb_fmt, tvb, offset, 1, FALSE ); + proto_tree_add_item( rtcp_tree, hf_rtcp_psfb_fmt, tvb, offset, 1, ENC_BIG_ENDIAN ); rtcp_psfb_fmt = (tvb_get_guint8(tvb, offset) & 0x1f); offset++; /* Packet type, 8 bits */ - proto_tree_add_item( rtcp_tree, hf_rtcp_pt, tvb, offset, 1, FALSE ); + proto_tree_add_item( rtcp_tree, hf_rtcp_pt, tvb, offset, 1, ENC_BIG_ENDIAN ); offset++; /* Packet length in 32 bit words MINUS one, 16 bits */ @@ -927,11 +927,11 @@ dissect_rtcp_psfb( tvbuff_t *tvb, int offset, proto_tree *rtcp_tree, offset = dissect_rtcp_length_field(rtcp_tree, tvb, offset); /* SSRC of packet sender, 32 bits */ - proto_tree_add_item( rtcp_tree, hf_rtcp_ssrc_sender, tvb, offset, 4, FALSE ); + proto_tree_add_item( rtcp_tree, hf_rtcp_ssrc_sender, tvb, offset, 4, ENC_BIG_ENDIAN ); offset += 4; /* SSRC of media source, 32 bits */ - proto_tree_add_item( rtcp_tree, hf_rtcp_ssrc_media_source, tvb, offset, 4, FALSE ); + proto_tree_add_item( rtcp_tree, hf_rtcp_ssrc_media_source, tvb, offset, 4, ENC_BIG_ENDIAN ); offset += 4; /* Feedback Control Information (FCI) */ @@ -942,14 +942,14 @@ dissect_rtcp_psfb( tvbuff_t *tvb, int offset, proto_tree *rtcp_tree, ti = proto_tree_add_text( rtcp_tree, tvb, offset, 8, "FIR %u", ++counter ); fci_tree = proto_item_add_subtree( ti, ett_ssrc ); /* SSRC 32 bit*/ - proto_tree_add_item( fci_tree, hf_rtcp_psfb_fir_fci_ssrc, tvb, offset, 4, FALSE ); + proto_tree_add_item( fci_tree, hf_rtcp_psfb_fir_fci_ssrc, tvb, offset, 4, ENC_BIG_ENDIAN ); offset += 4; /* Command Sequence Number 8 bit*/ - proto_tree_add_item( fci_tree, hf_rtcp_psfb_fir_fci_csn, tvb, offset, 1, FALSE ); - /*proto_tree_add_item( ssrc_tree, hf_rtcp_ssrc_source, tvb, offset, 4, FALSE );*/ + proto_tree_add_item( fci_tree, hf_rtcp_psfb_fir_fci_csn, tvb, offset, 1, ENC_BIG_ENDIAN ); + /*proto_tree_add_item( ssrc_tree, hf_rtcp_ssrc_source, tvb, offset, 4, ENC_BIG_ENDIAN );*/ offset += 1; /* Reserved 24 bit*/ - proto_tree_add_item( fci_tree, hf_rtcp_psfb_fir_fci_reserved, tvb, offset, 3, FALSE ); + proto_tree_add_item( fci_tree, hf_rtcp_psfb_fir_fci_reserved, tvb, offset, 3, ENC_BIG_ENDIAN ); offset += 3; read_fci += 2; } else { @@ -969,17 +969,17 @@ static int dissect_rtcp_fir( tvbuff_t *tvb, int offset, proto_tree *tree ) { /* Packet type = FIR (H261) */ - proto_tree_add_item( tree, hf_rtcp_rc, tvb, offset, 1, FALSE ); + proto_tree_add_item( tree, hf_rtcp_rc, tvb, offset, 1, ENC_BIG_ENDIAN ); offset++; /* Packet type, 8 bits = APP */ - proto_tree_add_item( tree, hf_rtcp_pt, tvb, offset, 1, FALSE ); + proto_tree_add_item( tree, hf_rtcp_pt, tvb, offset, 1, ENC_BIG_ENDIAN ); offset++; /* Packet length in 32 bit words minus one */ offset = dissect_rtcp_length_field(tree, tvb, offset); /* SSRC */ - proto_tree_add_item( tree, hf_rtcp_ssrc_source, tvb, offset, 4, FALSE ); + proto_tree_add_item( tree, hf_rtcp_ssrc_source, tvb, offset, 4, ENC_BIG_ENDIAN ); offset += 4; return offset; @@ -1003,7 +1003,7 @@ dissect_rtcp_app( tvbuff_t *tvb,packet_info *pinfo, int offset, proto_tree *tree /* SSRC / CSRC */ - proto_tree_add_item( tree, hf_rtcp_ssrc_source, tvb, offset, 4, FALSE ); + proto_tree_add_item( tree, hf_rtcp_ssrc_source, tvb, offset, 4, ENC_BIG_ENDIAN ); offset += 4; packet_len -= 4; @@ -1073,7 +1073,7 @@ dissect_rtcp_app( tvbuff_t *tvb,packet_info *pinfo, int offset, proto_tree *tree return offset; priority = tvb_get_ntohs(tvb, offset); - proto_tree_add_item(PoC1_tree, hf_rtcp_app_poc1_priority, tvb, offset, 2, FALSE ); + proto_tree_add_item(PoC1_tree, hf_rtcp_app_poc1_priority, tvb, offset, 2, ENC_BIG_ENDIAN ); offset += 2; packet_len -= 2; @@ -1137,7 +1137,7 @@ dissect_rtcp_app( tvbuff_t *tvb,packet_info *pinfo, int offset, proto_tree *tree return offset; stop_talking_time = tvb_get_ntohs(tvb, offset); - ti = proto_tree_add_item(PoC1_tree, hf_rtcp_app_poc1_stt, tvb, offset, 2, FALSE ); + ti = proto_tree_add_item(PoC1_tree, hf_rtcp_app_poc1_stt, tvb, offset, 2, ENC_BIG_ENDIAN ); /* Append text with meanings of value */ switch (stop_talking_time) @@ -1176,7 +1176,7 @@ dissect_rtcp_app( tvbuff_t *tvb,packet_info *pinfo, int offset, proto_tree *tree return offset; participants = tvb_get_ntohs(tvb, offset); - ti = proto_tree_add_item(PoC1_tree, hf_rtcp_app_poc1_partic, tvb, offset, 2, FALSE ); + ti = proto_tree_add_item(PoC1_tree, hf_rtcp_app_poc1_partic, tvb, offset, 2, ENC_BIG_ENDIAN ); /* Append text with meanings of extreme values */ switch (participants) @@ -1205,13 +1205,13 @@ dissect_rtcp_app( tvbuff_t *tvb,packet_info *pinfo, int offset, proto_tree *tree proto_item *ti; /* SSRC of PoC client */ - proto_tree_add_item(PoC1_tree, hf_rtcp_app_poc1_ssrc_granted, tvb, offset, 4, FALSE ); + proto_tree_add_item(PoC1_tree, hf_rtcp_app_poc1_ssrc_granted, tvb, offset, 4, ENC_BIG_ENDIAN ); offset += 4; packet_len -= 4; /* SDES type (must be CNAME) */ sdes_type = tvb_get_guint8( tvb, offset ); - proto_tree_add_item( PoC1_tree, hf_rtcp_sdes_type, tvb, offset, 1, FALSE ); + proto_tree_add_item( PoC1_tree, hf_rtcp_sdes_type, tvb, offset, 1, ENC_BIG_ENDIAN ); offset++; packet_len--; if (sdes_type != RTCP_SDES_CNAME) @@ -1246,7 +1246,7 @@ dissect_rtcp_app( tvbuff_t *tvb,packet_info *pinfo, int offset, proto_tree *tree /* SDES type (must be NAME if present) */ sdes_type = tvb_get_guint8( tvb, offset ); if (sdes_type == RTCP_SDES_NAME) { - proto_tree_add_item( PoC1_tree, hf_rtcp_sdes_type, tvb, offset, 1, FALSE ); + proto_tree_add_item( PoC1_tree, hf_rtcp_sdes_type, tvb, offset, 1, ENC_BIG_ENDIAN ); offset++; packet_len--; @@ -1293,7 +1293,7 @@ dissect_rtcp_app( tvbuff_t *tvb,packet_info *pinfo, int offset, proto_tree *tree } participants = tvb_get_ntohs(tvb, offset); - ti = proto_tree_add_item(PoC1_tree, hf_rtcp_app_poc1_partic, tvb, offset, 2, FALSE ); + ti = proto_tree_add_item(PoC1_tree, hf_rtcp_app_poc1_partic, tvb, offset, 2, ENC_BIG_ENDIAN ); /* Append text with meanings of extreme values */ switch (participants) { @@ -1320,7 +1320,7 @@ dissect_rtcp_app( tvbuff_t *tvb,packet_info *pinfo, int offset, proto_tree *tree /* Reason code */ reason_code = tvb_get_guint8(tvb, offset); - proto_tree_add_item( PoC1_tree, hf_rtcp_app_poc1_reason_code1, tvb, offset, 1, FALSE ); + proto_tree_add_item( PoC1_tree, hf_rtcp_app_poc1_reason_code1, tvb, offset, 1, ENC_BIG_ENDIAN ); offset++; packet_len--; @@ -1345,12 +1345,12 @@ dissect_rtcp_app( tvbuff_t *tvb,packet_info *pinfo, int offset, proto_tree *tree /*guint16 ignore_last_seq_no;*/ /* Sequence number of last RTP packet in burst */ - proto_tree_add_item( PoC1_tree, hf_rtcp_app_poc1_last_pkt_seq_no, tvb, offset, 2, FALSE ); + proto_tree_add_item( PoC1_tree, hf_rtcp_app_poc1_last_pkt_seq_no, tvb, offset, 2, ENC_BIG_ENDIAN ); last_seq_no = tvb_get_ntohs(tvb, offset); /* Bit 16 is ignore flag */ offset += 2; - proto_tree_add_item(PoC1_tree, hf_rtcp_app_poc1_ignore_seq_no, tvb, offset, 2, FALSE ); + proto_tree_add_item(PoC1_tree, hf_rtcp_app_poc1_ignore_seq_no, tvb, offset, 2, ENC_BIG_ENDIAN ); /*ignore_last_seq_no = (tvb_get_ntohs(tvb, offset) & 0x8000);*/ /* XXX: Was the intention to also show the "ignore_last_seq_no' flag in COL_INFO ? */ @@ -1371,7 +1371,7 @@ dissect_rtcp_app( tvbuff_t *tvb,packet_info *pinfo, int offset, proto_tree *tree { /* Reason code */ guint16 reason_code = tvb_get_ntohs(tvb, offset); - proto_tree_add_item( PoC1_tree, hf_rtcp_app_poc1_reason_code2, tvb, offset, 2, FALSE ); + proto_tree_add_item( PoC1_tree, hf_rtcp_app_poc1_reason_code2, tvb, offset, 2, ENC_BIG_ENDIAN ); /* The meaning of this field depends upon the reason code... */ switch (reason_code) @@ -1381,7 +1381,7 @@ dissect_rtcp_app( tvbuff_t *tvb,packet_info *pinfo, int offset, proto_tree *tree break; case 2: /* Talk burst too long */ /* Additional info is 16 bits with time (in seconds) client can request */ - proto_tree_add_item( PoC1_tree, hf_rtcp_app_poc1_new_time_request, tvb, offset + 2, 2, FALSE ); + proto_tree_add_item( PoC1_tree, hf_rtcp_app_poc1_new_time_request, tvb, offset + 2, 2, ENC_BIG_ENDIAN ); break; case 3: /* No permission */ /* No additional info */ @@ -1406,7 +1406,7 @@ dissect_rtcp_app( tvbuff_t *tvb,packet_info *pinfo, int offset, proto_tree *tree /* Code of message being acknowledged */ subtype = (tvb_get_guint8(tvb, offset) & 0xf8) >> 3; - proto_tree_add_item( PoC1_tree, hf_rtcp_app_poc1_ack_subtype, tvb, offset, 1, FALSE ); + proto_tree_add_item( PoC1_tree, hf_rtcp_app_poc1_ack_subtype, tvb, offset, 1, ENC_BIG_ENDIAN ); col_append_fstr(pinfo->cinfo, COL_INFO, " (for %s)", val_to_str(subtype, @@ -1416,7 +1416,7 @@ dissect_rtcp_app( tvbuff_t *tvb,packet_info *pinfo, int offset, proto_tree *tree /* Reason code only seen if subtype was Connect */ if (subtype == TBCP_CONNECT) { - proto_tree_add_item( PoC1_tree, hf_rtcp_app_poc1_ack_reason_code, tvb, offset, 2, FALSE ); + proto_tree_add_item( PoC1_tree, hf_rtcp_app_poc1_ack_reason_code, tvb, offset, 2, ENC_BIG_ENDIAN ); } /* 16 bits of padding follow */ @@ -1434,11 +1434,11 @@ dissect_rtcp_app( tvbuff_t *tvb,packet_info *pinfo, int offset, proto_tree *tree proto_item *ti; /* Priority */ - proto_tree_add_item( PoC1_tree, hf_rtcp_app_poc1_qsresp_priority, tvb, offset, 1, FALSE ); + proto_tree_add_item( PoC1_tree, hf_rtcp_app_poc1_qsresp_priority, tvb, offset, 1, ENC_BIG_ENDIAN ); /* Queue position. 65535 indicates 'position not available' */ position = tvb_get_ntohs(tvb, offset+1); - ti = proto_tree_add_item( PoC1_tree, hf_rtcp_app_poc1_qsresp_position, tvb, offset+1, 2, FALSE ); + ti = proto_tree_add_item( PoC1_tree, hf_rtcp_app_poc1_qsresp_position, tvb, offset+1, 2, ENC_BIG_ENDIAN ); if (position == 0) { proto_item_append_text(ti, " (client is un-queued)"); @@ -1482,7 +1482,7 @@ dissect_rtcp_app( tvbuff_t *tvb,packet_info *pinfo, int offset, proto_tree *tree proto_item_append_text(content, " (%u items)", items_set); /* Session type */ - proto_tree_add_item( PoC1_tree, hf_rtcp_app_poc1_conn_session_type, tvb, offset + 2, 1, FALSE ); + proto_tree_add_item( PoC1_tree, hf_rtcp_app_poc1_conn_session_type, tvb, offset + 2, 1, ENC_BIG_ENDIAN ); /* Additional indications */ proto_tree_add_item( PoC1_tree, hf_rtcp_app_poc1_conn_add_ind_mao, tvb, offset + 3, 1, FALSE ); @@ -1538,7 +1538,7 @@ dissect_rtcp_app( tvbuff_t *tvb,packet_info *pinfo, int offset, proto_tree *tree proto_tree* mux_tree = proto_item_add_subtree( mux_item, ett_mux ); proto_tree_add_item( mux_tree, hf_rtcp_app_mux_mux, tvb, offset, 1, FALSE ); proto_tree_add_item( mux_tree, hf_rtcp_app_mux_cp, tvb, offset, 1, FALSE ); - proto_tree_add_item( mux_tree, hf_rtcp_app_mux_selection, tvb, offset, 1, FALSE ); + proto_tree_add_item( mux_tree, hf_rtcp_app_mux_selection, tvb, offset, 1, ENC_BIG_ENDIAN ); local_port = tvb_get_ntohs( tvb, offset+2 ); proto_tree_add_uint( mux_tree, hf_rtcp_app_mux_localmuxport, tvb, offset+2, 2, local_port*2 ); } @@ -1614,7 +1614,7 @@ dissect_rtcp_bye( tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *tre if ( tvb_reported_length_remaining( tvb, offset ) > 0 ) { /* Bye reason consists of an 8 bit length l and a string with length l */ reason_length = tvb_get_guint8( tvb, offset ); - proto_tree_add_item( tree, hf_rtcp_sdes_length, tvb, offset, 1, FALSE ); + proto_tree_add_item( tree, hf_rtcp_sdes_length, tvb, offset, 1, ENC_BIG_ENDIAN ); offset++; reason_offset = offset; @@ -1678,7 +1678,7 @@ dissect_rtcp_sdes( tvbuff_t *tvb, int offset, proto_tree *tree, sdes_tree = proto_item_add_subtree( sdes_item, ett_sdes ); /* SSRC_n source identifier, 32 bits */ - proto_tree_add_item( sdes_tree, hf_rtcp_ssrc_source, tvb, offset, 4, FALSE ); + proto_tree_add_item( sdes_tree, hf_rtcp_ssrc_source, tvb, offset, 4, ENC_BIG_ENDIAN ); offset += 4; /* Create a subtree for the SDES items; we don't yet know @@ -1695,7 +1695,7 @@ dissect_rtcp_sdes( tvbuff_t *tvb, int offset, proto_tree *tree, while ( tvb_reported_length_remaining( tvb, offset ) > 0 ) { /* ID, 8 bits */ sdes_type = tvb_get_guint8( tvb, offset ); - proto_tree_add_item( sdes_item_tree, hf_rtcp_sdes_type, tvb, offset, 1, FALSE ); + proto_tree_add_item( sdes_item_tree, hf_rtcp_sdes_type, tvb, offset, 1, ENC_BIG_ENDIAN ); offset++; if ( sdes_type == RTCP_SDES_END ) { @@ -1705,7 +1705,7 @@ dissect_rtcp_sdes( tvbuff_t *tvb, int offset, proto_tree *tree, /* Item length, 8 bits */ item_len = tvb_get_guint8( tvb, offset ); - proto_tree_add_item( sdes_item_tree, hf_rtcp_sdes_length, tvb, offset, 1, FALSE ); + proto_tree_add_item( sdes_item_tree, hf_rtcp_sdes_length, tvb, offset, 1, ENC_BIG_ENDIAN ); offset++; if ( item_len != 0 ) { @@ -1725,7 +1725,7 @@ dissect_rtcp_sdes( tvbuff_t *tvb, int offset, proto_tree *tree, offset += item_len; continue; } - proto_tree_add_item( sdes_item_tree, hf_rtcp_sdes_prefix_len, tvb, offset, 1, FALSE ); + proto_tree_add_item( sdes_item_tree, hf_rtcp_sdes_prefix_len, tvb, offset, 1, ENC_BIG_ENDIAN ); offset++; proto_tree_add_item( sdes_item_tree, hf_rtcp_sdes_prefix_string, tvb, offset, prefix_len, FALSE ); @@ -1835,7 +1835,7 @@ dissect_rtcp_xr(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *tree, } /* SSRC */ - proto_tree_add_item( tree, hf_rtcp_ssrc_sender, tvb, offset, 4, FALSE ); + proto_tree_add_item( tree, hf_rtcp_ssrc_sender, tvb, offset, 4, ENC_BIG_ENDIAN ); offset += 4; packet_len -= 4; @@ -2252,7 +2252,7 @@ dissect_rtcp_rr( packet_info *pinfo, tvbuff_t *tvb, int offset, proto_tree *tree ssrc_tree = proto_item_add_subtree( ti, ett_ssrc ); /* SSRC_n source identifier, 32 bits */ - proto_tree_add_item( ssrc_tree, hf_rtcp_ssrc_source, tvb, offset, 4, FALSE ); + proto_tree_add_item( ssrc_tree, hf_rtcp_ssrc_source, tvb, offset, 4, ENC_BIG_ENDIAN ); offset += 4; ti = proto_tree_add_text(ssrc_tree, tvb, offset, 20, "SSRC contents" ); @@ -2266,7 +2266,7 @@ dissect_rtcp_rr( packet_info *pinfo, tvbuff_t *tvb, int offset, proto_tree *tree /* Cumulative number of packets lost, 24 bits */ proto_tree_add_item( ssrc_sub_tree, hf_rtcp_ssrc_cum_nr, tvb, - offset, 3, FALSE ); + offset, 3, ENC_BIG_ENDIAN ); offset += 3; /* Extended highest sequence nr received, 32 bits @@ -2274,32 +2274,32 @@ dissect_rtcp_rr( packet_info *pinfo, tvbuff_t *tvb, int offset, proto_tree *tree * because this might be a little clearer */ ti = proto_tree_add_item( ssrc_tree, hf_rtcp_ssrc_ext_high_seq, - tvb, offset, 4, FALSE ); + tvb, offset, 4, ENC_BIG_ENDIAN ); high_sec_tree = proto_item_add_subtree( ti, ett_ssrc_ext_high ); /* Sequence number cycles */ proto_tree_add_item( high_sec_tree, hf_rtcp_ssrc_high_cycles, - tvb, offset, 2, FALSE ); + tvb, offset, 2, ENC_BIG_ENDIAN ); offset += 2; /* highest sequence number received */ proto_tree_add_item( high_sec_tree, hf_rtcp_ssrc_high_seq, - tvb, offset, 2, FALSE ); + tvb, offset, 2, ENC_BIG_ENDIAN ); offset += 2; /* Interarrival jitter */ proto_tree_add_item( ssrc_tree, hf_rtcp_ssrc_jitter, tvb, - offset, 4, FALSE ); + offset, 4, ENC_BIG_ENDIAN ); offset += 4; /* Last SR timestamp */ lsr = tvb_get_ntohl( tvb, offset ); proto_tree_add_item( ssrc_tree, hf_rtcp_ssrc_lsr, tvb, - offset, 4, FALSE ); + offset, 4, ENC_BIG_ENDIAN ); offset += 4; /* Delay since last SR timestamp */ dlsr = tvb_get_ntohl( tvb, offset ); ti = proto_tree_add_item( ssrc_tree, hf_rtcp_ssrc_dlsr, tvb, - offset, 4, FALSE ); + offset, 4, ENC_BIG_ENDIAN ); proto_item_append_text(ti, " (%d milliseconds)", (int)(((double)dlsr/(double)65536) * 1000.0)); offset += 4; @@ -2345,13 +2345,13 @@ dissect_rtcp_sr( packet_info *pinfo, tvbuff_t *tvb, int offset, proto_tree *tree offset += 8; /* RTP timestamp, 32 bits */ - proto_tree_add_item( tree, hf_rtcp_rtp_timestamp, tvb, offset, 4, FALSE ); + proto_tree_add_item( tree, hf_rtcp_rtp_timestamp, tvb, offset, 4, ENC_BIG_ENDIAN ); offset += 4; /* Sender's packet count, 32 bits */ - proto_tree_add_item( tree, hf_rtcp_sender_pkt_cnt, tvb, offset, 4, FALSE ); + proto_tree_add_item( tree, hf_rtcp_sender_pkt_cnt, tvb, offset, 4, ENC_BIG_ENDIAN ); offset += 4; /* Sender's octet count, 32 bits */ - proto_tree_add_item( tree, hf_rtcp_sender_oct_cnt, tvb, offset, 4, FALSE ); + proto_tree_add_item( tree, hf_rtcp_sender_oct_cnt, tvb, offset, 4, ENC_BIG_ENDIAN ); offset += 4; /* Record the time of this packet in the sender's conversation */ @@ -2820,12 +2820,12 @@ dissect_rtcp( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) proto_tree_add_uint( rtcp_tree, hf_rtcp_rc, tvb, offset, 1, temp_byte ); offset++; /* Packet type, 8 bits */ - proto_tree_add_item( rtcp_tree, hf_rtcp_pt, tvb, offset, 1, FALSE ); + proto_tree_add_item( rtcp_tree, hf_rtcp_pt, tvb, offset, 1, ENC_BIG_ENDIAN ); offset++; /* Packet length in 32 bit words MINUS one, 16 bits */ offset = dissect_rtcp_length_field(rtcp_tree, tvb, offset); /* Sender Synchronization source, 32 bits */ - proto_tree_add_item( rtcp_tree, hf_rtcp_ssrc_sender, tvb, offset, 4, FALSE ); + proto_tree_add_item( rtcp_tree, hf_rtcp_ssrc_sender, tvb, offset, 4, ENC_BIG_ENDIAN ); offset += 4; if (srtcp_encrypted) { /* rest of the payload is encrypted - do not try to dissect */ @@ -2843,7 +2843,7 @@ dissect_rtcp( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) proto_tree_add_uint( rtcp_tree, hf_rtcp_sc, tvb, offset, 1, temp_byte ); offset++; /* Packet type, 8 bits */ - proto_tree_add_item( rtcp_tree, hf_rtcp_pt, tvb, offset, 1, FALSE ); + proto_tree_add_item( rtcp_tree, hf_rtcp_pt, tvb, offset, 1, ENC_BIG_ENDIAN ); offset++; /* Packet length in 32 bit words MINUS one, 16 bits */ offset = dissect_rtcp_length_field(rtcp_tree, tvb, offset); @@ -2854,7 +2854,7 @@ dissect_rtcp( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) proto_tree_add_uint( rtcp_tree, hf_rtcp_sc, tvb, offset, 1, temp_byte ); offset++; /* Packet type, 8 bits */ - proto_tree_add_item( rtcp_tree, hf_rtcp_pt, tvb, offset, 1, FALSE ); + proto_tree_add_item( rtcp_tree, hf_rtcp_pt, tvb, offset, 1, ENC_BIG_ENDIAN ); offset++; /* Packet length in 32 bit words MINUS one, 16 bits */ offset = dissect_rtcp_length_field(rtcp_tree, tvb, offset); @@ -2866,7 +2866,7 @@ dissect_rtcp( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) proto_tree_add_uint( rtcp_tree, hf_rtcp_subtype, tvb, offset, 1, elem_count ); offset++; /* Packet type, 8 bits */ - proto_tree_add_item( rtcp_tree, hf_rtcp_pt, tvb, offset, 1, FALSE ); + proto_tree_add_item( rtcp_tree, hf_rtcp_pt, tvb, offset, 1, ENC_BIG_ENDIAN ); offset++; /* Packet length in 32 bit words MINUS one, 16 bits */ app_length = tvb_get_ntohs( tvb, offset ) <<2; @@ -2877,7 +2877,7 @@ dissect_rtcp( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) /* Reserved, 5 bits, Ignore */ offset++; /* Packet type, 8 bits */ - proto_tree_add_item( rtcp_tree, hf_rtcp_pt, tvb, offset, 1, FALSE ); + proto_tree_add_item( rtcp_tree, hf_rtcp_pt, tvb, offset, 1, ENC_BIG_ENDIAN ); offset++; /* Packet length in 32 bit words MINUS one, 16 bits */ offset = dissect_rtcp_length_field(rtcp_tree, tvb, offset); @@ -2925,7 +2925,7 @@ dissect_rtcp( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) proto_tree_add_item( rtcp_tree, hf_rtcp_padding_data, tvb, offset, padding_length - 1, ENC_NA ); offset += padding_length - 1; } - proto_tree_add_item( rtcp_tree, hf_rtcp_padding_count, tvb, offset, 1, FALSE ); + proto_tree_add_item( rtcp_tree, hf_rtcp_padding_count, tvb, offset, 1, ENC_BIG_ENDIAN ); offset++; } diff --git a/epan/dissectors/packet-rtmpt.c b/epan/dissectors/packet-rtmpt.c index 6e669b197a..a28dfbcc0d 100644 --- a/epan/dissectors/packet-rtmpt.c +++ b/epan/dissectors/packet-rtmpt.c @@ -734,23 +734,23 @@ dissect_rtmpt_body_scm(tvbuff_t *tvb, gint offset, proto_tree *rtmpt_tree, guint { switch (scm) { case RTMPT_TYPE_CHUNK_SIZE: - proto_tree_add_item(rtmpt_tree, hf_rtmpt_scm_chunksize, tvb, offset, 4, FALSE); + proto_tree_add_item(rtmpt_tree, hf_rtmpt_scm_chunksize, tvb, offset, 4, ENC_BIG_ENDIAN); break; case RTMPT_TYPE_ABORT_MESSAGE: - proto_tree_add_item(rtmpt_tree, hf_rtmpt_scm_csid, tvb, offset, 4, FALSE); + proto_tree_add_item(rtmpt_tree, hf_rtmpt_scm_csid, tvb, offset, 4, ENC_BIG_ENDIAN); break; case RTMPT_TYPE_ACKNOWLEDGEMENT: - proto_tree_add_item(rtmpt_tree, hf_rtmpt_scm_seq, tvb, offset, 4, FALSE); + proto_tree_add_item(rtmpt_tree, hf_rtmpt_scm_seq, tvb, offset, 4, ENC_BIG_ENDIAN); break; case RTMPT_TYPE_UCM: - proto_tree_add_item(rtmpt_tree, hf_rtmpt_ucm_eventtype, tvb, offset, 2, FALSE); + proto_tree_add_item(rtmpt_tree, hf_rtmpt_ucm_eventtype, tvb, offset, 2, ENC_BIG_ENDIAN); break; case RTMPT_TYPE_WINDOW: - proto_tree_add_item(rtmpt_tree, hf_rtmpt_scm_was, tvb, offset, 4, FALSE); + proto_tree_add_item(rtmpt_tree, hf_rtmpt_scm_was, tvb, offset, 4, ENC_BIG_ENDIAN); break; case RTMPT_TYPE_PEER_BANDWIDTH: - proto_tree_add_item(rtmpt_tree, hf_rtmpt_scm_was, tvb, offset, 4, FALSE); - proto_tree_add_item(rtmpt_tree, hf_rtmpt_scm_limittype, tvb, offset+4, 1, FALSE); + proto_tree_add_item(rtmpt_tree, hf_rtmpt_scm_was, tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(rtmpt_tree, hf_rtmpt_scm_limittype, tvb, offset+4, 1, ENC_BIG_ENDIAN); break; } } @@ -924,7 +924,7 @@ dissect_rtmpt_body_command(tvbuff_t *tvb, gint offset, proto_tree *rtmpt_tree, g "Name: %s", sProperty); name_tree = proto_item_add_subtree(ti, ett_rtmpt_string); - proto_tree_add_item(name_tree, hf_rtmpt_amf_stringlength, tvb, iPropertyOffset, 2, FALSE); + proto_tree_add_item(name_tree, hf_rtmpt_amf_stringlength, tvb, iPropertyOffset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(name_tree, hf_rtmpt_amf_string, tvb, iPropertyOffset+2, iPropertyLength-2, FALSE); } @@ -937,11 +937,11 @@ dissect_rtmpt_body_command(tvbuff_t *tvb, gint offset, proto_tree *rtmpt_tree, g val_to_str(iObjType, rtmpt_type_vals, "Unknown"), sValue); val_tree = proto_item_add_subtree(ti, ett_rtmpt_value); - proto_tree_add_item(val_tree, hf_rtmpt_amf_type, tvb, iValueOffset-iValueExtra, 1, FALSE); + proto_tree_add_item(val_tree, hf_rtmpt_amf_type, tvb, iValueOffset-iValueExtra, 1, ENC_BIG_ENDIAN); if (iObjType==RTMPT_AMF_STRING) { - proto_tree_add_item(val_tree, hf_rtmpt_amf_stringlength, tvb, iValueOffset-iValueExtra+1, 2, FALSE); + proto_tree_add_item(val_tree, hf_rtmpt_amf_stringlength, tvb, iValueOffset-iValueExtra+1, 2, ENC_BIG_ENDIAN); } else if (iObjType==RTMPT_AMF_LONG_STRING || iObjType==RTMPT_AMF_XML) { - proto_tree_add_item(val_tree, hf_rtmpt_amf_longstringlength, tvb, iValueOffset-iValueExtra+1, 4, FALSE); + proto_tree_add_item(val_tree, hf_rtmpt_amf_longstringlength, tvb, iValueOffset-iValueExtra+1, 4, ENC_BIG_ENDIAN); } if (iValueLength>0 && hfvalue!=-1) { proto_tree_add_item(val_tree, hfvalue, tvb, iValueOffset, iValueLength, FALSE); @@ -961,9 +961,9 @@ dissect_rtmpt_body_command(tvbuff_t *tvb, gint offset, proto_tree *rtmpt_tree, g ep_stack_push(amftrs, rtmpt_tree); rtmpt_tree = proto_item_add_subtree(ti_object, ett_rtmpt_array); - proto_tree_add_item(rtmpt_tree, hf_rtmpt_amf_type, tvb, iValueOffset-iValueExtra, 1, FALSE); + proto_tree_add_item(rtmpt_tree, hf_rtmpt_amf_type, tvb, iValueOffset-iValueExtra, 1, ENC_BIG_ENDIAN); if (iValueExtra>1 || iValueLength>0) { - proto_tree_add_item(rtmpt_tree, hf_rtmpt_amf_arraylength, tvb, iValueOffset-iValueExtra+1, 4, FALSE); + proto_tree_add_item(rtmpt_tree, hf_rtmpt_amf_arraylength, tvb, iValueOffset-iValueExtra+1, 4, ENC_BIG_ENDIAN); } } @@ -1056,11 +1056,11 @@ dissect_rtmpt_body_aggregate(tvbuff_t *tvb, gint offset, proto_tree *rtmpt_tree) tag_item = proto_tree_add_text(rtmpt_tree, tvb, offset, 11+iDataSize+4, "%s", val_to_str(iTagType, rtmpt_tag_vals, "Unknown Tag")); tag_tree = proto_item_add_subtree(tag_item, ett_rtmpt_tag); - proto_tree_add_item(tag_tree, hf_rtmpt_tag_type, tvb, offset+0, 1, FALSE); - proto_tree_add_item(tag_tree, hf_rtmpt_tag_datasize, tvb, offset+1, 3, FALSE); - proto_tree_add_item(tag_tree, hf_rtmpt_tag_timestamp, tvb, offset+4, 3, FALSE); - proto_tree_add_item(tag_tree, hf_rtmpt_tag_ets, tvb, offset+7, 1, FALSE); - proto_tree_add_item(tag_tree, hf_rtmpt_tag_streamid, tvb, offset+8, 3, FALSE); + proto_tree_add_item(tag_tree, hf_rtmpt_tag_type, tvb, offset+0, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tag_tree, hf_rtmpt_tag_datasize, tvb, offset+1, 3, ENC_BIG_ENDIAN); + proto_tree_add_item(tag_tree, hf_rtmpt_tag_timestamp, tvb, offset+4, 3, ENC_BIG_ENDIAN); + proto_tree_add_item(tag_tree, hf_rtmpt_tag_ets, tvb, offset+7, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tag_tree, hf_rtmpt_tag_streamid, tvb, offset+8, 3, ENC_BIG_ENDIAN); data_item = proto_tree_add_text(tag_tree, tvb, offset+11, iDataSize, "Data"); data_tree = proto_item_add_subtree(data_item, ett_rtmpt_tag_data); @@ -1079,7 +1079,7 @@ dissect_rtmpt_body_aggregate(tvbuff_t *tvb, gint offset, proto_tree *rtmpt_tree) break; } - proto_tree_add_item(tag_tree, hf_rtmpt_tag_tagsize, tvb, offset+11+iDataSize, 4, FALSE); + proto_tree_add_item(tag_tree, hf_rtmpt_tag_tagsize, tvb, offset+11+iDataSize, 4, ENC_BIG_ENDIAN); offset += 11 + iDataSize + 4; } } @@ -1213,24 +1213,24 @@ dissect_rtmpt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, rtmpt_conv_t /* proto_item_append_text(ti, " (%s)", val_to_str(tp->cmd, rtmpt_opcode_vals, "Unknown (0x%01x)")); */ rtmpt_tree = proto_item_add_subtree(ti, ett_rtmpt_header); - if (tp->fmt <= 3) proto_tree_add_item(rtmpt_tree, hf_rtmpt_header_format, tvb, offset + 0, 1, FALSE); - if (tp->fmt <= 3) proto_tree_add_item(rtmpt_tree, hf_rtmpt_header_csid, tvb, offset + 0, tp->bhlen, FALSE); + if (tp->fmt <= 3) proto_tree_add_item(rtmpt_tree, hf_rtmpt_header_format, tvb, offset + 0, 1, ENC_BIG_ENDIAN); + if (tp->fmt <= 3) proto_tree_add_item(rtmpt_tree, hf_rtmpt_header_csid, tvb, offset + 0, tp->bhlen, ENC_BIG_ENDIAN); if (tp->fmt <= 2) { if (tp->fmt>0) { - proto_tree_add_item(rtmpt_tree, hf_rtmpt_header_timestamp_delta, tvb, offset + tp->bhlen, 3, FALSE); + proto_tree_add_item(rtmpt_tree, hf_rtmpt_header_timestamp_delta, tvb, offset + tp->bhlen, 3, ENC_BIG_ENDIAN); } else { - proto_tree_add_item(rtmpt_tree, hf_rtmpt_header_timestamp, tvb, offset + tp->bhlen, 3, FALSE); + proto_tree_add_item(rtmpt_tree, hf_rtmpt_header_timestamp, tvb, offset + tp->bhlen, 3, ENC_BIG_ENDIAN); } if (haveETS) { - proto_tree_add_item(rtmpt_tree, hf_rtmpt_header_ets, tvb, offset + tp->bhlen + tp->mhlen - 4, 4, FALSE); + proto_tree_add_item(rtmpt_tree, hf_rtmpt_header_ets, tvb, offset + tp->bhlen + tp->mhlen - 4, 4, ENC_BIG_ENDIAN); } } if ((tp->fmt>0 && !haveETS) || tp->fmt==3) { proto_tree_add_text(rtmpt_tree, tvb, offset + tp->bhlen, 0, "Timestamp: %d (calculated)", tp->ts); } - if (tp->fmt <= 1) proto_tree_add_item(rtmpt_tree, hf_rtmpt_header_body_size, tvb, offset + tp->bhlen + 3, 3, FALSE); - if (tp->fmt <= 1) proto_tree_add_item(rtmpt_tree, hf_rtmpt_header_typeid, tvb, offset + tp->bhlen + 6, 1, FALSE); - if (tp->fmt <= 0) proto_tree_add_item(rtmpt_tree, hf_rtmpt_header_streamid, tvb, offset + tp->bhlen + 7, 4, TRUE); + if (tp->fmt <= 1) proto_tree_add_item(rtmpt_tree, hf_rtmpt_header_body_size, tvb, offset + tp->bhlen + 3, 3, ENC_BIG_ENDIAN); + if (tp->fmt <= 1) proto_tree_add_item(rtmpt_tree, hf_rtmpt_header_typeid, tvb, offset + tp->bhlen + 6, 1, ENC_BIG_ENDIAN); + if (tp->fmt <= 0) proto_tree_add_item(rtmpt_tree, hf_rtmpt_header_streamid, tvb, offset + tp->bhlen + 7, 4, ENC_LITTLE_ENDIAN); /* Dissect body */ if (tp->len==0) return; diff --git a/epan/dissectors/packet-rtnet.c b/epan/dissectors/packet-rtnet.c index 1c9a5a16e6..a454687bd0 100644 --- a/epan/dissectors/packet-rtnet.c +++ b/epan/dissectors/packet-rtnet.c @@ -248,11 +248,11 @@ static guint dissect_rtnet_tdma_request_test(tvbuff_t *tvb, guint offset, proto_tree *tree) { proto_tree_add_item(tree, hf_tdma_v1_msg_request_test_counter, tvb, - offset, 4, TRUE ); + offset, 4, ENC_LITTLE_ENDIAN ); offset += 4; proto_tree_add_item(tree, hf_tdma_v1_msg_request_test_tx, tvb, - offset, 8, TRUE ); + offset, 8, ENC_LITTLE_ENDIAN ); offset += 8; return offset; @@ -262,11 +262,11 @@ static guint dissect_rtnet_tdma_ack_test(tvbuff_t *tvb, guint offset, proto_tree *tree) { proto_tree_add_item(tree, hf_tdma_v1_msg_ack_test_counter, tvb, - offset, 4, TRUE ); + offset, 4, ENC_LITTLE_ENDIAN ); offset += 4; proto_tree_add_item(tree, hf_tdma_v1_msg_ack_test_tx, tvb, - offset, 8, TRUE ); + offset, 8, ENC_LITTLE_ENDIAN ); offset += 8; return offset; @@ -276,19 +276,19 @@ static guint dissect_rtnet_tdma_request_conf(tvbuff_t *tvb, guint offset, proto_tree *tree) { proto_tree_add_item(tree, hf_tdma_v1_msg_request_conf_station, tvb, - offset, 1, FALSE ); + offset, 1, ENC_BIG_ENDIAN ); offset += 1; proto_tree_add_item(tree, hf_tdma_v1_msg_request_conf_padding, tvb, - offset, 1, FALSE ); + offset, 1, ENC_BIG_ENDIAN ); offset += 1; proto_tree_add_item(tree, hf_tdma_v1_msg_request_conf_mtu, tvb, - offset, 2, FALSE ); + offset, 2, ENC_BIG_ENDIAN ); offset += 2; proto_tree_add_item(tree, hf_tdma_v1_msg_request_conf_cycle, tvb, - offset, 4, FALSE ); + offset, 4, ENC_BIG_ENDIAN ); offset += 4; return offset; @@ -299,19 +299,19 @@ static guint dissect_rtnet_tdma_ack_conf(tvbuff_t *tvb, guint offset, proto_tree *tree) { proto_tree_add_item(tree, hf_tdma_v1_msg_ack_conf_station, tvb, - offset, 1, FALSE ); + offset, 1, ENC_BIG_ENDIAN ); offset += 1; proto_tree_add_item(tree, hf_tdma_v1_msg_ack_conf_padding, tvb, - offset, 1, FALSE ); + offset, 1, ENC_BIG_ENDIAN ); offset += 1; proto_tree_add_item(tree, hf_tdma_v1_msg_ack_conf_mtu, tvb, - offset, 2, FALSE ); + offset, 2, ENC_BIG_ENDIAN ); offset += 2; proto_tree_add_item(tree, hf_tdma_v1_msg_ack_conf_cycle, tvb, - offset, 4, FALSE ); + offset, 4, ENC_BIG_ENDIAN ); offset += 4; return offset; @@ -321,7 +321,7 @@ static guint dissect_rtnet_tdma_ack_ack_conf(tvbuff_t *tvb, guint offset, proto_tree *tree) { proto_tree_add_item(tree, hf_tdma_v1_msg_ack_ack_conf_station, tvb, - offset, 1, FALSE ); + offset, 1, ENC_BIG_ENDIAN ); offset += 1; @@ -357,7 +357,7 @@ dissect_rtnet_tdma_station_list(tvbuff_t *tvb, guint offset, proto_tree *tree) offset += 4; proto_tree_add_item(tree, hf_tdma_v1_msg_station_list_nr, tvb, - offset, 1, FALSE ); + offset, 1, ENC_BIG_ENDIAN ); offset += 1; @@ -373,7 +373,7 @@ static guint dissect_rtnet_tdma_request_change_offset(tvbuff_t *tvb, guint offset, proto_tree *tree) { proto_tree_add_item(tree, hf_tdma_v1_msg_request_change_offset_offset, tvb, - offset, 4, FALSE ); + offset, 4, ENC_BIG_ENDIAN ); offset += 4; @@ -384,7 +384,7 @@ static guint dissect_rtnet_tdma_start_of_frame(tvbuff_t *tvb, guint offset, proto_tree *tree) { proto_tree_add_item(tree, hf_tdma_v1_msg_start_of_frame_timestamp, tvb, - offset, 8, FALSE ); + offset, 8, ENC_BIG_ENDIAN ); offset += 8; return offset; @@ -416,7 +416,7 @@ dissect_rtnet_tdma_v1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *root) { val_to_str(msg, tdma_v1_msg_vals, "Unknown (0x%04x)")); proto_tree_add_item(tree, hf_tdma_v1_msg, tvb, - offset, 4, FALSE); + offset, 4, ENC_BIG_ENDIAN); offset += 4; switch( msg ) { @@ -467,27 +467,27 @@ dissect_tdma_sync(tvbuff_t *tvb, guint offset, proto_tree *tree) { gint64 timestamp; proto_item *ti; - proto_tree_add_item(tree, hf_tdma_sync_cycle, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_tdma_sync_cycle, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - ti = proto_tree_add_item(tree, hf_tdma_sync_xmit_stamp, tvb, offset, 8, FALSE); + ti = proto_tree_add_item(tree, hf_tdma_sync_xmit_stamp, tvb, offset, 8, ENC_BIG_ENDIAN); timestamp = tvb_get_ntoh64(tvb, offset) - tvb_get_ntoh64(tvb, offset+8); proto_item_append_text(ti, " (%s%" G_GINT64_MODIFIER "d)", (timestamp > 0) ? "+" : "", timestamp); offset += 8; - proto_tree_add_item(tree, hf_tdma_sync_sched_xmit, tvb, offset, 8, FALSE); + proto_tree_add_item(tree, hf_tdma_sync_sched_xmit, tvb, offset, 8, ENC_BIG_ENDIAN); } static void dissect_tdma_request_cal(tvbuff_t *tvb, guint offset, proto_tree *tree) { - proto_tree_add_item(tree, hf_tdma_req_cal_xmit_stamp, tvb, offset, 8, FALSE); + proto_tree_add_item(tree, hf_tdma_req_cal_xmit_stamp, tvb, offset, 8, ENC_BIG_ENDIAN); offset += 8; - proto_tree_add_item(tree, hf_tdma_req_cal_rpl_cycle, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_tdma_req_cal_rpl_cycle, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(tree, hf_tdma_req_cal_rpl_slot, tvb, offset, 8, FALSE); + proto_tree_add_item(tree, hf_tdma_req_cal_rpl_slot, tvb, offset, 8, ENC_BIG_ENDIAN); } static void @@ -495,15 +495,15 @@ dissect_tdma_reply_cal(tvbuff_t *tvb, guint offset, proto_tree *tree) { gint64 timestamp; proto_item *ti; - proto_tree_add_item(tree, hf_tdma_rpl_cal_req_stamp, tvb, offset, 8, FALSE); + proto_tree_add_item(tree, hf_tdma_rpl_cal_req_stamp, tvb, offset, 8, ENC_BIG_ENDIAN); offset += 8; - proto_tree_add_item(tree, hf_tdma_rpl_cal_rcv_stamp, tvb, offset, 8, FALSE); + proto_tree_add_item(tree, hf_tdma_rpl_cal_rcv_stamp, tvb, offset, 8, ENC_BIG_ENDIAN); timestamp = tvb_get_ntoh64(tvb, offset+8) - tvb_get_ntoh64(tvb, offset); offset += 8; - ti = proto_tree_add_item(tree, hf_tdma_rpl_cal_xmit_stamp, tvb, offset, 8, FALSE); + ti = proto_tree_add_item(tree, hf_tdma_rpl_cal_xmit_stamp, tvb, offset, 8, ENC_BIG_ENDIAN); proto_item_append_text(ti, " (%s%" G_GINT64_MODIFIER "d)", (timestamp > 0) ? "+" : "", timestamp); } @@ -531,10 +531,10 @@ dissect_rtnet_tdma(tvbuff_t *tvb, packet_info *pinfo, proto_tree *root) { proto_item_append_text(ti, ", %s", val_to_str(msg, tdma_msg_vals, "Unknown (0x%04x)")); - proto_tree_add_item(tree, hf_tdma_ver, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_tdma_ver, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(tree, hf_tdma_id, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_tdma_id, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; switch (msg) { @@ -622,15 +622,15 @@ dissect_rtmac(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { type_str, "Type: %s (0x%04x)", type_str, type); offset += 2; - proto_tree_add_item(rtmac_tree, hf_rtmac_header_ver, tvb, offset, 1, FALSE); + proto_tree_add_item(rtmac_tree, hf_rtmac_header_ver, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; if (ver == 1) - proto_tree_add_item(rtmac_tree, hf_rtmac_header_res_v1, tvb, offset, 1, FALSE); + proto_tree_add_item(rtmac_tree, hf_rtmac_header_res_v1, tvb, offset, 1, ENC_BIG_ENDIAN); else { - item = proto_tree_add_item(rtmac_tree, hf_rtmac_header_flags, tvb, offset, 1, FALSE); + item = proto_tree_add_item(rtmac_tree, hf_rtmac_header_flags, tvb, offset, 1, ENC_BIG_ENDIAN); ti = proto_item_add_subtree(item, ett_rtmac_flags); - proto_tree_add_item(ti, hf_rtmac_header_flags_res, tvb, offset, 1, FALSE); + proto_tree_add_item(ti, hf_rtmac_header_flags_res, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ti, hf_rtmac_header_flags_tunnel, tvb, offset, 1, FALSE); } offset += 1; @@ -698,8 +698,8 @@ dissect_rtcfg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { offset, 1, vers_id); vers_id_tree=proto_item_add_subtree(vers_id_item, ett_rtcfg); - proto_tree_add_item(vers_id_tree, hf_rtcfg_vers, tvb, offset, 1, FALSE); - proto_tree_add_item(vers_id_tree, hf_rtcfg_id, tvb, offset, 1, FALSE); + proto_tree_add_item(vers_id_tree, hf_rtcfg_vers, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(vers_id_tree, hf_rtcfg_id, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; proto_item_append_text(ti, ", Version %d, %s", @@ -710,7 +710,7 @@ dissect_rtcfg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { { case RTCFG_MSG_S1_CONFIG: addr_type = tvb_get_guint8(tvb, offset); - proto_tree_add_item( rtcfg_tree, hf_rtcfg_address_type, tvb, offset, 1, FALSE ); + proto_tree_add_item( rtcfg_tree, hf_rtcfg_address_type, tvb, offset, 1, ENC_BIG_ENDIAN ); offset += 1; switch( addr_type ) @@ -729,11 +729,11 @@ dissect_rtcfg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { break; } - proto_tree_add_item( rtcfg_tree, hf_rtcfg_burst_rate, tvb, offset, 1, FALSE ); + proto_tree_add_item( rtcfg_tree, hf_rtcfg_burst_rate, tvb, offset, 1, ENC_BIG_ENDIAN ); offset += 1; config_length = tvb_get_ntohs( tvb, offset ); - proto_tree_add_item( rtcfg_tree, hf_rtcfg_s1_config_length, tvb, offset, 2, FALSE ); + proto_tree_add_item( rtcfg_tree, hf_rtcfg_s1_config_length, tvb, offset, 2, ENC_BIG_ENDIAN ); offset += 2; if( config_length > 0 ) { @@ -745,7 +745,7 @@ dissect_rtcfg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { case RTCFG_MSG_ANN_NEW: addr_type = tvb_get_guint8(tvb, offset); - proto_tree_add_item( rtcfg_tree, hf_rtcfg_address_type, tvb, offset, 1, FALSE ); + proto_tree_add_item( rtcfg_tree, hf_rtcfg_address_type, tvb, offset, 1, ENC_BIG_ENDIAN ); offset += 1; switch( addr_type ) @@ -761,22 +761,22 @@ dissect_rtcfg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { } flags_item = proto_tree_add_item(rtcfg_tree, hf_rtcfg_client_flags, tvb, - offset, 1, FALSE); + offset, 1, ENC_BIG_ENDIAN); flags_tree=proto_item_add_subtree(flags_item, ett_rtcfg); - proto_tree_add_item(flags_tree, hf_rtcfg_client_flags_available, tvb, offset, 1, FALSE); - proto_tree_add_item(flags_tree, hf_rtcfg_client_flags_ready, tvb, offset, 1, FALSE); - proto_tree_add_item(flags_tree, hf_rtcfg_client_flags_res, tvb, offset, 1, FALSE); + proto_tree_add_item(flags_tree, hf_rtcfg_client_flags_available, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(flags_tree, hf_rtcfg_client_flags_ready, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(flags_tree, hf_rtcfg_client_flags_res, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item( rtcfg_tree, hf_rtcfg_burst_rate, tvb, offset, 1, FALSE ); + proto_tree_add_item( rtcfg_tree, hf_rtcfg_burst_rate, tvb, offset, 1, ENC_BIG_ENDIAN ); offset += 1; break; case RTCFG_MSG_ANN_REPLY: addr_type = tvb_get_guint8(tvb, offset); - proto_tree_add_item( rtcfg_tree, hf_rtcfg_address_type, tvb, offset, 1, FALSE ); + proto_tree_add_item( rtcfg_tree, hf_rtcfg_address_type, tvb, offset, 1, ENC_BIG_ENDIAN ); offset += 1; switch( addr_type ) @@ -792,37 +792,37 @@ dissect_rtcfg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { } flags_item = proto_tree_add_item(rtcfg_tree, hf_rtcfg_client_flags, tvb, - offset, 1, FALSE); + offset, 1, ENC_BIG_ENDIAN); flags_tree=proto_item_add_subtree(flags_item, ett_rtcfg); - proto_tree_add_item(flags_tree, hf_rtcfg_client_flags_available, tvb, offset, 1, FALSE); - proto_tree_add_item(flags_tree, hf_rtcfg_client_flags_ready, tvb, offset, 1, FALSE); - proto_tree_add_item(flags_tree, hf_rtcfg_client_flags_res, tvb, offset, 1, FALSE); + proto_tree_add_item(flags_tree, hf_rtcfg_client_flags_available, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(flags_tree, hf_rtcfg_client_flags_ready, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(flags_tree, hf_rtcfg_client_flags_res, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item( rtcfg_tree, hf_rtcfg_padding, tvb, offset, 1, FALSE ); + proto_tree_add_item( rtcfg_tree, hf_rtcfg_padding, tvb, offset, 1, ENC_BIG_ENDIAN ); offset += 1; break; case RTCFG_MSG_S2_CONFIG: flags_item = proto_tree_add_item(rtcfg_tree, hf_rtcfg_server_flags, tvb, - offset, 1, FALSE); + offset, 1, ENC_BIG_ENDIAN); flags_tree=proto_item_add_subtree(flags_item, ett_rtcfg); - proto_tree_add_item(flags_tree, hf_rtcfg_server_flags_res0, tvb, offset, 1, FALSE); - proto_tree_add_item(flags_tree, hf_rtcfg_server_flags_ready, tvb, offset, 1, FALSE); - proto_tree_add_item(flags_tree, hf_rtcfg_server_flags_res2, tvb, offset, 1, FALSE); + proto_tree_add_item(flags_tree, hf_rtcfg_server_flags_res0, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(flags_tree, hf_rtcfg_server_flags_ready, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(flags_tree, hf_rtcfg_server_flags_res2, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item( rtcfg_tree, hf_rtcfg_active_stations, tvb, offset, 4, FALSE ); + proto_tree_add_item( rtcfg_tree, hf_rtcfg_active_stations, tvb, offset, 4, ENC_BIG_ENDIAN ); offset += 4; - proto_tree_add_item( rtcfg_tree, hf_rtcfg_heartbeat_period, tvb, offset, 2, FALSE ); + proto_tree_add_item( rtcfg_tree, hf_rtcfg_heartbeat_period, tvb, offset, 2, ENC_BIG_ENDIAN ); offset += 2; config_length = tvb_get_ntohl( tvb, offset ); - proto_tree_add_item( rtcfg_tree, hf_rtcfg_s2_config_length, tvb, offset, 4, FALSE ); + proto_tree_add_item( rtcfg_tree, hf_rtcfg_s2_config_length, tvb, offset, 4, ENC_BIG_ENDIAN ); offset += 4; if( config_length > 0 ) { @@ -834,7 +834,7 @@ dissect_rtcfg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { break; case RTCFG_MSG_S2_FRAG: - proto_tree_add_item( rtcfg_tree, hf_rtcfg_config_offset, tvb, offset, 4, FALSE ); + proto_tree_add_item( rtcfg_tree, hf_rtcfg_config_offset, tvb, offset, 4, ENC_BIG_ENDIAN ); offset += 4; len = tvb_reported_length_remaining(tvb, offset); @@ -843,7 +843,7 @@ dissect_rtcfg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { break; case RTCFG_MSG_ACK: - proto_tree_add_item( rtcfg_tree, hf_rtcfg_ack_length, tvb, offset, 4, FALSE ); + proto_tree_add_item( rtcfg_tree, hf_rtcfg_ack_length, tvb, offset, 4, ENC_BIG_ENDIAN ); offset += 4; break; @@ -856,7 +856,7 @@ dissect_rtcfg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { case RTCFG_MSG_DEAD_STN: addr_type = tvb_get_guint8(tvb, offset); - proto_tree_add_item( rtcfg_tree, hf_rtcfg_address_type, tvb, offset, 1, FALSE ); + proto_tree_add_item( rtcfg_tree, hf_rtcfg_address_type, tvb, offset, 1, ENC_BIG_ENDIAN ); offset += 1; switch( addr_type ) diff --git a/epan/dissectors/packet-rtp-events.c b/epan/dissectors/packet-rtp-events.c index 9e37214baf..6584c0cefd 100644 --- a/epan/dissectors/packet-rtp-events.c +++ b/epan/dissectors/packet-rtp-events.c @@ -130,7 +130,7 @@ dissect_rtp_events( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) * being reported, in timestamp units. */ rtp_event_info.info_duration = tvb_get_ntohs(tvb, offset); - proto_tree_add_item ( rtp_events_tree, hf_rtp_events_duration, tvb, offset, 2, FALSE); + proto_tree_add_item ( rtp_events_tree, hf_rtp_events_duration, tvb, offset, 2, ENC_BIG_ENDIAN); /* set the end info for the tap */ if (octet & 0x80) diff --git a/epan/dissectors/packet-rtp.c b/epan/dissectors/packet-rtp.c index d02ea28b7e..71196ee70d 100644 --- a/epan/dissectors/packet-rtp.c +++ b/epan/dissectors/packet-rtp.c @@ -1101,8 +1101,8 @@ dissect_rtp_rfc2198(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) /* Timestamp offset and block length don't apply to last header */ if (hdr_follow) { - proto_tree_add_item(rfc2198_hdr_tree, hf_rtp_rfc2198_tm_off, tvb, offset, 2, FALSE ); - proto_tree_add_item(rfc2198_hdr_tree, hf_rtp_rfc2198_bl_len, tvb, offset + 1, 2, FALSE ); + proto_tree_add_item(rfc2198_hdr_tree, hf_rtp_rfc2198_tm_off, tvb, offset, 2, ENC_BIG_ENDIAN ); + proto_tree_add_item(rfc2198_hdr_tree, hf_rtp_rfc2198_bl_len, tvb, offset + 1, 2, ENC_BIG_ENDIAN ); hdr_new->len = tvb_get_ntohs(tvb, offset + 1) & 0x03FF; proto_item_append_text(ti, ", len=%u", hdr_new->len); offset += 3; @@ -1498,7 +1498,7 @@ dissect_rtp( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) * count. */ if ( tree ) proto_tree_add_item( rtp_tree, hf_rtp_padding_count, - tvb, offset, 1, FALSE ); + tvb, offset, 1, ENC_BIG_ENDIAN ); } else { /* @@ -1624,7 +1624,7 @@ dissect_pkt_ccc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ti = proto_tree_add_item(tree, proto_pkt_ccc, tvb, 0, 12, FALSE); pkt_ccc_tree = proto_item_add_subtree(ti, ett_pkt_ccc); - proto_tree_add_item(pkt_ccc_tree, hf_pkt_ccc_id, tvb, 0, 4, FALSE); + proto_tree_add_item(pkt_ccc_tree, hf_pkt_ccc_id, tvb, 0, 4, ENC_BIG_ENDIAN); proto_tree_add_item(pkt_ccc_tree, hf_pkt_ccc_ts, tvb, 4, 8, ENC_TIME_NTP|ENC_BIG_ENDIAN); } diff --git a/epan/dissectors/packet-rtps.c b/epan/dissectors/packet-rtps.c index 3de78e922b..0dd688951d 100644 --- a/epan/dissectors/packet-rtps.c +++ b/epan/dissectors/packet-rtps.c @@ -780,13 +780,13 @@ static void rtps_util_add_protocol_version(proto_tree *tree, /* Can NOT be NULL tvb, offset, 1, - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item(version_tree, hf_rtps_protocol_version_minor, tvb, offset+1, 1, - FALSE); + ENC_BIG_ENDIAN); } diff --git a/epan/dissectors/packet-rtps2.c b/epan/dissectors/packet-rtps2.c index eb3225ea58..b650cbfc15 100644 --- a/epan/dissectors/packet-rtps2.c +++ b/epan/dissectors/packet-rtps2.c @@ -1033,13 +1033,13 @@ static void rtps_util_add_protocol_version(proto_tree *tree, tvb, offset, 1, - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item(version_tree, hf_rtps_protocol_version_minor, tvb, offset+1, 1, - FALSE); + ENC_BIG_ENDIAN); } } diff --git a/epan/dissectors/packet-rudp.c b/epan/dissectors/packet-rudp.c index 86c0f79cf7..e4144a27b2 100644 --- a/epan/dissectors/packet-rudp.c +++ b/epan/dissectors/packet-rudp.c @@ -113,19 +113,19 @@ dissect_rudp(tvbuff_t *tvb, packet_info *pinfo _U_ , proto_tree *tree) ti = proto_tree_add_item(tree, proto_rudp, tvb, 0, hlen, FALSE); rudp_tree = proto_item_add_subtree(ti, ett_rudp); - ti = proto_tree_add_item(rudp_tree, hf_rudp_flags, tvb, 0, 1, FALSE); + ti = proto_tree_add_item(rudp_tree, hf_rudp_flags, tvb, 0, 1, ENC_BIG_ENDIAN); flags_tree = proto_item_add_subtree(ti, ett_rudp_flags); for (i = 0; i < 8; i++) proto_tree_add_item(flags_tree, flags[i], tvb, 0, 1, FALSE); - proto_tree_add_item(rudp_tree, hf_rudp_hlen, tvb, 1, 1, FALSE); - proto_tree_add_item(rudp_tree, hf_rudp_seq, tvb, 2, 1, FALSE); - proto_tree_add_item(rudp_tree, hf_rudp_ack, tvb, 3, 1, FALSE); + proto_tree_add_item(rudp_tree, hf_rudp_hlen, tvb, 1, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(rudp_tree, hf_rudp_seq, tvb, 2, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(rudp_tree, hf_rudp_ack, tvb, 3, 1, ENC_BIG_ENDIAN); /* If the header is more than 4 bytes the next 2 bytes are the checksum */ if (hlen > 4) { - proto_tree_add_item(rudp_tree, hf_rudp_cksum, tvb, 4, 2, FALSE); + proto_tree_add_item(rudp_tree, hf_rudp_cksum, tvb, 4, 2, ENC_BIG_ENDIAN); } /* If we have even more bytes their meaning is unknown - we have seen this diff --git a/epan/dissectors/packet-rx.c b/epan/dissectors/packet-rx.c index af0420715c..737d0fe603 100644 --- a/epan/dissectors/packet-rx.c +++ b/epan/dissectors/packet-rx.c @@ -159,14 +159,14 @@ dissect_rx_response_encrypted(tvbuff_t *tvb, proto_tree *parent_tree, int offset } /* cid : 4 bytes */ - proto_tree_add_item(tree, hf_rx_cid, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_rx_cid, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; /*FIXME dont know how to handle this checksum, skipping it */ offset += 4; /* sequrityindex : 1 byte */ - proto_tree_add_item(tree, hf_rx_securityindex, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_rx_securityindex, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 4; for (i=0; i<RX_MAXCALLS; i++) { @@ -178,11 +178,11 @@ dissect_rx_response_encrypted(tvbuff_t *tvb, proto_tree *parent_tree, int offset } /* inc nonce : 4 bytes */ - proto_tree_add_item(tree, hf_rx_inc_nonce, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_rx_inc_nonce, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; /* level : 4 bytes */ - proto_tree_add_item(tree, hf_rx_level, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_rx_level, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; proto_item_set_len(item, offset-old_offset); @@ -228,7 +228,7 @@ dissect_rx_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, offset = dissect_rx_response_encrypted(tvb, tree, offset); /* kvno */ - proto_tree_add_item(tree, hf_rx_kvno, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_rx_kvno, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; /* ticket_len */ @@ -271,7 +271,7 @@ dissect_rx_abort(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int tree = proto_item_add_subtree(item, ett_rx_abort); /* kvno */ - proto_tree_add_item(tree, hf_rx_abortcode, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_rx_abortcode, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; proto_item_set_len(item, offset-old_offset); @@ -310,10 +310,10 @@ dissect_rx_challenge(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, offset += 4; if (version==2) { - proto_tree_add_item(tree, hf_rx_nonce, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_rx_nonce, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(tree, hf_rx_min_level, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_rx_min_level, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; } @@ -348,27 +348,27 @@ dissect_rx_acks(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int /* bufferspace: 2 bytes*/ - proto_tree_add_item(tree, hf_rx_bufferspace, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_rx_bufferspace, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; /* maxskew: 2 bytes*/ - proto_tree_add_item(tree, hf_rx_maxskew, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_rx_maxskew, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; /* first packet: 4 bytes*/ - proto_tree_add_item(tree, hf_rx_first_packet, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_rx_first_packet, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; /* prev packet: 4 bytes*/ - proto_tree_add_item(tree, hf_rx_prev_packet, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_rx_prev_packet, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; /* serial : 4 bytes */ - proto_tree_add_item(tree, hf_rx_serial, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_rx_serial, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; /* reason : 1 byte */ - proto_tree_add_item(tree, hf_rx_reason, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_rx_reason, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; /* nACKs */ @@ -378,7 +378,7 @@ dissect_rx_acks(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int while(num--){ proto_tree_add_item(tree, hf_rx_ack_type, tvb, offset, 1, - FALSE); + ENC_BIG_ENDIAN); offset += 1; } @@ -395,22 +395,22 @@ dissect_rx_acks(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int if (tvb_reported_length_remaining(tvb, offset) >= 4){ proto_tree_add_item(tree, hf_rx_ifmtu, tvb, offset, 4, - FALSE); + ENC_BIG_ENDIAN); offset += 4; } if (tvb_reported_length_remaining(tvb, offset) >= 4){ proto_tree_add_item(tree, hf_rx_maxmtu, tvb, offset, 4, - FALSE); + ENC_BIG_ENDIAN); offset += 4; } if (tvb_reported_length_remaining(tvb, offset) >= 4){ proto_tree_add_item(tree, hf_rx_rwind, tvb, offset, 4, - FALSE); + ENC_BIG_ENDIAN); offset += 4; } if (tvb_reported_length_remaining(tvb, offset) >= 4){ proto_tree_add_item(tree, hf_rx_maxpackets, tvb, offset, 4, - FALSE); + ENC_BIG_ENDIAN); offset += 4; } } @@ -486,7 +486,7 @@ dissect_rx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) /* cid : 4 bytes */ rxinfo.cid = tvb_get_ntohl(tvb, offset); - proto_tree_add_item(tree, hf_rx_cid, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_rx_cid, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; /* callnumber : 4 bytes */ @@ -504,7 +504,7 @@ dissect_rx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) rxinfo.seq = seq; /* serial : 4 bytes */ - proto_tree_add_item(tree, hf_rx_serial, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_rx_serial, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; /* type : 1 byte */ @@ -518,11 +518,11 @@ dissect_rx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) offset = dissect_rx_flags(tvb, &rxinfo, tree, offset); /* userstatus : 1 byte */ - proto_tree_add_item(tree, hf_rx_userstatus, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_rx_userstatus, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; /* sequrityindex : 1 byte */ - proto_tree_add_item(tree, hf_rx_securityindex, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_rx_securityindex, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; /* @@ -532,7 +532,7 @@ dissect_rx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) */ /* spare */ - proto_tree_add_item(tree, hf_rx_spare, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_rx_spare, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; /* service id : 2 bytes */ diff --git a/epan/dissectors/packet-s5066.c b/epan/dissectors/packet-s5066.c index 73728d6025..23bc512357 100644 --- a/epan/dissectors/packet-s5066.c +++ b/epan/dissectors/packet-s5066.c @@ -836,8 +836,8 @@ dissect_s5066_address(tvbuff_t *tvb, guint offset, proto_tree *tree, gint source ti = proto_tree_add_text(tree, tvb, offset, 4, "Destination Address"); } s5066_tree_address = proto_item_add_subtree(ti, ett_s5066_address); - proto_tree_add_item(s5066_tree_address, hf_s5066_ad_size, tvb, offset, 1, FALSE); - proto_tree_add_item(s5066_tree_address, hf_s5066_ad_group, tvb, offset, 1, FALSE); + proto_tree_add_item(s5066_tree_address, hf_s5066_ad_size, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(s5066_tree_address, hf_s5066_ad_group, tvb, offset, 1, ENC_BIG_ENDIAN); addr = tvb_get_ntohl(tvb, offset); addr = addr & 0x1FFFFFFF; proto_tree_add_ipv4(s5066_tree_address, hf_s5066_ad_address, tvb, offset, 4, g_htonl(addr)); @@ -854,11 +854,11 @@ dissect_s5066_servicetype(tvbuff_t *tvb, guint offset, proto_tree *tree) ti = proto_tree_add_text(tree, tvb, offset, 2, "Service type"); s5066_tree_servicetype = proto_item_add_subtree(ti, ett_s5066_servicetype); - proto_tree_add_item(s5066_tree_servicetype, hf_s5066_st_txmode, tvb, offset, 1, FALSE); - proto_tree_add_item(s5066_tree_servicetype, hf_s5066_st_delivery_confirmation, tvb, offset, 1, FALSE); - proto_tree_add_item(s5066_tree_servicetype, hf_s5066_st_delivery_order, tvb, offset, 1, FALSE); - proto_tree_add_item(s5066_tree_servicetype, hf_s5066_st_extended, tvb, offset, 1, FALSE); offset++; - proto_tree_add_item(s5066_tree_servicetype, hf_s5066_st_retries, tvb, offset, 1, FALSE); + proto_tree_add_item(s5066_tree_servicetype, hf_s5066_st_txmode, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(s5066_tree_servicetype, hf_s5066_st_delivery_confirmation, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(s5066_tree_servicetype, hf_s5066_st_delivery_order, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(s5066_tree_servicetype, hf_s5066_st_extended, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; + proto_tree_add_item(s5066_tree_servicetype, hf_s5066_st_retries, tvb, offset, 1, ENC_BIG_ENDIAN); return offset; } @@ -867,12 +867,12 @@ dissect_s5066_servicetype(tvbuff_t *tvb, guint offset, proto_tree *tree) static guint dissect_s5066_01(tvbuff_t *tvb, guint offset, proto_tree *tree) { - proto_tree_add_item(tree, hf_s5066_01_sapid, tvb, offset, 1, FALSE); - proto_tree_add_item(tree, hf_s5066_01_rank, tvb, offset, 1, FALSE); offset++; + proto_tree_add_item(tree, hf_s5066_01_sapid, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_s5066_01_rank, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; offset = dissect_s5066_servicetype(tvb, offset, tree); - proto_tree_add_item(tree, hf_s5066_01_unused, tvb, offset, 1, FALSE); offset++; + proto_tree_add_item(tree, hf_s5066_01_unused, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; return offset; } @@ -889,9 +889,9 @@ dissect_s5066_02(tvbuff_t *tvb, guint offset, proto_tree *tree) static guint dissect_s5066_03(tvbuff_t *tvb, guint offset, proto_tree *tree) { - proto_tree_add_item(tree, hf_s5066_03_sapid, tvb, offset, 1, FALSE); - proto_tree_add_item(tree, hf_s5066_03_unused, tvb, offset, 1, FALSE); offset++; - proto_tree_add_item(tree, hf_s5066_03_mtu, tvb, offset, 2, FALSE); offset +=2; + proto_tree_add_item(tree, hf_s5066_03_sapid, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_s5066_03_unused, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; + proto_tree_add_item(tree, hf_s5066_03_mtu, tvb, offset, 2, ENC_BIG_ENDIAN); offset +=2; return offset; } @@ -899,7 +899,7 @@ dissect_s5066_03(tvbuff_t *tvb, guint offset, proto_tree *tree) static guint dissect_s5066_04(tvbuff_t *tvb, guint offset, proto_tree *tree) { - proto_tree_add_item(tree, hf_s5066_04_reason, tvb, offset, 1, FALSE); offset++; + proto_tree_add_item(tree, hf_s5066_04_reason, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; return offset; } @@ -907,7 +907,7 @@ dissect_s5066_04(tvbuff_t *tvb, guint offset, proto_tree *tree) static guint dissect_s5066_05(tvbuff_t *tvb, guint offset, proto_tree *tree) { - proto_tree_add_item(tree, hf_s5066_05_reason, tvb, offset, 1, FALSE); offset++; + proto_tree_add_item(tree, hf_s5066_05_reason, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; return offset; } @@ -915,9 +915,9 @@ dissect_s5066_05(tvbuff_t *tvb, guint offset, proto_tree *tree) static guint dissect_s5066_06(tvbuff_t *tvb, guint offset, proto_tree *tree) { - proto_tree_add_item(tree, hf_s5066_06_link_type, tvb, offset, 1, FALSE); - proto_tree_add_item(tree, hf_s5066_06_link_priority, tvb, offset, 1, FALSE); - proto_tree_add_item(tree, hf_s5066_06_sapid, tvb, offset, 1, FALSE); offset++; + proto_tree_add_item(tree, hf_s5066_06_link_type, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_s5066_06_link_priority, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_s5066_06_sapid, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; offset = dissect_s5066_address(tvb, offset, tree, FALSE); return offset; } @@ -934,10 +934,10 @@ dissect_s5066_07(tvbuff_t *tvb, guint offset, proto_tree *tree) static guint dissect_s5066_08(tvbuff_t *tvb, guint offset, proto_tree *tree) { - proto_tree_add_item(tree, hf_s5066_08_remote_status, tvb, offset, 1, FALSE); offset++; - proto_tree_add_item(tree, hf_s5066_08_link_type, tvb, offset, 1, FALSE); - proto_tree_add_item(tree, hf_s5066_08_link_priority, tvb, offset, 1, FALSE); - proto_tree_add_item(tree, hf_s5066_08_sapid, tvb, offset, 1, FALSE); offset++; + proto_tree_add_item(tree, hf_s5066_08_remote_status, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; + proto_tree_add_item(tree, hf_s5066_08_link_type, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_s5066_08_link_priority, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_s5066_08_sapid, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; offset = dissect_s5066_address(tvb, offset, tree, FALSE); return offset; } @@ -946,10 +946,10 @@ dissect_s5066_08(tvbuff_t *tvb, guint offset, proto_tree *tree) static guint dissect_s5066_09(tvbuff_t *tvb, guint offset, proto_tree *tree) { - proto_tree_add_item(tree, hf_s5066_09_reason, tvb, offset, 1, FALSE); offset++; - proto_tree_add_item(tree, hf_s5066_09_link_type, tvb, offset, 1, FALSE); - proto_tree_add_item(tree, hf_s5066_09_link_priority, tvb, offset, 1, FALSE); - proto_tree_add_item(tree, hf_s5066_09_sapid, tvb, offset, 1, FALSE); offset++; + proto_tree_add_item(tree, hf_s5066_09_reason, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; + proto_tree_add_item(tree, hf_s5066_09_link_type, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_s5066_09_link_priority, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_s5066_09_sapid, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; offset = dissect_s5066_address(tvb, offset, tree, FALSE); return offset; } @@ -958,10 +958,10 @@ dissect_s5066_09(tvbuff_t *tvb, guint offset, proto_tree *tree) static guint dissect_s5066_10(tvbuff_t *tvb, guint offset, proto_tree *tree) { - proto_tree_add_item(tree, hf_s5066_10_reason, tvb, offset, 1, FALSE); offset++; - proto_tree_add_item(tree, hf_s5066_10_link_type, tvb, offset, 1, FALSE); - proto_tree_add_item(tree, hf_s5066_10_link_priority, tvb, offset, 1, FALSE); - proto_tree_add_item(tree, hf_s5066_10_sapid, tvb, offset, 1, FALSE); offset++; + proto_tree_add_item(tree, hf_s5066_10_reason, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; + proto_tree_add_item(tree, hf_s5066_10_link_type, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_s5066_10_link_priority, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_s5066_10_sapid, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; offset = dissect_s5066_address(tvb, offset, tree, FALSE); return offset; } @@ -970,10 +970,10 @@ dissect_s5066_10(tvbuff_t *tvb, guint offset, proto_tree *tree) static guint dissect_s5066_11(tvbuff_t *tvb, guint offset, proto_tree *tree) { - proto_tree_add_item(tree, hf_s5066_11_remote_status, tvb, offset, 1, FALSE); offset++; - proto_tree_add_item(tree, hf_s5066_11_link_type, tvb, offset, 1, FALSE); - proto_tree_add_item(tree, hf_s5066_11_link_priority, tvb, offset, 1, FALSE); - proto_tree_add_item(tree, hf_s5066_11_sapid, tvb, offset, 1, FALSE); offset++; + proto_tree_add_item(tree, hf_s5066_11_remote_status, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; + proto_tree_add_item(tree, hf_s5066_11_link_type, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_s5066_11_link_priority, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_s5066_11_sapid, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; offset = dissect_s5066_address(tvb, offset, tree, FALSE); return offset; } @@ -982,9 +982,9 @@ dissect_s5066_11(tvbuff_t *tvb, guint offset, proto_tree *tree) static guint dissect_s5066_12(tvbuff_t *tvb, guint offset, proto_tree *tree) { - proto_tree_add_item(tree, hf_s5066_12_link_type, tvb, offset, 1, FALSE); - proto_tree_add_item(tree, hf_s5066_12_link_priority, tvb, offset, 1, FALSE); - proto_tree_add_item(tree, hf_s5066_12_sapid, tvb, offset, 1, FALSE); offset++; + proto_tree_add_item(tree, hf_s5066_12_link_type, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_s5066_12_link_priority, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_s5066_12_sapid, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; offset = dissect_s5066_address(tvb, offset, tree, FALSE); return offset; } @@ -993,10 +993,10 @@ dissect_s5066_12(tvbuff_t *tvb, guint offset, proto_tree *tree) static guint dissect_s5066_13(tvbuff_t *tvb, guint offset, proto_tree *tree) { - proto_tree_add_item(tree, hf_s5066_13_reason, tvb, offset, 1, FALSE); offset++; - proto_tree_add_item(tree, hf_s5066_13_link_type, tvb, offset, 1, FALSE); - proto_tree_add_item(tree, hf_s5066_13_link_priority, tvb, offset, 1, FALSE); - proto_tree_add_item(tree, hf_s5066_13_sapid, tvb, offset, 1, FALSE); offset++; + proto_tree_add_item(tree, hf_s5066_13_reason, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; + proto_tree_add_item(tree, hf_s5066_13_link_type, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_s5066_13_link_priority, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_s5066_13_sapid, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; offset = dissect_s5066_address(tvb, offset, tree, FALSE); return offset; } @@ -1005,8 +1005,8 @@ dissect_s5066_13(tvbuff_t *tvb, guint offset, proto_tree *tree) static guint dissect_s5066_14(tvbuff_t *tvb, guint offset, proto_tree *tree) { - proto_tree_add_item(tree, hf_s5066_14_status, tvb, offset, 1, FALSE); offset++; - proto_tree_add_item(tree, hf_s5066_14_reason, tvb, offset, 1, FALSE); offset++; + proto_tree_add_item(tree, hf_s5066_14_status, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; + proto_tree_add_item(tree, hf_s5066_14_reason, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; return offset; } @@ -1043,7 +1043,7 @@ static guint dissect_s5066_18(tvbuff_t *tvb, guint offset, proto_tree *tree, guint pdu_size) { guint body_size = 0; - proto_tree_add_item(tree, hf_s5066_18_type, tvb, offset, 1, FALSE); offset++; + proto_tree_add_item(tree, hf_s5066_18_type, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; body_size = pdu_size - offset; proto_tree_add_item(tree, hf_s5066_18_body, tvb, offset, body_size, ENC_NA); offset += body_size; return offset; @@ -1054,7 +1054,7 @@ static guint dissect_s5066_19(tvbuff_t *tvb, guint offset, proto_tree *tree, guint pdu_size) { guint body_size = 0; - proto_tree_add_item(tree, hf_s5066_19_type, tvb, offset, 1, FALSE); offset++; + proto_tree_add_item(tree, hf_s5066_19_type, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; body_size = pdu_size - offset; proto_tree_add_item(tree, hf_s5066_19_body, tvb, offset, body_size, ENC_NA); offset += body_size; return offset; @@ -1064,12 +1064,12 @@ dissect_s5066_19(tvbuff_t *tvb, guint offset, proto_tree *tree, guint pdu_size) static guint dissect_s5066_20(tvbuff_t *tvb, guint offset, proto_tree *tree) { - proto_tree_add_item(tree, hf_s5066_20_priority, tvb, offset, 1, FALSE); - proto_tree_add_item(tree, hf_s5066_20_sapid, tvb, offset, 1, FALSE); offset++; + proto_tree_add_item(tree, hf_s5066_20_priority, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_s5066_20_sapid, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; offset = dissect_s5066_address(tvb, offset, tree, FALSE); offset = dissect_s5066_servicetype(tvb, offset, tree); - proto_tree_add_item(tree, hf_s5066_20_ttl, tvb, offset, 3, FALSE); offset += 3; - proto_tree_add_item(tree, hf_s5066_20_size, tvb, offset, 2, FALSE); offset += 2; + proto_tree_add_item(tree, hf_s5066_20_ttl, tvb, offset, 3, ENC_BIG_ENDIAN); offset += 3; + proto_tree_add_item(tree, hf_s5066_20_size, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; return offset; } @@ -1086,8 +1086,8 @@ dissect_s5066_21(tvbuff_t *tvb, guint offset, proto_tree *tree, guint pdu_size) guint16 no_nrx_blocks = 0; gboolean non_arq_w_errors = FALSE; - proto_tree_add_item(tree, hf_s5066_21_priority, tvb, offset, 1, FALSE); - proto_tree_add_item(tree, hf_s5066_21_dest_sapid, tvb, offset, 1, FALSE); offset++; + proto_tree_add_item(tree, hf_s5066_21_priority, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_s5066_21_dest_sapid, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; offset = dissect_s5066_address(tvb, offset, tree, FALSE); tx_mode = tvb_get_guint8(tvb, offset); @@ -1096,33 +1096,33 @@ dissect_s5066_21(tvbuff_t *tvb, guint offset, proto_tree *tree, guint pdu_size) non_arq_w_errors = TRUE; } - proto_tree_add_item(tree, hf_s5066_21_tx_mode, tvb, offset, 1, FALSE); - proto_tree_add_item(tree, hf_s5066_21_src_sapid, tvb, offset, 1, FALSE); offset++; + proto_tree_add_item(tree, hf_s5066_21_tx_mode, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_s5066_21_src_sapid, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; offset = dissect_s5066_address(tvb, offset, tree, TRUE); d_pdu_size = tvb_get_ntohs(tvb, offset); - proto_tree_add_item(tree, hf_s5066_21_size, tvb, offset, 2, FALSE); offset += 2; + proto_tree_add_item(tree, hf_s5066_21_size, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; /* Handle RockwellCollins (<= v2.1) 4-byte offset */ if ( (pdu_size - offset) == (d_pdu_size + 4) ) { - ti = proto_tree_add_item(tree, hf_s5066_21_err_blocks, tvb, offset, 2, FALSE); offset += 2; + ti = proto_tree_add_item(tree, hf_s5066_21_err_blocks, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; proto_item_append_text(ti, ", (Field should not be present. Rockwell Collins v2.1 or earlier.) "); - ti = proto_tree_add_item(tree, hf_s5066_21_nrx_blocks, tvb, offset, 2, FALSE); offset += 2; + ti = proto_tree_add_item(tree, hf_s5066_21_nrx_blocks, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; proto_item_append_text(ti, ", (Field should not be present. Rockwell Collins v2.1 or earlier.) "); } /* Handle Non-ARQ with errors */ if ( non_arq_w_errors ) { no_err_blocks = tvb_get_ntohs(tvb, offset); - proto_tree_add_item(tree, hf_s5066_21_err_blocks, tvb, offset, 2, FALSE); offset += 2; + proto_tree_add_item(tree, hf_s5066_21_err_blocks, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; for (i=0; i<no_err_blocks; i++) { - proto_tree_add_item(tree, hf_s5066_21_err_ptr, tvb, offset, 2, FALSE); offset += 2; - proto_tree_add_item(tree, hf_s5066_21_err_size, tvb, offset, 2, FALSE); offset += 2; + proto_tree_add_item(tree, hf_s5066_21_err_ptr, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; + proto_tree_add_item(tree, hf_s5066_21_err_size, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; } no_nrx_blocks = tvb_get_ntohs(tvb, offset); - proto_tree_add_item(tree, hf_s5066_21_nrx_blocks, tvb, offset, 2, FALSE); offset += 2; + proto_tree_add_item(tree, hf_s5066_21_nrx_blocks, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; for (i=0; i<no_nrx_blocks; i++) { - proto_tree_add_item(tree, hf_s5066_21_nrx_ptr, tvb, offset, 2, FALSE); offset += 2; - proto_tree_add_item(tree, hf_s5066_21_nrx_size, tvb, offset, 2, FALSE); offset += 2; + proto_tree_add_item(tree, hf_s5066_21_nrx_ptr, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; + proto_tree_add_item(tree, hf_s5066_21_nrx_size, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; } } return offset; @@ -1133,11 +1133,11 @@ static guint dissect_s5066_22(tvbuff_t *tvb, guint offset, proto_tree *tree) { guint pdu_size = 0; - proto_tree_add_item(tree, hf_s5066_22_unused, tvb, offset, 1, FALSE); - proto_tree_add_item(tree, hf_s5066_22_sapid, tvb, offset, 1, FALSE); offset++; + proto_tree_add_item(tree, hf_s5066_22_unused, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_s5066_22_sapid, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; offset = dissect_s5066_address(tvb, offset, tree, FALSE); pdu_size = tvb_get_ntohs(tvb, offset); - proto_tree_add_item(tree, hf_s5066_22_size, tvb, offset, 2, FALSE); offset += 2; + proto_tree_add_item(tree, hf_s5066_22_size, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(tree, hf_s5066_22_data, tvb, offset, pdu_size, ENC_NA); offset += pdu_size; return offset; @@ -1148,11 +1148,11 @@ static guint dissect_s5066_23(tvbuff_t *tvb, guint offset, proto_tree *tree) { guint pdu_size = 0; - proto_tree_add_item(tree, hf_s5066_23_reason, tvb, offset, 1, FALSE); - proto_tree_add_item(tree, hf_s5066_23_sapid, tvb, offset, 1, FALSE); offset++; + proto_tree_add_item(tree, hf_s5066_23_reason, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_s5066_23_sapid, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; offset = dissect_s5066_address(tvb, offset, tree, FALSE); pdu_size = tvb_get_ntohs(tvb, offset); - proto_tree_add_item(tree, hf_s5066_23_size, tvb, offset, 2, FALSE); offset += 2; + proto_tree_add_item(tree, hf_s5066_23_size, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(tree, hf_s5066_23_data, tvb, offset, pdu_size, ENC_NA); offset += pdu_size; return offset; @@ -1162,12 +1162,12 @@ dissect_s5066_23(tvbuff_t *tvb, guint offset, proto_tree *tree) static guint dissect_s5066_24(tvbuff_t *tvb, guint offset, proto_tree *tree) { - proto_tree_add_item(tree, hf_s5066_24_unused, tvb, offset, 1, FALSE); - proto_tree_add_item(tree, hf_s5066_24_sapid, tvb, offset, 1, FALSE); offset++; + proto_tree_add_item(tree, hf_s5066_24_unused, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_s5066_24_sapid, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; offset = dissect_s5066_address(tvb, offset, tree, FALSE); offset = dissect_s5066_servicetype(tvb, offset, tree); - proto_tree_add_item(tree, hf_s5066_24_ttl, tvb, offset, 3, FALSE); offset += 3; - proto_tree_add_item(tree, hf_s5066_24_size, tvb, offset, 2, FALSE); offset += 2; + proto_tree_add_item(tree, hf_s5066_24_ttl, tvb, offset, 3, ENC_BIG_ENDIAN); offset += 3; + proto_tree_add_item(tree, hf_s5066_24_size, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; return offset; } @@ -1184,8 +1184,8 @@ dissect_s5066_25(tvbuff_t *tvb, guint offset, proto_tree *tree, guint pdu_size) guint16 no_nrx_blocks = 0; gboolean non_arq_w_errors = FALSE; - proto_tree_add_item(tree, hf_s5066_25_unused, tvb, offset, 1, FALSE); - proto_tree_add_item(tree, hf_s5066_25_dest_sapid, tvb, offset, 1, FALSE); offset++; + proto_tree_add_item(tree, hf_s5066_25_unused, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_s5066_25_dest_sapid, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; offset = dissect_s5066_address(tvb, offset, tree, FALSE); tx_mode = tvb_get_guint8(tvb, offset); @@ -1194,33 +1194,33 @@ dissect_s5066_25(tvbuff_t *tvb, guint offset, proto_tree *tree, guint pdu_size) non_arq_w_errors = TRUE; } - proto_tree_add_item(tree, hf_s5066_25_tx_mode, tvb, offset, 1, FALSE); - proto_tree_add_item(tree, hf_s5066_25_src_sapid, tvb, offset, 1, FALSE); offset++; + proto_tree_add_item(tree, hf_s5066_25_tx_mode, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_s5066_25_src_sapid, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; offset = dissect_s5066_address(tvb, offset, tree, TRUE); d_pdu_size = tvb_get_ntohs(tvb, offset); - proto_tree_add_item(tree, hf_s5066_25_size, tvb, offset, 2, FALSE); offset += 2; + proto_tree_add_item(tree, hf_s5066_25_size, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; /* Handle RockwellCollins (<= v2.1) 4-byte offset */ if ( (pdu_size - offset) == (d_pdu_size + 4) ) { - ti = proto_tree_add_item(tree, hf_s5066_25_err_blocks, tvb, offset, 2, FALSE); offset += 2; + ti = proto_tree_add_item(tree, hf_s5066_25_err_blocks, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; proto_item_append_text(ti, ", (Field should not be present. Rockwell Collins v2.1 or earlier.) "); - ti = proto_tree_add_item(tree, hf_s5066_25_nrx_blocks, tvb, offset, 2, FALSE); offset += 2; + ti = proto_tree_add_item(tree, hf_s5066_25_nrx_blocks, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; proto_item_append_text(ti, ", (Field should not be present. Rockwell Collins v2.1 or earlier.) "); } /* Handle Non-ARQ with errors */ if ( non_arq_w_errors ) { no_err_blocks = tvb_get_ntohs(tvb, offset); - proto_tree_add_item(tree, hf_s5066_25_err_blocks, tvb, offset, 2, FALSE); offset += 2; + proto_tree_add_item(tree, hf_s5066_25_err_blocks, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; for (i=0; i<no_err_blocks; i++) { - proto_tree_add_item(tree, hf_s5066_25_err_ptr, tvb, offset, 2, FALSE); offset += 2; - proto_tree_add_item(tree, hf_s5066_25_err_size, tvb, offset, 2, FALSE); offset += 2; + proto_tree_add_item(tree, hf_s5066_25_err_ptr, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; + proto_tree_add_item(tree, hf_s5066_25_err_size, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; } no_nrx_blocks = tvb_get_ntohs(tvb, offset); - proto_tree_add_item(tree, hf_s5066_25_nrx_blocks, tvb, offset, 2, FALSE); offset += 2; + proto_tree_add_item(tree, hf_s5066_25_nrx_blocks, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; for (i=0; i<no_nrx_blocks; i++) { - proto_tree_add_item(tree, hf_s5066_25_nrx_ptr, tvb, offset, 2, FALSE); offset += 2; - proto_tree_add_item(tree, hf_s5066_25_nrx_size, tvb, offset, 2, FALSE); offset += 2; + proto_tree_add_item(tree, hf_s5066_25_nrx_ptr, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; + proto_tree_add_item(tree, hf_s5066_25_nrx_size, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; } } return offset; @@ -1231,11 +1231,11 @@ static guint dissect_s5066_26(tvbuff_t *tvb, guint offset, proto_tree *tree) { guint pdu_size = 0; - proto_tree_add_item(tree, hf_s5066_26_unused, tvb, offset, 1, FALSE); - proto_tree_add_item(tree, hf_s5066_26_sapid, tvb, offset, 1, FALSE); offset++; + proto_tree_add_item(tree, hf_s5066_26_unused, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_s5066_26_sapid, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; offset = dissect_s5066_address(tvb, offset, tree, FALSE); pdu_size = tvb_get_ntohs(tvb, offset); - proto_tree_add_item(tree, hf_s5066_26_size, tvb, offset, 2, FALSE); offset += 2; + proto_tree_add_item(tree, hf_s5066_26_size, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(tree, hf_s5066_26_data, tvb, offset, pdu_size, ENC_NA); offset += pdu_size; return offset; @@ -1246,11 +1246,11 @@ static guint dissect_s5066_27(tvbuff_t *tvb, guint offset, proto_tree *tree) { guint pdu_size = 0; - proto_tree_add_item(tree, hf_s5066_27_reason, tvb, offset, 1, FALSE); - proto_tree_add_item(tree, hf_s5066_27_sapid, tvb, offset, 1, FALSE); offset++; + proto_tree_add_item(tree, hf_s5066_27_reason, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_s5066_27_sapid, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; offset = dissect_s5066_address(tvb, offset, tree, FALSE); pdu_size = tvb_get_ntohs(tvb, offset); - proto_tree_add_item(tree, hf_s5066_27_size, tvb, offset, 2, FALSE); offset += 2; + proto_tree_add_item(tree, hf_s5066_27_size, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(tree, hf_s5066_27_data, tvb, offset, pdu_size, ENC_NA); offset += pdu_size; return offset; @@ -1314,12 +1314,12 @@ dissect_s5066_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ti_s5066 = proto_tree_add_item(tree, proto_s5066, tvb, 0, -1, FALSE); proto_item_append_text(ti_s5066, ", PDU type %s", val_to_str(pdu_type, s5066_pdu_type, "Unknown (0x%02x)")); s5066_tree = proto_item_add_subtree(ti_s5066, ett_s5066); - proto_tree_add_item(s5066_tree, hf_s5066_sync_word, tvb, offset, 2, FALSE); offset +=2; + proto_tree_add_item(s5066_tree, hf_s5066_sync_word, tvb, offset, 2, ENC_BIG_ENDIAN); offset +=2; if (!s5066_edition_one) { - proto_tree_add_item(s5066_tree, hf_s5066_version, tvb, offset, 1, FALSE); offset++; + proto_tree_add_item(s5066_tree, hf_s5066_version, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; } - proto_tree_add_item(s5066_tree, hf_s5066_size, tvb, offset, 2, FALSE); offset +=2; - ti_pdu = proto_tree_add_item(s5066_tree, hf_s5066_type, tvb, offset, 1, FALSE); offset++; + proto_tree_add_item(s5066_tree, hf_s5066_size, tvb, offset, 2, ENC_BIG_ENDIAN); offset +=2; + ti_pdu = proto_tree_add_item(s5066_tree, hf_s5066_type, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; s5066_tree_pdu = proto_item_add_subtree(ti_pdu, ett_s5066_pdu); switch (pdu_type) { case 1: offset = dissect_s5066_01(tvb, offset, s5066_tree_pdu); break; diff --git a/epan/dissectors/packet-sasp.c b/epan/dissectors/packet-sasp.c index beafb78e2b..5b6393a34b 100644 --- a/epan/dissectors/packet-sasp.c +++ b/epan/dissectors/packet-sasp.c @@ -397,27 +397,27 @@ dissect_sasp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset+=2; /*length*/ - proto_tree_add_item(sasp_tree,hf_sasp_length,tvb,offset,2,FALSE); + proto_tree_add_item(sasp_tree,hf_sasp_length,tvb,offset,2,ENC_BIG_ENDIAN); offset+=2; /*Header Version */ - proto_tree_add_item(sasp_tree,hf_sasp_vrsn,tvb,offset,1,FALSE); + proto_tree_add_item(sasp_tree,hf_sasp_vrsn,tvb,offset,1,ENC_BIG_ENDIAN); offset++; /*Message*/ msg_tree = proto_item_add_subtree(ti,ett_sasp_msg); /*Message Len*/ - proto_tree_add_item(msg_tree,hf_msg_len,tvb,offset,4,FALSE); + proto_tree_add_item(msg_tree,hf_msg_len,tvb,offset,4,ENC_BIG_ENDIAN); offset+=4; /*Message Id*/ - proto_tree_add_item(msg_tree,hf_msg_id,tvb,offset,4,FALSE); + proto_tree_add_item(msg_tree,hf_msg_id,tvb,offset,4,ENC_BIG_ENDIAN); offset+=4; /*Message Type*/ msg_type = tvb_get_ntohs(tvb, offset); - mti = proto_tree_add_item(msg_tree,hf_msg_type,tvb,offset,2,FALSE); + mti = proto_tree_add_item(msg_tree,hf_msg_type,tvb,offset,2,ENC_BIG_ENDIAN); pay_load = proto_item_add_subtree(ti,ett_sasp_payload); offset+=2; @@ -526,7 +526,7 @@ static void dissect_reg_req(tvbuff_t *tvb,proto_tree *pay_load,guint32 offset) reg_req_data = proto_item_add_subtree(reg_tree, ett_sasp_reg_req_sz); /* Reg Req Size */ - proto_tree_add_item(reg_req_data, hf_sasp_reg_req_sz, tvb, offset, 2, FALSE); + proto_tree_add_item(reg_req_data, hf_sasp_reg_req_sz, tvb, offset, 2, ENC_BIG_ENDIAN); offset+=2; /* Reg Req LB Flag */ @@ -536,7 +536,7 @@ static void dissect_reg_req(tvbuff_t *tvb,proto_tree *pay_load,guint32 offset) gmd_cnt=tvb_get_ntohs(tvb, offset); /* Group MEM Data Count */ - proto_tree_add_item(reg_req_data,hf_sasp_gmd_cnt,tvb,offset,2,FALSE); + proto_tree_add_item(reg_req_data,hf_sasp_gmd_cnt,tvb,offset,2,ENC_BIG_ENDIAN); offset+=2; for( i=0; i<gmd_cnt; i++) @@ -558,11 +558,11 @@ static void dissect_reg_rep(tvbuff_t *tvb, proto_tree *pay_load,guint32 offset) reg_rep_tree = proto_item_add_subtree(reg_rep,ett_sasp_reg_rep); /* Size */ - proto_tree_add_item(reg_rep_tree, hf_sasp_reg_rep_sz, tvb, offset,2, FALSE); + proto_tree_add_item(reg_rep_tree, hf_sasp_reg_rep_sz, tvb, offset,2, ENC_BIG_ENDIAN); offset+=2; /* Response Code */ - proto_tree_add_item(reg_rep_tree, hf_sasp_reg_rep_rcode,tvb,offset,1,FALSE); + proto_tree_add_item(reg_rep_tree, hf_sasp_reg_rep_rcode,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1; } @@ -592,7 +592,7 @@ static void dissect_dereg_req(tvbuff_t *tvb,proto_tree *pay_load,guint32 offset) dereg_req_data = proto_item_add_subtree(dereg_tree,ett_sasp_dereg_req_sz); /* Size */ - proto_tree_add_item(dereg_req_data, hf_sasp_dereg_req_sz, tvb, offset, 2, FALSE); + proto_tree_add_item(dereg_req_data, hf_sasp_dereg_req_sz, tvb, offset, 2, ENC_BIG_ENDIAN); offset+=2; /* LB Flag */ @@ -628,7 +628,7 @@ static void dissect_dereg_req(tvbuff_t *tvb,proto_tree *pay_load,guint32 offset) gmd_cnt = tvb_get_ntohs(tvb, offset); /* Group Mem Data Count */ - proto_tree_add_item(dereg_req_data,hf_sasp_gmd_cnt,tvb,offset,2,FALSE); + proto_tree_add_item(dereg_req_data,hf_sasp_gmd_cnt,tvb,offset,2,ENC_BIG_ENDIAN); offset+=2; /*Group Mem Data */ @@ -651,11 +651,11 @@ static void dissect_dereg_rep(tvbuff_t *tvb, proto_tree *pay_load,guint32 offset dereg_rep_tree = proto_item_add_subtree(dereg_rep,ett_sasp_dereg_rep); /* Size */ - proto_tree_add_item(dereg_rep_tree, hf_sasp_dereg_rep_sz, tvb, offset,2, FALSE); + proto_tree_add_item(dereg_rep_tree, hf_sasp_dereg_rep_sz, tvb, offset,2, ENC_BIG_ENDIAN); offset+=2; /* Return Code */ - proto_tree_add_item(dereg_rep_tree, hf_sasp_dereg_rep_rcode,tvb,offset,1,FALSE); + proto_tree_add_item(dereg_rep_tree, hf_sasp_dereg_rep_rcode,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1; } @@ -673,13 +673,13 @@ static void dissect_sendwt(tvbuff_t *tvb,proto_tree *pay_load,guint32 offset) sendwt_tree = proto_item_add_subtree(sendwt,ett_sasp_sendwt); /* Size */ - proto_tree_add_item(sendwt_tree, hf_sasp_sendwt_sz, tvb, offset,2, FALSE); + proto_tree_add_item(sendwt_tree, hf_sasp_sendwt_sz, tvb, offset,2, ENC_BIG_ENDIAN); offset+=2; gwed_cnt=tvb_get_ntohs(tvb, offset); /* Group Wt Entry Data Count */ - proto_tree_add_item(sendwt_tree, hf_sasp_sendwt_gwedcnt,tvb,offset,2,FALSE); + proto_tree_add_item(sendwt_tree, hf_sasp_sendwt_gwedcnt,tvb,offset,2,ENC_BIG_ENDIAN); offset+=2; for( i=0; i<gwed_cnt; i++) @@ -703,7 +703,7 @@ static void dissect_setmemstate_req(tvbuff_t *tvb,proto_tree *pay_load,guint32 o setmemstate_req_data = proto_item_add_subtree(setmemstate,ett_sasp_setmemstate_req); /* Size */ - proto_tree_add_item(setmemstate_req_data, hf_sasp_setmemstate_req_sz, tvb, offset, 2, FALSE); + proto_tree_add_item(setmemstate_req_data, hf_sasp_setmemstate_req_sz, tvb, offset, 2, ENC_BIG_ENDIAN); offset+=2; /*LB Flag*/ @@ -712,7 +712,7 @@ static void dissect_setmemstate_req(tvbuff_t *tvb,proto_tree *pay_load,guint32 o /*Group Data Count*/ gmsd_cnt=tvb_get_ntohs(tvb, offset); - proto_tree_add_item(setmemstate_req_data,hf_sasp_setmemstate_req_gmsd_cnt,tvb,offset,2,FALSE); + proto_tree_add_item(setmemstate_req_data,hf_sasp_setmemstate_req_gmsd_cnt,tvb,offset,2,ENC_BIG_ENDIAN); offset+=2; for( i=0; i<gmsd_cnt; i++) @@ -734,11 +734,11 @@ static void dissect_setmemstate_rep(tvbuff_t *tvb,proto_tree *pay_load,guint32 o setmemstate_rep_tree = proto_item_add_subtree(setmemstate_rep,ett_sasp_setmemstate_rep); /* Size */ - proto_tree_add_item(setmemstate_rep_tree, hf_sasp_setmemstate_rep_sz, tvb, offset,2, FALSE); + proto_tree_add_item(setmemstate_rep_tree, hf_sasp_setmemstate_rep_sz, tvb, offset,2, ENC_BIG_ENDIAN); offset+=2; /* Response Code */ - proto_tree_add_item(setmemstate_rep_tree, hf_sasp_setmemstate_rep_rcode,tvb,offset,1,FALSE); + proto_tree_add_item(setmemstate_rep_tree, hf_sasp_setmemstate_rep_rcode,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1; } @@ -764,19 +764,19 @@ static guint32 dissect_memdatacomp(tvbuff_t *tvb, proto_tree *pay_load,guint32 o /* Message Type */ - proto_tree_add_item(memdatacomp_tree, hf_sasp_memdatacomp_type, tvb, offset,2, FALSE); + proto_tree_add_item(memdatacomp_tree, hf_sasp_memdatacomp_type, tvb, offset,2, ENC_BIG_ENDIAN); offset+=2; /* Size */ - proto_tree_add_item(memdatacomp_tree, hf_sasp_memdatacomp_sz, tvb, offset,2, FALSE); + proto_tree_add_item(memdatacomp_tree, hf_sasp_memdatacomp_sz, tvb, offset,2, ENC_BIG_ENDIAN); offset+=2; /* Protocol */ - proto_tree_add_item(memdatacomp_tree, hf_sasp_memdatacomp_protocol,tvb,offset,1,FALSE); + proto_tree_add_item(memdatacomp_tree, hf_sasp_memdatacomp_protocol,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1; /* Port */ - proto_tree_add_item(memdatacomp_tree, hf_sasp_memdatacomp_port, tvb, offset,2, FALSE); + proto_tree_add_item(memdatacomp_tree, hf_sasp_memdatacomp_port, tvb, offset,2, ENC_BIG_ENDIAN); offset+=2; /*Ip*/ @@ -785,7 +785,7 @@ static guint32 dissect_memdatacomp(tvbuff_t *tvb, proto_tree *pay_load,guint32 o /*Label Len*/ - proto_tree_add_item(memdatacomp_tree, hf_sasp_memdatacomp_lab_len,tvb,offset,1,FALSE); + proto_tree_add_item(memdatacomp_tree, hf_sasp_memdatacomp_lab_len,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1; /*Label*/ @@ -812,17 +812,17 @@ static guint32 dissect_grpdatacomp(tvbuff_t *tvb, proto_tree *pay_load,guint32 o grpdatacomp_tree = proto_item_add_subtree(grpdatacomp,ett_sasp_grpdatacomp); /*Type*/ - proto_tree_add_item(grpdatacomp_tree, hf_sasp_grpdatacomp, tvb, offset,2, FALSE); + proto_tree_add_item(grpdatacomp_tree, hf_sasp_grpdatacomp, tvb, offset,2, ENC_BIG_ENDIAN); offset+=2; /*Size*/ - proto_tree_add_item(grpdatacomp_tree, hf_sasp_grpdatacomp_sz, tvb, offset,2, FALSE); + proto_tree_add_item(grpdatacomp_tree, hf_sasp_grpdatacomp_sz, tvb, offset,2, ENC_BIG_ENDIAN); offset+=2; LB_uid_len = tvb_get_guint8(tvb, offset); /* LB UID Len*/ - proto_tree_add_item(grpdatacomp_tree, hf_sasp_grpdatacomp_LB_uid_len, tvb, offset,1, FALSE); + proto_tree_add_item(grpdatacomp_tree, hf_sasp_grpdatacomp_LB_uid_len, tvb, offset,1, ENC_BIG_ENDIAN); offset+=1; proto_tree_add_item(grpdatacomp_tree, hf_sasp_grpdatacomp_LB_uid, tvb,offset,LB_uid_len,FALSE); @@ -833,7 +833,7 @@ static guint32 dissect_grpdatacomp(tvbuff_t *tvb, proto_tree *pay_load,guint32 o /*Group Name Len */ - proto_tree_add_item(grpdatacomp_tree, hf_sasp_grpdatacomp_grp_name_len,tvb,offset,1,FALSE); + proto_tree_add_item(grpdatacomp_tree, hf_sasp_grpdatacomp_grp_name_len,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1; /*Group Name*/ @@ -857,17 +857,17 @@ static guint32 dissect_grp_memdatacomp(tvbuff_t *tvb,proto_tree *pay_load,guint3 grp_memdatacomp_tree = proto_item_add_subtree(grp_memdatacomp,ett_sasp_grp_memdatacomp); /* Group MEM Data */ - proto_tree_add_item(grp_memdatacomp_tree, hf_sasp_grp_memdatacomp, tvb, offset,2, FALSE); + proto_tree_add_item(grp_memdatacomp_tree, hf_sasp_grp_memdatacomp, tvb, offset,2, ENC_BIG_ENDIAN); offset+=2; /* Group MEM Data Size*/ - proto_tree_add_item(grp_memdatacomp_tree, hf_sasp_grp_memdatacomp_sz, tvb, offset,2, FALSE); + proto_tree_add_item(grp_memdatacomp_tree, hf_sasp_grp_memdatacomp_sz, tvb, offset,2, ENC_BIG_ENDIAN); offset+=2; mem_cnt=tvb_get_ntohs(tvb, offset); /* Group MEM Data Count*/ - proto_tree_add_item(grp_memdatacomp_tree, hf_sasp_grp_memdatacomp_cnt,tvb,offset,2,FALSE); + proto_tree_add_item(grp_memdatacomp_tree, hf_sasp_grp_memdatacomp_cnt,tvb,offset,2,ENC_BIG_ENDIAN); offset+=2; offset = dissect_grpdatacomp(tvb,grp_memdatacomp_tree, offset); @@ -897,13 +897,13 @@ static void dissect_wt_req(tvbuff_t *tvb,proto_tree *pay_load,guint32 offset) get_wt_tree = proto_item_add_subtree(get_wt_data,ett_sasp_getwt); /* Size */ - proto_tree_add_item(get_wt_tree, hf_sasp_wt_req_sz, tvb, offset, 2, FALSE); + proto_tree_add_item(get_wt_tree, hf_sasp_wt_req_sz, tvb, offset, 2, ENC_BIG_ENDIAN); offset+=2; gd_cnt=tvb_get_ntohs(tvb, offset); /* Group Data Count */ - proto_tree_add_item(get_wt_tree,hf_sasp_wt_req_gd_cnt,tvb,offset,2,FALSE); + proto_tree_add_item(get_wt_tree,hf_sasp_wt_req_gd_cnt,tvb,offset,2,ENC_BIG_ENDIAN); offset+=2; for( i=0; i<gd_cnt; i++) @@ -926,22 +926,22 @@ static void dissect_wt_rep(tvbuff_t *tvb,proto_tree *pay_load,guint32 offset) wt_rep_tree = proto_item_add_subtree(wt_rep,ett_sasp_wt_rep); /* Size */ - proto_tree_add_item(wt_rep_tree, hf_sasp_wt_rep_sz, tvb, offset,2, FALSE); + proto_tree_add_item(wt_rep_tree, hf_sasp_wt_rep_sz, tvb, offset,2, ENC_BIG_ENDIAN); offset+=2; /* Response Code */ - proto_tree_add_item(wt_rep_tree, hf_sasp_wt_rep_rcode,tvb,offset,1,FALSE); + proto_tree_add_item(wt_rep_tree, hf_sasp_wt_rep_rcode,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1; /* Interval */ - proto_tree_add_item(wt_rep_tree, hf_sasp_wt_rep_interval,tvb,offset,2,FALSE); + proto_tree_add_item(wt_rep_tree, hf_sasp_wt_rep_interval,tvb,offset,2,ENC_BIG_ENDIAN); offset+=2; gwed_cnt=tvb_get_ntohs(tvb, offset); /* Count of Group of Wt Entry Data */ - proto_tree_add_item(wt_rep_tree,hf_sasp_wt_rep_gwed_cnt,tvb,offset,2,FALSE); + proto_tree_add_item(wt_rep_tree,hf_sasp_wt_rep_gwed_cnt,tvb,offset,2,ENC_BIG_ENDIAN); offset+=2; @@ -974,14 +974,14 @@ static void dissect_setlbstate_req(tvbuff_t *tvb,proto_tree *pay_load,guint32 of setlbstate_req_tree = proto_item_add_subtree(setlbstate_req,ett_sasp_setlbstate_req); /* Size*/ - proto_tree_add_item(setlbstate_req_tree, hf_sasp_setlbstate_req_sz, tvb, offset,2, FALSE); + proto_tree_add_item(setlbstate_req_tree, hf_sasp_setlbstate_req_sz, tvb, offset,2, ENC_BIG_ENDIAN); offset+=2; LB_uid_len = tvb_get_guint8(tvb, offset); /* LB UID Len */ - proto_tree_add_item(setlbstate_req_tree, hf_sasp_setlbstate_req_LB_uid_len, tvb, offset,1, FALSE); + proto_tree_add_item(setlbstate_req_tree, hf_sasp_setlbstate_req_LB_uid_len, tvb, offset,1, ENC_BIG_ENDIAN); offset+=1; /*LB UID*/ @@ -989,7 +989,7 @@ static void dissect_setlbstate_req(tvbuff_t *tvb,proto_tree *pay_load,guint32 of offset+=(guint8)LB_uid_len; /*LB Health*/ - proto_tree_add_item(setlbstate_req_tree, hf_sasp_setlbstate_req_LB_health, tvb, offset,1, FALSE); + proto_tree_add_item(setlbstate_req_tree, hf_sasp_setlbstate_req_LB_health, tvb, offset,1, ENC_BIG_ENDIAN); offset += 1; @@ -1015,11 +1015,11 @@ static void dissect_setlbstate_rep(tvbuff_t *tvb,proto_tree *pay_load,guint32 of /* Size */ - proto_tree_add_item(setlbstate_rep_tree, hf_sasp_setlbstate_rep_sz, tvb, offset,2, FALSE); + proto_tree_add_item(setlbstate_rep_tree, hf_sasp_setlbstate_rep_sz, tvb, offset,2, ENC_BIG_ENDIAN); offset+=2; /* Response Code */ - proto_tree_add_item(setlbstate_rep_tree, hf_sasp_setlbstate_rep_rcode,tvb,offset,1,FALSE); + proto_tree_add_item(setlbstate_rep_tree, hf_sasp_setlbstate_rep_rcode,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1; } @@ -1040,17 +1040,17 @@ static guint32 dissect_grp_memstatedatacomp(tvbuff_t *tvb,proto_tree *pay_load,g grp_memstatedatacomp_tree = proto_item_add_subtree(grp_memstatedatacomp,ett_sasp_grp_memstatedatacomp); /* Type */ - proto_tree_add_item(grp_memstatedatacomp_tree, hf_sasp_grp_memstatedatacomp, tvb, offset,2, FALSE); + proto_tree_add_item(grp_memstatedatacomp_tree, hf_sasp_grp_memstatedatacomp, tvb, offset,2, ENC_BIG_ENDIAN); offset+=2; /* Size */ - proto_tree_add_item(grp_memstatedatacomp_tree, hf_sasp_grp_memstatedatacomp_sz, tvb, offset,2, FALSE); + proto_tree_add_item(grp_memstatedatacomp_tree, hf_sasp_grp_memstatedatacomp_sz, tvb, offset,2, ENC_BIG_ENDIAN); offset+=2; mem_cnt=tvb_get_ntohs(tvb, offset); /* Count */ - proto_tree_add_item(grp_memstatedatacomp_tree, hf_sasp_grp_memstatedatacomp_cnt,tvb,offset,2,FALSE); + proto_tree_add_item(grp_memstatedatacomp_tree, hf_sasp_grp_memstatedatacomp_cnt,tvb,offset,2,ENC_BIG_ENDIAN); offset+=2; /* Group Data TLV */ @@ -1080,15 +1080,15 @@ static guint32 dissect_memstatedatacomp(tvbuff_t *tvb,proto_tree *pay_load,guint memstatedatacomp_tree = proto_item_add_subtree(memstatedatacomp, ett_sasp_memstatedatacomp); /* Type */ - proto_tree_add_item(memstatedatacomp_tree, hf_sasp_memstatedatacomp_instance, tvb, offset,2, FALSE); + proto_tree_add_item(memstatedatacomp_tree, hf_sasp_memstatedatacomp_instance, tvb, offset,2, ENC_BIG_ENDIAN); offset+=2; /* Size */ - proto_tree_add_item(memstatedatacomp_tree, hf_sasp_memstatedatacomp_sz, tvb, offset,2, FALSE); + proto_tree_add_item(memstatedatacomp_tree, hf_sasp_memstatedatacomp_sz, tvb, offset,2, ENC_BIG_ENDIAN); offset+=2; /* State */ - proto_tree_add_item(memstatedatacomp_tree, hf_sasp_memstatedatacomp_state, tvb, offset,1, FALSE); + proto_tree_add_item(memstatedatacomp_tree, hf_sasp_memstatedatacomp_state, tvb, offset,1, ENC_BIG_ENDIAN); offset+=1; /* Quiesce flag*/ @@ -1122,15 +1122,15 @@ static guint32 dissect_weight_entry_data_comp(tvbuff_t *tvb,proto_tree *pay_load weight_entry_data_comp_tree = proto_item_add_subtree(weight_entry_data_comp,ett_sasp_weight_entry_data_comp); /* Type */ - proto_tree_add_item(weight_entry_data_comp_tree, hf_sasp_weight_entry_data_comp_type, tvb, offset,2, FALSE); + proto_tree_add_item(weight_entry_data_comp_tree, hf_sasp_weight_entry_data_comp_type, tvb, offset,2, ENC_BIG_ENDIAN); offset+=2; /* Size */ - proto_tree_add_item(weight_entry_data_comp_tree, hf_sasp_weight_entry_data_comp_sz, tvb, offset,2, FALSE); + proto_tree_add_item(weight_entry_data_comp_tree, hf_sasp_weight_entry_data_comp_sz, tvb, offset,2, ENC_BIG_ENDIAN); offset+=2; - proto_tree_add_item(weight_entry_data_comp_tree, hf_sasp_weight_entry_data_comp_state, tvb, offset,1, FALSE); + proto_tree_add_item(weight_entry_data_comp_tree, hf_sasp_weight_entry_data_comp_state, tvb, offset,1, ENC_BIG_ENDIAN); offset+=1; @@ -1141,7 +1141,7 @@ static guint32 dissect_weight_entry_data_comp(tvbuff_t *tvb,proto_tree *pay_load /* Weight */ - proto_tree_add_item(weight_entry_data_comp_tree, hf_sasp_weight_entry_data_comp_weight, tvb, offset,2, FALSE); + proto_tree_add_item(weight_entry_data_comp_tree, hf_sasp_weight_entry_data_comp_weight, tvb, offset,2, ENC_BIG_ENDIAN); offset+=2; return offset; @@ -1161,17 +1161,17 @@ static guint32 dissect_grp_wt_entry_datacomp(tvbuff_t *tvb,proto_tree *pay_load, grp_wt_entry_datacomp_tree = proto_item_add_subtree(grp_wt_entry_datacomp, ett_sasp_grp_wt_entry_datacomp); /* Type */ - proto_tree_add_item(grp_wt_entry_datacomp_tree, hf_sasp_grp_wt_entry_datacomp_type, tvb, offset,2, FALSE); + proto_tree_add_item(grp_wt_entry_datacomp_tree, hf_sasp_grp_wt_entry_datacomp_type, tvb, offset,2, ENC_BIG_ENDIAN); offset+=2; /* Size */ - proto_tree_add_item(grp_wt_entry_datacomp_tree, hf_sasp_grp_wt_entry_datacomp_sz, tvb, offset,2, FALSE); + proto_tree_add_item(grp_wt_entry_datacomp_tree, hf_sasp_grp_wt_entry_datacomp_sz, tvb, offset,2, ENC_BIG_ENDIAN); offset+=2; wt_entry_cnt=tvb_get_ntohs(tvb, offset); /* Wt Entry Count*/ - proto_tree_add_item(grp_wt_entry_datacomp_tree, hf_sasp_grp_wt_entry_datacomp_cnt,tvb,offset,2,FALSE); + proto_tree_add_item(grp_wt_entry_datacomp_tree, hf_sasp_grp_wt_entry_datacomp_cnt,tvb,offset,2,ENC_BIG_ENDIAN); offset+=2; /* Group Data */ diff --git a/epan/dissectors/packet-sbus.c b/epan/dissectors/packet-sbus.c index f332c4c764..7625c5bb0f 100644 --- a/epan/dissectors/packet-sbus.c +++ b/epan/dissectors/packet-sbus.c @@ -894,19 +894,19 @@ dissect_sbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* add an item to the subtree*/ sbus_eth_len = tvb_get_ntohl(tvb,offset); proto_tree_add_item(ethsbus_tree, - hf_sbus_length, tvb, offset, 4, FALSE); + hf_sbus_length, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; proto_tree_add_item(ethsbus_tree, - hf_sbus_version, tvb, offset, 1, FALSE); + hf_sbus_version, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; proto_tree_add_item(ethsbus_tree, - hf_sbus_protocol, tvb, offset, 1, FALSE); + hf_sbus_protocol, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; proto_tree_add_item(ethsbus_tree, - hf_sbus_sequence, tvb, offset, 2, FALSE); + hf_sbus_sequence, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; /* Continue adding stuff to the main tree*/ @@ -917,11 +917,11 @@ dissect_sbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (sbus_attribut == SBUS_REQUEST) { proto_tree_add_item(sbus_tree, - hf_sbus_dest, tvb, offset, 1, FALSE); + hf_sbus_dest, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; sbus_cmd_code = tvb_get_guint8(tvb,offset); proto_tree_add_item(sbus_tree, - hf_sbus_command, tvb, offset, 1, FALSE); + hf_sbus_command, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; if (request_val && request_val->retry_count > 0) {/*this is a retry telegram*/ hi = proto_tree_add_boolean(sbus_tree, @@ -949,7 +949,7 @@ dissect_sbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) hf_sbus_rcount, tvb, offset, 1, sbus_media_cnt); offset += 1; proto_tree_add_item(sbus_tree, - hf_sbus_addr_rtc, tvb, offset, 2, FALSE); + hf_sbus_addr_rtc, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; break; @@ -962,7 +962,7 @@ dissect_sbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) hf_sbus_rcount, tvb, offset, 1, sbus_media_cnt); offset += 1; proto_tree_add_item(sbus_tree, - hf_sbus_addr_iof, tvb, offset, 2, FALSE); + hf_sbus_addr_iof, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; break; @@ -976,10 +976,10 @@ dissect_sbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) hf_sbus_wcount_calculated, tvb, offset, 1, sbus_media_cnt); proto_tree_add_item(sbus_tree, - hf_sbus_wcount, tvb, offset, 1, FALSE); + hf_sbus_wcount, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; proto_tree_add_item(sbus_tree, - hf_sbus_addr_rtc, tvb, offset, 2, FALSE); + hf_sbus_addr_rtc, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; /*Add subtree for Data*/ dt = proto_tree_add_text(sbus_tree, tvb, offset, @@ -989,7 +989,7 @@ dissect_sbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) for (i=((sbus_media_cnt)); i>0; i--) { proto_tree_add_item(sbusdata_tree, hf_sbus_data_rtc, tvb, offset, - 4, FALSE); + 4, ENC_BIG_ENDIAN); offset += 4; } break; @@ -1003,10 +1003,10 @@ dissect_sbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) hf_sbus_wcount_calculated, tvb, offset, 1, sbus_media_cnt); proto_tree_add_item(sbus_tree, - hf_sbus_wcount, tvb, offset, 1, FALSE); + hf_sbus_wcount, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; proto_tree_add_item(sbus_tree, - hf_sbus_addr_iof, tvb, offset, 2, FALSE); + hf_sbus_addr_iof, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; sbus_fio_cnt = (tvb_get_guint8(tvb,offset)); sbus_fio_cnt = ((sbus_fio_cnt + 1)); @@ -1060,13 +1060,13 @@ dissect_sbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) sbusdata_tree = proto_item_add_subtree(dt, ett_sbus_data); proto_tree_add_item(sbusdata_tree, - hf_sbus_week_day, tvb, offset, 2, FALSE); + hf_sbus_week_day, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(sbusdata_tree, hf_sbus_date, tvb, offset, 3, FALSE); offset += 3; proto_tree_add_item(sbusdata_tree, - hf_sbus_time, tvb, offset, 3, FALSE); + hf_sbus_time, tvb, offset, 3, ENC_BIG_ENDIAN); offset += 3; break; @@ -1078,7 +1078,7 @@ dissect_sbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) hf_sbus_rcount, tvb, offset, 1, sbus_media_cnt); offset += 1; proto_tree_add_item(sbus_tree, - hf_sbus_addr_prog, tvb, offset, 3, FALSE); + hf_sbus_addr_prog, tvb, offset, 3, ENC_BIG_ENDIAN); offset += 3; break; @@ -1090,10 +1090,10 @@ dissect_sbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) hf_sbus_wcount_calculated, tvb, offset, 1, sbus_media_cnt); proto_tree_add_item(sbus_tree, - hf_sbus_wcount, tvb, offset, 1, FALSE); + hf_sbus_wcount, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; proto_tree_add_item(sbus_tree, - hf_sbus_addr_68k, tvb, offset, 3, FALSE); + hf_sbus_addr_68k, tvb, offset, 3, ENC_BIG_ENDIAN); offset += 3; /*Add subtree for Data*/ dt = proto_tree_add_text(sbus_tree, tvb, offset, @@ -1103,7 +1103,7 @@ dissect_sbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) for (i=((sbus_media_cnt)); i>0; i--) { proto_tree_add_item(sbusdata_tree, hf_sbus_data_rtc, tvb, offset, - 4, FALSE); + 4, ENC_BIG_ENDIAN); offset += 4; } @@ -1116,7 +1116,7 @@ dissect_sbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) hf_sbus_rcount, tvb, offset, 1, sbus_media_cnt); offset += 1; proto_tree_add_item(sbus_tree, - hf_sbus_addr_68k, tvb, offset, 3, FALSE); + hf_sbus_addr_68k, tvb, offset, 3, ENC_BIG_ENDIAN); offset += 3; break; @@ -1128,10 +1128,10 @@ dissect_sbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) hf_sbus_wcount_calculated, tvb, offset, 1, sbus_media_cnt); proto_tree_add_item(sbus_tree, - hf_sbus_wcount, tvb, offset, 1, FALSE); + hf_sbus_wcount, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; proto_tree_add_item(sbus_tree, - hf_sbus_addr_68k, tvb, offset, 3, FALSE); + hf_sbus_addr_68k, tvb, offset, 3, ENC_BIG_ENDIAN); offset += 3; /*Add subtree for Data*/ dt = proto_tree_add_text(sbus_tree, tvb, offset, @@ -1141,7 +1141,7 @@ dissect_sbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) for (i=sbus_media_cnt; i>0; i--) { proto_tree_add_item(sbusdata_tree, hf_sbus_data_byte, tvb, offset, - 1, FALSE); + 1, ENC_BIG_ENDIAN); offset += 1; } break; @@ -1149,14 +1149,14 @@ dissect_sbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /*Read EEPROM register*/ case SBUS_RD_USER_EEPROM_REGISTER: proto_tree_add_item(sbus_tree, - hf_sbus_command_extension, tvb, offset, 1, FALSE); + hf_sbus_command_extension, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; sbus_media_cnt = (tvb_get_guint8(tvb,offset))+1; proto_tree_add_uint(sbus_tree, hf_sbus_rcount, tvb, offset, 1, sbus_media_cnt); offset += 1; proto_tree_add_item(sbus_tree, - hf_sbus_addr_eeprom, tvb, offset, 2, FALSE); + hf_sbus_addr_eeprom, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; break; @@ -1164,10 +1164,10 @@ dissect_sbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /*Syinfo 05 is not implemented as no serial baud is possible*/ case SBUS_RD_SYSTEM_INFORMATION: proto_tree_add_item(sbus_tree, - hf_sbus_sysinfo_nr, tvb, offset, 1, FALSE); + hf_sbus_sysinfo_nr, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; proto_tree_add_item(sbus_tree, - hf_sbus_sysinfo_nr, tvb, offset, 1, FALSE); + hf_sbus_sysinfo_nr, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; break; @@ -1199,7 +1199,7 @@ dissect_sbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) for (i=sbus_web_size -1 ; i>0; i--) { proto_tree_add_item(sbusdata_tree, hf_sbus_data_byte, tvb, offset, - 1, FALSE); + 1, ENC_BIG_ENDIAN); offset += 1; } } @@ -1228,11 +1228,11 @@ dissect_sbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) sbus_rdwr_block_type = tvb_get_guint8(tvb, 14); proto_tree_add_item(sbus_tree, hf_sbus_rdwr_telegram_sequence, tvb, offset, - 1, FALSE); + 1, ENC_BIG_ENDIAN); offset += 1; proto_tree_add_item(sbus_tree, hf_sbus_block_type, tvb, offset, - 1, FALSE); + 1, ENC_BIG_ENDIAN); offset += 1; /* Check for file or block download */ @@ -1240,7 +1240,7 @@ dissect_sbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) (sbus_rdwr_block_type == SBUS_RD_WR_PROGRAM_BLOCK_FILE)) { proto_tree_add_item(sbus_tree, hf_sbus_rdwr_block_size, tvb, offset, - 4, FALSE); + 4, ENC_BIG_ENDIAN); offset += 4; sbus_quint8_helper0=0; /*find zero-termination of string*/ @@ -1260,11 +1260,11 @@ dissect_sbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } else { /* block write telegram, no file write*/ proto_tree_add_item(sbus_tree, hf_sbus_block_nr, tvb, offset, - 2, FALSE); + 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(sbus_tree, hf_sbus_rdwr_block_size, tvb, offset, - 4, FALSE); + 4, ENC_BIG_ENDIAN); offset += 4; /*do not display a field for block data (skip)*/ offset += (sbus_rdwr_length-8); @@ -1297,7 +1297,7 @@ dissect_sbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) sbus_rdwr_block_type = tvb_get_guint8(tvb, 14); proto_tree_add_item(sbus_tree, hf_sbus_block_type, tvb, offset, - 1, FALSE); + 1, ENC_BIG_ENDIAN); offset += 1; /* Check for file or block download */ @@ -1305,7 +1305,7 @@ dissect_sbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) (sbus_rdwr_block_type == SBUS_RD_WR_PROGRAM_BLOCK_FILE)) { proto_tree_add_item(sbus_tree, hf_sbus_rdwr_block_addr, tvb, offset, - 4, FALSE); + 4, ENC_BIG_ENDIAN); offset += 4; sbus_quint8_helper0=0; /*find zero-termination of string*/ @@ -1325,11 +1325,11 @@ dissect_sbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } else { /* block write telegram, no file write*/ proto_tree_add_item(sbus_tree, hf_sbus_block_nr, tvb, offset, - 2, FALSE); + 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(sbus_tree, hf_sbus_rdwr_block_addr, tvb, offset, - 4, FALSE); + 4, ENC_BIG_ENDIAN); offset += 4; /*do not display a field for block data (skip)*/ offset += (sbus_rdwr_length-8); @@ -1339,11 +1339,11 @@ dissect_sbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) sbus_rdwr_block_type = tvb_get_guint8(tvb, 14); proto_tree_add_item(sbus_tree, hf_sbus_rdwr_telegram_sequence, tvb, offset, - 1, FALSE); + 1, ENC_BIG_ENDIAN); offset += 1; proto_tree_add_item(sbus_tree, hf_sbus_block_type, tvb, offset, - 1, FALSE); + 1, ENC_BIG_ENDIAN); offset += 1; /* Check for file or block download */ @@ -1365,21 +1365,21 @@ dissect_sbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } else { /* block write telegram, no file write*/ proto_tree_add_item(sbus_tree, hf_sbus_block_nr, tvb, offset, - 2, FALSE); + 2, ENC_BIG_ENDIAN); offset += 2; } break; case SBUS_RD_BLOCK_DATA_STREAM: proto_tree_add_item(sbus_tree, hf_sbus_rdwr_telegram_sequence, tvb, offset, - 1, FALSE); + 1, ENC_BIG_ENDIAN); offset += 1; break; case SBUS_RD_BLOCK_DATA_BYTES: sbus_rdwr_block_type = tvb_get_guint8(tvb, 13); proto_tree_add_item(sbus_tree, hf_sbus_block_type, tvb, offset, - 1, FALSE); + 1, ENC_BIG_ENDIAN); offset += 1; /* Check for file or block read */ if ((sbus_rdwr_block_type == SBUS_RD_WR_CONFIGURATION_FILE) || @@ -1387,11 +1387,11 @@ dissect_sbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /*reading from a file*/ proto_tree_add_item(sbus_tree, hf_sbus_rdwr_block_addr, tvb, offset, - 4, FALSE); + 4, ENC_BIG_ENDIAN); offset += 4; proto_tree_add_item(sbus_tree, hf_sbus_rdwr_block_size, tvb, offset, - 4, FALSE); + 4, ENC_BIG_ENDIAN); offset += 4; sbus_quint8_helper0=0; /*find zero-termination of string*/ @@ -1409,15 +1409,15 @@ dissect_sbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } else { /* block read telegram, no file read*/ proto_tree_add_item(sbus_tree, hf_sbus_block_nr, tvb, offset, - 2, FALSE); + 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(sbus_tree, hf_sbus_rdwr_block_addr, tvb, offset, - 4, FALSE); + 4, ENC_BIG_ENDIAN); offset += 4; proto_tree_add_item(sbus_tree, hf_sbus_rdwr_block_size, tvb, offset, - 4, FALSE); + 4, ENC_BIG_ENDIAN); offset += 4; } break; @@ -1426,7 +1426,7 @@ dissect_sbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) sbus_rdwr_block_type = tvb_get_guint8(tvb, 13); proto_tree_add_item(sbus_tree, hf_sbus_block_type, tvb, offset, - 1, FALSE); + 1, ENC_BIG_ENDIAN); offset += 1; /* Check for file or block deletion */ if ((sbus_rdwr_block_type == SBUS_RD_WR_CONFIGURATION_FILE) || @@ -1448,7 +1448,7 @@ dissect_sbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } else { /* delete a block*/ proto_tree_add_item(sbus_tree, hf_sbus_block_nr, tvb, offset, - 2, FALSE); + 2, ENC_BIG_ENDIAN); offset += 2; } break; @@ -1502,7 +1502,7 @@ dissect_sbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) for (i=(request_val->count); i>0; i--) { proto_tree_add_item(sbusdata_tree, hf_sbus_data_rtc, tvb, offset, - 4, FALSE); + 4, ENC_BIG_ENDIAN); offset += 4; } break; @@ -1510,7 +1510,7 @@ dissect_sbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Response: PCD Display register*/ case SBUS_RD_DISPLAY_REGISTER: proto_tree_add_item(sbus_tree, - hf_sbus_display_register, tvb, offset, 4, FALSE); + hf_sbus_display_register, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; break; @@ -1565,13 +1565,13 @@ dissect_sbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) sbusdata_tree = proto_item_add_subtree(dt, ett_sbus_data); proto_tree_add_item(sbusdata_tree, - hf_sbus_week_day, tvb, offset, 2, FALSE); + hf_sbus_week_day, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(sbusdata_tree, hf_sbus_date, tvb, offset, 3, FALSE); offset += 3; proto_tree_add_item(sbusdata_tree, - hf_sbus_time, tvb, offset, 3, FALSE); + hf_sbus_time, tvb, offset, 3, ENC_BIG_ENDIAN); offset += 3; break; @@ -1585,14 +1585,14 @@ dissect_sbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case SBUS_RD_PCD_STATUS_CPU6: case SBUS_RD_PCD_STATUS_OWN: proto_tree_add_item(sbus_tree, - hf_sbus_cpu_status, tvb, offset, 1, FALSE); + hf_sbus_cpu_status, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; break; /* Response: Station address*/ case SBUS_RD_SBUS_STN_NBR: proto_tree_add_item(sbus_tree, - hf_sbus_address, tvb, offset, 1, FALSE); + hf_sbus_address, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; break; @@ -1638,7 +1638,7 @@ dissect_sbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) for (i=(request_val->count); i>0; i--) { proto_tree_add_item(sbusdata_tree, hf_sbus_data_byte, tvb, offset, - 1, FALSE); + 1, ENC_BIG_ENDIAN); offset += 1; } break; @@ -1653,7 +1653,7 @@ dissect_sbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) for (i=0; i<2; i++) { /*2 bytes*/ proto_tree_add_item(sbusdata_tree, hf_sbus_data_byte_hex, tvb, offset, - 1, FALSE); + 1, ENC_BIG_ENDIAN); offset += 1; } break; @@ -1661,27 +1661,27 @@ dissect_sbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Response: Instruction pointer*/ case SBUS_RD_INSTRUCTION_POINTER: proto_tree_add_item(sbus_tree, - hf_sbus_addr_prog, tvb, offset, 3, FALSE); + hf_sbus_addr_prog, tvb, offset, 3, ENC_BIG_ENDIAN); offset += 3; break; /*Response for Find History*/ case SBUS_FIND_HISTORY: proto_tree_add_item(sbus_tree, - hf_sbus_addr_68k, tvb, offset, 3, FALSE); + hf_sbus_addr_68k, tvb, offset, 3, ENC_BIG_ENDIAN); offset += 3; proto_tree_add_item(sbus_tree, - hf_sbus_nbr_elements, tvb, offset, 2, FALSE); + hf_sbus_nbr_elements, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; break; /* Response: Read current block*/ case SBUS_RD_CURRENT_BLOCK: proto_tree_add_item(sbus_tree, - hf_sbus_block_type, tvb, offset, 1, FALSE); + hf_sbus_block_type, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; proto_tree_add_item(sbus_tree, - hf_sbus_block_nr, tvb, offset, 2, FALSE); + hf_sbus_block_nr, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; break; @@ -1739,7 +1739,7 @@ dissect_sbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) for (i=sbus_web_size - 2; i>0; i--) { proto_tree_add_item(sbusdata_tree, hf_sbus_data_byte, tvb, offset, - 1, FALSE); + 1, ENC_BIG_ENDIAN); offset += 1; } } @@ -1754,7 +1754,7 @@ dissect_sbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset += 1; hi = proto_tree_add_item(sbus_tree, hf_sbus_rdwr_acknakcode, tvb, offset, - 1, FALSE); + 1, ENC_BIG_ENDIAN); if ((tvb_get_guint8(tvb, offset) >= SBUS_RD_WR_NAK)&& (tvb_get_guint8(tvb, offset) <= SBUS_RD_WR_NAK_INVALID_SIZE)) { expert_add_info_format(pinfo, hi, PI_RESPONSE_CODE, PI_CHAT, @@ -1767,7 +1767,7 @@ dissect_sbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case SBUS_WR_BLOCK_END_OF_STREAM: proto_tree_add_item(sbus_tree, hf_sbus_rdwr_telegram_sequence, tvb, offset, - 1, FALSE); + 1, ENC_BIG_ENDIAN); offset += 1; break; case SBUS_WR_ABORT_BLOCK_STREAM: @@ -1778,11 +1778,11 @@ dissect_sbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case SBUS_RD_BLOCK_START_OF_STREAM: proto_tree_add_item(sbus_tree, hf_sbus_rdwr_telegram_sequence, tvb, offset, - 1, FALSE); + 1, ENC_BIG_ENDIAN); offset += 1; proto_tree_add_item(sbus_tree, hf_sbus_rdwr_block_size, tvb, offset, - 4, FALSE); + 4, ENC_BIG_ENDIAN); offset += 4; /*do not display a field for block data (skip)*/ offset += (sbus_rdwr_length-6); @@ -1790,7 +1790,7 @@ dissect_sbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case SBUS_RD_BLOCK_DATA_STREAM: proto_tree_add_item(sbus_tree, hf_sbus_rdwr_telegram_sequence, tvb, offset, - 1, FALSE); + 1, ENC_BIG_ENDIAN); offset += 1; /*do not display a field for block data (skip)*/ offset += (sbus_rdwr_length-2); @@ -1807,7 +1807,7 @@ dissect_sbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } else { /* add block size and CRC32 in case of known block*/ proto_tree_add_item(sbus_tree, hf_sbus_rdwr_block_size, tvb, offset, - 4, FALSE); + 4, ENC_BIG_ENDIAN); offset += 4; /*Now the CRC32 follows, but I don't bother calculating it*/ offset += 4; @@ -1816,15 +1816,15 @@ dissect_sbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case SBUS_GET_PROGRAM_BLOCK_LIST: proto_tree_add_item(sbus_tree, hf_sbus_block_type, tvb, offset, - 1, FALSE); + 1, ENC_BIG_ENDIAN); offset += 1; proto_tree_add_item(sbus_tree, hf_sbus_block_nr, tvb, offset, - 2, FALSE); + 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(sbus_tree, hf_sbus_rdwr_block_size, tvb, offset, - 4, FALSE); + 4, ENC_BIG_ENDIAN); offset += 4; /*do not display block_timestamp as no description is available*/ offset += (sbus_rdwr_length-8); @@ -1862,7 +1862,7 @@ dissect_sbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) request_val->req_frame); } hi = proto_tree_add_item(sbus_tree, - hf_sbus_acknackcode, tvb, offset, 2, FALSE); + hf_sbus_acknackcode, tvb, offset, 2, ENC_BIG_ENDIAN); if (tvb_get_guint8(tvb, (offset+1)) > 0) { expert_add_info_format(pinfo, hi, PI_RESPONSE_CODE, PI_CHAT, "Telegram not acknowledged by PCD"); diff --git a/epan/dissectors/packet-scriptingservice.c b/epan/dissectors/packet-scriptingservice.c index b06c41db83..3206e3a027 100644 --- a/epan/dissectors/packet-scriptingservice.c +++ b/epan/dissectors/packet-scriptingservice.c @@ -127,16 +127,16 @@ dissect_ssprotocol_message(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree if (pinfo && (check_col(pinfo->cinfo, COL_INFO))) { col_add_fstr(pinfo->cinfo, COL_INFO, "%s ", val_to_str(type, message_type_values, "Unknown SSP type: %u")); } - proto_tree_add_item(ssprotocol_tree, hf_message_type, message_tvb, MESSAGE_TYPE_OFFSET, MESSAGE_TYPE_LENGTH, FALSE); - flags_item = proto_tree_add_item(ssprotocol_tree, hf_message_flags, message_tvb, MESSAGE_FLAGS_OFFSET, MESSAGE_FLAGS_LENGTH, FALSE); - proto_tree_add_item(ssprotocol_tree, hf_message_length, message_tvb, MESSAGE_LENGTH_OFFSET, MESSAGE_LENGTH_LENGTH, FALSE); + proto_tree_add_item(ssprotocol_tree, hf_message_type, message_tvb, MESSAGE_TYPE_OFFSET, MESSAGE_TYPE_LENGTH, ENC_BIG_ENDIAN); + flags_item = proto_tree_add_item(ssprotocol_tree, hf_message_flags, message_tvb, MESSAGE_FLAGS_OFFSET, MESSAGE_FLAGS_LENGTH, ENC_BIG_ENDIAN); + proto_tree_add_item(ssprotocol_tree, hf_message_length, message_tvb, MESSAGE_LENGTH_OFFSET, MESSAGE_LENGTH_LENGTH, ENC_BIG_ENDIAN); total_length = MESSAGE_LENGTH_OFFSET + MESSAGE_LENGTH_LENGTH; switch (type) { case SS_KEEPALIVE_ACK_TYPE: case SS_STATUS_TYPE: info_length = tvb_get_ntohs(message_tvb, MESSAGE_LENGTH_OFFSET) - MESSAGE_STATUS_OFFSET; if (info_length == MESSAGE_STATUS_LENGTH) { - proto_tree_add_item(ssprotocol_tree, hf_message_status, message_tvb, MESSAGE_STATUS_OFFSET, MESSAGE_STATUS_LENGTH, FALSE); + proto_tree_add_item(ssprotocol_tree, hf_message_status, message_tvb, MESSAGE_STATUS_OFFSET, MESSAGE_STATUS_LENGTH, ENC_BIG_ENDIAN); total_length += MESSAGE_STATUS_LENGTH; } break; @@ -158,7 +158,7 @@ dissect_ssprotocol_message(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree case SS_NOTREADY_TYPE: info_length = tvb_get_ntohs(message_tvb, MESSAGE_LENGTH_OFFSET) - MESSAGE_NOTRDY_INFO_OFFSET; if (info_length > 0) { - proto_tree_add_item(ssprotocol_tree, hf_message_reason, message_tvb, MESSAGE_NOTRDY_REASON_OFFSET, MESSAGE_NOTRDY_REASON_LENGTH, FALSE); + proto_tree_add_item(ssprotocol_tree, hf_message_reason, message_tvb, MESSAGE_NOTRDY_REASON_OFFSET, MESSAGE_NOTRDY_REASON_LENGTH, ENC_BIG_ENDIAN); proto_tree_add_item(ssprotocol_tree, hf_message_info, message_tvb, MESSAGE_NOTRDY_INFO_OFFSET, info_length, FALSE); total_length += info_length; } diff --git a/epan/dissectors/packet-scsi-mmc.c b/epan/dissectors/packet-scsi-mmc.c index 71d9ab58dd..aebc2e1216 100644 --- a/epan/dissectors/packet-scsi-mmc.c +++ b/epan/dissectors/packet-scsi-mmc.c @@ -362,8 +362,8 @@ dissect_mmc4_getconfiguration (tvbuff_t *tvb, packet_info *pinfo _U_, volatile guint offset_v = offset; if (tree && isreq && iscdb) { - proto_tree_add_item (tree, hf_scsi_mmc_getconf_rt, tvb_v, offset_v+0, 1, 0); - proto_tree_add_item (tree, hf_scsi_mmc_getconf_starting_feature, tvb_v, offset_v+1, 2, 0); + proto_tree_add_item (tree, hf_scsi_mmc_getconf_rt, tvb_v, offset_v+0, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_scsi_mmc_getconf_starting_feature, tvb_v, offset_v+1, 2, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_alloclen16, tvb_v, offset_v+6, 2, 0); /* we need the alloc_len in the response */ if(cdata){ @@ -380,8 +380,8 @@ dissect_mmc4_getconfiguration (tvbuff_t *tvb, packet_info *pinfo _U_, TRY_SCSI_CDB_ALLOC_LEN(pinfo, tvb_v, offset_v, cdata->itlq->alloc_len); len=tvb_get_ntohl(tvb_v, offset_v+0); - proto_tree_add_item (tree, hf_scsi_mmc_data_length, tvb_v, offset_v, 4, 0); - proto_tree_add_item (tree, hf_scsi_mmc_getconf_current_profile, tvb_v, offset_v+6, 2, 0); + proto_tree_add_item (tree, hf_scsi_mmc_data_length, tvb_v, offset_v, 4, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_scsi_mmc_getconf_current_profile, tvb_v, offset_v+6, 2, ENC_BIG_ENDIAN); offset_v+=8; len-=4; while(len>0){ @@ -390,14 +390,14 @@ dissect_mmc4_getconfiguration (tvbuff_t *tvb, packet_info *pinfo _U_, guint8 num_linksize; feature=tvb_get_ntohs(tvb_v, offset_v); - proto_tree_add_item (tree, hf_scsi_mmc_feature, tvb_v, offset_v, 2, 0); + proto_tree_add_item (tree, hf_scsi_mmc_feature, tvb_v, offset_v, 2, ENC_BIG_ENDIAN); offset_v+=2; - proto_tree_add_item (tree, hf_scsi_mmc_feature_version, tvb_v, offset_v, 1, 0); - proto_tree_add_item (tree, hf_scsi_mmc_feature_persistent, tvb_v, offset_v, 1, 0); - proto_tree_add_item (tree, hf_scsi_mmc_feature_current, tvb_v, offset_v, 1, 0); + proto_tree_add_item (tree, hf_scsi_mmc_feature_version, tvb_v, offset_v, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_scsi_mmc_feature_persistent, tvb_v, offset_v, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_scsi_mmc_feature_current, tvb_v, offset_v, 1, ENC_BIG_ENDIAN); offset_v+=1; additional_length=tvb_get_guint8(tvb_v, offset_v); - proto_tree_add_item (tree, hf_scsi_mmc_feature_additional_length, tvb_v, offset_v, 1, 0); + proto_tree_add_item (tree, hf_scsi_mmc_feature_additional_length, tvb_v, offset_v, 1, ENC_BIG_ENDIAN); offset_v+=1; old_offset=offset_v; switch(feature){ @@ -414,7 +414,7 @@ dissect_mmc4_getconfiguration (tvbuff_t *tvb, packet_info *pinfo _U_, } profile=tvb_get_ntohs(tvb_v, offset_v); - proto_tree_add_item (tr, hf_scsi_mmc_feature_profile, tvb_v, offset_v, 2, 0); + proto_tree_add_item (tr, hf_scsi_mmc_feature_profile, tvb_v, offset_v, 2, ENC_BIG_ENDIAN); proto_item_append_text(it, "%s", val_to_str(profile, scsi_getconf_current_profile_val, "Unknown 0x%04x")); cur_profile=tvb_get_guint8(tvb_v, offset_v+2); @@ -436,15 +436,15 @@ dissect_mmc4_getconfiguration (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree_add_item (tree, hf_scsi_mmc_feature_cdread_cdtext, tvb_v, offset_v, 1, 0); break; case 0x0021: /* incremental streaming writeable */ - proto_tree_add_item (tree, hf_scsi_mmc_feature_dts, tvb_v, offset_v, 2, 0); + proto_tree_add_item (tree, hf_scsi_mmc_feature_dts, tvb_v, offset_v, 2, ENC_BIG_ENDIAN); offset_v+=2; proto_tree_add_item (tree, hf_scsi_mmc_feature_isw_buf, tvb_v, offset_v, 1, 0); offset_v+=1; num_linksize=tvb_get_guint8(tvb_v, offset_v); - proto_tree_add_item (tree, hf_scsi_mmc_feature_isw_num_linksize, tvb_v, offset_v, 1, 0); + proto_tree_add_item (tree, hf_scsi_mmc_feature_isw_num_linksize, tvb_v, offset_v, 1, ENC_BIG_ENDIAN); offset_v+=1; while(num_linksize--){ - proto_tree_add_item (tree, hf_scsi_mmc_feature_isw_linksize, tvb_v, offset_v, 1, 0); + proto_tree_add_item (tree, hf_scsi_mmc_feature_isw_linksize, tvb_v, offset_v, 1, ENC_BIG_ENDIAN); offset_v+=1; } break; @@ -463,7 +463,7 @@ dissect_mmc4_getconfiguration (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree_add_item (tree, hf_scsi_mmc_feature_tao_testwrite, tvb_v, offset_v, 1, 0); proto_tree_add_item (tree, hf_scsi_mmc_feature_tao_cdrw, tvb_v, offset_v, 1, 0); proto_tree_add_item (tree, hf_scsi_mmc_feature_tao_rwsubcode, tvb_v, offset_v, 1, 0); - proto_tree_add_item (tree, hf_scsi_mmc_feature_dts, tvb_v, offset_v+2, 2, 0); + proto_tree_add_item (tree, hf_scsi_mmc_feature_dts, tvb_v, offset_v+2, 2, ENC_BIG_ENDIAN); break; case 0x002e: /* session at once */ proto_tree_add_item (tree, hf_scsi_mmc_feature_sao_buf, tvb_v, offset_v, 1, 0); @@ -473,7 +473,7 @@ dissect_mmc4_getconfiguration (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree_add_item (tree, hf_scsi_mmc_feature_sao_testwrite, tvb_v, offset_v, 1, 0); proto_tree_add_item (tree, hf_scsi_mmc_feature_sao_cdrw, tvb_v, offset_v, 1, 0); proto_tree_add_item (tree, hf_scsi_mmc_feature_sao_rw, tvb_v, offset_v, 1, 0); - proto_tree_add_item (tree, hf_scsi_mmc_feature_sao_mcsl, tvb_v, offset_v+1, 3, 0); + proto_tree_add_item (tree, hf_scsi_mmc_feature_sao_mcsl, tvb_v, offset_v+1, 3, ENC_BIG_ENDIAN); break; case 0x002f: /* dvd-r/-rw*/ proto_tree_add_item (tree, hf_scsi_mmc_feature_dvdr_buf, tvb_v, offset_v, 1, 0); @@ -543,16 +543,16 @@ dissect_mmc4_readtocpmaatip (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree * } break; } - proto_tree_add_item (tree, hf_scsi_mmc_readtoc_format, tvb, offset+1, 1, 0); + proto_tree_add_item (tree, hf_scsi_mmc_readtoc_format, tvb, offset+1, 1, ENC_BIG_ENDIAN); switch(format){ case 0x00: - proto_tree_add_item (tree, hf_scsi_mmc_track, tvb, offset+5, 1, 0); + proto_tree_add_item (tree, hf_scsi_mmc_track, tvb, offset+5, 1, ENC_BIG_ENDIAN); /* save track so we can pick it up in the response */ cdata->itlq->flags|=0x0200; break; case 0x02: - proto_tree_add_item (tree, hf_scsi_mmc_session, tvb, offset+5, 1, 0); + proto_tree_add_item (tree, hf_scsi_mmc_session, tvb, offset+5, 1, ENC_BIG_ENDIAN); /* save session so we can pick it up in the response */ cdata->itlq->flags|=0x0400; break; @@ -564,27 +564,27 @@ dissect_mmc4_readtocpmaatip (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree * } if(tree && (!isreq)) { len=tvb_get_ntohs(tvb, offset); - proto_tree_add_item (tree, hf_scsi_mmc_data_length, tvb, offset, 2, 0); + proto_tree_add_item (tree, hf_scsi_mmc_data_length, tvb, offset, 2, ENC_BIG_ENDIAN); if(cdata->itlq->flags&0x0200){ - proto_tree_add_item (tree, hf_scsi_mmc_first_track, tvb, offset+2, 1, 0); - proto_tree_add_item (tree, hf_scsi_mmc_readtoc_last_track, tvb, offset+3, 1, 0); + proto_tree_add_item (tree, hf_scsi_mmc_first_track, tvb, offset+2, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_scsi_mmc_readtoc_last_track, tvb, offset+3, 1, ENC_BIG_ENDIAN); } if(cdata->itlq->flags&0x0400){ - proto_tree_add_item (tree, hf_scsi_mmc_readtoc_first_session, tvb, offset+2, 1, 0); - proto_tree_add_item (tree, hf_scsi_mmc_readtoc_last_session, tvb, offset+3, 1, 0); + proto_tree_add_item (tree, hf_scsi_mmc_readtoc_first_session, tvb, offset+2, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_scsi_mmc_readtoc_last_session, tvb, offset+3, 1, ENC_BIG_ENDIAN); } offset+=4; len-=2; switch(cdata->itlq->flags&0x000f){ case 0x0: while(len>0){ - proto_tree_add_item (tree, hf_scsi_mmc_q_subchannel_adr, tvb, offset+1, 1, 0); - proto_tree_add_item (tree, hf_scsi_mmc_q_subchannel_control, tvb, offset+1, 1, 0); - proto_tree_add_item (tree, hf_scsi_mmc_track, tvb, offset+2, 1, 0); + proto_tree_add_item (tree, hf_scsi_mmc_q_subchannel_adr, tvb, offset+1, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_scsi_mmc_q_subchannel_control, tvb, offset+1, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_scsi_mmc_track, tvb, offset+2, 1, ENC_BIG_ENDIAN); if(cdata->itlq->flags&0x0100){ - proto_tree_add_item (tree, hf_scsi_mmc_track_start_time, tvb, offset+4, 4, 0); + proto_tree_add_item (tree, hf_scsi_mmc_track_start_time, tvb, offset+4, 4, ENC_BIG_ENDIAN); } else { - proto_tree_add_item (tree, hf_scsi_mmc_track_start_address, tvb, offset+4, 4, 0); + proto_tree_add_item (tree, hf_scsi_mmc_track_start_address, tvb, offset+4, 4, ENC_BIG_ENDIAN); } offset+=8; len-=8; @@ -642,11 +642,11 @@ dissect_mmc4_readdiscinformation (tvbuff_t *tvb, packet_info *pinfo _U_, proto_t ett_scsi_control, cdb_control_fields, FALSE); } if(tree && (!isreq)) { - proto_tree_add_item (tree, hf_scsi_mmc_data_length, tvb, 0, 2, 0); + proto_tree_add_item (tree, hf_scsi_mmc_data_length, tvb, 0, 2, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_mmc_disc_info_erasable, tvb, 2, 1, 0); - proto_tree_add_item (tree, hf_scsi_mmc_disc_info_state_of_last_session, tvb, 2, 1, 0); - proto_tree_add_item (tree, hf_scsi_mmc_disc_info_disk_status, tvb, 2, 1, 0); - proto_tree_add_item (tree, hf_scsi_mmc_first_track, tvb, offset+3, 1, 0); + proto_tree_add_item (tree, hf_scsi_mmc_disc_info_state_of_last_session, tvb, 2, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_scsi_mmc_disc_info_disk_status, tvb, 2, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_scsi_mmc_first_track, tvb, offset+3, 1, ENC_BIG_ENDIAN); /* number of session offset+4 and offset+9 */ proto_tree_add_uint (tree, hf_scsi_mmc_disc_info_number_of_sessions, tvb, 4, 1, (tvb_get_guint8(tvb, offset+9)<<8)|tvb_get_guint8(tvb, offset+4)); /* first track in last session offset+5 and offset+10 */ @@ -658,12 +658,12 @@ dissect_mmc4_readdiscinformation (tvbuff_t *tvb, packet_info *pinfo _U_, proto_t proto_tree_add_item (tree, hf_scsi_mmc_disc_info_uru, tvb, offset+7, 1, 0); proto_tree_add_item (tree, hf_scsi_mmc_disc_info_dac_v, tvb, offset+7, 1, 0); proto_tree_add_item (tree, hf_scsi_mmc_disc_info_dbit, tvb, offset+7, 1, 0); - proto_tree_add_item (tree, hf_scsi_mmc_disc_info_bgfs, tvb, offset+7, 1, 0); - proto_tree_add_item (tree, hf_scsi_mmc_disc_info_disc_type, tvb, offset+8, 1, 0); - proto_tree_add_item (tree, hf_scsi_mmc_disc_info_disc_identification, tvb, offset+12, 4, 0); - proto_tree_add_item (tree, hf_scsi_mmc_disc_info_last_session_lead_in_start_address, tvb, offset+16, 4, 0); - proto_tree_add_item (tree, hf_scsi_mmc_disc_info_last_possible_lead_out_start_address, tvb, offset+20, 4, 0); - proto_tree_add_item (tree, hf_scsi_mmc_disc_info_disc_bar_code, tvb, offset+24, 8, 0); + proto_tree_add_item (tree, hf_scsi_mmc_disc_info_bgfs, tvb, offset+7, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_scsi_mmc_disc_info_disc_type, tvb, offset+8, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_scsi_mmc_disc_info_disc_identification, tvb, offset+12, 4, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_scsi_mmc_disc_info_last_session_lead_in_start_address, tvb, offset+16, 4, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_scsi_mmc_disc_info_last_possible_lead_out_start_address, tvb, offset+20, 4, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_scsi_mmc_disc_info_disc_bar_code, tvb, offset+24, 8, ENC_BIG_ENDIAN); /* XXX should add OPC table decoding here ... */ } } @@ -703,7 +703,7 @@ dissect_mmc4_readdiscstructure (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre ti = proto_tree_add_uint (tree, hf_scsi_mmc_read_dvd_format, tvb, 0, 0, cdata->itlq->flags); PROTO_ITEM_SET_GENERATED(ti); - proto_tree_add_item (tree, hf_scsi_mmc_data_length, tvb, offset, 2, 0); + proto_tree_add_item (tree, hf_scsi_mmc_data_length, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 4; @@ -712,42 +712,42 @@ dissect_mmc4_readdiscstructure (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre case 0x11: /* ADIP Information */ /* disc category */ - proto_tree_add_item (tree, hf_scsi_mmc_disc_book_type, tvb, offset, 1, 0); - proto_tree_add_item (tree, hf_scsi_mmc_disc_book_version, tvb, offset, 1, 0); + proto_tree_add_item (tree, hf_scsi_mmc_disc_book_type, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_scsi_mmc_disc_book_version, tvb, offset, 1, ENC_BIG_ENDIAN); /* disc size */ - proto_tree_add_item (tree, hf_scsi_mmc_disc_size_size, tvb, offset+1, 1, 0); - proto_tree_add_item (tree, hf_scsi_mmc_disc_size_rate, tvb, offset+1, 1, 0); + proto_tree_add_item (tree, hf_scsi_mmc_disc_size_size, tvb, offset+1, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_scsi_mmc_disc_size_rate, tvb, offset+1, 1, ENC_BIG_ENDIAN); /* number of layers */ - proto_tree_add_item (tree, hf_scsi_mmc_disc_num_layers, tvb, offset+2, 1, 0); + proto_tree_add_item (tree, hf_scsi_mmc_disc_num_layers, tvb, offset+2, 1, ENC_BIG_ENDIAN); /* track path */ proto_tree_add_item (tree, hf_scsi_mmc_disc_track_path, tvb, offset+2, 1, 0); /* disc structure */ - proto_tree_add_item (tree, hf_scsi_mmc_disc_structure_layer, tvb, offset+2, 1, 0); + proto_tree_add_item (tree, hf_scsi_mmc_disc_structure_layer, tvb, offset+2, 1, ENC_BIG_ENDIAN); /* recording density */ - proto_tree_add_item (tree, hf_scsi_mmc_disc_density_length, tvb, offset+3, 1, 0); - proto_tree_add_item (tree, hf_scsi_mmc_disc_density_pitch, tvb, offset+3, 1, 0); + proto_tree_add_item (tree, hf_scsi_mmc_disc_density_length, tvb, offset+3, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_scsi_mmc_disc_density_pitch, tvb, offset+3, 1, ENC_BIG_ENDIAN); /* first physical sector of data zone */ - proto_tree_add_item (tree, hf_scsi_mmc_disc_first_physical, tvb, offset+5, 3, 0); + proto_tree_add_item (tree, hf_scsi_mmc_disc_first_physical, tvb, offset+5, 3, ENC_BIG_ENDIAN); /* last physical sector of data zone */ - proto_tree_add_item (tree, hf_scsi_mmc_disc_last_physical, tvb, offset+9, 3, 0); + proto_tree_add_item (tree, hf_scsi_mmc_disc_last_physical, tvb, offset+9, 3, ENC_BIG_ENDIAN); if (cdata->itlq->flags == 0x00) { /* last physical sector of layer 0 */ - proto_tree_add_item (tree, hf_scsi_mmc_disc_last_physical_layer0, tvb, offset+13, 3, 0); + proto_tree_add_item (tree, hf_scsi_mmc_disc_last_physical_layer0, tvb, offset+13, 3, ENC_BIG_ENDIAN); } /* extended format info */ proto_tree_add_item (tree, hf_scsi_mmc_disc_extended_format_info, tvb, offset+16, 1, 0); /* disk application code */ - proto_tree_add_item (tree, hf_scsi_mmc_disc_application_code, tvb, offset+17, 1, 0); + proto_tree_add_item (tree, hf_scsi_mmc_disc_application_code, tvb, offset+17, 1, ENC_BIG_ENDIAN); /* extended information blocks */ proto_tree_add_item (tree, hf_scsi_mmc_adip_eib5, tvb, offset+18, 1, 0); @@ -764,10 +764,10 @@ dissect_mmc4_readdiscstructure (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre proto_tree_add_item (tree, hf_scsi_mmc_adip_media_type_id, tvb, offset+27, 3, 0); /* product revision number */ - proto_tree_add_item (tree, hf_scsi_mmc_adip_product_revision_number, tvb, offset+30, 1, 0); + proto_tree_add_item (tree, hf_scsi_mmc_adip_product_revision_number, tvb, offset+30, 1, ENC_BIG_ENDIAN); /* number of bytes of physical info */ - proto_tree_add_item (tree, hf_scsi_mmc_adip_number_of_physical_info, tvb, offset+31, 1, 0); + proto_tree_add_item (tree, hf_scsi_mmc_adip_number_of_physical_info, tvb, offset+31, 1, ENC_BIG_ENDIAN); break; @@ -820,8 +820,8 @@ dissect_mmc4_synchronizecache (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree if (tree && isreq && iscdb) { proto_tree_add_item (tree, hf_scsi_mmc_synccache_immed, tvb, offset, 1, 0); proto_tree_add_item (tree, hf_scsi_mmc_synccache_reladr, tvb, offset, 1, 0); - proto_tree_add_item (tree, hf_scsi_mmc_lba, tvb, offset+1, 4, 0); - proto_tree_add_item (tree, hf_scsi_mmc_num_blocks, tvb, offset+6, 2, 0); + 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); } @@ -867,10 +867,10 @@ dissect_mmc4_reportkey (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, if (tree && isreq && iscdb) { proto_tree_add_item (tree, hf_scsi_mmc_lba, tvb, offset+1, - 4, 0); + 4, ENC_BIG_ENDIAN); key_class=tvb_get_guint8(tvb, offset+6); proto_tree_add_item (tree, hf_scsi_mmc_key_class, tvb, offset+6, - 1, 0); + 1, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_alloclen16, tvb, offset+7, 2, 0); agid=tvb_get_guint8(tvb, offset+9)&0xc0; @@ -894,12 +894,12 @@ dissect_mmc4_reportkey (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, if(tree && (!isreq)) { switch(cdata->itlq->flags){ case 0x0800: /* format:RPC State class:00 */ - proto_tree_add_item (tree, hf_scsi_mmc_data_length, tvb, offset, 2, 0); - proto_tree_add_item (tree, hf_scsi_mmc_report_key_type_code, tvb, offset+4, 1, 0); - proto_tree_add_item (tree, hf_scsi_mmc_report_key_vendor_resets, tvb, offset+4, 1, 0); - proto_tree_add_item (tree, hf_scsi_mmc_report_key_user_changes, tvb, offset+4, 1, 0); - proto_tree_add_item (tree, hf_scsi_mmc_report_key_region_mask, tvb, offset+5, 1, 0); - proto_tree_add_item (tree, hf_scsi_mmc_report_key_rpc_scheme, tvb, offset+6, 1, 0); + proto_tree_add_item (tree, hf_scsi_mmc_data_length, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_scsi_mmc_report_key_type_code, tvb, offset+4, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_scsi_mmc_report_key_vendor_resets, tvb, offset+4, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_scsi_mmc_report_key_user_changes, tvb, offset+4, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_scsi_mmc_report_key_region_mask, tvb, offset+5, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_scsi_mmc_report_key_rpc_scheme, tvb, offset+6, 1, ENC_BIG_ENDIAN); break; default: ti = proto_tree_add_text (tree, tvb, 0, 0, @@ -928,19 +928,19 @@ dissect_mmc4_readtrackinformation (tvbuff_t *tvb, packet_info *pinfo _U_, proto_ if (tree && isreq && iscdb) { addresstype=tvb_get_guint8(tvb, offset)&0x03; - proto_tree_add_item (tree, hf_scsi_mmc_rti_address_type, tvb, offset+0, 1, 0); + proto_tree_add_item (tree, hf_scsi_mmc_rti_address_type, tvb, offset+0, 1, ENC_BIG_ENDIAN); switch(addresstype){ case 0x00: /* logical block address */ proto_tree_add_item (tree, hf_scsi_mmc_lba, tvb, offset+1, - 4, 0); + 4, ENC_BIG_ENDIAN); break; case 0x01: /* logical track number */ proto_tree_add_item (tree, hf_scsi_mmc_track, tvb, offset+1, - 4, 0); + 4, ENC_BIG_ENDIAN); break; case 0x02: /* logical session number */ proto_tree_add_item (tree, hf_scsi_mmc_session, tvb, offset+1, - 4, 0); + 4, ENC_BIG_ENDIAN); break; } @@ -949,28 +949,28 @@ dissect_mmc4_readtrackinformation (tvbuff_t *tvb, packet_info *pinfo _U_, proto_ ett_scsi_control, cdb_control_fields, FALSE); } if(tree && (!isreq)) { - proto_tree_add_item (tree, hf_scsi_mmc_data_length, tvb, 0, 2, 0); + proto_tree_add_item (tree, hf_scsi_mmc_data_length, tvb, 0, 2, ENC_BIG_ENDIAN); /* track offset+2 and offset+32 */ proto_tree_add_uint (tree, hf_scsi_mmc_track, tvb, 2, 1, (tvb_get_guint8(tvb, offset+32)<<8)|tvb_get_guint8(tvb, offset+2)); /* session offset+3 and offset+33 */ proto_tree_add_uint (tree, hf_scsi_mmc_session, tvb, 3, 1, (tvb_get_guint8(tvb, offset+33)<<8)|tvb_get_guint8(tvb, offset+3)); proto_tree_add_item (tree, hf_scsi_mmc_rti_damage, tvb, 5, 1, 0); proto_tree_add_item (tree, hf_scsi_mmc_rti_copy, tvb, 5, 1, 0); - proto_tree_add_item (tree, hf_scsi_mmc_rti_track_mode, tvb, 5, 1, 0); + proto_tree_add_item (tree, hf_scsi_mmc_rti_track_mode, tvb, 5, 1, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_mmc_rti_rt, tvb, 6, 1, 0); proto_tree_add_item (tree, hf_scsi_mmc_rti_blank, tvb, 6, 1, 0); proto_tree_add_item (tree, hf_scsi_mmc_rti_packet, tvb, 6, 1, 0); proto_tree_add_item (tree, hf_scsi_mmc_rti_fp, tvb, 6, 1, 0); - proto_tree_add_item (tree, hf_scsi_mmc_rti_data_mode, tvb, 6, 1, 0); + proto_tree_add_item (tree, hf_scsi_mmc_rti_data_mode, tvb, 6, 1, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_mmc_rti_lra_v, tvb, 7, 1, 0); proto_tree_add_item (tree, hf_scsi_mmc_rti_nwa_v, tvb, 7, 1, 0); - proto_tree_add_item (tree, hf_scsi_mmc_track_start_address, tvb, offset+8, 4, 0); - proto_tree_add_item (tree, hf_scsi_mmc_next_writable_address, tvb, offset+12, 4, 0); - proto_tree_add_item (tree, hf_scsi_mmc_free_blocks, tvb, offset+16, 4, 0); - proto_tree_add_item (tree, hf_scsi_mmc_fixed_packet_size, tvb, offset+20, 4, 0); - proto_tree_add_item (tree, hf_scsi_mmc_track_size, tvb, offset+24, 4, 0); - proto_tree_add_item (tree, hf_scsi_mmc_last_recorded_address, tvb, offset+28, 4, 0); - proto_tree_add_item (tree, hf_scsi_mmc_read_compatibility_lba, tvb, offset+36, 4, 0); + proto_tree_add_item (tree, hf_scsi_mmc_track_start_address, tvb, offset+8, 4, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_scsi_mmc_next_writable_address, tvb, offset+12, 4, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_scsi_mmc_free_blocks, tvb, offset+16, 4, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_scsi_mmc_fixed_packet_size, tvb, offset+20, 4, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_scsi_mmc_track_size, tvb, offset+24, 4, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_scsi_mmc_last_recorded_address, tvb, offset+28, 4, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_scsi_mmc_read_compatibility_lba, tvb, offset+36, 4, ENC_BIG_ENDIAN); } } @@ -1007,7 +1007,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, 0); + 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); } @@ -1036,14 +1036,14 @@ dissect_mmc4_close_track (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tre offset++; /* close function */ - proto_tree_add_item (tree, hf_scsi_mmc_closetrack_func, tvb, offset, 1, 0); + proto_tree_add_item (tree, hf_scsi_mmc_closetrack_func, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; /* reserved */ offset++; /* track number */ - proto_tree_add_item (tree, hf_scsi_mmc_track, tvb, offset, 2, 0); + proto_tree_add_item (tree, hf_scsi_mmc_track, tvb, offset, 2, ENC_BIG_ENDIAN); offset+=2; /* reserved */ @@ -1073,13 +1073,13 @@ dissect_mmc4_readbuffercapacity (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tr ett_scsi_control, cdb_control_fields, FALSE); } if(tree && (!isreq)) { - proto_tree_add_item (tree, hf_scsi_mmc_data_length, tvb, offset, 2, 0); + proto_tree_add_item (tree, hf_scsi_mmc_data_length, tvb, offset, 2, ENC_BIG_ENDIAN); if(cdata->itlq->flags){ - proto_tree_add_item (tree, hf_scsi_mmc_rbc_lob_blocks, tvb, offset+4, 4, 0); - proto_tree_add_item (tree, hf_scsi_mmc_rbc_alob_blocks, tvb, offset+8, 4, 0); + proto_tree_add_item (tree, hf_scsi_mmc_rbc_lob_blocks, tvb, offset+4, 4, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_scsi_mmc_rbc_alob_blocks, tvb, offset+8, 4, ENC_BIG_ENDIAN); } else { - proto_tree_add_item (tree, hf_scsi_mmc_rbc_lob_bytes, tvb, offset+4, 4, 0); - proto_tree_add_item (tree, hf_scsi_mmc_rbc_alob_bytes, tvb, offset+8, 4, 0); + proto_tree_add_item (tree, hf_scsi_mmc_rbc_lob_bytes, tvb, offset+4, 4, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_scsi_mmc_rbc_alob_bytes, tvb, offset+8, 4, ENC_BIG_ENDIAN); } } } @@ -1100,7 +1100,7 @@ dissect_mmc4_setcdspeed (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree { if (tree && isreq && iscdb) { - proto_tree_add_item (tree, hf_scsi_mmc_setcdspeed_rc, tvb, offset+0, 1, 0); + proto_tree_add_item (tree, hf_scsi_mmc_setcdspeed_rc, tvb, offset+0, 1, ENC_BIG_ENDIAN); proto_tree_add_text (tree, tvb, offset+1, 2, "Logical Unit Read Speed(bytes/sec): %u", tvb_get_ntohs (tvb, offset+1)); @@ -1131,24 +1131,24 @@ dissect_mmc4_setstreaming (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr if (tree && isreq && iscdb) { type=tvb_get_guint8(tvb, offset+7); cdata->itlq->flags=type; - proto_tree_add_item (tree, hf_scsi_mmc_setstreaming_type, tvb, offset+7, 1, 0); - proto_tree_add_item (tree, hf_scsi_mmc_setstreaming_param_len, tvb, offset+8, 2, 0); + 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); } if(tree && isreq && (!iscdb)) { switch(cdata->itlq->flags){ case 0x00: /* performance descriptor */ - proto_tree_add_item (tree, hf_scsi_mmc_setstreaming_wrc, tvb, offset+0, 1, 0); + proto_tree_add_item (tree, hf_scsi_mmc_setstreaming_wrc, tvb, offset+0, 1, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_mmc_setstreaming_rdd, tvb, offset+0, 1, 0); proto_tree_add_item (tree, hf_scsi_mmc_setstreaming_exact, tvb, offset+0, 1, 0); proto_tree_add_item (tree, hf_scsi_mmc_setstreaming_ra, tvb, offset+0, 1, 0); - proto_tree_add_item (tree, hf_scsi_mmc_setstreaming_start_lba, tvb, offset+4, 4, 0); - proto_tree_add_item (tree, hf_scsi_mmc_setstreaming_end_lba, tvb, offset+8, 4, 0); - proto_tree_add_item (tree, hf_scsi_mmc_setstreaming_read_size, tvb, offset+12, 4, 0); - proto_tree_add_item (tree, hf_scsi_mmc_setstreaming_read_time, tvb, offset+16, 4, 0); - proto_tree_add_item (tree, hf_scsi_mmc_setstreaming_write_size, tvb, offset+20, 4, 0); - proto_tree_add_item (tree, hf_scsi_mmc_setstreaming_write_time, tvb, offset+24, 4, 0); + proto_tree_add_item (tree, hf_scsi_mmc_setstreaming_start_lba, tvb, offset+4, 4, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_scsi_mmc_setstreaming_end_lba, tvb, offset+8, 4, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_scsi_mmc_setstreaming_read_size, tvb, offset+12, 4, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_scsi_mmc_setstreaming_read_time, tvb, offset+16, 4, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_scsi_mmc_setstreaming_write_size, tvb, offset+20, 4, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_scsi_mmc_setstreaming_write_time, tvb, offset+24, 4, ENC_BIG_ENDIAN); break; default: ti = proto_tree_add_text (tree, tvb, 0, 0, diff --git a/epan/dissectors/packet-scsi-osd.c b/epan/dissectors/packet-scsi-osd.c index adf382cb9a..47444329d2 100644 --- a/epan/dissectors/packet-scsi-osd.c +++ b/epan/dissectors/packet-scsi-osd.c @@ -202,7 +202,7 @@ attribute_1_82(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) int offset=0; /* user object id */ - proto_tree_add_item(tree, hf_scsi_osd_user_object_logical_length, tvb, offset, 8, 0); + proto_tree_add_item(tree, hf_scsi_osd_user_object_logical_length, tvb, offset, 8, ENC_BIG_ENDIAN); offset+=8; } @@ -257,7 +257,7 @@ dissect_osd_attributes_list(packet_info *pinfo, tvbuff_t *tvb, int offset, proto /* list type */ type=tvb_get_guint8(tvb, offset)&0x0f; - proto_tree_add_item(tree, hf_scsi_osd_attributes_list_type, tvb, offset, 1, 0); + proto_tree_add_item(tree, hf_scsi_osd_attributes_list_type, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; /* a reserved byte */ @@ -265,7 +265,7 @@ dissect_osd_attributes_list(packet_info *pinfo, tvbuff_t *tvb, int offset, proto /* length */ length=tvb_get_ntohs(tvb, offset); - proto_tree_add_item(tree, hf_scsi_osd_attributes_list_length, tvb, offset, 2, 0); + proto_tree_add_item(tree, hf_scsi_osd_attributes_list_length, tvb, offset, 2, ENC_BIG_ENDIAN); offset+=2; /* if type is 1 length will be zero and we have to cycle over @@ -280,12 +280,12 @@ dissect_osd_attributes_list(packet_info *pinfo, tvbuff_t *tvb, int offset, proto case 0x01: /* retrieving attributes 7.1.3.2 */ /* attributes page */ page=tvb_get_ntohl(tvb, offset); - proto_tree_add_item(tree, hf_scsi_osd_attributes_page, tvb, offset, 4, 0); + proto_tree_add_item(tree, hf_scsi_osd_attributes_page, tvb, offset, 4, ENC_BIG_ENDIAN); offset+=4; /* attribute number */ number=tvb_get_ntohl(tvb, offset); - item=proto_tree_add_item(tree, hf_scsi_osd_attribute_number, tvb, offset, 4, 0); + item=proto_tree_add_item(tree, hf_scsi_osd_attribute_number, tvb, offset, 4, ENC_BIG_ENDIAN); offset+=4; /* find the proper attributes page */ @@ -323,17 +323,17 @@ dissect_osd_attributes_list(packet_info *pinfo, tvbuff_t *tvb, int offset, proto case 0x09: /* retrieved/set attributes 7.1.3.3 */ /* attributes page */ page=tvb_get_ntohl(tvb, offset); - proto_tree_add_item(tree, hf_scsi_osd_attributes_page, tvb, offset, 4, 0); + proto_tree_add_item(tree, hf_scsi_osd_attributes_page, tvb, offset, 4, ENC_BIG_ENDIAN); offset+=4; /* attribute number */ number=tvb_get_ntohl(tvb, offset); - item=proto_tree_add_item(tree, hf_scsi_osd_attribute_number, tvb, offset, 4, 0); + item=proto_tree_add_item(tree, hf_scsi_osd_attribute_number, tvb, offset, 4, ENC_BIG_ENDIAN); offset+=4; /* attribute length */ attribute_length=tvb_get_ntohs(tvb, offset); - proto_tree_add_item(tree, hf_scsi_osd_attribute_length, tvb, offset, 2, 0); + proto_tree_add_item(tree, hf_scsi_osd_attribute_length, tvb, offset, 2, ENC_BIG_ENDIAN); offset+=2; /* find the proper attributes page */ @@ -399,7 +399,7 @@ dissect_osd_option(tvbuff_t *tvb, int offset, proto_tree *parent_tree) option=tvb_get_guint8(tvb, offset); if(parent_tree){ - it=proto_tree_add_item(parent_tree, hf_scsi_osd_option, tvb, offset, 1, 0); + it=proto_tree_add_item(parent_tree, hf_scsi_osd_option, tvb, offset, 1, ENC_BIG_ENDIAN); tree = proto_item_add_subtree(it, ett_osd_option); } @@ -428,7 +428,7 @@ dissect_osd_getsetattrib(tvbuff_t *tvb, int offset, proto_tree *tree, scsi_task_ scsi_osd_extra_data_t *extra_data=cdata->itlq->extra_data; extra_data->gsatype=(tvb_get_guint8(tvb, offset)>>4)&0x03; } - proto_tree_add_item(tree, hf_scsi_osd_getsetattrib, tvb, offset, 1, 0); + proto_tree_add_item(tree, hf_scsi_osd_getsetattrib, tvb, offset, 1, ENC_BIG_ENDIAN); } @@ -441,14 +441,14 @@ static const value_string scsi_osd_timestamps_control_vals[] = { static void dissect_osd_timestamps_control(tvbuff_t *tvb, int offset, proto_tree *tree) { - proto_tree_add_item(tree, hf_scsi_osd_timestamps_control, tvb, offset, 1, 0); + proto_tree_add_item(tree, hf_scsi_osd_timestamps_control, tvb, offset, 1, ENC_BIG_ENDIAN); } static void dissect_osd_formatted_capacity(tvbuff_t *tvb, int offset, proto_tree *tree) { - proto_tree_add_item(tree, hf_scsi_osd_formatted_capacity, tvb, offset, 8, 0); + proto_tree_add_item(tree, hf_scsi_osd_formatted_capacity, tvb, offset, 8, ENC_BIG_ENDIAN); } @@ -475,23 +475,23 @@ dissect_osd_attribute_parameters(tvbuff_t *tvb, int offset, proto_tree *parent_t switch(gsatype){ case 2: /* 5.2.2.2 attribute page */ - proto_tree_add_item(tree, hf_scsi_osd_get_attributes_page, tvb, offset, 4, 0); + proto_tree_add_item(tree, hf_scsi_osd_get_attributes_page, tvb, offset, 4, ENC_BIG_ENDIAN); offset+=4; - proto_tree_add_item(tree, hf_scsi_osd_get_attributes_allocation_length, tvb, offset, 4, 0); + proto_tree_add_item(tree, hf_scsi_osd_get_attributes_allocation_length, tvb, offset, 4, ENC_BIG_ENDIAN); offset+=4; - proto_tree_add_item(tree, hf_scsi_osd_retrieved_attributes_offset, tvb, offset, 4, 0); + proto_tree_add_item(tree, hf_scsi_osd_retrieved_attributes_offset, tvb, offset, 4, ENC_BIG_ENDIAN); offset+=4; - proto_tree_add_item(tree, hf_scsi_osd_set_attributes_page, tvb, offset, 4, 0); + proto_tree_add_item(tree, hf_scsi_osd_set_attributes_page, tvb, offset, 4, ENC_BIG_ENDIAN); offset+=4; - proto_tree_add_item(tree, hf_scsi_osd_set_attribute_number, tvb, offset, 4, 0); + proto_tree_add_item(tree, hf_scsi_osd_set_attribute_number, tvb, offset, 4, ENC_BIG_ENDIAN); offset+=4; - proto_tree_add_item(tree, hf_scsi_osd_set_attribute_length, tvb, offset, 4, 0); + proto_tree_add_item(tree, hf_scsi_osd_set_attribute_length, tvb, offset, 4, ENC_BIG_ENDIAN); offset+=4; - proto_tree_add_item(tree, hf_scsi_osd_set_attributes_offset, tvb, offset, 4, 0); + proto_tree_add_item(tree, hf_scsi_osd_set_attributes_offset, tvb, offset, 4, ENC_BIG_ENDIAN); offset+=4; break; case 3: /* 5.2.2.3 attribute list */ - proto_tree_add_item(tree, hf_scsi_osd_get_attributes_list_length, tvb, offset, 4, 0); + proto_tree_add_item(tree, hf_scsi_osd_get_attributes_list_length, tvb, offset, 4, ENC_BIG_ENDIAN); extra_data->u.al.get_list_length=tvb_get_ntohl(tvb, offset); offset+=4; @@ -502,7 +502,7 @@ dissect_osd_attribute_parameters(tvbuff_t *tvb, int offset, proto_tree *parent_t proto_tree_add_uint(tree, hf_scsi_osd_get_attributes_list_offset, tvb, offset, 4, extra_data->u.al.get_list_offset); offset+=4; - proto_tree_add_item(tree, hf_scsi_osd_get_attributes_allocation_length, tvb, offset, 4, 0); + proto_tree_add_item(tree, hf_scsi_osd_get_attributes_allocation_length, tvb, offset, 4, ENC_BIG_ENDIAN); extra_data->u.al.get_list_allocation_length=tvb_get_ntohl(tvb, offset); offset+=4; @@ -513,11 +513,11 @@ dissect_osd_attribute_parameters(tvbuff_t *tvb, int offset, proto_tree *parent_t proto_tree_add_uint(tree, hf_scsi_osd_retrieved_attributes_offset, tvb, offset, 4, extra_data->u.al.retrieved_list_offset); offset+=4; - proto_tree_add_item(tree, hf_scsi_osd_set_attributes_list_length, tvb, offset, 4, 0); + proto_tree_add_item(tree, hf_scsi_osd_set_attributes_list_length, tvb, offset, 4, ENC_BIG_ENDIAN); extra_data->u.al.set_list_length=tvb_get_ntohl(tvb, offset); offset+=4; - proto_tree_add_item(tree, hf_scsi_osd_set_attributes_list_offset, tvb, offset, 4, 0); + proto_tree_add_item(tree, hf_scsi_osd_set_attributes_list_offset, tvb, offset, 4, ENC_BIG_ENDIAN); extra_data->u.al.set_list_offset=tvb_get_ntohl(tvb, offset); offset+=4; @@ -658,7 +658,7 @@ dissect_osd_permissions(tvbuff_t *tvb, int offset, proto_tree *parent_tree) permissions=tvb_get_ntohs(tvb, offset); if(parent_tree){ - it=proto_tree_add_item(parent_tree, hf_scsi_osd_permissions, tvb, offset, 2, 0); + it=proto_tree_add_item(parent_tree, hf_scsi_osd_permissions, tvb, offset, 2, ENC_BIG_ENDIAN); tree = proto_item_add_subtree(it, ett_osd_permission_bitmask); } @@ -722,16 +722,16 @@ dissect_osd_capability(tvbuff_t *tvb, int offset, proto_tree *parent_tree) } /* capability format */ - proto_tree_add_item(tree, hf_scsi_osd_capability_format, tvb, offset, 1, 0); + proto_tree_add_item(tree, hf_scsi_osd_capability_format, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; /* key version and icva */ - proto_tree_add_item(tree, hf_scsi_osd_key_version, tvb, offset, 1, 0); - proto_tree_add_item(tree, hf_scsi_osd_icva, tvb, offset, 1, 0); + proto_tree_add_item(tree, hf_scsi_osd_key_version, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_scsi_osd_icva, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; /* security method */ - proto_tree_add_item(tree, hf_scsi_osd_security_method, tvb, offset, 1, 0); + proto_tree_add_item(tree, hf_scsi_osd_security_method, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; /* a reserved byte */ @@ -754,7 +754,7 @@ dissect_osd_capability(tvbuff_t *tvb, int offset, proto_tree *parent_tree) offset+=6; /* object type */ - proto_tree_add_item(tree, hf_scsi_osd_object_type, tvb, offset, 1, 0); + proto_tree_add_item(tree, hf_scsi_osd_object_type, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; /* permission bitmask */ @@ -765,7 +765,7 @@ dissect_osd_capability(tvbuff_t *tvb, int offset, proto_tree *parent_tree) offset++; /* object descriptor type */ - proto_tree_add_item(tree, hf_scsi_osd_object_descriptor_type, tvb, offset, 1, 0); + proto_tree_add_item(tree, hf_scsi_osd_object_descriptor_type, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; /* object descriptor */ @@ -797,11 +797,11 @@ dissect_osd_security_parameters(tvbuff_t *tvb, int offset, proto_tree *parent_tr offset+=12; /* data in integrity check value offset */ - proto_tree_add_item(tree, hf_scsi_osd_diicvo, tvb, offset, 4, 0); + proto_tree_add_item(tree, hf_scsi_osd_diicvo, tvb, offset, 4, ENC_BIG_ENDIAN); offset+=4; /* data out integrity check value offset */ - proto_tree_add_item(tree, hf_scsi_osd_doicvo, tvb, offset, 4, 0); + proto_tree_add_item(tree, hf_scsi_osd_doicvo, tvb, offset, 4, ENC_BIG_ENDIAN); offset+=4; } @@ -994,7 +994,7 @@ static void dissect_osd_sortorder(tvbuff_t *tvb, int offset, proto_tree *tree) { /* sort order */ - proto_tree_add_item(tree, hf_scsi_osd_sortorder, tvb, offset, 1, 0); + proto_tree_add_item(tree, hf_scsi_osd_sortorder, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; } @@ -1002,7 +1002,7 @@ static void dissect_osd_list_identifier(tvbuff_t *tvb, int offset, proto_tree *tree) { /* list identifier */ - proto_tree_add_item(tree, hf_scsi_osd_list_identifier, tvb, offset, 4, 0); + proto_tree_add_item(tree, hf_scsi_osd_list_identifier, tvb, offset, 4, ENC_BIG_ENDIAN); offset+=4; } @@ -1010,7 +1010,7 @@ static void dissect_osd_allocation_length(tvbuff_t *tvb, int offset, proto_tree *tree) { /* allocation length */ - proto_tree_add_item(tree, hf_scsi_osd_allocation_length, tvb, offset, 8, 0); + proto_tree_add_item(tree, hf_scsi_osd_allocation_length, tvb, offset, 8, ENC_BIG_ENDIAN); offset+=8; } @@ -1026,7 +1026,7 @@ static void dissect_osd_additional_length(tvbuff_t *tvb, int offset, proto_tree *tree) { /* additional length */ - proto_tree_add_item(tree, hf_scsi_osd_additional_length, tvb, offset, 8, 0); + proto_tree_add_item(tree, hf_scsi_osd_additional_length, tvb, offset, 8, ENC_BIG_ENDIAN); offset+=8; } @@ -1171,7 +1171,7 @@ static void dissect_osd_number_of_user_objects(tvbuff_t *tvb, int offset, proto_tree *tree) { /* number_of_user_objects */ - proto_tree_add_item(tree, hf_scsi_osd_number_of_user_objects, tvb, offset, 2, 0); + proto_tree_add_item(tree, hf_scsi_osd_number_of_user_objects, tvb, offset, 2, ENC_BIG_ENDIAN); offset+=2; } @@ -1320,13 +1320,13 @@ static const value_string key_to_set_vals[] = { static void dissect_osd_key_to_set(tvbuff_t *tvb, int offset, proto_tree *tree) { - proto_tree_add_item(tree, hf_scsi_osd_key_to_set, tvb, offset, 1, 0); + proto_tree_add_item(tree, hf_scsi_osd_key_to_set, tvb, offset, 1, ENC_BIG_ENDIAN); } static void dissect_osd_set_key_version(tvbuff_t *tvb, int offset, proto_tree *tree) { - proto_tree_add_item(tree, hf_scsi_osd_set_key_version, tvb, offset, 1, 0); + proto_tree_add_item(tree, hf_scsi_osd_set_key_version, tvb, offset, 1, ENC_BIG_ENDIAN); } static void @@ -1569,7 +1569,7 @@ static void dissect_osd_length(tvbuff_t *tvb, int offset, proto_tree *tree) { /* length */ - proto_tree_add_item(tree, hf_scsi_osd_length, tvb, offset, 8, 0); + proto_tree_add_item(tree, hf_scsi_osd_length, tvb, offset, 8, ENC_BIG_ENDIAN); offset+=8; } @@ -1577,7 +1577,7 @@ static void dissect_osd_starting_byte_address(tvbuff_t *tvb, int offset, proto_tree *tree) { /* starting_byte_address */ - proto_tree_add_item(tree, hf_scsi_osd_starting_byte_address, tvb, offset, 8, 0); + proto_tree_add_item(tree, hf_scsi_osd_starting_byte_address, tvb, offset, 8, ENC_BIG_ENDIAN); offset+=8; } @@ -1744,7 +1744,7 @@ static void dissect_osd_flush_scope(tvbuff_t *tvb, int offset, proto_tree *tree) { /* flush scope */ - proto_tree_add_item(tree, hf_scsi_osd_flush_scope, tvb, offset, 1, 0); + proto_tree_add_item(tree, hf_scsi_osd_flush_scope, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; } @@ -1826,7 +1826,7 @@ static void dissect_osd_flush_collection_scope(tvbuff_t *tvb, int offset, proto_tree *tree) { /* flush collection scope */ - proto_tree_add_item(tree, hf_scsi_osd_flush_collection_scope, tvb, offset, 1, 0); + proto_tree_add_item(tree, hf_scsi_osd_flush_collection_scope, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; } @@ -2057,7 +2057,7 @@ static void dissect_osd_flush_osd_scope(tvbuff_t *tvb, int offset, proto_tree *tree) { /* flush osd scope */ - proto_tree_add_item(tree, hf_scsi_osd_flush_osd_scope, tvb, offset, 1, 0); + proto_tree_add_item(tree, hf_scsi_osd_flush_osd_scope, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; } @@ -2128,7 +2128,7 @@ static void dissect_osd_flush_partition_scope(tvbuff_t *tvb, int offset, proto_tree *tree) { /* flush partition scope */ - proto_tree_add_item(tree, hf_scsi_osd_flush_partition_scope, tvb, offset, 1, 0); + proto_tree_add_item(tree, hf_scsi_osd_flush_partition_scope, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; } @@ -2611,7 +2611,7 @@ dissect_osd_opcode(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, /* 5 reserved bytes */ offset+=5; - proto_tree_add_item (tree, hf_scsi_osd_add_cdblen, tvb, offset, 1, 0); + proto_tree_add_item (tree, hf_scsi_osd_add_cdblen, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; svcaction=tvb_get_ntohs(tvb, offset); @@ -2628,7 +2628,7 @@ dissect_osd_opcode(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, cdata->itlq->extra_data=extra_data; } } - proto_tree_add_item (tree, hf_scsi_osd_svcaction, tvb, offset, 2, 0); + proto_tree_add_item (tree, hf_scsi_osd_svcaction, tvb, offset, 2, ENC_BIG_ENDIAN); offset+=2; diff --git a/epan/dissectors/packet-scsi-sbc.c b/epan/dissectors/packet-scsi-sbc.c index 65e8cf3a40..a5ebcd5090 100644 --- a/epan/dissectors/packet-scsi-sbc.c +++ b/epan/dissectors/packet-scsi-sbc.c @@ -182,8 +182,8 @@ 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); - proto_tree_add_item (tree, hf_scsi_sbc_formatunit_vendor, tvb, offset+1, 1, 0); - proto_tree_add_item (tree, hf_scsi_sbc_formatunit_interleave, tvb, offset+2, 2, 0); + 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); } @@ -203,8 +203,8 @@ dissect_sbc_read6 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, } if (tree && isreq && iscdb) { - proto_tree_add_item (tree, hf_scsi_sbc_rdwr6_lba, tvb, offset, 3, 0); - proto_tree_add_item (tree, hf_scsi_sbc_rdwr6_xferlen, tvb, offset+3, 1, 0); + 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); } @@ -223,8 +223,8 @@ dissect_sbc_write6 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, } if (tree && isreq && iscdb) { - proto_tree_add_item (tree, hf_scsi_sbc_rdwr6_lba, tvb, offset, 3, 0); - proto_tree_add_item (tree, hf_scsi_sbc_rdwr6_xferlen, tvb, offset+3, 1, 0); + 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); } @@ -251,9 +251,9 @@ 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); - proto_tree_add_item (tree, hf_scsi_sbc_rdwr10_lba, tvb, offset+1, 4, 0); - proto_tree_add_item (tree, hf_scsi_sbc_group, tvb, offset+5, 1, 0); - proto_tree_add_item (tree, hf_scsi_sbc_rdwr10_xferlen, tvb, offset+6, 2, 0); + 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); } @@ -281,9 +281,9 @@ 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); - proto_tree_add_item (tree, hf_scsi_sbc_rdwr10_lba, tvb, offset+1, 4, 0); - proto_tree_add_item (tree, hf_scsi_sbc_group, tvb, offset+5, 1, 0); - proto_tree_add_item (tree, hf_scsi_sbc_rdwr10_xferlen, tvb, offset+6, 2, 0); + 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); } @@ -312,8 +312,8 @@ dissect_sbc_synchronizecache16 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre proto_tree_add_bitmask(tree, tvb, offset, hf_scsi_sbc_synccache_flags, ett_scsi_synccache, sync_fields, FALSE); 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, 0); - proto_tree_add_item (tree, hf_scsi_sbc_group, tvb, offset+13, 1, 0); + 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); } @@ -341,8 +341,8 @@ dissect_sbc_prefetch16 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, proto_tree_add_bitmask(tree, tvb, offset, hf_scsi_sbc_prefetch_flags, ett_scsi_prefetch, prefetch_fields, FALSE); 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, 0); - proto_tree_add_item (tree, hf_scsi_sbc_group, tvb, offset+13, 1, 0); + 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); } @@ -372,9 +372,9 @@ 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); - proto_tree_add_item (tree, hf_scsi_sbc_rdwr10_lba, tvb, offset+1, 4, 0); - proto_tree_add_item (tree, hf_scsi_sbc_group, tvb, offset+5, 1, 0); - proto_tree_add_item (tree, hf_scsi_sbc_rdwr10_xferlen, tvb, offset+6, 2, 0); + 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); } @@ -401,9 +401,9 @@ 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); - proto_tree_add_item (tree, hf_scsi_sbc_rdwr10_lba, tvb, offset+1, 4, 0); - proto_tree_add_item (tree, hf_scsi_sbc_group, tvb, offset+5, 1, 0); - proto_tree_add_item (tree, hf_scsi_sbc_rdwr10_xferlen, tvb, offset+6, 2, 0); + 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); } @@ -434,9 +434,9 @@ 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); - proto_tree_add_item (tree, hf_scsi_sbc_rdwr10_lba, tvb, offset+1, 4, 0); - proto_tree_add_item (tree, hf_scsi_sbc_group, tvb, offset+5, 1, 0); - proto_tree_add_item (tree, hf_scsi_sbc_rdwr10_xferlen, tvb, offset+6, 2, 0); + 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); } @@ -468,9 +468,9 @@ 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); - proto_tree_add_item (tree, hf_scsi_sbc_rdwr10_lba, tvb, offset+1, 4, 0); - proto_tree_add_item (tree, hf_scsi_sbc_group, tvb, offset+5, 1, 0); - proto_tree_add_item (tree, hf_scsi_sbc_rdwr10_xferlen, tvb, offset+6, 2, 0); + 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); } @@ -500,9 +500,9 @@ 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); - proto_tree_add_item (tree, hf_scsi_sbc_rdwr10_lba, tvb, offset+1, 4, 0); - proto_tree_add_item (tree, hf_scsi_sbc_group, tvb, offset+5, 1, 0); - proto_tree_add_item (tree, hf_scsi_sbc_rdwr10_xferlen, tvb, offset+6, 2, 0); + 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); } @@ -532,9 +532,9 @@ 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); - proto_tree_add_item (tree, hf_scsi_sbc_rdwr10_lba, tvb, offset+1, 4, 0); - proto_tree_add_item (tree, hf_scsi_sbc_group, tvb, offset+5, 1, 0); - proto_tree_add_item (tree, hf_scsi_sbc_rdwr10_xferlen, tvb, offset+6, 2, 0); + 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); } @@ -563,9 +563,9 @@ 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); - proto_tree_add_item (tree, hf_scsi_sbc_rdwr10_lba, tvb, offset+1, 4, 0); - proto_tree_add_item (tree, hf_scsi_sbc_rdwr12_xferlen, tvb, offset+5, 4, 0); - proto_tree_add_item (tree, hf_scsi_sbc_group, tvb, offset+9, 1, 0); + 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); } @@ -593,9 +593,9 @@ 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); - proto_tree_add_item (tree, hf_scsi_sbc_rdwr10_lba, tvb, offset+1, 4, 0); - proto_tree_add_item (tree, hf_scsi_sbc_rdwr12_xferlen, tvb, offset+5, 4, 0); - proto_tree_add_item (tree, hf_scsi_sbc_group, tvb, offset+9, 1, 0); + 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); } @@ -625,8 +625,8 @@ dissect_sbc_read16 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, proto_tree_add_bitmask(tree, tvb, offset, hf_scsi_sbc_read_flags, ett_scsi_rdwr, rdwr16_fields, FALSE); 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, 0); - proto_tree_add_item (tree, hf_scsi_sbc_group, tvb, offset+13, 1, 0); + 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); } @@ -655,8 +655,8 @@ dissect_sbc_write16 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, proto_tree_add_bitmask(tree, tvb, offset, hf_scsi_sbc_read_flags, ett_scsi_rdwr, rdwr16_fields, FALSE); 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, 0); - proto_tree_add_item (tree, hf_scsi_sbc_group, tvb, offset+13, 1, 0); + 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); } @@ -731,9 +731,9 @@ 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); - proto_tree_add_item (tree, hf_scsi_sbc_verify_lba, tvb, offset+1, 4, 0); - proto_tree_add_item (tree, hf_scsi_sbc_group, tvb, offset+5, 1, 0); - proto_tree_add_item (tree, hf_scsi_sbc_verify_vlen, tvb, offset+6, 2, 0); + 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); } @@ -762,9 +762,9 @@ 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); - proto_tree_add_item (tree, hf_scsi_sbc_verify_lba, tvb, offset+1, 4, 0); - proto_tree_add_item (tree, hf_scsi_sbc_verify_vlen32, tvb, offset+5, 4, 0); - proto_tree_add_item (tree, hf_scsi_sbc_group, tvb, offset+9, 1, 0); + 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); } @@ -793,9 +793,9 @@ 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); - proto_tree_add_item (tree, hf_scsi_sbc_verify_lba64, tvb, offset+1, 8, 0); - proto_tree_add_item (tree, hf_scsi_sbc_verify_vlen32, tvb, offset+9, 4, 0); - proto_tree_add_item (tree, hf_scsi_sbc_group, tvb, offset+13, 1, 0); + 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); } @@ -826,9 +826,9 @@ 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); - proto_tree_add_item (tree, hf_scsi_sbc_wrverify_lba, tvb, offset+1, 4, 0); - proto_tree_add_item (tree, hf_scsi_sbc_group, tvb, offset+5, 1, 0); - proto_tree_add_item (tree, hf_scsi_sbc_wrverify_xferlen, tvb, offset+6, 2, 0); + 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); } @@ -857,9 +857,9 @@ 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); - proto_tree_add_item (tree, hf_scsi_sbc_wrverify_lba, tvb, offset+1, 4, 0); - proto_tree_add_item (tree, hf_scsi_sbc_wrverify_xferlen32, tvb, offset+5, 4, 0); - proto_tree_add_item (tree, hf_scsi_sbc_group, tvb, offset+9, 1, 0); + 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); } @@ -888,9 +888,9 @@ 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); - proto_tree_add_item (tree, hf_scsi_sbc_wrverify_lba64, tvb, offset+1, 8, 0); - proto_tree_add_item (tree, hf_scsi_sbc_wrverify_xferlen32, tvb, offset+9, 4, 0); - proto_tree_add_item (tree, hf_scsi_sbc_group, tvb, offset+13, 1, 0); + 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); } @@ -912,7 +912,7 @@ dissect_sbc_readcapacity10 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *t return; if (isreq && iscdb) { - proto_tree_add_item (tree, hf_scsi_sbc_readcapacity_lba, tvb, offset+1, 4, 0); + 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); proto_tree_add_bitmask(tree, tvb, offset+8, hf_scsi_control, @@ -928,7 +928,7 @@ dissect_sbc_readcapacity10 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *t un="GB"; } proto_tree_add_uint_format (tree, hf_scsi_sbc_returned_lba, tvb, offset, 4, len, "LBA: %u (%u %s)", len, tot_len, un); - proto_tree_add_item (tree, hf_scsi_sbc_blocksize, tvb, offset+4, 4, 0); + proto_tree_add_item (tree, hf_scsi_sbc_blocksize, tvb, offset+4, 4, ENC_BIG_ENDIAN); } } @@ -951,7 +951,7 @@ 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); - proto_tree_add_item (tree, hf_scsi_sbc_alloclen16, tvb, offset+6, 2, 0); + 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); } @@ -976,8 +976,8 @@ 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); - proto_tree_add_item (tree, hf_scsi_sbc_rdwr10_lba, tvb, offset+1, 4, 0); - proto_tree_add_item (tree, hf_scsi_sbc_alloclen16, tvb, offset+6, 2, 0); + 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); } @@ -994,8 +994,8 @@ dissect_sbc_writelong10 (tvbuff_t *tvb, packet_info *pinfo _U_, return; if (isreq && iscdb) { - proto_tree_add_item (tree, hf_scsi_sbc_rdwr10_lba, tvb, offset+1, 4, 0); - proto_tree_add_item (tree, hf_scsi_sbc_alloclen16, tvb, offset+6, 2, 0); + 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); } @@ -1020,9 +1020,9 @@ 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); - proto_tree_add_item (tree, hf_scsi_sbc_rdwr10_lba, tvb, offset+1, 4, 0); - proto_tree_add_item (tree, hf_scsi_sbc_group, tvb, offset+5, 1, 0); - proto_tree_add_item (tree, hf_scsi_sbc_alloclen16, tvb, offset+6, 2, 0); + 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); } @@ -1048,8 +1048,8 @@ dissect_sbc_writesame16 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree_add_bitmask(tree, tvb, offset, hf_scsi_sbc_writesame_flags, ett_scsi_writesame, writesame16_fields, FALSE); 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, 0); - proto_tree_add_item (tree, hf_scsi_sbc_group, tvb, offset+13, 1, 0); + 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); } @@ -1074,7 +1074,7 @@ 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); - proto_tree_add_item (tree, hf_scsi_sbc_alloclen32, tvb, offset+5, 4, 0); + 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); } @@ -1158,7 +1158,7 @@ dissect_sbc_serviceactionin16 (tvbuff_t *tvb, packet_info *pinfo _U_, tvb_get_ntoh64 (tvb, offset)); offset += 8; - proto_tree_add_item (tree, hf_scsi_sbc_alloclen32, tvb, offset, 4, 0); + 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); @@ -1185,7 +1185,7 @@ dissect_sbc_serviceactionin16 (tvbuff_t *tvb, packet_info *pinfo _U_, /* two reserved bytes */ offset+=2; - proto_tree_add_item (tree, hf_scsi_sbc_alloclen16, tvb, offset, 2, 0); + proto_tree_add_item (tree, hf_scsi_sbc_alloclen16, tvb, offset, 2, ENC_BIG_ENDIAN); offset+=2; /* CORRCT bit */ @@ -1211,7 +1211,7 @@ dissect_sbc_serviceactionin16 (tvbuff_t *tvb, packet_info *pinfo _U_, } proto_tree_add_text (tree, tvb, offset, 8, "LBA: %" G_GINT64_MODIFIER "u (%" G_GINT64_MODIFIER "u %s)", len, tot_len, un); - proto_tree_add_item (tree, hf_scsi_sbc_blocksize, tvb, offset+8, 4, 0); + proto_tree_add_item (tree, hf_scsi_sbc_blocksize, tvb, offset+8, 4, ENC_BIG_ENDIAN); break; } } diff --git a/epan/dissectors/packet-scsi-smc.c b/epan/dissectors/packet-scsi-smc.c index 4113d15a94..d7c257c655 100644 --- a/epan/dissectors/packet-scsi-smc.c +++ b/epan/dissectors/packet-scsi-smc.c @@ -79,10 +79,10 @@ dissect_smc_exchangemedium (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *t return; if (isreq && iscdb) { - proto_tree_add_item (tree, hf_scsi_smc_mta, tvb, offset+1, 2, 0); - proto_tree_add_item (tree, hf_scsi_smc_sa, tvb, offset+3, 2, 0); - proto_tree_add_item (tree, hf_scsi_smc_fda, tvb, offset+5, 2, 0); - proto_tree_add_item (tree, hf_scsi_smc_sda, tvb, offset+7, 2, 0); + proto_tree_add_item (tree, hf_scsi_smc_mta, tvb, offset+1, 2, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_scsi_smc_sa, tvb, offset+3, 2, ENC_BIG_ENDIAN); + 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); proto_tree_add_bitmask(tree, tvb, offset+10, hf_scsi_control, @@ -104,8 +104,8 @@ dissect_smc_position_to_element (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tr return; if (isreq && iscdb) { - proto_tree_add_item (tree, hf_scsi_smc_mta, tvb, offset+1, 2, 0); - proto_tree_add_item (tree, hf_scsi_smc_da, tvb, offset+3, 2, 0); + 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); proto_tree_add_bitmask(tree, tvb, offset+8, hf_scsi_control, @@ -144,8 +144,8 @@ 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); - proto_tree_add_item (tree, hf_scsi_smc_sa, tvb, offset+1, 2, 0); - proto_tree_add_item (tree, hf_scsi_smc_num_elements, tvb, offset+5, 2, 0); + 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); } @@ -160,8 +160,8 @@ dissect_smc_openclose_importexport_element (tvbuff_t *tvb, packet_info *pinfo _U return; if (isreq && iscdb) { - proto_tree_add_item (tree, hf_scsi_smc_ea, tvb, offset+1, 2, 0); - proto_tree_add_item (tree, hf_scsi_smc_action_code, tvb, offset+3, 1, 0); + 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); } @@ -180,9 +180,9 @@ dissect_smc_movemedium (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, return; if (isreq && iscdb) { - proto_tree_add_item (tree, hf_scsi_smc_mta, tvb, offset+1, 2, 0); - proto_tree_add_item (tree, hf_scsi_smc_sa, tvb, offset+3, 2, 0); - proto_tree_add_item (tree, hf_scsi_smc_da, tvb, offset+5, 2, 0); + proto_tree_add_item (tree, hf_scsi_smc_mta, tvb, offset+1, 2, ENC_BIG_ENDIAN); + 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); proto_tree_add_bitmask(tree, tvb, offset+10, hf_scsi_control, diff --git a/epan/dissectors/packet-scsi-ssc.c b/epan/dissectors/packet-scsi-ssc.c index 260ea074cc..350ad5062d 100644 --- a/epan/dissectors/packet-scsi-ssc.c +++ b/epan/dissectors/packet-scsi-ssc.c @@ -118,7 +118,7 @@ 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); - proto_tree_add_item (tree, hf_scsi_ssc_rdwr6_xferlen, tvb, offset+1, 3, 0); + 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); } @@ -144,7 +144,7 @@ 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); - proto_tree_add_item (tree, hf_scsi_ssc_rdwr6_xferlen, tvb, offset+1, 3, 0); + 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); } @@ -173,7 +173,7 @@ 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); - proto_tree_add_item (tree, hf_scsi_ssc_rdwr6_xferlen, tvb, offset+6, 2, 0); + 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); } else { @@ -202,7 +202,7 @@ 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); - proto_tree_add_item (tree, hf_scsi_ssc_rdwr6_xferlen, tvb, offset+1, 3, 0); + 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); } @@ -228,9 +228,9 @@ 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); - proto_tree_add_item (tree, hf_scsi_ssc_partition, tvb, offset+2, 1, 0); - proto_tree_add_item (tree, hf_scsi_ssc_locate16_loid, tvb, offset+3, 8, 0); - proto_tree_add_item (tree, hf_scsi_ssc_rdwr6_xferlen, tvb, offset+11, 3, 0); + 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); } @@ -257,9 +257,9 @@ 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); - proto_tree_add_item (tree, hf_scsi_ssc_partition, tvb, offset+2, 1, 0); - proto_tree_add_item (tree, hf_scsi_ssc_locate16_loid, tvb, offset+3, 8, 0); - proto_tree_add_item (tree, hf_scsi_ssc_rdwr6_xferlen, tvb, offset+11, 3, 0); + 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); } @@ -286,9 +286,9 @@ 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); - proto_tree_add_item (tree, hf_scsi_ssc_partition, tvb, offset+2, 1, 0); - proto_tree_add_item (tree, hf_scsi_ssc_locate16_loid, tvb, offset+3, 8, 0); - proto_tree_add_item (tree, hf_scsi_ssc_rdwr6_xferlen, tvb, offset+11, 3, 0); + 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); } @@ -315,9 +315,9 @@ 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); - proto_tree_add_item (tree, hf_scsi_ssc_partition, tvb, offset+2, 1, 0); - proto_tree_add_item (tree, hf_scsi_ssc_locate16_loid, tvb, offset+3, 8, 0); - proto_tree_add_item (tree, hf_scsi_ssc_ver16_verlen, tvb, offset+11, 3, 0); + 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); } @@ -344,7 +344,7 @@ 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); - proto_tree_add_item (tree, hf_scsi_ssc_ver16_verlen, tvb, offset+1, 3, 0); + 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); } @@ -371,9 +371,9 @@ 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); - proto_tree_add_item (tree, hf_scsi_ssc_partition, tvb, offset+2, 1, 0); - proto_tree_add_item (tree, hf_scsi_ssc_locate16_loid, tvb, offset+3, 8, 0); - proto_tree_add_item (tree, hf_scsi_ssc_rdwr6_xferlen, tvb, offset+11, 3, 0); + 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); } @@ -398,7 +398,7 @@ 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); - proto_tree_add_item (tree, hf_scsi_ssc_rdwr6_xferlen, tvb, offset+1, 3, FALSE); + 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); } @@ -423,7 +423,7 @@ 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); - proto_tree_add_item (tree, hf_scsi_ssc_rdwr6_xferlen, tvb, offset+1, 3, FALSE); + 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); } @@ -533,7 +533,7 @@ 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); - proto_tree_add_item (tree, hf_scsi_ssc_capacity_prop_value, tvb, offset+2, 2, 0); + 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); } @@ -558,8 +558,8 @@ 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); - proto_tree_add_item (tree, hf_scsi_ssc_locate10_loid, tvb, offset+2, 4, 0); - proto_tree_add_item (tree, hf_scsi_ssc_partition, tvb, offset+7, 1, 0); + 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); } @@ -590,8 +590,8 @@ dissect_ssc_locate16 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, ett_scsi_locate, locate_fields, FALSE); proto_tree_add_bitmask(tree, tvb, offset+1, hf_scsi_ssc_bam_flags, ett_scsi_bam, bam_fields, FALSE); - proto_tree_add_item (tree, hf_scsi_ssc_partition, tvb, offset+2, 1, 0); - proto_tree_add_item (tree, hf_scsi_ssc_locate16_loid, tvb, offset+3, 8, 0); + 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); } @@ -640,8 +640,8 @@ 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); - proto_tree_add_item (tree, hf_scsi_ssc_partition, tvb, offset+2, 1, 0); - proto_tree_add_item (tree, hf_scsi_ssc_lbi, tvb, offset+3, 8, 0); + 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); } @@ -656,8 +656,8 @@ dissect_ssc_space6 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, return; if (isreq && iscdb) { - proto_tree_add_item (tree, hf_scsi_ssc_space6_code, tvb, offset, 1, 0); - proto_tree_add_item (tree, hf_scsi_ssc_space6_count, tvb, offset+1, 3, 0); + 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); } @@ -672,8 +672,8 @@ dissect_ssc_space16 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, return; if (isreq && iscdb) { - proto_tree_add_item (tree, hf_scsi_ssc_space6_code, tvb, offset, 1, 0); - proto_tree_add_item (tree, hf_scsi_ssc_space16_count, tvb, offset+3, 8, 0); + proto_tree_add_item (tree, hf_scsi_ssc_space6_code, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_scsi_ssc_space16_count, tvb, offset+3, 8, ENC_BIG_ENDIAN); proto_tree_add_text (tree, tvb, offset+11, 2, "Parameter Len: %u", tvb_get_ntohs (tvb, offset+11)); @@ -720,8 +720,8 @@ 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); - proto_tree_add_item (tree, hf_scsi_ssc_format, tvb, offset+1, 1, 0); - proto_tree_add_item (tree, hf_scsi_ssc_rdwr10_xferlen, tvb, offset+2, 2, 0); + 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); } @@ -777,7 +777,7 @@ dissect_ssc_readposition (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tre (flags & BPU) >> 2, (flags & 0x02) >> 1); offset += 1; - proto_tree_add_item (tree, hf_scsi_ssc_partition, tvb, offset, 1, 0); + proto_tree_add_item (tree, hf_scsi_ssc_partition, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; offset += 2; /* reserved */ @@ -859,7 +859,7 @@ dissect_ssc_readposition (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tre (flags & 0x02) >> 1); offset += 1; - proto_tree_add_item (tree, hf_scsi_ssc_partition, tvb, offset, 1, 0); + proto_tree_add_item (tree, hf_scsi_ssc_partition, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; proto_tree_add_text (tree, tvb, offset, 2, diff --git a/epan/dissectors/packet-scsi.c b/epan/dissectors/packet-scsi.c index d7dac8f9ff..08f5e4a045 100644 --- a/epan/dissectors/packet-scsi.c +++ b/epan/dissectors/packet-scsi.c @@ -1984,9 +1984,9 @@ dissect_scsi_evpd (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, evpd_tree = proto_item_add_subtree (ti, ett_scsi_page); proto_tree_add_item (evpd_tree, hf_scsi_inq_qualifier, tvb, offset, - 1, 0); + 1, ENC_BIG_ENDIAN); proto_tree_add_item (evpd_tree, hf_scsi_inq_devtype, tvb, offset, - 1, 0); + 1, ENC_BIG_ENDIAN); proto_tree_add_text (evpd_tree, tvb, offset+1, 1, "Page Code: %s", val_to_str (pcode, scsi_evpd_pagecode_val, @@ -2105,9 +2105,9 @@ dissect_scsi_cmddt (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, cmdt_tree = proto_item_add_subtree (ti, ett_scsi_page); proto_tree_add_item (cmdt_tree, hf_scsi_inq_qualifier, tvb, offset, - 1, 0); + 1, ENC_BIG_ENDIAN); proto_tree_add_item (cmdt_tree, hf_scsi_inq_devtype, tvb, offset, - 1, 0); + 1, ENC_BIG_ENDIAN); proto_tree_add_text (cmdt_tree, tvb, offset+1, 1, "Support: %s", val_to_str (tvb_get_guint8 (tvb, offset+1) & 0x7, scsi_cmdt_supp_val, "Unknown (%d)")); @@ -2154,7 +2154,7 @@ dissect_spc_inq_sccsflags(tvbuff_t *tvb, int offset, proto_tree *parent_tree) proto_tree *tree=NULL; if(parent_tree){ - item=proto_tree_add_item(parent_tree, hf_scsi_inq_sccsflags, tvb, offset, 1, 0); + item=proto_tree_add_item(parent_tree, hf_scsi_inq_sccsflags, tvb, offset, 1, ENC_BIG_ENDIAN); tree = proto_item_add_subtree (item, ett_scsi_inq_sccsflags); } @@ -2175,7 +2175,7 @@ dissect_spc_inq_sccsflags(tvbuff_t *tvb, int offset, proto_tree *parent_tree) flags&=(~SCSI_INQ_SCCSFLAGS_ACC); /* TPGS (introduced in SPC-3) */ - proto_tree_add_item (tree, hf_scsi_inq_tpgs, tvb, offset, 1, 0); + proto_tree_add_item (tree, hf_scsi_inq_tpgs, tvb, offset, 1, ENC_BIG_ENDIAN); flags&=0xcf; /* TPC (introduced in SPC-3) */ @@ -2211,7 +2211,7 @@ dissect_spc_inq_bqueflags(tvbuff_t *tvb, int offset, proto_tree *parent_tree) proto_tree *tree=NULL; if(parent_tree){ - item=proto_tree_add_item(parent_tree, hf_scsi_inq_bqueflags, tvb, offset, 1, 0); + item=proto_tree_add_item(parent_tree, hf_scsi_inq_bqueflags, tvb, offset, 1, ENC_BIG_ENDIAN); tree = proto_item_add_subtree (item, ett_scsi_inq_bqueflags); } @@ -2263,7 +2263,7 @@ dissect_spc_inq_reladrflags(tvbuff_t *tvb, int offset, proto_tree *parent_tree) proto_tree *tree=NULL; if(parent_tree){ - item=proto_tree_add_item(parent_tree, hf_scsi_inq_reladrflags, tvb, offset, 1, 0); + item=proto_tree_add_item(parent_tree, hf_scsi_inq_reladrflags, tvb, offset, 1, ENC_BIG_ENDIAN); tree = proto_item_add_subtree (item, ett_scsi_inq_reladrflags); } @@ -2359,14 +2359,14 @@ dissect_spc_inquiry (tvbuff_t *tvb, packet_info *pinfo, flags & 0x2, flags & 0x1); if (flags & 0x1) { proto_tree_add_item (tree, hf_scsi_inquiry_evpd_page, tvb_v, offset_v+1, - 1, 0); + 1, ENC_BIG_ENDIAN); } else if (flags & 0x2) { proto_tree_add_item (tree, hf_scsi_inquiry_cmdt_page, tvb_v, offset_v+1, - 1, 0); + 1, ENC_BIG_ENDIAN); } - proto_tree_add_item (tree, hf_scsi_alloclen, tvb_v, offset_v+3, 1, 0); + proto_tree_add_item (tree, hf_scsi_alloclen, tvb_v, offset_v+3, 1, ENC_BIG_ENDIAN); /* we need the alloc_len in the response */ if(cdata){ cdata->itlq->alloc_len=tvb_get_guint8(tvb_v, offset_v+3); @@ -2401,7 +2401,7 @@ dissect_spc_inquiry (tvbuff_t *tvb, packet_info *pinfo, offset_v+=1; /* Version */ - proto_tree_add_item (tree, hf_scsi_inq_version, tvb_v, offset_v, 1, 0); + proto_tree_add_item (tree, hf_scsi_inq_version, tvb_v, offset_v, 1, ENC_BIG_ENDIAN); offset_v+=1; /* aca flags */ @@ -2410,7 +2410,7 @@ dissect_spc_inquiry (tvbuff_t *tvb, packet_info *pinfo, /* Additional Length */ SET_SCSI_DATA_END(tvb_get_guint8(tvb_v, offset_v)+offset); - proto_tree_add_item(tree, hf_scsi_inq_add_len, tvb_v, offset_v, 1, 0); + proto_tree_add_item(tree, hf_scsi_inq_add_len, tvb_v, offset_v, 1, ENC_BIG_ENDIAN); offset_v+=1; /* sccs flags */ @@ -2447,7 +2447,7 @@ dissect_spc_inquiry (tvbuff_t *tvb, packet_info *pinfo, /* version descriptors */ for(i=0;i<8;i++){ - proto_tree_add_item(tree, hf_scsi_inq_version_desc, tvb_v, offset_v, 2, 0); + proto_tree_add_item(tree, hf_scsi_inq_version_desc, tvb_v, offset_v, 2, ENC_BIG_ENDIAN); offset_v+=2; } @@ -2505,7 +2505,7 @@ dissect_scsi_log_page (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, /* page length */ pagelen=tvb_get_ntohs(tvb, offset); - proto_tree_add_item(log_tree, hf_scsi_log_page_length, tvb, offset, 2, 0); + proto_tree_add_item(log_tree, hf_scsi_log_page_length, tvb, offset, 2, ENC_BIG_ENDIAN); offset+=2; @@ -2527,7 +2527,7 @@ dissect_scsi_log_page (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, /* parameter code */ log_param=tvb_get_ntohs(tvb, offset); - proto_tree_add_item(log_tree, hf_scsi_log_parameter_code, tvb, offset, 2, 0); + proto_tree_add_item(log_tree, hf_scsi_log_parameter_code, tvb, offset, 2, ENC_BIG_ENDIAN); offset+=2; /* flags */ @@ -2536,7 +2536,7 @@ dissect_scsi_log_page (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, /* parameter length */ paramlen=tvb_get_guint8(tvb, offset); - proto_tree_add_item(log_tree, hf_scsi_log_param_len, tvb, offset, 1, 0); + proto_tree_add_item(log_tree, hf_scsi_log_param_len, tvb, offset, 1, ENC_BIG_ENDIAN); offset+=1; /* find the log parameter */ @@ -2595,7 +2595,7 @@ dissect_spc_logselect (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, 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); - proto_tree_add_item (tree, hf_scsi_paramlen16, tvb, offset+6, 2, 0); + 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); } @@ -2641,8 +2641,8 @@ dissect_spc_logsense (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_tree_add_bitmask(tree, tvb, offset+1, hf_scsi_log_pc_flags, ett_scsi_log_pc, pcflags_fields, FALSE); proto_tree_add_item (tree, hf_scsi_log_parameter_ptr, tvb, offset+4, - 2, 0); - proto_tree_add_item (tree, hf_scsi_alloclen16, tvb, offset+6, 2, 0); + 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); } else if (!isreq) { @@ -2735,12 +2735,12 @@ dissect_scsi_spc_modepage (tvbuff_t *tvb, packet_info *pinfo _U_, switch (pcode) { case SCSI_SPC_MODEPAGE_CTL: flags = tvb_get_guint8 (tvb, offset+2); - proto_tree_add_item (tree, hf_scsi_modesns_tst, tvb, offset+2, 1, 0); + proto_tree_add_item (tree, hf_scsi_modesns_tst, tvb, offset+2, 1, ENC_BIG_ENDIAN); proto_tree_add_text (tree, tvb, offset+2, 1, "Global Logging Target Save Disable: %u, Report Log Exception Condition: %u", (flags & 0x2) >> 1, (flags & 0x1)); flags = tvb_get_guint8 (tvb, offset+3); - proto_tree_add_item (tree, hf_scsi_modesns_qmod, tvb, offset+3, 1, 0); + proto_tree_add_item (tree, hf_scsi_modesns_qmod, tvb, offset+3, 1, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_modesns_qerr, tvb, offset+3, 1, 0); proto_tree_add_text (tree, tvb, offset+3, 1, "Disable Queuing: %u", flags & 0x1); @@ -2796,11 +2796,11 @@ dissect_scsi_spc_modepage (tvbuff_t *tvb, packet_info *pinfo _U_, if (!((flags & 0x10) >> 4) && ((flags & 0x08) >> 3)) { proto_item *hidden_item; hidden_item = proto_tree_add_item (tree, hf_scsi_modesns_errrep, tvb, - offset+3, 1, 0); + offset+3, 1, ENC_BIG_ENDIAN); PROTO_ITEM_SET_HIDDEN(hidden_item); } else { - proto_tree_add_item (tree, hf_scsi_modesns_errrep, tvb, offset+3, 1, 0); + proto_tree_add_item (tree, hf_scsi_modesns_errrep, tvb, offset+3, 1, ENC_BIG_ENDIAN); } proto_tree_add_text (tree, tvb, offset+4, 4, "Interval Timer: %u", tvb_get_ntohl (tvb, offset+4)); @@ -2822,7 +2822,7 @@ dissect_scsi_spc_modepage (tvbuff_t *tvb, packet_info *pinfo _U_, return FALSE; case SCSI_SPC_MODEPAGE_PORT: proto = tvb_get_guint8 (tvb, offset+2) & 0x0F; - proto_tree_add_item (tree, hf_scsi_protocol, tvb, offset+2, 1, 0); + proto_tree_add_item (tree, hf_scsi_protocol, tvb, offset+2, 1, ENC_BIG_ENDIAN); if (proto == SCSI_PROTO_FCP) { flags = tvb_get_guint8 (tvb, offset+3); proto_tree_add_text (tree, tvb, offset+3, 1, @@ -3461,7 +3461,7 @@ dissect_spc_modeselect6 (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_tree_add_uint_format (tree, hf_scsi_modesel_flags, tvb, offset, 1, flags, "PF = %u, SP = %u", flags & 0x10, flags & 0x1); - proto_tree_add_item (tree, hf_scsi_paramlen, tvb, offset+3, 1, 0); + 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); } @@ -3555,7 +3555,7 @@ dissect_spc_modeselect10 (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_tree_add_uint_format (tree, hf_scsi_modesel_flags, tvb, offset, 1, flags, "PF = %u, SP = %u", flags & 0x10, flags & 0x1); - proto_tree_add_item (tree, hf_scsi_paramlen16, tvb, offset+6, 2, 0); + 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); } @@ -3703,9 +3703,9 @@ dissect_spc_modesense6 (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, flags = tvb_get_guint8 (tvb, offset); proto_tree_add_uint_format (tree, hf_scsi_modesns_flags, tvb, offset, 1, flags, "DBD = %u", flags & 0x8); - proto_tree_add_item (tree, hf_scsi_modesns_pc, tvb, offset+1, 1, 0); + proto_tree_add_item (tree, hf_scsi_modesns_pc, tvb, offset+1, 1, ENC_BIG_ENDIAN); dissect_scsi_pagecode (tvb, pinfo, tree, offset+1, cdata); - proto_tree_add_item (tree, hf_scsi_alloclen, tvb, offset+3, 1, 0); + 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); } @@ -3793,9 +3793,9 @@ dissect_spc_modesense10 (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_tree_add_uint_format (tree, hf_scsi_modesns_flags, tvb, offset, 1, flags, "LLBAA = %u, DBD = %u", flags & 0x10, flags & 0x8); - proto_tree_add_item (tree, hf_scsi_modesns_pc, tvb, offset+1, 1, 0); + proto_tree_add_item (tree, hf_scsi_modesns_pc, tvb, offset+1, 1, ENC_BIG_ENDIAN); dissect_scsi_pagecode (tvb, pinfo, tree, offset+1, cdata); - proto_tree_add_item (tree, hf_scsi_alloclen16, tvb, offset+6, 2, 0); + 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); } @@ -3902,8 +3902,8 @@ dissect_spc_persistentreservein (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tr return; if (isreq && iscdb) { - proto_tree_add_item (tree, hf_scsi_persresvin_svcaction, tvb, offset, 1, 0); - proto_tree_add_item (tree, hf_scsi_alloclen16, tvb, offset+6, 2, 0); + 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); /* We store the service action since we want to interpret the data */ @@ -3941,9 +3941,9 @@ dissect_spc_persistentreservein (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tr proto_tree_add_item (tree, hf_scsi_persresv_scopeaddr, tvb, offset+8, 4, ENC_NA); proto_tree_add_item (tree, hf_scsi_persresv_scope, tvb, offset+13, - 1, 0); + 1, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_scsi_persresv_type, tvb, offset+13, - 1, 0); + 1, ENC_BIG_ENDIAN); } } } @@ -3957,10 +3957,10 @@ dissect_spc_persistentreserveout (tvbuff_t *tvb, packet_info *pinfo _U_, proto_t return; if (isreq && iscdb) { - proto_tree_add_item (tree, hf_scsi_persresvout_svcaction, tvb, offset, 1, 0); - proto_tree_add_item (tree, hf_scsi_persresv_scope, tvb, offset+1, 1, 0); - proto_tree_add_item (tree, hf_scsi_persresv_type, tvb, offset+1, 1, 0); - proto_tree_add_item (tree, hf_scsi_paramlen16, tvb, offset+6, 2, 0); + proto_tree_add_item (tree, hf_scsi_persresvout_svcaction, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_scsi_persresv_scope, tvb, offset+1, 1, ENC_BIG_ENDIAN); + 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); /* We store the service action since we want to interpret the params */ @@ -4039,7 +4039,7 @@ dissect_spc_release10 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, proto_tree_add_item (tree, hf_scsi_release_thirdpartyid, tvb, offset+2, 1, ENC_NA); } - proto_tree_add_item (tree, hf_scsi_paramlen16, tvb, offset+6, 2, 0); + 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); } @@ -4065,8 +4065,8 @@ dissect_spc_reportluns (tvbuff_t *tvb, packet_info *pinfo _U_, volatile guint offset_v = offset; if (isreq && iscdb) { - proto_tree_add_item (tree, hf_scsi_select_report, tvb_v, offset_v+1, 1, 0); - proto_tree_add_item (tree, hf_scsi_alloclen32, tvb_v, offset_v+5, 4, 0); + proto_tree_add_item (tree, hf_scsi_select_report, tvb_v, offset_v+1, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_scsi_alloclen32, tvb_v, offset_v+5, 4, ENC_BIG_ENDIAN); if(cdata){ cdata->itlq->alloc_len=tvb_get_ntohl(tvb_v, offset_v+5); } @@ -4086,7 +4086,7 @@ dissect_spc_reportluns (tvbuff_t *tvb, packet_info *pinfo _U_, while(listlen>0){ if (!tvb_get_guint8 (tvb_v, offset_v)) proto_tree_add_item (tree, hf_scsi_rluns_lun, tvb_v, offset_v+1, 1, - 0); + ENC_BIG_ENDIAN); else proto_tree_add_item (tree, hf_scsi_rluns_multilun, tvb_v, offset_v, 8, ENC_NA); @@ -4106,24 +4106,24 @@ dissect_scsi_fix_snsinfo (tvbuff_t *tvb, proto_tree *sns_tree, guint offset) flags = tvb_get_guint8 (tvb, offset); proto_tree_add_text (sns_tree, tvb, offset, 1, "Valid: %u", (flags & 0x80) >> 7); - proto_tree_add_item (sns_tree, hf_scsi_sns_errtype, tvb, offset, 1, 0); + proto_tree_add_item (sns_tree, hf_scsi_sns_errtype, tvb, offset, 1, ENC_BIG_ENDIAN); flags = tvb_get_guint8 (tvb, offset+2); proto_tree_add_text (sns_tree, tvb, offset+2, 1, "Filemark: %u, EOM: %u, ILI: %u", (flags & 0x80) >> 7, (flags & 0x40) >> 6, (flags & 0x20) >> 5); - proto_tree_add_item (sns_tree, hf_scsi_snskey, tvb, offset+2, 1, 0); - proto_tree_add_item (sns_tree, hf_scsi_snsinfo, tvb, offset+3, 4, 0); - proto_tree_add_item (sns_tree, hf_scsi_addlsnslen, tvb, offset+7, 1, 0); + proto_tree_add_item (sns_tree, hf_scsi_snskey, tvb, offset+2, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (sns_tree, hf_scsi_snsinfo, tvb, offset+3, 4, ENC_BIG_ENDIAN); + proto_tree_add_item (sns_tree, hf_scsi_addlsnslen, tvb, offset+7, 1, ENC_BIG_ENDIAN); proto_tree_add_text (sns_tree, tvb, offset+8, 4, "Command-Specific Information: %s", tvb_bytes_to_str (tvb, offset+8, 4)); proto_tree_add_item (sns_tree, hf_scsi_ascascq, tvb, offset+12, 2, 0); - hidden_item = proto_tree_add_item (sns_tree, hf_scsi_asc, tvb, offset+12, 1, 0); + hidden_item = proto_tree_add_item (sns_tree, hf_scsi_asc, tvb, offset+12, 1, ENC_BIG_ENDIAN); PROTO_ITEM_SET_HIDDEN(hidden_item); - hidden_item = proto_tree_add_item (sns_tree, hf_scsi_ascq, tvb, offset+13, 1, 0); + hidden_item = proto_tree_add_item (sns_tree, hf_scsi_ascq, tvb, offset+13, 1, ENC_BIG_ENDIAN); PROTO_ITEM_SET_HIDDEN(hidden_item); - proto_tree_add_item (sns_tree, hf_scsi_fru, tvb, offset+14, 1, 0); + proto_tree_add_item (sns_tree, hf_scsi_fru, tvb, offset+14, 1, ENC_BIG_ENDIAN); proto_tree_add_item (sns_tree, hf_scsi_sksv, tvb, offset+15, 1, 0); proto_tree_add_text (sns_tree, tvb, offset+15, 3, "Sense Key Specific: %s", @@ -4139,7 +4139,7 @@ dissect_spc_requestsense (tvbuff_t * tvb, packet_info *pinfo _U_, proto_tree *tr return; if (isreq && iscdb) { - proto_tree_add_item (tree, hf_scsi_alloclen, tvb, offset+3, 1, 0); + 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); } @@ -4181,7 +4181,7 @@ dissect_spc_reserve10 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, proto_tree_add_item (tree, hf_scsi_release_thirdpartyid, tvb, offset+2, 1, ENC_NA); } - proto_tree_add_item (tree, hf_scsi_paramlen16, tvb, offset+6, 2, 0); + 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); } @@ -4250,9 +4250,9 @@ dissect_scsi_varlencdb (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, return; if (isreq && iscdb) { - proto_tree_add_item (tree, hf_scsi_control, tvb, offset, 1, 0); - proto_tree_add_item (tree, hf_scsi_add_cdblen, tvb, offset+6, 1, 0); - proto_tree_add_item (tree, hf_scsi_svcaction, tvb, offset+7, 2, 0); + proto_tree_add_item (tree, hf_scsi_control, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_scsi_add_cdblen, tvb, offset+6, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_scsi_svcaction, tvb, offset+7, 2, ENC_BIG_ENDIAN); } } @@ -4716,7 +4716,7 @@ dissect_scsi_cdb (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, "Opcode: %s (0x%02x)", valstr, opcode); } else { - proto_tree_add_item (scsi_tree, hf_scsi_spcopcode, tvb, offset, 1, 0); + proto_tree_add_item (scsi_tree, hf_scsi_spcopcode, tvb, offset, 1, ENC_BIG_ENDIAN); } if(csdata->cdb_table[opcode].func){ diff --git a/epan/dissectors/packet-sebek.c b/epan/dissectors/packet-sebek.c index d75e428304..dc02f81199 100644 --- a/epan/dissectors/packet-sebek.c +++ b/epan/dissectors/packet-sebek.c @@ -172,16 +172,16 @@ dissect_sebek(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) sebek_ver = tvb_get_ntohs(tvb, 4); switch (sebek_ver) { - case 2: proto_tree_add_item(sebek_tree, hf_sebek_magic, tvb, offset, 4, FALSE); + case 2: proto_tree_add_item(sebek_tree, hf_sebek_magic, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(sebek_tree, hf_sebek_version, tvb, offset, 2, FALSE); + proto_tree_add_item(sebek_tree, hf_sebek_version, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(sebek_tree, hf_sebek_type, tvb, offset, 2, FALSE); + proto_tree_add_item(sebek_tree, hf_sebek_type, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(sebek_tree, hf_sebek_counter, tvb, offset, 4, FALSE); + proto_tree_add_item(sebek_tree, hf_sebek_counter, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; ts.secs = tvb_get_ntohl(tvb, offset); @@ -189,36 +189,36 @@ dissect_sebek(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_time(sebek_tree, hf_sebek_time, tvb, offset, 8, &ts); offset += 8; - proto_tree_add_item(sebek_tree, hf_sebek_pid, tvb, offset, 4, FALSE); + proto_tree_add_item(sebek_tree, hf_sebek_pid, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(sebek_tree, hf_sebek_uid, tvb, offset, 4, FALSE); + proto_tree_add_item(sebek_tree, hf_sebek_uid, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(sebek_tree, hf_sebek_fd, tvb, offset, 4, FALSE); + proto_tree_add_item(sebek_tree, hf_sebek_fd, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; proto_tree_add_item(sebek_tree, hf_sebek_cmd, tvb, offset, 12, FALSE); offset += 12; - proto_tree_add_item(sebek_tree, hf_sebek_len, tvb, offset, 4, FALSE); + proto_tree_add_item(sebek_tree, hf_sebek_len, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; proto_tree_add_item(sebek_tree, hf_sebek_data, tvb, offset, -1, FALSE); break; - case 3: proto_tree_add_item(sebek_tree, hf_sebek_magic, tvb, offset, 4, FALSE); + case 3: proto_tree_add_item(sebek_tree, hf_sebek_magic, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(sebek_tree, hf_sebek_version, tvb, offset, 2, FALSE); + proto_tree_add_item(sebek_tree, hf_sebek_version, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; sebek_type=tvb_get_ntohs(tvb, offset); - proto_tree_add_item(sebek_tree, hf_sebek_type, tvb, offset, 2, FALSE); + proto_tree_add_item(sebek_tree, hf_sebek_type, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(sebek_tree, hf_sebek_counter, tvb, offset, 4, FALSE); + proto_tree_add_item(sebek_tree, hf_sebek_counter, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; ts.secs = tvb_get_ntohl(tvb, offset); @@ -226,40 +226,40 @@ dissect_sebek(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_time(sebek_tree, hf_sebek_time, tvb, offset, 8, &ts); offset += 8; - proto_tree_add_item(sebek_tree, hf_sebek_ppid, tvb, offset, 4, FALSE); + proto_tree_add_item(sebek_tree, hf_sebek_ppid, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(sebek_tree, hf_sebek_pid, tvb, offset, 4, FALSE); + proto_tree_add_item(sebek_tree, hf_sebek_pid, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(sebek_tree, hf_sebek_uid, tvb, offset, 4, FALSE); + proto_tree_add_item(sebek_tree, hf_sebek_uid, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(sebek_tree, hf_sebek_fd, tvb, offset, 4, FALSE); + proto_tree_add_item(sebek_tree, hf_sebek_fd, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(sebek_tree, hf_sebek_inode, tvb, offset, 4, FALSE); + proto_tree_add_item(sebek_tree, hf_sebek_inode, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; proto_tree_add_item(sebek_tree, hf_sebek_cmd, tvb, offset, 12, FALSE); offset += 12; - proto_tree_add_item(sebek_tree, hf_sebek_len, tvb, offset, 4, FALSE); + proto_tree_add_item(sebek_tree, hf_sebek_len, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; if (sebek_type == 2) { /*data is socket data, process accordingly*/ proto_tree_add_item(sebek_tree, hf_sebek_socket_dst_ip, tvb, offset, 4, FALSE); offset += 4; - proto_tree_add_item(sebek_tree, hf_sebek_socket_dst_port, tvb, offset, 2, FALSE); + proto_tree_add_item(sebek_tree, hf_sebek_socket_dst_port, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(sebek_tree, hf_sebek_socket_src_ip, tvb, offset, 4, FALSE); offset += 4; - proto_tree_add_item(sebek_tree, hf_sebek_socket_src_port, tvb, offset, 2, FALSE); + proto_tree_add_item(sebek_tree, hf_sebek_socket_src_port, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(sebek_tree, hf_sebek_socket_call, tvb, offset, 2, FALSE); + proto_tree_add_item(sebek_tree, hf_sebek_socket_call, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(sebek_tree, hf_sebek_socket_proto, tvb, offset, 1, FALSE); + proto_tree_add_item(sebek_tree, hf_sebek_socket_proto, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; } else { proto_tree_add_item(sebek_tree, hf_sebek_data, tvb, offset, -1, FALSE); diff --git a/epan/dissectors/packet-sercosiii.c b/epan/dissectors/packet-sercosiii.c index 4049648ae9..94f1d19da2 100644 --- a/epan/dissectors/packet-sercosiii.c +++ b/epan/dissectors/packet-sercosiii.c @@ -782,17 +782,17 @@ void dissect_siii_mst(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) ti = proto_tree_add_text(subtree, tvb, 0, 1, "Telegram Type"); subtree2 = proto_item_add_subtree(ti, ett_siii_mst_teltype); - proto_tree_add_item(subtree2, hf_siii_mst_channel, tvb, 0, 1, TRUE); - proto_tree_add_item(subtree2, hf_siii_mst_type, tvb, 0, 1, TRUE); - proto_tree_add_item(subtree2, hf_siii_mst_cyclecntvalid, tvb, 0, 1, TRUE); - proto_tree_add_item(subtree2, hf_siii_mst_telno, tvb, 0, 1, TRUE); + proto_tree_add_item(subtree2, hf_siii_mst_channel, tvb, 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(subtree2, hf_siii_mst_type, tvb, 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(subtree2, hf_siii_mst_cyclecntvalid, tvb, 0, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(subtree2, hf_siii_mst_telno, tvb, 0, 1, ENC_LITTLE_ENDIAN); ti = proto_tree_add_text(subtree, tvb, 1, 1, "Phase Field"); subtree2 = proto_item_add_subtree(ti, ett_siii_mst_phase); proto_tree_add_item(subtree2, hf_siii_mst_phase, tvb, 1, 1, TRUE); proto_tree_add_item(subtree2, hf_siii_mst_cyclecnt, tvb, 1, 1, TRUE); - proto_tree_add_item(subtree, hf_siii_mst_crc32, tvb, 2, 4, TRUE); + proto_tree_add_item(subtree, hf_siii_mst_crc32, tvb, 2, 4, ENC_LITTLE_ENDIAN); } @@ -805,13 +805,13 @@ void dissect_siii_mdt_hp(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree ti = proto_tree_add_text(tree, tvb, 0, 8, "Hot-Plug"); subtree = proto_item_add_subtree(ti, ett_siii_mdt_hp); - proto_tree_add_item(subtree, hf_siii_mdt_hotplug_address, tvb, 2, 2, TRUE); + proto_tree_add_item(subtree, hf_siii_mdt_hotplug_address, tvb, 2, 2, ENC_LITTLE_ENDIAN); - ti = proto_tree_add_item(subtree, hf_siii_mdt_hp_ctrl, tvb, 2, 2, TRUE); + ti = proto_tree_add_item(subtree, hf_siii_mdt_hp_ctrl, tvb, 2, 2, ENC_LITTLE_ENDIAN); subtree2 = proto_item_add_subtree(ti, ett_siii_mdt_hp_ctrl); - proto_tree_add_item(subtree2, hf_siii_mdt_hotplug_control_svc_switch, tvb, 2, 2, TRUE); - proto_tree_add_item(subtree2, hf_siii_mdt_hotplug_control_param, tvb, 2, 2, TRUE); + proto_tree_add_item(subtree2, hf_siii_mdt_hotplug_control_svc_switch, tvb, 2, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item(subtree2, hf_siii_mdt_hotplug_control_param, tvb, 2, 2, ENC_LITTLE_ENDIAN); proto_tree_add_item(subtree, hf_siii_mdt_hp_info, tvb, 4, 4, ENC_NA); } @@ -821,10 +821,10 @@ void dissect_siii_mdt_devctrl(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree proto_tree* subtree; proto_item* ti; - ti = proto_tree_add_item(tree, hf_siii_mdt_dev_control, tvb, 0, 2, TRUE); + ti = proto_tree_add_item(tree, hf_siii_mdt_dev_control, tvb, 0, 2, ENC_LITTLE_ENDIAN); subtree = proto_item_add_subtree(ti, ett_siii_mdt_devctrl); - proto_tree_add_item(subtree, hf_siii_at_dev_control_ident, tvb, 0, 2, TRUE); + proto_tree_add_item(subtree, hf_siii_at_dev_control_ident, tvb, 0, 2, ENC_LITTLE_ENDIAN); proto_tree_add_item(subtree, hf_siii_mdt_dev_control_change_topology, tvb, 0, 2, TRUE); proto_tree_add_item(subtree, hf_siii_mdt_dev_control_top_control, tvb, 0, 2, TRUE); } @@ -838,13 +838,13 @@ void dissect_siii_mdt_svc(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tre guint32 svc_info = tvb_get_letohl(tvb, 2); /* service channel data */ guint8 svc_dbe = (svc_ctrl>>3) & 7; /* accessed data block element */ - ti = proto_tree_add_item(tree, hf_siii_mdt_svch_ctrl, tvb, 0, 2, TRUE); + ti = proto_tree_add_item(tree, hf_siii_mdt_svch_ctrl, tvb, 0, 2, ENC_LITTLE_ENDIAN); subtree = proto_item_add_subtree(ti, ett_siii_mdt_svcctrl); - proto_tree_add_item(subtree, hf_siii_mdt_svch_dbe, tvb, 0, 2, TRUE); /* data block element */ - proto_tree_add_item(subtree, hf_siii_mdt_svch_eot, tvb, 0, 2, TRUE); /* end of transmission */ - proto_tree_add_item(subtree, hf_siii_mdt_svch_rw, tvb, 0, 2, TRUE); /* read or write */ - proto_tree_add_item(subtree, hf_siii_mdt_svch_mhs, tvb, 0, 2, TRUE); /* master hand shake */ + proto_tree_add_item(subtree, hf_siii_mdt_svch_dbe, tvb, 0, 2, ENC_LITTLE_ENDIAN); /* data block element */ + proto_tree_add_item(subtree, hf_siii_mdt_svch_eot, tvb, 0, 2, ENC_LITTLE_ENDIAN); /* end of transmission */ + proto_tree_add_item(subtree, hf_siii_mdt_svch_rw, tvb, 0, 2, ENC_LITTLE_ENDIAN); /* read or write */ + proto_tree_add_item(subtree, hf_siii_mdt_svch_mhs, tvb, 0, 2, ENC_LITTLE_ENDIAN); /* master hand shake */ ti = proto_tree_add_item(tree, hf_siii_mdt_svch_info, tvb, 2, 4, ENC_NA); @@ -857,7 +857,7 @@ void dissect_siii_mdt_svc(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tre (svc_info&4095), /* IDN */ (svc_info>>24) & 0xFF, /* structure index */ (svc_info>>16) & 0xFF); /* structure element */ - proto_tree_add_item(subtree, hf_siii_mdt_svch_idn, tvb, 2, 4, TRUE); + proto_tree_add_item(subtree, hf_siii_mdt_svch_idn, tvb, 2, 4, ENC_LITTLE_ENDIAN); } } @@ -865,12 +865,12 @@ static void dissect_siii_mdt_cp0(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tr { proto_item* ti; proto_tree* subtree; - ti = proto_tree_add_item(tree, hf_siii_mdt_version, tvb, 0, 4, TRUE); + ti = proto_tree_add_item(tree, hf_siii_mdt_version, tvb, 0, 4, ENC_LITTLE_ENDIAN); subtree = proto_item_add_subtree(ti, ett_siii_mdt_version); - proto_tree_add_item(subtree, hf_siii_mdt_version_num_mdt_at_cp1_2, tvb, 0, 4, TRUE); - proto_tree_add_item(subtree, hf_siii_mdt_version_initprocvers, tvb, 0, 4, TRUE); - proto_tree_add_item(subtree, hf_siii_mdt_version_revision, tvb, 0, 4, TRUE); + proto_tree_add_item(subtree, hf_siii_mdt_version_num_mdt_at_cp1_2, tvb, 0, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(subtree, hf_siii_mdt_version_initprocvers, tvb, 0, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(subtree, hf_siii_mdt_version_revision, tvb, 0, 4, ENC_LITTLE_ENDIAN); } @@ -983,13 +983,13 @@ void dissect_siii_at_svc(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree proto_tree* subtree; proto_item* ti; - ti = proto_tree_add_item(tree, hf_siii_at_svch_stat, tvb, 0, 2, TRUE); + ti = proto_tree_add_item(tree, hf_siii_at_svch_stat, tvb, 0, 2, ENC_LITTLE_ENDIAN); subtree = proto_item_add_subtree(ti, ett_siii_at_svcstat); - proto_tree_add_item(subtree, hf_siii_at_svch_valid, tvb, 0, 2, TRUE); - proto_tree_add_item(subtree, hf_siii_at_svch_error, tvb, 0, 2, TRUE); - proto_tree_add_item(subtree, hf_siii_at_svch_busy, tvb, 0, 2, TRUE); - proto_tree_add_item(subtree, hf_siii_at_svch_ahs, tvb, 0, 2, TRUE); + proto_tree_add_item(subtree, hf_siii_at_svch_valid, tvb, 0, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item(subtree, hf_siii_at_svch_error, tvb, 0, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item(subtree, hf_siii_at_svch_busy, tvb, 0, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item(subtree, hf_siii_at_svch_ahs, tvb, 0, 2, ENC_LITTLE_ENDIAN); proto_tree_add_item(tree, hf_siii_at_svch_info, tvb, 2, 4, ENC_NA); } @@ -999,7 +999,7 @@ void dissect_siii_at_devstat(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree * proto_tree* subtree; proto_item* ti; - ti = proto_tree_add_item(tree, hf_siii_at_dev_status, tvb, 0, 2, TRUE); + ti = proto_tree_add_item(tree, hf_siii_at_dev_status, tvb, 0, 2, ENC_LITTLE_ENDIAN); subtree = proto_item_add_subtree(ti, ett_siii_at_devstatus); proto_tree_add_item(subtree, hf_siii_at_dev_status_commwarning, tvb, 0, 2, TRUE); @@ -1021,14 +1021,14 @@ void dissect_siii_at_hp(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) ti = proto_tree_add_text(tree, tvb, 0, 8, "Hot-Plug"); subtree = proto_item_add_subtree(ti, ett_siii_at_hp); - proto_tree_add_item(subtree, hf_siii_at_hotplug_address, tvb, 2, 2, TRUE); + proto_tree_add_item(subtree, hf_siii_at_hotplug_address, tvb, 2, 2, ENC_LITTLE_ENDIAN); - ti = proto_tree_add_item(subtree, hf_siii_at_hp_stat, tvb, 2, 2, TRUE); + ti = proto_tree_add_item(subtree, hf_siii_at_hp_stat, tvb, 2, 2, ENC_LITTLE_ENDIAN); subtree2 = proto_item_add_subtree(ti, ett_siii_at_hp_stat); - proto_tree_add_item(subtree2, hf_siii_at_hotplug_status_error, tvb, 2, 2, TRUE); - proto_tree_add_item(subtree2, hf_siii_at_hotplug_status_hp0_finished, tvb, 2, 2, TRUE); - proto_tree_add_item(subtree2, hf_siii_at_hotplug_status_param, tvb, 2, 2, TRUE); + proto_tree_add_item(subtree2, hf_siii_at_hotplug_status_error, tvb, 2, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item(subtree2, hf_siii_at_hotplug_status_hp0_finished, tvb, 2, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item(subtree2, hf_siii_at_hotplug_status_param, tvb, 2, 2, ENC_LITTLE_ENDIAN); proto_tree_add_item(subtree, hf_siii_at_hp_info, tvb, 4, 4, ENC_NA); } diff --git a/epan/dissectors/packet-ses.c b/epan/dissectors/packet-ses.c index 7cd054652f..b0ef31d3e0 100644 --- a/epan/dissectors/packet-ses.c +++ b/epan/dissectors/packet-ses.c @@ -707,16 +707,16 @@ dissect_parameter(tvbuff_t *tvb, int offset, proto_tree *tree, { proto_tree_add_item(param_tree, hf_release_token_setting, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(param_tree, hf_major_activity_token_setting, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(param_tree, hf_synchronize_minor_token_setting, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(param_tree, hf_data_token_setting, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); } break; diff --git a/epan/dissectors/packet-sflow.c b/epan/dissectors/packet-sflow.c index 7338e554aa..22e65037aa 100644 --- a/epan/dissectors/packet-sflow.c +++ b/epan/dissectors/packet-sflow.c @@ -720,7 +720,7 @@ dissect_sflow_245_sampled_header(tvbuff_t *tvb, packet_info *pinfo, version = tvb_get_ntohl(tvb, 0); header_proto = tvb_get_ntohl(tvb, offset); - proto_tree_add_item(tree, hf_sflow_245_header_protocol, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_sflow_245_header_protocol, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; frame_length = tvb_get_ntohl(tvb, offset); proto_tree_add_text(tree, tvb, offset, 4, "Frame Length: %u bytes", frame_length); @@ -912,13 +912,13 @@ dissect_sflow_245_address_type(tvbuff_t *tvb, proto_tree *tree, gint offset, /* extended switch data, after the packet data */ static gint dissect_sflow_245_extended_switch(tvbuff_t *tvb, proto_tree *tree, gint offset) { - proto_tree_add_item(tree, hf_sflow_245_vlan_in, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_sflow_245_vlan_in, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(tree, hf_sflow_245_pri_in, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_sflow_245_pri_in, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(tree, hf_sflow_245_vlan_out, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_sflow_245_vlan_out, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(tree, hf_sflow_245_pri_out, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_sflow_245_pri_out, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; return offset; @@ -930,9 +930,9 @@ dissect_sflow_245_extended_router(tvbuff_t *tvb, proto_tree *tree, gint offset) struct sflow_address_type addr_type = {hf_sflow_245_nexthop_v4, hf_sflow_245_nexthop_v6}; offset = dissect_sflow_245_address_type(tvb, tree, offset, &addr_type, NULL); - proto_tree_add_item(tree, hf_sflow_245_nexthop_src_mask, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_sflow_245_nexthop_src_mask, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(tree, hf_sflow_245_nexthop_dst_mask, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_sflow_245_nexthop_dst_mask, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; return offset; } @@ -1016,13 +1016,13 @@ dissect_sflow_245_extended_gateway(tvbuff_t *tvb, proto_tree *tree, gint offset) offset = dissect_sflow_245_address_type(tvb, tree, offset, &addr_type, NULL); } - proto_tree_add_item(tree, hf_sflow_245_as, tvb, offset + len, 4, FALSE); + proto_tree_add_item(tree, hf_sflow_245_as, tvb, offset + len, 4, ENC_BIG_ENDIAN); len += 4; - proto_tree_add_item(tree, hf_sflow_245_src_as, tvb, offset + len, 4, FALSE); + proto_tree_add_item(tree, hf_sflow_245_src_as, tvb, offset + len, 4, ENC_BIG_ENDIAN); len += 4; - proto_tree_add_item(tree, hf_sflow_245_src_peer_as, tvb, offset + len, 4, FALSE); + proto_tree_add_item(tree, hf_sflow_245_src_peer_as, tvb, offset + len, 4, ENC_BIG_ENDIAN); len += 4; dst_len = tvb_get_ntohl(tvb, offset + len); @@ -1064,7 +1064,7 @@ dissect_sflow_245_extended_gateway(tvbuff_t *tvb, proto_tree *tree, gint offset) } for (j = 0; j < dst_seg_len; j++) { - proto_tree_add_item(sflow_245_dst_as_seg_tree, hf_sflow_245_dst_as, tvb, offset + len, 4, FALSE); + proto_tree_add_item(sflow_245_dst_as_seg_tree, hf_sflow_245_dst_as, tvb, offset + len, 4, ENC_BIG_ENDIAN); len += 4; } } @@ -1079,11 +1079,11 @@ dissect_sflow_245_extended_gateway(tvbuff_t *tvb, proto_tree *tree, gint offset) for (i = 0; i < comm_len; i++) { proto_tree_add_item(sflow_245_comm_tree, hf_sflow_245_dst_as, tvb, offset + len, - 4, FALSE); + 4, ENC_BIG_ENDIAN); len += 4; } - proto_tree_add_item(tree, hf_sflow_245_localpref, tvb, offset + len, 4, FALSE); + proto_tree_add_item(tree, hf_sflow_245_localpref, tvb, offset + len, 4, ENC_BIG_ENDIAN); len += 4; } @@ -1817,10 +1817,10 @@ dissect_sflow_5_flow_record(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, flow_data_tree = proto_item_add_subtree(ti, ett_sflow_5_flow_record); proto_tree_add_text(flow_data_tree, tvb, offset, 4, "Enterprise: standard sFlow (%u)", enterprise); - proto_tree_add_item(flow_data_tree, hf_sflow_5_flow_record_format, tvb, offset, 4, FALSE); + proto_tree_add_item(flow_data_tree, hf_sflow_5_flow_record_format, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(flow_data_tree, hf_sflow_5_flow_data_length, tvb, offset, 4, FALSE); + proto_tree_add_item(flow_data_tree, hf_sflow_5_flow_data_length, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; switch (format) { @@ -1903,11 +1903,11 @@ static gint dissect_sflow_5_generic_interface(proto_tree *counter_data_tree, tvbuff_t *tvb, gint offset) { struct if_counters ifc; tvb_memcpy(tvb, (guint8 *) & ifc, offset, sizeof (ifc)); - proto_tree_add_item(counter_data_tree, hf_sflow_245_ifindex, tvb, offset, 4, FALSE); + proto_tree_add_item(counter_data_tree, hf_sflow_245_ifindex, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(counter_data_tree, hf_sflow_245_iftype, tvb, offset, 4, FALSE); + proto_tree_add_item(counter_data_tree, hf_sflow_245_iftype, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(counter_data_tree, hf_sflow_245_ifspeed, tvb, offset, 8, FALSE); + proto_tree_add_item(counter_data_tree, hf_sflow_245_ifspeed, tvb, offset, 8, ENC_BIG_ENDIAN); offset += 8; switch (tvb_get_ntohl(tvb, offset)) { case 1: @@ -1938,33 +1938,33 @@ dissect_sflow_5_generic_interface(proto_tree *counter_data_tree, tvbuff_t *tvb, proto_tree_add_text(counter_data_tree, tvb, offset, 4, "IfOperStatus: Down"); } offset += 4; - proto_tree_add_item(counter_data_tree, hf_sflow_245_ifinoct, tvb, offset, 8, FALSE); + proto_tree_add_item(counter_data_tree, hf_sflow_245_ifinoct, tvb, offset, 8, ENC_BIG_ENDIAN); offset += 8; - proto_tree_add_item(counter_data_tree, hf_sflow_245_ifinpkt, tvb, offset, 4, FALSE); + proto_tree_add_item(counter_data_tree, hf_sflow_245_ifinpkt, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(counter_data_tree, hf_sflow_245_ifinmcast, tvb, offset, 4, FALSE); + proto_tree_add_item(counter_data_tree, hf_sflow_245_ifinmcast, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(counter_data_tree, hf_sflow_245_ifinbcast, tvb, offset, 4, FALSE); + proto_tree_add_item(counter_data_tree, hf_sflow_245_ifinbcast, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(counter_data_tree, hf_sflow_245_ifindisc, tvb, offset, 4, FALSE); + proto_tree_add_item(counter_data_tree, hf_sflow_245_ifindisc, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(counter_data_tree, hf_sflow_245_ifinerr, tvb, offset, 4, FALSE); + proto_tree_add_item(counter_data_tree, hf_sflow_245_ifinerr, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(counter_data_tree, hf_sflow_245_ifinunk, tvb, offset, 4, FALSE); + proto_tree_add_item(counter_data_tree, hf_sflow_245_ifinunk, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(counter_data_tree, hf_sflow_245_ifoutoct, tvb, offset, 8, FALSE); + proto_tree_add_item(counter_data_tree, hf_sflow_245_ifoutoct, tvb, offset, 8, ENC_BIG_ENDIAN); offset += 8; - proto_tree_add_item(counter_data_tree, hf_sflow_245_ifoutpkt, tvb, offset, 4, FALSE); + proto_tree_add_item(counter_data_tree, hf_sflow_245_ifoutpkt, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(counter_data_tree, hf_sflow_245_ifoutmcast, tvb, offset, 4, FALSE); + proto_tree_add_item(counter_data_tree, hf_sflow_245_ifoutmcast, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(counter_data_tree, hf_sflow_245_ifoutbcast, tvb, offset, 4, FALSE); + proto_tree_add_item(counter_data_tree, hf_sflow_245_ifoutbcast, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(counter_data_tree, hf_sflow_245_ifoutdisc, tvb, offset, 4, FALSE); + proto_tree_add_item(counter_data_tree, hf_sflow_245_ifoutdisc, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(counter_data_tree, hf_sflow_245_ifouterr, tvb, offset, 4, FALSE); + proto_tree_add_item(counter_data_tree, hf_sflow_245_ifouterr, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(counter_data_tree, hf_sflow_245_ifpromisc, tvb, offset, 4, FALSE); + proto_tree_add_item(counter_data_tree, hf_sflow_245_ifpromisc, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; return offset; @@ -1976,31 +1976,31 @@ dissect_sflow_5_ethernet_interface(proto_tree *counter_data_tree, tvbuff_t *tvb, struct ethernet_counters ethc; tvb_memcpy(tvb, (guint8 *) & ethc, offset, sizeof (ethc)); - proto_tree_add_item(counter_data_tree, hf_sflow_245_dot3StatsAlignmentErrors, tvb, offset, 4, FALSE); + proto_tree_add_item(counter_data_tree, hf_sflow_245_dot3StatsAlignmentErrors, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(counter_data_tree, hf_sflow_245_dot3StatsFCSErrors, tvb, offset, 4, FALSE); + proto_tree_add_item(counter_data_tree, hf_sflow_245_dot3StatsFCSErrors, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(counter_data_tree, hf_sflow_245_dot3StatsSingleCollisionFrames, tvb, offset, 4, FALSE); + proto_tree_add_item(counter_data_tree, hf_sflow_245_dot3StatsSingleCollisionFrames, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(counter_data_tree, hf_sflow_245_dot3StatsMultipleCollisionFrames, tvb, offset, 4, FALSE); + proto_tree_add_item(counter_data_tree, hf_sflow_245_dot3StatsMultipleCollisionFrames, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(counter_data_tree, hf_sflow_245_dot3StatsSQETestErrors, tvb, offset, 4, FALSE); + proto_tree_add_item(counter_data_tree, hf_sflow_245_dot3StatsSQETestErrors, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(counter_data_tree, hf_sflow_245_dot3StatsDeferredTransmissions, tvb, offset, 4, FALSE); + proto_tree_add_item(counter_data_tree, hf_sflow_245_dot3StatsDeferredTransmissions, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(counter_data_tree, hf_sflow_245_dot3StatsLateCollisions, tvb, offset, 4, FALSE); + proto_tree_add_item(counter_data_tree, hf_sflow_245_dot3StatsLateCollisions, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(counter_data_tree, hf_sflow_245_dot3StatsExcessiveCollisions, tvb, offset, 4, FALSE); + proto_tree_add_item(counter_data_tree, hf_sflow_245_dot3StatsExcessiveCollisions, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(counter_data_tree, hf_sflow_245_dot3StatsInternalMacTransmitErrors, tvb, offset, 4, FALSE); + proto_tree_add_item(counter_data_tree, hf_sflow_245_dot3StatsInternalMacTransmitErrors, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(counter_data_tree, hf_sflow_245_dot3StatsCarrierSenseErrors, tvb, offset, 4, FALSE); + proto_tree_add_item(counter_data_tree, hf_sflow_245_dot3StatsCarrierSenseErrors, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(counter_data_tree, hf_sflow_245_dot3StatsFrameTooLongs, tvb, offset, 4, FALSE); + proto_tree_add_item(counter_data_tree, hf_sflow_245_dot3StatsFrameTooLongs, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(counter_data_tree, hf_sflow_245_dot3StatsInternalMacReceiveErrors, tvb, offset, 4, FALSE); + proto_tree_add_item(counter_data_tree, hf_sflow_245_dot3StatsInternalMacReceiveErrors, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(counter_data_tree, hf_sflow_245_dot3StatsSymbolErrors, tvb, offset, 4, FALSE); + proto_tree_add_item(counter_data_tree, hf_sflow_245_dot3StatsSymbolErrors, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; return offset; @@ -2012,41 +2012,41 @@ dissect_sflow_5_token_ring(proto_tree *counter_data_tree, tvbuff_t *tvb, gint of struct token_ring_counters tokc; tvb_memcpy(tvb, (guint8 *) & tokc, offset, sizeof (tokc)); - proto_tree_add_item(counter_data_tree, hf_sflow_245_dot5StatsLineErrors, tvb, offset, 4, FALSE); + proto_tree_add_item(counter_data_tree, hf_sflow_245_dot5StatsLineErrors, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(counter_data_tree, hf_sflow_245_dot5StatsBurstErrors, tvb, offset, 4, FALSE); + proto_tree_add_item(counter_data_tree, hf_sflow_245_dot5StatsBurstErrors, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(counter_data_tree, hf_sflow_245_dot5StatsACErrors, tvb, offset, 4, FALSE); + proto_tree_add_item(counter_data_tree, hf_sflow_245_dot5StatsACErrors, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(counter_data_tree, hf_sflow_245_dot5StatsAbortTransErrors, tvb, offset, 4, FALSE); + proto_tree_add_item(counter_data_tree, hf_sflow_245_dot5StatsAbortTransErrors, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(counter_data_tree, hf_sflow_245_dot5StatsInternalErrors, tvb, offset, 4, FALSE); + proto_tree_add_item(counter_data_tree, hf_sflow_245_dot5StatsInternalErrors, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(counter_data_tree, hf_sflow_245_dot5StatsLostFrameErrors, tvb, offset, 4, FALSE); + proto_tree_add_item(counter_data_tree, hf_sflow_245_dot5StatsLostFrameErrors, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(counter_data_tree, hf_sflow_245_dot5StatsReceiveCongestions, tvb, offset, 4, FALSE); + proto_tree_add_item(counter_data_tree, hf_sflow_245_dot5StatsReceiveCongestions, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(counter_data_tree, hf_sflow_245_dot5StatsFrameCopiedErrors, tvb, offset, 4, FALSE); + proto_tree_add_item(counter_data_tree, hf_sflow_245_dot5StatsFrameCopiedErrors, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(counter_data_tree, hf_sflow_245_dot5StatsTokenErrors, tvb, offset, 4, FALSE); + proto_tree_add_item(counter_data_tree, hf_sflow_245_dot5StatsTokenErrors, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(counter_data_tree, hf_sflow_245_dot5StatsSoftErrors, tvb, offset, 4, FALSE); + proto_tree_add_item(counter_data_tree, hf_sflow_245_dot5StatsSoftErrors, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(counter_data_tree, hf_sflow_245_dot5StatsHardErrors, tvb, offset, 4, FALSE); + proto_tree_add_item(counter_data_tree, hf_sflow_245_dot5StatsHardErrors, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(counter_data_tree, hf_sflow_245_dot5StatsSignalLoss, tvb, offset, 4, FALSE); + proto_tree_add_item(counter_data_tree, hf_sflow_245_dot5StatsSignalLoss, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(counter_data_tree, hf_sflow_245_dot5StatsTransmitBeacons, tvb, offset, 4, FALSE); + proto_tree_add_item(counter_data_tree, hf_sflow_245_dot5StatsTransmitBeacons, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(counter_data_tree, hf_sflow_245_dot5StatsRecoveries, tvb, offset, 4, FALSE); + proto_tree_add_item(counter_data_tree, hf_sflow_245_dot5StatsRecoveries, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(counter_data_tree, hf_sflow_245_dot5StatsLobeWires, tvb, offset, 4, FALSE); + proto_tree_add_item(counter_data_tree, hf_sflow_245_dot5StatsLobeWires, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(counter_data_tree, hf_sflow_245_dot5StatsRemoves, tvb, offset, 4, FALSE); + proto_tree_add_item(counter_data_tree, hf_sflow_245_dot5StatsRemoves, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(counter_data_tree, hf_sflow_245_dot5StatsSingles, tvb, offset, 4, FALSE); + proto_tree_add_item(counter_data_tree, hf_sflow_245_dot5StatsSingles, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(counter_data_tree, hf_sflow_245_dot5StatsFreqErrors, tvb, offset, 4, FALSE); + proto_tree_add_item(counter_data_tree, hf_sflow_245_dot5StatsFreqErrors, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; return offset; @@ -2058,33 +2058,33 @@ dissect_sflow_5_vg_interface(proto_tree *counter_data_tree, tvbuff_t *tvb, gint struct vg_counters vgc; tvb_memcpy(tvb, (guint8 *) & vgc, offset, sizeof (vgc)); - proto_tree_add_item(counter_data_tree, hf_sflow_245_dot12InHighPriorityFrames, tvb, offset, 4, FALSE); + proto_tree_add_item(counter_data_tree, hf_sflow_245_dot12InHighPriorityFrames, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(counter_data_tree, hf_sflow_245_dot12InHighPriorityOctets, tvb, offset, 8, FALSE); + proto_tree_add_item(counter_data_tree, hf_sflow_245_dot12InHighPriorityOctets, tvb, offset, 8, ENC_BIG_ENDIAN); offset += 8; - proto_tree_add_item(counter_data_tree, hf_sflow_245_dot12InNormPriorityFrames, tvb, offset, 4, FALSE); + proto_tree_add_item(counter_data_tree, hf_sflow_245_dot12InNormPriorityFrames, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(counter_data_tree, hf_sflow_245_dot12InNormPriorityOctets, tvb, offset, 8, FALSE); + proto_tree_add_item(counter_data_tree, hf_sflow_245_dot12InNormPriorityOctets, tvb, offset, 8, ENC_BIG_ENDIAN); offset += 8; - proto_tree_add_item(counter_data_tree, hf_sflow_245_dot12InIPMErrors, tvb, offset, 4, FALSE); + proto_tree_add_item(counter_data_tree, hf_sflow_245_dot12InIPMErrors, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(counter_data_tree, hf_sflow_245_dot12InOversizeFrameErrors, tvb, offset, 4, FALSE); + proto_tree_add_item(counter_data_tree, hf_sflow_245_dot12InOversizeFrameErrors, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(counter_data_tree, hf_sflow_245_dot12InDataErrors, tvb, offset, 4, FALSE); + proto_tree_add_item(counter_data_tree, hf_sflow_245_dot12InDataErrors, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(counter_data_tree, hf_sflow_245_dot12InNullAddressedFrames, tvb, offset, 4, FALSE); + proto_tree_add_item(counter_data_tree, hf_sflow_245_dot12InNullAddressedFrames, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(counter_data_tree, hf_sflow_245_dot12OutHighPriorityFrames, tvb, offset, 4, FALSE); + proto_tree_add_item(counter_data_tree, hf_sflow_245_dot12OutHighPriorityFrames, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(counter_data_tree, hf_sflow_245_dot12OutHighPriorityOctets, tvb, offset, 8, FALSE); + proto_tree_add_item(counter_data_tree, hf_sflow_245_dot12OutHighPriorityOctets, tvb, offset, 8, ENC_BIG_ENDIAN); offset += 8; - proto_tree_add_item(counter_data_tree, hf_sflow_245_dot12TransitionIntoTrainings, tvb, offset, 4, FALSE); + proto_tree_add_item(counter_data_tree, hf_sflow_245_dot12TransitionIntoTrainings, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(counter_data_tree, hf_sflow_245_dot12HCInHighPriorityOctets, tvb, offset, 8, FALSE); + proto_tree_add_item(counter_data_tree, hf_sflow_245_dot12HCInHighPriorityOctets, tvb, offset, 8, ENC_BIG_ENDIAN); offset += 8; - proto_tree_add_item(counter_data_tree, hf_sflow_245_dot12HCInNormPriorityOctets, tvb, offset, 8, FALSE); + proto_tree_add_item(counter_data_tree, hf_sflow_245_dot12HCInNormPriorityOctets, tvb, offset, 8, ENC_BIG_ENDIAN); offset += 8; - proto_tree_add_item(counter_data_tree, hf_sflow_245_dot12HCOutHighPriorityOctets, tvb, offset, 8, FALSE); + proto_tree_add_item(counter_data_tree, hf_sflow_245_dot12HCOutHighPriorityOctets, tvb, offset, 8, ENC_BIG_ENDIAN); offset += 8; return offset; @@ -2096,17 +2096,17 @@ dissect_sflow_5_vlan(proto_tree *counter_data_tree, tvbuff_t *tvb, gint offset) struct vlan_counters vlanc; tvb_memcpy(tvb, (guint8 *) & vlanc, offset, sizeof (vlanc)); - proto_tree_add_item(counter_data_tree, hf_sflow_245_vlan_id, tvb, offset, 4, FALSE); + proto_tree_add_item(counter_data_tree, hf_sflow_245_vlan_id, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(counter_data_tree, hf_sflow_245_octets, tvb, offset, 8, FALSE); + proto_tree_add_item(counter_data_tree, hf_sflow_245_octets, tvb, offset, 8, ENC_BIG_ENDIAN); offset += 8; - proto_tree_add_item(counter_data_tree, hf_sflow_245_ucastPkts, tvb, offset, 4, FALSE); + proto_tree_add_item(counter_data_tree, hf_sflow_245_ucastPkts, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(counter_data_tree, hf_sflow_245_multicastPkts, tvb, offset, 4, FALSE); + proto_tree_add_item(counter_data_tree, hf_sflow_245_multicastPkts, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(counter_data_tree, hf_sflow_245_broadcastPkts, tvb, offset, 4, FALSE); + proto_tree_add_item(counter_data_tree, hf_sflow_245_broadcastPkts, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(counter_data_tree, hf_sflow_245_discards, tvb, offset, 4, FALSE); + proto_tree_add_item(counter_data_tree, hf_sflow_245_discards, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; return offset; @@ -2118,45 +2118,45 @@ dissect_sflow_5_80211_counters(proto_tree *counter_data_tree, tvbuff_t *tvb, gin struct ieee80211_if_counters ieee80211; tvb_memcpy(tvb, (guint8 *) & ieee80211, offset, sizeof (ieee80211)); - proto_tree_add_item(counter_data_tree, hf_sflow_5_dot11TransmittedFragmentCount, tvb, offset, 4, FALSE); + proto_tree_add_item(counter_data_tree, hf_sflow_5_dot11TransmittedFragmentCount, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(counter_data_tree, hf_sflow_5_dot11MulticastTransmittedFrameCount, tvb, offset, 4, FALSE); + proto_tree_add_item(counter_data_tree, hf_sflow_5_dot11MulticastTransmittedFrameCount, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(counter_data_tree, hf_sflow_5_dot11FailedCount, tvb, offset, 4, FALSE); + proto_tree_add_item(counter_data_tree, hf_sflow_5_dot11FailedCount, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(counter_data_tree, hf_sflow_5_dot11RetryCount, tvb, offset, 4, FALSE); + proto_tree_add_item(counter_data_tree, hf_sflow_5_dot11RetryCount, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(counter_data_tree, hf_sflow_5_dot11MultipleRetryCount, tvb, offset, 4, FALSE); + proto_tree_add_item(counter_data_tree, hf_sflow_5_dot11MultipleRetryCount, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(counter_data_tree, hf_sflow_5_dot11FrameDuplicateCount, tvb, offset, 4, FALSE); + proto_tree_add_item(counter_data_tree, hf_sflow_5_dot11FrameDuplicateCount, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(counter_data_tree, hf_sflow_5_dot11RTSSuccessCount, tvb, offset, 4, FALSE); + proto_tree_add_item(counter_data_tree, hf_sflow_5_dot11RTSSuccessCount, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(counter_data_tree, hf_sflow_5_dot11RTSFailureCount, tvb, offset, 4, FALSE); + proto_tree_add_item(counter_data_tree, hf_sflow_5_dot11RTSFailureCount, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(counter_data_tree, hf_sflow_5_dot11ACKFailureCount, tvb, offset, 4, FALSE); + proto_tree_add_item(counter_data_tree, hf_sflow_5_dot11ACKFailureCount, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(counter_data_tree, hf_sflow_5_dot11ReceivedFragmentCount, tvb, offset, 4, FALSE); + proto_tree_add_item(counter_data_tree, hf_sflow_5_dot11ReceivedFragmentCount, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(counter_data_tree, hf_sflow_5_dot11MulticastReceivedFrameCount, tvb, offset, 4, FALSE); + proto_tree_add_item(counter_data_tree, hf_sflow_5_dot11MulticastReceivedFrameCount, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(counter_data_tree, hf_sflow_5_dot11FCSErrorCount, tvb, offset, 4, FALSE); + proto_tree_add_item(counter_data_tree, hf_sflow_5_dot11FCSErrorCount, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(counter_data_tree, hf_sflow_5_dot11TransmittedFrameCount, tvb, offset, 4, FALSE); + proto_tree_add_item(counter_data_tree, hf_sflow_5_dot11TransmittedFrameCount, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(counter_data_tree, hf_sflow_5_dot11WEPUndecryptableCount, tvb, offset, 4, FALSE); + proto_tree_add_item(counter_data_tree, hf_sflow_5_dot11WEPUndecryptableCount, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(counter_data_tree, hf_sflow_5_dot11QoSDiscardedFragmentCount, tvb, offset, 4, FALSE); + proto_tree_add_item(counter_data_tree, hf_sflow_5_dot11QoSDiscardedFragmentCount, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(counter_data_tree, hf_sflow_5_dot11AssociatedStationCount, tvb, offset, 4, FALSE); + proto_tree_add_item(counter_data_tree, hf_sflow_5_dot11AssociatedStationCount, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(counter_data_tree, hf_sflow_5_dot11QoSCFPollsReceivedCount, tvb, offset, 4, FALSE); + proto_tree_add_item(counter_data_tree, hf_sflow_5_dot11QoSCFPollsReceivedCount, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(counter_data_tree, hf_sflow_5_dot11QoSCFPollsUnusedCount, tvb, offset, 4, FALSE); + proto_tree_add_item(counter_data_tree, hf_sflow_5_dot11QoSCFPollsUnusedCount, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(counter_data_tree, hf_sflow_5_dot11QoSCFPollsUnusableCount, tvb, offset, 4, FALSE); + proto_tree_add_item(counter_data_tree, hf_sflow_5_dot11QoSCFPollsUnusableCount, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(counter_data_tree, hf_sflow_5_dot11QoSCFPollsLostCount, tvb, offset, 4, FALSE); + proto_tree_add_item(counter_data_tree, hf_sflow_5_dot11QoSCFPollsLostCount, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; return offset; @@ -2174,9 +2174,9 @@ dissect_sflow_5_processor_information(proto_tree *counter_data_tree, tvbuff_t *t offset += 4; proto_tree_add_item(counter_data_tree, hf_sflow_5_cpu_5m, tvb, offset, 4, FALSE); offset += 4; - proto_tree_add_item(counter_data_tree, hf_sflow_5_total_memory, tvb, offset, 8, FALSE); + proto_tree_add_item(counter_data_tree, hf_sflow_5_total_memory, tvb, offset, 8, ENC_BIG_ENDIAN); offset += 8; - proto_tree_add_item(counter_data_tree, hf_sflow_5_free_memory, tvb, offset, 8, FALSE); + proto_tree_add_item(counter_data_tree, hf_sflow_5_free_memory, tvb, offset, 8, ENC_BIG_ENDIAN); offset += 8; return offset; @@ -2188,11 +2188,11 @@ dissect_sflow_5_radio_utilization(proto_tree *counter_data_tree, tvbuff_t *tvb, struct radio_utilization radio; tvb_memcpy(tvb, (guint8 *) & radio, offset, sizeof (radio)); - proto_tree_add_item(counter_data_tree, hf_sflow_5_elapsed_time, tvb, offset, 4, FALSE); + proto_tree_add_item(counter_data_tree, hf_sflow_5_elapsed_time, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(counter_data_tree, hf_sflow_5_on_channel_time, tvb, offset, 4, FALSE); + proto_tree_add_item(counter_data_tree, hf_sflow_5_on_channel_time, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(counter_data_tree, hf_sflow_5_on_channel_busy_time, tvb, offset, 4, FALSE); + proto_tree_add_item(counter_data_tree, hf_sflow_5_on_channel_busy_time, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; return offset; @@ -2217,11 +2217,11 @@ dissect_sflow_5_counters_record(tvbuff_t *tvb, proto_tree *tree, gint offset) { proto_tree_add_text(counter_data_tree, tvb, offset, 4, "Enterprise: standard sFlow (%u)", enterprise); - proto_tree_add_item(counter_data_tree, hf_sflow_5_counters_record_format, tvb, offset, 4, FALSE); + proto_tree_add_item(counter_data_tree, hf_sflow_5_counters_record_format, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(counter_data_tree, hf_sflow_5_flow_data_length, tvb, offset, 4, FALSE); + proto_tree_add_item(counter_data_tree, hf_sflow_5_flow_data_length, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; switch (format) { @@ -2429,11 +2429,11 @@ dissect_sflow_24_counters_sample(tvbuff_t *tvb, proto_tree *tree, gint offset, p case SFLOW_245_COUNTERS_WAN: tvb_memcpy(tvb, (guint8 *) & ifc, offset, sizeof (ifc)); proto_item_append_text(parent, ", ifIndex %u", g_ntohl(ifc.ifIndex)); - proto_tree_add_item(tree, hf_sflow_245_ifindex, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_sflow_245_ifindex, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(tree, hf_sflow_245_iftype, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_sflow_245_iftype, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(tree, hf_sflow_245_ifspeed, tvb, offset, 8, FALSE); + proto_tree_add_item(tree, hf_sflow_245_ifspeed, tvb, offset, 8, ENC_BIG_ENDIAN); offset += 8; /* IfDirection, IfAdminStatus, IfOperStatus fixed by Yi Yu */ switch (tvb_get_ntohl(tvb, offset)) { @@ -2465,33 +2465,33 @@ dissect_sflow_24_counters_sample(tvbuff_t *tvb, proto_tree *tree, gint offset, p proto_tree_add_text(tree, tvb, offset, 4, "IfOperStatus: Down"); } offset += 4; - proto_tree_add_item(tree, hf_sflow_245_ifinoct, tvb, offset, 8, FALSE); + proto_tree_add_item(tree, hf_sflow_245_ifinoct, tvb, offset, 8, ENC_BIG_ENDIAN); offset += 8; - proto_tree_add_item(tree, hf_sflow_245_ifinpkt, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_sflow_245_ifinpkt, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(tree, hf_sflow_245_ifinmcast, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_sflow_245_ifinmcast, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(tree, hf_sflow_245_ifinbcast, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_sflow_245_ifinbcast, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(tree, hf_sflow_245_ifindisc, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_sflow_245_ifindisc, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(tree, hf_sflow_245_ifinerr, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_sflow_245_ifinerr, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(tree, hf_sflow_245_ifinunk, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_sflow_245_ifinunk, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(tree, hf_sflow_245_ifoutoct, tvb, offset, 8, FALSE); + proto_tree_add_item(tree, hf_sflow_245_ifoutoct, tvb, offset, 8, ENC_BIG_ENDIAN); offset += 8; - proto_tree_add_item(tree, hf_sflow_245_ifoutpkt, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_sflow_245_ifoutpkt, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(tree, hf_sflow_245_ifoutmcast, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_sflow_245_ifoutmcast, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(tree, hf_sflow_245_ifoutbcast, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_sflow_245_ifoutbcast, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(tree, hf_sflow_245_ifoutdisc, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_sflow_245_ifoutdisc, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(tree, hf_sflow_245_ifouterr, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_sflow_245_ifouterr, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(tree, hf_sflow_245_ifpromisc, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_sflow_245_ifpromisc, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; break; } @@ -2595,11 +2595,11 @@ dissect_sflow_245_samples(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, g sflow_245_sample_tree = proto_item_add_subtree(ti, ett_sflow_245_sample); proto_tree_add_text(sflow_245_sample_tree, tvb, offset, 4, "Enterprise: standard sFlow (%u)", enterprise); - proto_tree_add_item(sflow_245_sample_tree, hf_sflow_245_sampletype, tvb, offset, 4, FALSE); + proto_tree_add_item(sflow_245_sample_tree, hf_sflow_245_sampletype, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; length = tvb_get_ntohl(tvb, offset); - proto_tree_add_item(sflow_245_sample_tree, hf_sflow_5_sample_length, tvb, offset, 4, FALSE); + proto_tree_add_item(sflow_245_sample_tree, hf_sflow_5_sample_length, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; switch (format) { @@ -2633,7 +2633,7 @@ dissect_sflow_245_samples(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, g val_to_str(sample_type, sflow_245_sampletype, "Unknown sample type")); sflow_245_sample_tree = proto_item_add_subtree(ti, ett_sflow_245_sample); - proto_tree_add_item(sflow_245_sample_tree, hf_sflow_245_sampletype, tvb, offset, 4, FALSE); + proto_tree_add_item(sflow_245_sample_tree, hf_sflow_245_sampletype, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; switch (sample_type) { @@ -2678,7 +2678,7 @@ dissect_sflow_245(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { version = tvb_get_ntohl(tvb, offset); col_add_fstr(pinfo->cinfo, COL_INFO, "V%u", version); - proto_tree_add_item(sflow_245_tree, hf_sflow_version, tvb, offset, 4, FALSE); + proto_tree_add_item(sflow_245_tree, hf_sflow_version, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; offset = dissect_sflow_245_address_type(tvb, sflow_245_tree, offset, @@ -2706,7 +2706,7 @@ dissect_sflow_245(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { col_append_fstr(pinfo->cinfo, COL_INFO, ", seq %u", seqnum); proto_tree_add_uint(sflow_245_tree, hf_sflow_245_seqnum, tvb, offset, 4, seqnum); offset += 4; - proto_tree_add_item(sflow_245_tree, hf_sflow_245_sysuptime, tvb, offset, 4, FALSE); + proto_tree_add_item(sflow_245_tree, hf_sflow_245_sysuptime, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; numsamples = tvb_get_ntohl(tvb, offset); col_append_fstr(pinfo->cinfo, COL_INFO, ", %u samples", numsamples); diff --git a/epan/dissectors/packet-sgsap.c b/epan/dissectors/packet-sgsap.c index c513767cfa..baa91f4177 100644 --- a/epan/dissectors/packet-sgsap.c +++ b/epan/dissectors/packet-sgsap.c @@ -106,7 +106,7 @@ de_sgsap_eps_loc_upd_type(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U curr_offset = offset; /* Octet 3 EPS location update type value */ - proto_tree_add_item(tree, hf_sgsap_eps_location_update_type, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_sgsap_eps_location_update_type, tvb, offset, 1, ENC_BIG_ENDIAN); if(add_string){ oct = tvb_get_guint8(tvb,curr_offset); g_snprintf(add_string, string_len, " - %s", val_to_str_const(oct, sgsap_eps_location_update_type_values, "Reserved")); @@ -129,7 +129,7 @@ de_sgsap_err_msg(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint3 * Octet 3 - Octet n * Erroneous message including the message type. */ - proto_tree_add_item(tree, hf_sgsap_msg_type, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_sgsap_msg_type, tvb, offset, 1, ENC_BIG_ENDIAN); return(len); } @@ -149,7 +149,7 @@ de_sgsap_ecgi(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 o dissect_e212_mcc_mnc(tvb, gpinfo, tree, offset, TRUE); curr_offset+=3; - proto_tree_add_item(tree, hf_sgsap_eci, tvb, curr_offset, 4, FALSE); + proto_tree_add_item(tree, hf_sgsap_eci, tvb, curr_offset, 4, ENC_BIG_ENDIAN); curr_offset+=4; return(curr_offset-offset); @@ -174,7 +174,7 @@ de_sgsap_g_cn_id(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint3 dissect_e212_mcc_mnc(tvb, gpinfo, tree, offset, TRUE); curr_offset+=3; - proto_tree_add_item(tree, hf_sgsap_cn_id, tvb, curr_offset, 2, FALSE); + proto_tree_add_item(tree, hf_sgsap_cn_id, tvb, curr_offset, 2, ENC_BIG_ENDIAN); curr_offset+=2; return(curr_offset-offset); @@ -230,7 +230,7 @@ de_sgsap_imsi_det_eps(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, g curr_offset = offset; - proto_tree_add_item(tree, hf_sgsap_imsi_det_eps, tvb, curr_offset, 1, FALSE); + proto_tree_add_item(tree, hf_sgsap_imsi_det_eps, tvb, curr_offset, 1, ENC_BIG_ENDIAN); curr_offset+=1; return(curr_offset-offset); @@ -254,7 +254,7 @@ de_sgsap_imsi_det_non_eps(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U curr_offset = offset; - proto_tree_add_item(tree, hf_sgsap_imsi_det_eps, tvb, curr_offset, 1, FALSE); + proto_tree_add_item(tree, hf_sgsap_imsi_det_eps, tvb, curr_offset, 1, ENC_BIG_ENDIAN); curr_offset+=1; return(curr_offset-offset); @@ -281,7 +281,7 @@ de_sgsap_lcs_indic(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guin curr_offset = offset; - proto_tree_add_item(tree, hf_sgsap_lcs_indic, tvb, curr_offset, 1, FALSE); + proto_tree_add_item(tree, hf_sgsap_lcs_indic, tvb, curr_offset, 1, ENC_BIG_ENDIAN); curr_offset+=1; return(curr_offset-offset); @@ -413,7 +413,7 @@ de_sgsap_serv_indic(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, gui curr_offset = offset; /* Octet 3 Service indicator value */ - proto_tree_add_item(tree, hf_sgsap_service_indicator_value, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_sgsap_service_indicator_value, tvb, offset, 1, ENC_BIG_ENDIAN); if(add_string){ oct = tvb_get_guint8(tvb,curr_offset); g_snprintf(add_string, string_len, " - %s", val_to_str_const(oct, sgsap_service_indicator_values, "Reserved")); @@ -455,7 +455,7 @@ de_sgsap_sgs_cause(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guin curr_offset = offset; - proto_tree_add_item(tree, hf_sgsap_sgs_cause, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_sgsap_sgs_cause, tvb, offset, 1, ENC_BIG_ENDIAN); if(add_string){ oct = tvb_get_guint8(tvb,curr_offset); g_snprintf(add_string, string_len, " - %s", val_to_str_ext_const(oct, &sgsap_sgs_cause_values_ext, "Reserved")); @@ -510,7 +510,7 @@ de_sgsap_ue_emm_mode(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, gu curr_offset = offset; - proto_tree_add_item(tree, hf_sgsap_ue_emm_mode, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_sgsap_ue_emm_mode, tvb, offset, 1, ENC_BIG_ENDIAN); curr_offset+=1; return(curr_offset - offset); diff --git a/epan/dissectors/packet-simulcrypt.c b/epan/dissectors/packet-simulcrypt.c index 57b281db44..acec8f7744 100644 --- a/epan/dissectors/packet-simulcrypt.c +++ b/epan/dissectors/packet-simulcrypt.c @@ -765,11 +765,11 @@ dissect_ecmg_parameter_value (proto_tree *tree, tvbuff_t *tvb, packet_info *pinf switch (ptype) { case SIMULCRYPT_ECMG_SUPER_CAS_ID: /* add super_cas_id item */ - simulcrypt_item = proto_tree_add_item(tree, hf_simulcrypt_super_cas_id, tvb, offset, plen, FALSE); /* value item */ + simulcrypt_item = proto_tree_add_item(tree, hf_simulcrypt_super_cas_id, tvb, offset, plen, ENC_BIG_ENDIAN); /* value item */ simulcrypt_super_cas_id_tree = proto_item_add_subtree(simulcrypt_item, ett_simulcrypt_super_cas_id); /* Simulcrypt_super_cas_id_tree */ - simulcrypt_item = proto_tree_add_item(simulcrypt_super_cas_id_tree, hf_simulcrypt_ca_system_id, tvb, offset, 2, FALSE ); + simulcrypt_item = proto_tree_add_item(simulcrypt_super_cas_id_tree, hf_simulcrypt_ca_system_id, tvb, offset, 2, ENC_BIG_ENDIAN ); /* Test for known CA_System_ID */ ca_system_id = tvb_get_ntohs(tvb,offset); @@ -782,86 +782,86 @@ dissect_ecmg_parameter_value (proto_tree *tree, tvbuff_t *tvb, packet_info *pinf break; } } - proto_tree_add_item(simulcrypt_super_cas_id_tree, hf_simulcrypt_ca_subsystem_id, tvb, offset+2, 2, FALSE ); + proto_tree_add_item(simulcrypt_super_cas_id_tree, hf_simulcrypt_ca_subsystem_id, tvb, offset+2, 2, ENC_BIG_ENDIAN ); break; case SIMULCRYPT_ECMG_SECTION_TSPKT_FLAG: - proto_tree_add_item(tree, hf_simulcrypt_section_tspkt_flag, tvb, offset, plen, FALSE); /* value item */ + proto_tree_add_item(tree, hf_simulcrypt_section_tspkt_flag, tvb, offset, plen, ENC_BIG_ENDIAN); /* value item */ break; case SIMULCRYPT_ECMG_ECM_CHANNEL_ID: - proto_tree_add_item(tree, hf_simulcrypt_ecm_channel_id, tvb, offset, plen, FALSE); + proto_tree_add_item(tree, hf_simulcrypt_ecm_channel_id, tvb, offset, plen, ENC_BIG_ENDIAN); break; case SIMULCRYPT_ECMG_DELAY_START: - simulcrypt_item = proto_tree_add_item(tree, hf_simulcrypt_delay_start, tvb, offset, plen, FALSE); + simulcrypt_item = proto_tree_add_item(tree, hf_simulcrypt_delay_start, tvb, offset, plen, ENC_BIG_ENDIAN); proto_item_append_text(simulcrypt_item, " ms"); break; case SIMULCRYPT_ECMG_DELAY_STOP: - simulcrypt_item = proto_tree_add_item(tree, hf_simulcrypt_delay_stop, tvb, offset, plen, FALSE); + simulcrypt_item = proto_tree_add_item(tree, hf_simulcrypt_delay_stop, tvb, offset, plen, ENC_BIG_ENDIAN); proto_item_append_text(simulcrypt_item, " ms"); break; case SIMULCRYPT_ECMG_TRANSITION_DELAY_START: - simulcrypt_item = proto_tree_add_item(tree, hf_simulcrypt_transition_delay_start, tvb, offset, plen, FALSE); + simulcrypt_item = proto_tree_add_item(tree, hf_simulcrypt_transition_delay_start, tvb, offset, plen, ENC_BIG_ENDIAN); proto_item_append_text(simulcrypt_item, " ms"); break; case SIMULCRYPT_ECMG_TRANSITION_DELAY_STOP: - simulcrypt_item = proto_tree_add_item(tree, hf_simulcrypt_transition_delay_stop, tvb, offset, plen, FALSE); + simulcrypt_item = proto_tree_add_item(tree, hf_simulcrypt_transition_delay_stop, tvb, offset, plen, ENC_BIG_ENDIAN); proto_item_append_text(simulcrypt_item, " ms"); break; case SIMULCRYPT_ECMG_AC_DELAY_START: - simulcrypt_item = proto_tree_add_item(tree, hf_simulcrypt_ac_delay_start, tvb, offset, plen, FALSE); + simulcrypt_item = proto_tree_add_item(tree, hf_simulcrypt_ac_delay_start, tvb, offset, plen, ENC_BIG_ENDIAN); proto_item_append_text(simulcrypt_item, " ms"); break; case SIMULCRYPT_ECMG_AC_DELAY_STOP: - simulcrypt_item = proto_tree_add_item(tree, hf_simulcrypt_ac_delay_stop, tvb, offset, plen, FALSE); + simulcrypt_item = proto_tree_add_item(tree, hf_simulcrypt_ac_delay_stop, tvb, offset, plen, ENC_BIG_ENDIAN); proto_item_append_text(simulcrypt_item, " ms"); break; case SIMULCRYPT_ECMG_ECM_REP_PERIOD: - simulcrypt_item = proto_tree_add_item(tree, hf_simulcrypt_ecm_rep_period, tvb, offset, plen, FALSE); + simulcrypt_item = proto_tree_add_item(tree, hf_simulcrypt_ecm_rep_period, tvb, offset, plen, ENC_BIG_ENDIAN); proto_item_append_text(simulcrypt_item, " ms"); break; case SIMULCRYPT_ECMG_MAX_STREAMS: - proto_tree_add_item(tree, hf_simulcrypt_max_streams, tvb, offset, plen, FALSE); + proto_tree_add_item(tree, hf_simulcrypt_max_streams, tvb, offset, plen, ENC_BIG_ENDIAN); break; case SIMULCRYPT_ECMG_MIN_CP_DURATION: /* convert value to ms (in units 100 ms) */ pvaluedec = tvb_get_ntohs(tvb, offset); /* read 2 byte min CP duration value */ pvaluedec = pvaluedec*100; /* in ms now */ - simulcrypt_item = proto_tree_add_item(tree, hf_simulcrypt_min_cp_duration, tvb, offset, plen, FALSE); + simulcrypt_item = proto_tree_add_item(tree, hf_simulcrypt_min_cp_duration, tvb, offset, plen, ENC_BIG_ENDIAN); proto_item_append_text(simulcrypt_item, " (%d ms)",pvaluedec); break; case SIMULCRYPT_ECMG_LEAD_CW: - proto_tree_add_item(tree, hf_simulcrypt_lead_cw, tvb, offset, plen, FALSE); + proto_tree_add_item(tree, hf_simulcrypt_lead_cw, tvb, offset, plen, ENC_BIG_ENDIAN); break; case SIMULCRYPT_ECMG_CW_PER_MESSAGE: - proto_tree_add_item(tree, hf_simulcrypt_cw_per_msg, tvb, offset, plen, FALSE); + proto_tree_add_item(tree, hf_simulcrypt_cw_per_msg, tvb, offset, plen, ENC_BIG_ENDIAN); break; case SIMULCRYPT_ECMG_MAX_COMP_TIME: - simulcrypt_item = proto_tree_add_item(tree, hf_simulcrypt_max_comp_time, tvb, offset, plen, FALSE); + simulcrypt_item = proto_tree_add_item(tree, hf_simulcrypt_max_comp_time, tvb, offset, plen, ENC_BIG_ENDIAN); proto_item_append_text(simulcrypt_item, " ms"); break; case SIMULCRYPT_ECMG_ACCESS_CRITERIA: proto_tree_add_item(tree, hf_simulcrypt_access_criteria, tvb, offset, plen, ENC_NA); break; case SIMULCRYPT_ECMG_ECM_STREAM_ID: - proto_tree_add_item(tree, hf_simulcrypt_ecm_stream_id, tvb, offset, plen, FALSE); + proto_tree_add_item(tree, hf_simulcrypt_ecm_stream_id, tvb, offset, plen, ENC_BIG_ENDIAN); break; case SIMULCRYPT_ECMG_NOMINAL_CP_DURATION: /* convert value to ms (in units 100 ms) */ pvaluedec = tvb_get_ntohs(tvb, offset); /* read 2 byte nominal CP duration value */ pvaluedec = pvaluedec*100; /* in ms now */ - simulcrypt_item = proto_tree_add_item(tree, hf_simulcrypt_nominal_cp_duration, tvb, offset, plen, FALSE); + simulcrypt_item = proto_tree_add_item(tree, hf_simulcrypt_nominal_cp_duration, tvb, offset, plen, ENC_BIG_ENDIAN); proto_item_append_text(simulcrypt_item, " (%d ms)", pvaluedec); break; case SIMULCRYPT_ECMG_ACCESS_CRITERIA_TRANSFER_MODE: proto_tree_add_item(tree, hf_simulcrypt_access_criteria_transfer_mode, tvb, offset, plen, FALSE); break; case SIMULCRYPT_ECMG_CP_NUMBER: - proto_tree_add_item(tree, hf_simulcrypt_cp_number, tvb, offset, plen, FALSE); + proto_tree_add_item(tree, hf_simulcrypt_cp_number, tvb, offset, plen, ENC_BIG_ENDIAN); break; case SIMULCRYPT_ECMG_CP_DURATION: /* convert value to ms (in units 100 ms) */ pvaluedec = tvb_get_ntohs(tvb, offset); /* read 2 byte CP duration value */ pvaluedec = pvaluedec*100; /* in ms now */ - simulcrypt_item = proto_tree_add_item(tree, hf_simulcrypt_cp_duration, tvb, offset, plen, FALSE); + simulcrypt_item = proto_tree_add_item(tree, hf_simulcrypt_cp_duration, tvb, offset, plen, ENC_BIG_ENDIAN); proto_item_append_text(simulcrypt_item, " (%d ms)", pvaluedec); break; case SIMULCRYPT_ECMG_CP_CW_COMBINATION: @@ -888,10 +888,10 @@ dissect_ecmg_parameter_value (proto_tree *tree, tvbuff_t *tvb, packet_info *pinf proto_tree_add_item(tree, hf_simulcrypt_cw_encryption, tvb, offset, plen, ENC_NA); break; case SIMULCRYPT_ECMG_ECM_ID: - proto_tree_add_item(tree, hf_simulcrypt_ecm_id, tvb, offset, plen, FALSE); + proto_tree_add_item(tree, hf_simulcrypt_ecm_id, tvb, offset, plen, ENC_BIG_ENDIAN); break; case SIMULCRYPT_ECMG_ERROR_STATUS: - proto_tree_add_item(tree, hf_simulcrypt_ecmg_error_status, tvb, offset, plen, FALSE); + proto_tree_add_item(tree, hf_simulcrypt_ecmg_error_status, tvb, offset, plen, ENC_BIG_ENDIAN); break; case SIMULCRYPT_ECMG_ERROR_INFORMATION: proto_tree_add_item(tree, hf_simulcrypt_error_information, tvb, offset, plen, ENC_NA); @@ -910,32 +910,32 @@ dissect_emmg_parameter_value (proto_tree *tree, tvbuff_t *tvb, packet_info *pinf switch (ptype) { case SIMULCRYPT_EMMG_CLIENT_ID: - proto_tree_add_item(tree, hf_simulcrypt_client_id, tvb, offset, plen, FALSE); + proto_tree_add_item(tree, hf_simulcrypt_client_id, tvb, offset, plen, ENC_BIG_ENDIAN); break; case SIMULCRYPT_EMMG_SECTION_TSPKT_FLAG: - proto_tree_add_item(tree, hf_simulcrypt_section_tspkt_flag, tvb, offset, plen, FALSE); + proto_tree_add_item(tree, hf_simulcrypt_section_tspkt_flag, tvb, offset, plen, ENC_BIG_ENDIAN); break; case SIMULCRYPT_EMMG_DATA_CHANNEL_ID: - proto_tree_add_item(tree, hf_simulcrypt_data_channel_id, tvb, offset, plen, FALSE); + proto_tree_add_item(tree, hf_simulcrypt_data_channel_id, tvb, offset, plen, ENC_BIG_ENDIAN); break; case SIMULCRYPT_EMMG_DATA_STREAM_ID: - proto_tree_add_item(tree, hf_simulcrypt_data_stream_id, tvb, offset, plen, FALSE); + proto_tree_add_item(tree, hf_simulcrypt_data_stream_id, tvb, offset, plen, ENC_BIG_ENDIAN); break; case SIMULCRYPT_EMMG_DATAGRAM: proto_tree_add_item(tree, hf_simulcrypt_datagram, tvb, offset, plen, ENC_NA); break; case SIMULCRYPT_EMMG_BANDWIDTH: - simulcrypt_item = proto_tree_add_item(tree, hf_simulcrypt_bandwidth, tvb, offset, plen, FALSE); + simulcrypt_item = proto_tree_add_item(tree, hf_simulcrypt_bandwidth, tvb, offset, plen, ENC_BIG_ENDIAN); proto_item_append_text(simulcrypt_item, " kbit/s"); break; case SIMULCRYPT_EMMG_DATA_TYPE: - proto_tree_add_item(tree, hf_simulcrypt_data_type, tvb, offset, plen, FALSE); + proto_tree_add_item(tree, hf_simulcrypt_data_type, tvb, offset, plen, ENC_BIG_ENDIAN); break; case SIMULCRYPT_EMMG_DATA_ID: - proto_tree_add_item(tree, hf_simulcrypt_data_id, tvb, offset, plen, FALSE); + proto_tree_add_item(tree, hf_simulcrypt_data_id, tvb, offset, plen, ENC_BIG_ENDIAN); break; case SIMULCRYPT_EMMG_ERROR_STATUS: - proto_tree_add_item(tree, hf_simulcrypt_emmg_error_status, tvb, offset, plen, FALSE); + proto_tree_add_item(tree, hf_simulcrypt_emmg_error_status, tvb, offset, plen, ENC_BIG_ENDIAN); break; case SIMULCRYPT_EMMG_ERROR_INFORMATION: proto_tree_add_item(tree, hf_simulcrypt_error_information, tvb, offset, plen, ENC_NA); @@ -961,7 +961,7 @@ dissect_eis_parameter_value (proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo switch (ptype) { case SIMULCRYPT_EIS_CHANNEL_ID: - proto_tree_add_item(tree, hf_simulcrypt_eis_channel_id, tvb, offset, plen, FALSE); + proto_tree_add_item(tree, hf_simulcrypt_eis_channel_id, tvb, offset, plen, ENC_BIG_ENDIAN); break; case SIMULCRYPT_EIS_SERVICE_FLAG: proto_tree_add_item(tree, hf_simulcrypt_service_flag, tvb, offset, plen, FALSE); @@ -970,7 +970,7 @@ dissect_eis_parameter_value (proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo proto_tree_add_item(tree, hf_simulcrypt_component_flag, tvb, offset, plen, FALSE); break; case SIMULCRYPT_EIS_MAX_SCG: - proto_tree_add_item(tree, hf_simulcrypt_max_scg, tvb, offset, plen, FALSE); + proto_tree_add_item(tree, hf_simulcrypt_max_scg, tvb, offset, plen, ENC_BIG_ENDIAN); break; case SIMULCRYPT_EIS_ECM_GROUP: /* add ECM_Group item */ @@ -983,18 +983,18 @@ dissect_eis_parameter_value (proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo dissect_simulcrypt_data(simulcrypt_ecm_group_tree, simulcrypt_item, pinfo, tvb, tree, offset, plen, SIMULCRYPT_EIS_SCS, TRUE); break; case SIMULCRYPT_EIS_SCG_ID: - proto_tree_add_item(tree, hf_simulcrypt_scg_id, tvb, offset, plen, FALSE); + proto_tree_add_item(tree, hf_simulcrypt_scg_id, tvb, offset, plen, ENC_BIG_ENDIAN); break; case SIMULCRYPT_EIS_SCG_REFERENCE_ID: - proto_tree_add_item(tree, hf_simulcrypt_scg_reference_id, tvb, offset, plen, FALSE); + proto_tree_add_item(tree, hf_simulcrypt_scg_reference_id, tvb, offset, plen, ENC_BIG_ENDIAN); break; case SIMULCRYPT_EIS_SUPER_CAS_ID: /* add super_cas_id item */ - simulcrypt_item = proto_tree_add_item(tree, hf_simulcrypt_super_cas_id, tvb, offset, plen, FALSE); /* value item */ + simulcrypt_item = proto_tree_add_item(tree, hf_simulcrypt_super_cas_id, tvb, offset, plen, ENC_BIG_ENDIAN); /* value item */ simulcrypt_super_cas_id_tree = proto_item_add_subtree(simulcrypt_item, ett_simulcrypt_super_cas_id); /* Simulcrypt_super_cas_id_tree */ - simulcrypt_item = proto_tree_add_item(simulcrypt_super_cas_id_tree, hf_simulcrypt_ca_system_id, tvb, offset, 2, FALSE ); + simulcrypt_item = proto_tree_add_item(simulcrypt_super_cas_id_tree, hf_simulcrypt_ca_system_id, tvb, offset, 2, ENC_BIG_ENDIAN ); /* Test for known CA_System_ID */ ca_system_id = tvb_get_ntohs(tvb,offset); @@ -1007,10 +1007,10 @@ dissect_eis_parameter_value (proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo break; } } - proto_tree_add_item(simulcrypt_super_cas_id_tree, hf_simulcrypt_ca_subsystem_id, tvb, offset+2, 2, FALSE ); + proto_tree_add_item(simulcrypt_super_cas_id_tree, hf_simulcrypt_ca_subsystem_id, tvb, offset+2, 2, ENC_BIG_ENDIAN ); break; case SIMULCRYPT_EIS_ECM_ID: - proto_tree_add_item(tree, hf_simulcrypt_ecm_id, tvb, offset, plen, FALSE); + proto_tree_add_item(tree, hf_simulcrypt_ecm_id, tvb, offset, plen, ENC_BIG_ENDIAN); break; case SIMULCRYPT_EIS_ACCESS_CRITERIA: proto_tree_add_item(tree, hf_simulcrypt_access_criteria, tvb, offset, plen, ENC_NA); @@ -1022,58 +1022,58 @@ dissect_eis_parameter_value (proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo simulcrypt_activation_time_tree = proto_item_add_subtree(simulcrypt_item, ett_simulcrypt_activation_time); /* dissect subtree */ - proto_tree_add_item(simulcrypt_activation_time_tree, hf_simulcrypt_year, tvb, offset, 2, FALSE); /* first 2 bytes */ - proto_tree_add_item(simulcrypt_activation_time_tree, hf_simulcrypt_month, tvb, offset+2, 1, FALSE); /* third byte */ - proto_tree_add_item(simulcrypt_activation_time_tree, hf_simulcrypt_day, tvb, offset+3, 1, FALSE); /*fourth byte */ - proto_tree_add_item(simulcrypt_activation_time_tree, hf_simulcrypt_hour, tvb, offset+4, 1, FALSE); /*fifth byte */ - proto_tree_add_item(simulcrypt_activation_time_tree, hf_simulcrypt_minute, tvb, offset+5, 1, FALSE); /* sixth byte */ - proto_tree_add_item(simulcrypt_activation_time_tree, hf_simulcrypt_second, tvb, offset+6, 1, FALSE); /* seventh byte */ - proto_tree_add_item(simulcrypt_activation_time_tree, hf_simulcrypt_hundredth_second, tvb, offset+7, 1, FALSE); /* eighth byte */ + proto_tree_add_item(simulcrypt_activation_time_tree, hf_simulcrypt_year, tvb, offset, 2, ENC_BIG_ENDIAN); /* first 2 bytes */ + proto_tree_add_item(simulcrypt_activation_time_tree, hf_simulcrypt_month, tvb, offset+2, 1, ENC_BIG_ENDIAN); /* third byte */ + proto_tree_add_item(simulcrypt_activation_time_tree, hf_simulcrypt_day, tvb, offset+3, 1, ENC_BIG_ENDIAN); /*fourth byte */ + proto_tree_add_item(simulcrypt_activation_time_tree, hf_simulcrypt_hour, tvb, offset+4, 1, ENC_BIG_ENDIAN); /*fifth byte */ + proto_tree_add_item(simulcrypt_activation_time_tree, hf_simulcrypt_minute, tvb, offset+5, 1, ENC_BIG_ENDIAN); /* sixth byte */ + proto_tree_add_item(simulcrypt_activation_time_tree, hf_simulcrypt_second, tvb, offset+6, 1, ENC_BIG_ENDIAN); /* seventh byte */ + proto_tree_add_item(simulcrypt_activation_time_tree, hf_simulcrypt_hundredth_second, tvb, offset+7, 1, ENC_BIG_ENDIAN); /* eighth byte */ break; case SIMULCRYPT_EIS_ACTIVATION_PENDING_FLAG: proto_tree_add_item(tree, hf_simulcrypt_activation_pending_flag, tvb, offset, plen, FALSE); break; case SIMULCRYPT_EIS_COMPONENT_ID: - proto_tree_add_item(tree, hf_simulcrypt_component_id, tvb, offset, plen, FALSE); + proto_tree_add_item(tree, hf_simulcrypt_component_id, tvb, offset, plen, ENC_BIG_ENDIAN); break; case SIMULCRYPT_EIS_SERVICE_ID: - proto_tree_add_item(tree, hf_simulcrypt_service_id, tvb, offset, plen, FALSE); + proto_tree_add_item(tree, hf_simulcrypt_service_id, tvb, offset, plen, ENC_BIG_ENDIAN); break; case SIMULCRYPT_EIS_TRANSPORT_STREAM_ID: - proto_tree_add_item(tree, hf_simulcrypt_transport_stream_id, tvb, offset, plen, FALSE); + proto_tree_add_item(tree, hf_simulcrypt_transport_stream_id, tvb, offset, plen, ENC_BIG_ENDIAN); break; case SIMULCRYPT_EIS_AC_CHANGED_FLAG: proto_tree_add_item(tree, hf_simulcrypt_ac_changed_flag, tvb, offset, plen, FALSE); break; case SIMULCRYPT_EIS_SCG_CURRENT_REFERENCE_ID: - proto_tree_add_item(tree, hf_simulcrypt_scg_current_reference_id, tvb, offset, plen, FALSE); + proto_tree_add_item(tree, hf_simulcrypt_scg_current_reference_id, tvb, offset, plen, ENC_BIG_ENDIAN); break; case SIMULCRYPT_EIS_SCG_PENDING_REFERENCE_ID: - proto_tree_add_item(tree, hf_simulcrypt_scg_pending_reference_id, tvb, offset, plen, FALSE); + proto_tree_add_item(tree, hf_simulcrypt_scg_pending_reference_id, tvb, offset, plen, ENC_BIG_ENDIAN); break; case SIMULCRYPT_EIS_CP_DURATION_FLAG: - proto_tree_add_item(tree, hf_simulcrypt_cp_duration_flag, tvb, offset, plen, FALSE); + proto_tree_add_item(tree, hf_simulcrypt_cp_duration_flag, tvb, offset, plen, ENC_BIG_ENDIAN); break; case SIMULCRYPT_EIS_RECOMMENDED_CP_DURATION: /* convert value to ms (in units 100 ms) */ pvaluedec = tvb_get_ntohs(tvb, offset); /* read 2 byte CP duration value */ pvaluedec = pvaluedec*100; /* in ms now */ - simulcrypt_item = proto_tree_add_item(tree, hf_simulcrypt_recommended_cp_duration, tvb, offset, plen, FALSE); + simulcrypt_item = proto_tree_add_item(tree, hf_simulcrypt_recommended_cp_duration, tvb, offset, plen, ENC_BIG_ENDIAN); proto_item_append_text(simulcrypt_item, " (%d ms)", pvaluedec); break; case SIMULCRYPT_EIS_SCG_NOMINAL_CP_DURATION: /* convert value to ms (in units 100 ms) */ pvaluedec = tvb_get_ntohs(tvb, offset); /* read 2 byte CP duration value */ pvaluedec = pvaluedec*100; /* in ms now */ - simulcrypt_item = proto_tree_add_item(tree, hf_simulcrypt_scg_nominal_cp_duration, tvb, offset, plen, FALSE); + simulcrypt_item = proto_tree_add_item(tree, hf_simulcrypt_scg_nominal_cp_duration, tvb, offset, plen, ENC_BIG_ENDIAN); proto_item_append_text(simulcrypt_item, " (%d ms)", pvaluedec); break; case SIMULCRYPT_EIS_ORIGINAL_NETWORK_ID: - proto_tree_add_item(tree, hf_simulcrypt_original_network_id, tvb, offset, plen, FALSE); + proto_tree_add_item(tree, hf_simulcrypt_original_network_id, tvb, offset, plen, ENC_BIG_ENDIAN); break; case SIMULCRYPT_EIS_ERROR_STATUS: - proto_tree_add_item(tree, hf_simulcrypt_eis_error_status, tvb, offset, plen, FALSE); + proto_tree_add_item(tree, hf_simulcrypt_eis_error_status, tvb, offset, plen, ENC_BIG_ENDIAN); break; case SIMULCRYPT_EIS_ERROR_INFORMATION: proto_tree_add_item(tree, hf_simulcrypt_error_information, tvb, offset, plen, ENC_NA); @@ -1100,7 +1100,7 @@ dissect_psig_parameter_value (proto_tree *tree, tvbuff_t *tvb, packet_info *pinf switch (ptype) { case SIMULCRYPT_PSIG_PSIG_TYPE: pvaluedec = tvb_get_guint8(tvb, offset); - simulcrypt_item = proto_tree_add_item(tree, hf_simulcrypt_psig_type, tvb, offset, plen, FALSE); + simulcrypt_item = proto_tree_add_item(tree, hf_simulcrypt_psig_type, tvb, offset, plen, ENC_BIG_ENDIAN); switch(pvaluedec){ case 1: proto_item_append_text(simulcrypt_item, " (PSIG)"); @@ -1116,25 +1116,25 @@ dissect_psig_parameter_value (proto_tree *tree, tvbuff_t *tvb, packet_info *pinf } break; case SIMULCRYPT_PSIG_CHANNEL_ID: - proto_tree_add_item(tree, hf_simulcrypt_channel_id, tvb, offset, plen, FALSE); + proto_tree_add_item(tree, hf_simulcrypt_channel_id, tvb, offset, plen, ENC_BIG_ENDIAN); break; case SIMULCRYPT_PSIG_STREAM_ID: - proto_tree_add_item(tree, hf_simulcrypt_stream_id, tvb, offset, plen, FALSE); + proto_tree_add_item(tree, hf_simulcrypt_stream_id, tvb, offset, plen, ENC_BIG_ENDIAN); break; case SIMULCRYPT_PSIG_TRANSPORT_STREAM_ID: - proto_tree_add_item(tree, hf_simulcrypt_transport_stream_id, tvb, offset, plen, FALSE); + proto_tree_add_item(tree, hf_simulcrypt_transport_stream_id, tvb, offset, plen, ENC_BIG_ENDIAN); break; case SIMULCRYPT_PSIG_ORIGINAL_NETWORK_ID: - proto_tree_add_item(tree, hf_simulcrypt_original_network_id, tvb, offset, plen, FALSE); + proto_tree_add_item(tree, hf_simulcrypt_original_network_id, tvb, offset, plen, ENC_BIG_ENDIAN); break; case SIMULCRYPT_PSIG_PACKET_ID: - proto_tree_add_item(tree, hf_simulcrypt_packet_id, tvb, offset, plen, FALSE); + proto_tree_add_item(tree, hf_simulcrypt_packet_id, tvb, offset, plen, ENC_BIG_ENDIAN); break; case SIMULCRYPT_PSIG_INTERFACE_MODE_CONFIGURATION: - proto_tree_add_item(tree, hf_simulcrypt_interface_mode_configuration, tvb, offset, plen, FALSE); + proto_tree_add_item(tree, hf_simulcrypt_interface_mode_configuration, tvb, offset, plen, ENC_BIG_ENDIAN); break; case SIMULCRYPT_PSIG_MAX_STREAM: - proto_tree_add_item(tree, hf_simulcrypt_max_stream, tvb, offset, plen, FALSE); + proto_tree_add_item(tree, hf_simulcrypt_max_stream, tvb, offset, plen, ENC_BIG_ENDIAN); break; case SIMULCRYPT_PSIG_TABLE_PERIOD_PAIR: simulcrypt_item = proto_tree_add_item(tree, hf_simulcrypt_table_period_pair, tvb, offset, plen, ENC_NA); /* value item */ @@ -1149,7 +1149,7 @@ dissect_psig_parameter_value (proto_tree *tree, tvbuff_t *tvb, packet_info *pinf proto_tree_add_item(tree, hf_simulcrypt_mpeg_section, tvb, offset, plen, ENC_NA); break; case SIMULCRYPT_PSIG_REPETITION_RATE: - proto_tree_add_item(tree, hf_simulcrypt_repetition_rate, tvb, offset, plen, FALSE); + proto_tree_add_item(tree, hf_simulcrypt_repetition_rate, tvb, offset, plen, ENC_BIG_ENDIAN); break; case SIMULCRYPT_PSIG_ACTIVATION_TIME: simulcrypt_item = proto_tree_add_item(tree, hf_simulcrypt_activation_time, tvb, offset, plen, ENC_NA); /* value item */ @@ -1158,34 +1158,34 @@ dissect_psig_parameter_value (proto_tree *tree, tvbuff_t *tvb, packet_info *pinf simulcrypt_activation_time_tree = proto_item_add_subtree(simulcrypt_item, ett_simulcrypt_activation_time); /* dissect subtree */ - proto_tree_add_item(simulcrypt_activation_time_tree, hf_simulcrypt_year, tvb, offset, 2, FALSE); /* first 2 bytes */ - proto_tree_add_item(simulcrypt_activation_time_tree, hf_simulcrypt_month, tvb, offset+2, 1, FALSE); /* third byte */ - proto_tree_add_item(simulcrypt_activation_time_tree, hf_simulcrypt_day, tvb, offset+3, 1, FALSE); /*fourth byte */ - proto_tree_add_item(simulcrypt_activation_time_tree, hf_simulcrypt_hour, tvb, offset+4, 1, FALSE); /*fifth byte */ - proto_tree_add_item(simulcrypt_activation_time_tree, hf_simulcrypt_minute, tvb, offset+5, 1, FALSE); /* sixth byte */ - proto_tree_add_item(simulcrypt_activation_time_tree, hf_simulcrypt_second, tvb, offset+6, 1, FALSE); /* seventh byte */ - proto_tree_add_item(simulcrypt_activation_time_tree, hf_simulcrypt_hundredth_second, tvb, offset+7, 1, FALSE); /* eighth byte */ + proto_tree_add_item(simulcrypt_activation_time_tree, hf_simulcrypt_year, tvb, offset, 2, ENC_BIG_ENDIAN); /* first 2 bytes */ + proto_tree_add_item(simulcrypt_activation_time_tree, hf_simulcrypt_month, tvb, offset+2, 1, ENC_BIG_ENDIAN); /* third byte */ + proto_tree_add_item(simulcrypt_activation_time_tree, hf_simulcrypt_day, tvb, offset+3, 1, ENC_BIG_ENDIAN); /*fourth byte */ + proto_tree_add_item(simulcrypt_activation_time_tree, hf_simulcrypt_hour, tvb, offset+4, 1, ENC_BIG_ENDIAN); /*fifth byte */ + proto_tree_add_item(simulcrypt_activation_time_tree, hf_simulcrypt_minute, tvb, offset+5, 1, ENC_BIG_ENDIAN); /* sixth byte */ + proto_tree_add_item(simulcrypt_activation_time_tree, hf_simulcrypt_second, tvb, offset+6, 1, ENC_BIG_ENDIAN); /* seventh byte */ + proto_tree_add_item(simulcrypt_activation_time_tree, hf_simulcrypt_hundredth_second, tvb, offset+7, 1, ENC_BIG_ENDIAN); /* eighth byte */ break; case SIMULCRYPT_PSIG_DATAGRAM: proto_tree_add_item(tree, hf_simulcrypt_datagram, tvb, offset, plen, ENC_NA); break; case SIMULCRYPT_PSIG_BANDWIDTH: - simulcrypt_item = proto_tree_add_item(tree, hf_simulcrypt_bandwidth, tvb, offset, plen, FALSE); + simulcrypt_item = proto_tree_add_item(tree, hf_simulcrypt_bandwidth, tvb, offset, plen, ENC_BIG_ENDIAN); proto_item_append_text(simulcrypt_item, " kbit/s"); break; case SIMULCRYPT_PSIG_INITIAL_BANDWIDTH: - simulcrypt_item = proto_tree_add_item(tree, hf_simulcrypt_initial_bandwidth, tvb, offset, plen, FALSE); + simulcrypt_item = proto_tree_add_item(tree, hf_simulcrypt_initial_bandwidth, tvb, offset, plen, ENC_BIG_ENDIAN); proto_item_append_text(simulcrypt_item, " kbit/s"); break; case SIMULCRYPT_PSIG_MAX_COMP_TIME: - simulcrypt_item = proto_tree_add_item(tree, hf_simulcrypt_max_comp_time, tvb, offset, plen, FALSE); + simulcrypt_item = proto_tree_add_item(tree, hf_simulcrypt_max_comp_time, tvb, offset, plen, ENC_BIG_ENDIAN); proto_item_append_text(simulcrypt_item, " ms"); break; case SIMULCRYPT_PSIG_ASI_INPUT_PACKET_ID: - proto_tree_add_item(tree, hf_simulcrypt_asi_input_packet_id, tvb, offset, plen, FALSE); + proto_tree_add_item(tree, hf_simulcrypt_asi_input_packet_id, tvb, offset, plen, ENC_BIG_ENDIAN); break; case SIMULCRYPT_PSIG_ERROR_STATUS: - proto_tree_add_item(tree, hf_simulcrypt_psig_error_status, tvb, offset, plen, FALSE); + proto_tree_add_item(tree, hf_simulcrypt_psig_error_status, tvb, offset, plen, ENC_BIG_ENDIAN); break; case SIMULCRYPT_PSIG_ERROR_INFORMATION: proto_tree_add_item(tree, hf_simulcrypt_error_information, tvb, offset, plen, ENC_NA); diff --git a/epan/dissectors/packet-slimp3.c b/epan/dissectors/packet-slimp3.c index ed09877758..2266d6d9ae 100644 --- a/epan/dissectors/packet-slimp3.c +++ b/epan/dissectors/packet-slimp3.c @@ -306,7 +306,7 @@ dissect_slimp3(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) * [12..17] reserved */ if (tree) { - hidden_item = proto_tree_add_item(slimp3_tree, hf_slimp3_ir, tvb, offset+8, 4, FALSE); + hidden_item = proto_tree_add_item(slimp3_tree, hf_slimp3_ir, tvb, offset+8, 4, ENC_BIG_ENDIAN); PROTO_ITEM_SET_HIDDEN(hidden_item); i1 = tvb_get_ntohl(tvb, offset+2); diff --git a/epan/dissectors/packet-sll.c b/epan/dissectors/packet-sll.c index a21ab4b6c2..f30d322607 100644 --- a/epan/dissectors/packet-sll.c +++ b/epan/dissectors/packet-sll.c @@ -186,7 +186,7 @@ dissect_sll(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ti = proto_tree_add_protocol_format(tree, proto_sll, tvb, 0, SLL_HEADER_SIZE, "Linux cooked capture"); fh_tree = proto_item_add_subtree(ti, ett_sll); - proto_tree_add_item(fh_tree, hf_sll_pkttype, tvb, 0, 2, FALSE); + proto_tree_add_item(fh_tree, hf_sll_pkttype, tvb, 0, 2, ENC_BIG_ENDIAN); } /* diff --git a/epan/dissectors/packet-slowprotocols.c b/epan/dissectors/packet-slowprotocols.c index 334a35404c..8fb27ea2cf 100644 --- a/epan/dissectors/packet-slowprotocols.c +++ b/epan/dissectors/packet-slowprotocols.c @@ -1081,7 +1081,7 @@ dissect_slow_protocols(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Subtype */ proto_tree_add_item(pdu_tree, hf_slow_subtype, tvb, - 0, 1, FALSE); + 0, 1, ENC_BIG_ENDIAN); } break; @@ -1135,7 +1135,7 @@ dissect_lacp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Subtype */ proto_tree_add_item(lacpdu_tree, hf_slow_subtype, tvb, - 0, 1, FALSE); + 0, 1, ENC_BIG_ENDIAN); /* Version Number */ raw_octet = tvb_get_guint8(tvb, LACPDU_VERSION_NUMBER); @@ -1462,7 +1462,7 @@ dissect_marker_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Subtype */ proto_tree_add_item(marker_tree, hf_slow_subtype, tvb, - 0, 1, FALSE); + 0, 1, ENC_BIG_ENDIAN); offset = 1; @@ -1553,7 +1553,7 @@ dissect_ossp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ossp_tree = proto_item_add_subtree(ossp_item, ett_ossppdu); /* Slow Protocol Subtype */ - proto_tree_add_item(ossp_tree, hf_slow_subtype, tvb, offset, 1, FALSE); + proto_tree_add_item(ossp_tree, hf_slow_subtype, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; oui_item = proto_tree_add_item(ossp_tree, hf_ossp_oui, @@ -1613,7 +1613,7 @@ dissect_itu_ossp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* ITU-T OSSP Subtype */ subtype = tvb_get_ntohs(tvb, 0); - ti = proto_tree_add_item(tree, hf_itu_subtype, tvb, 0, 2, FALSE); + ti = proto_tree_add_item(tree, hf_itu_subtype, tvb, 0, 2, ENC_BIG_ENDIAN); itu_ossp_tree = proto_item_add_subtree(ti, ett_itu_ossp); @@ -1659,7 +1659,7 @@ dissect_esmc_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *treex) { /* version */ proto_item *item_b; - item_b = proto_tree_add_item(tree_a, hf_esmc_version, tvb, offset, 1, FALSE); + item_b = proto_tree_add_item(tree_a, hf_esmc_version, tvb, offset, 1, ENC_BIG_ENDIAN); if ((tvb_get_guint8(tvb, offset) >> 4) != ESMC_VERSION_1) { malformed = TRUE; @@ -1677,7 +1677,7 @@ dissect_esmc_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *treex) if (pref_decode_esmc_timestamp) { /* timestamp valid flag */ timestamp_valid_flag = ((tvb_get_guint8(tvb, offset) & 0x04) != 0); - proto_tree_add_item(tree_a, hf_esmc_timestamp_valid_flag, tvb, offset, 1, FALSE); + proto_tree_add_item(tree_a, hf_esmc_timestamp_valid_flag, tvb, offset, 1, ENC_BIG_ENDIAN); /*stay at the same octet in tvb*/ } { /* reserved bits */ @@ -1715,7 +1715,7 @@ dissect_esmc_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *treex) /* type */ type = tvb_get_guint8(tvb, offset); - item_c = proto_tree_add_item(tree_b, hf_esmc_tlv_type, tvb, offset, 1, FALSE); + item_c = proto_tree_add_item(tree_b, hf_esmc_tlv_type, tvb, offset, 1, ENC_BIG_ENDIAN); if (type != ESMC_QL_TLV_TYPE) { malformed = TRUE; @@ -1729,7 +1729,7 @@ dissect_esmc_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *treex) /* length */ length = tvb_get_ntohs(tvb, offset); - item_c = proto_tree_add_item(tree_b, hf_esmc_tlv_length, tvb, offset, 2, FALSE); + item_c = proto_tree_add_item(tree_b, hf_esmc_tlv_length, tvb, offset, 2, ENC_BIG_ENDIAN); if (length != ESMC_QL_TLV_LENGTH) { malformed = TRUE; @@ -1744,7 +1744,7 @@ dissect_esmc_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *treex) unused = tvb_get_guint8(tvb, offset); /*as temp var*/ ql = unused & 0x0f; unused &= 0xf0; - item_c = proto_tree_add_item(tree_b, hf_esmc_tlv_ql_unused, tvb, offset, 1, FALSE); + item_c = proto_tree_add_item(tree_b, hf_esmc_tlv_ql_unused, tvb, offset, 1, ENC_BIG_ENDIAN); if (unused != 0x00) { malformed = TRUE; @@ -1753,11 +1753,11 @@ dissect_esmc_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *treex) } if (NULL != match_strval(ql, esmc_quality_level_opt_1_vals)) { - proto_tree_add_item(tree_b, hf_esmc_quality_level_opt_1, tvb, offset, 1, FALSE); + proto_tree_add_item(tree_b, hf_esmc_quality_level_opt_1, tvb, offset, 1, ENC_BIG_ENDIAN); } else { - item_c = proto_tree_add_item(tree_b, hf_esmc_quality_level_invalid, tvb, offset, 1, FALSE); + item_c = proto_tree_add_item(tree_b, hf_esmc_quality_level_invalid, tvb, offset, 1, ENC_BIG_ENDIAN); expert_add_info_format(pinfo, item_c, PI_UNDECODED, PI_WARN ,"Invalid SSM message, unknown QL code"); } @@ -1793,7 +1793,7 @@ dissect_esmc_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *treex) guint8 reserved; /* type */ - item_c = proto_tree_add_item(tree_b, hf_esmc_tlv_type, tvb, offset, 1, FALSE); + item_c = proto_tree_add_item(tree_b, hf_esmc_tlv_type, tvb, offset, 1, ENC_BIG_ENDIAN); if (type != ESMC_TIMESTAMP_TLV_TYPE) { malformed = TRUE; @@ -1807,7 +1807,7 @@ dissect_esmc_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *treex) /* length */ length = tvb_get_ntohs(tvb, offset); - item_c = proto_tree_add_item(tree_b, hf_esmc_tlv_length, tvb, offset, 2, FALSE); + item_c = proto_tree_add_item(tree_b, hf_esmc_tlv_length, tvb, offset, 2, ENC_BIG_ENDIAN); if (length != ESMC_TIMESTAMP_TLV_LENGTH) { malformed = TRUE; @@ -1827,7 +1827,7 @@ dissect_esmc_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *treex) /* reserved */ reserved = tvb_get_guint8(tvb, offset); - item_c = proto_tree_add_item(tree_b, hf_esmc_tlv_ts_reserved, tvb, offset, 1, FALSE); + item_c = proto_tree_add_item(tree_b, hf_esmc_tlv_ts_reserved, tvb, offset, 1, ENC_BIG_ENDIAN); if (reserved != 0x0) { expert_add_info_format(pinfo, item_c, PI_UNDECODED, PI_WARN @@ -1969,7 +1969,7 @@ dissect_oampdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Subtype */ proto_tree_add_item(oampdu_tree, hf_slow_subtype, tvb, - 0, 1, FALSE); + 0, 1, ENC_BIG_ENDIAN); /* Flags field */ flags = tvb_get_ntohs(tvb, OAMPDU_FLAGS); diff --git a/epan/dissectors/packet-slsk.c b/epan/dissectors/packet-slsk.c index c555cf1595..0f0dad1e87 100644 --- a/epan/dissectors/packet-slsk.c +++ b/epan/dissectors/packet-slsk.c @@ -662,7 +662,7 @@ static void dissect_slsk_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree proto_tree_add_uint(slsk_compr_packet_tree, hf_slsk_string_length, uncompr_tvb, uncompr_tvb_offset, 4, len); proto_tree_add_item(slsk_compr_packet_tree, hf_slsk_username, uncompr_tvb, uncompr_tvb_offset+4, len, TRUE); uncompr_tvb_offset += 4+len; - proto_tree_add_item(slsk_compr_packet_tree, hf_slsk_token, uncompr_tvb, uncompr_tvb_offset, 4, TRUE); + proto_tree_add_item(slsk_compr_packet_tree, hf_slsk_token, uncompr_tvb, uncompr_tvb_offset, 4, ENC_LITTLE_ENDIAN); uncompr_tvb_offset += 4; i=0; j = tvb_get_letohl(uncompr_tvb, uncompr_tvb_offset); proto_tree_add_uint_format(slsk_compr_packet_tree, hf_slsk_integer, uncompr_tvb, uncompr_tvb_offset, 4, j, @@ -963,7 +963,7 @@ static void dissect_slsk_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree proto_tree_add_uint_format(slsk_tree, hf_slsk_message_code, tvb, offset, 4, msg_code, "Message Type: %s (Code: %02d)", message_type, msg_code); offset += 4; - proto_tree_add_item(slsk_tree, hf_slsk_token, tvb, offset, 4, TRUE); + proto_tree_add_item(slsk_tree, hf_slsk_token, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; len = tvb_get_letohl(tvb, offset); proto_tree_add_uint(slsk_tree, hf_slsk_string_length, tvb, offset, 4, len); @@ -998,9 +998,9 @@ static void dissect_slsk_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree offset += 4+len; proto_tree_add_item(slsk_tree, hf_slsk_ip, tvb, offset, 4, FALSE); offset += 4; - proto_tree_add_item(slsk_tree, hf_slsk_port, tvb, offset, 4, TRUE); + proto_tree_add_item(slsk_tree, hf_slsk_port, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; - proto_tree_add_item(slsk_tree, hf_slsk_token, tvb, offset, 4, TRUE); + proto_tree_add_item(slsk_tree, hf_slsk_token, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; } break; diff --git a/epan/dissectors/packet-smb-browse.c b/epan/dissectors/packet-smb-browse.c index 0bee40e77b..80902c6064 100644 --- a/epan/dissectors/packet-smb-browse.c +++ b/epan/dissectors/packet-smb-browse.c @@ -452,11 +452,11 @@ dissect_election_criterion(tvbuff_t *tvb, proto_tree *parent_tree, int offset) offset += 1; /* browser protocol major version */ - proto_tree_add_item(tree, hf_proto_major, tvb, offset, 1, TRUE); + proto_tree_add_item(tree, hf_proto_major, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 1; /* browser protocol minor version */ - proto_tree_add_item(tree, hf_proto_minor, tvb, offset, 1, TRUE); + proto_tree_add_item(tree, hf_proto_minor, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 1; /* election os */ @@ -617,7 +617,7 @@ dissect_mailslot_browse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tr case BROWSE_LOCAL_MASTER_ANNOUNCEMENT: case BROWSE_HOST_ANNOUNCE: { /* update count */ - proto_tree_add_item(tree, hf_update_count, tvb, offset, 1, TRUE); + proto_tree_add_item(tree, hf_update_count, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 1; /* periodicity (in milliseconds) */ @@ -658,11 +658,11 @@ dissect_mailslot_browse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tr proto_tree_add_text(tree, tvb, offset, 2, "Windows version: %s", windows_version); /* OS major version */ - proto_tree_add_item(tree, hf_os_major, tvb, offset, 1, TRUE); + proto_tree_add_item(tree, hf_os_major, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 1; /* OS minor version */ - proto_tree_add_item(tree, hf_os_minor, tvb, offset, 1, TRUE); + proto_tree_add_item(tree, hf_os_minor, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 1; /* server type flags */ @@ -684,15 +684,15 @@ dissect_mailslot_browse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tr offset += 4; } else { /* browser protocol major version */ - proto_tree_add_item(tree, hf_proto_major, tvb, offset, 1, TRUE); + proto_tree_add_item(tree, hf_proto_major, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 1; /* browser protocol minor version */ - proto_tree_add_item(tree, hf_proto_minor, tvb, offset, 1, TRUE); + proto_tree_add_item(tree, hf_proto_minor, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 1; /* signature constant */ - proto_tree_add_item(tree, hf_sig_const, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_sig_const, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; } @@ -710,7 +710,7 @@ dissect_mailslot_browse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tr /* unused/unknown flags */ proto_tree_add_item(tree, hf_unused_flags, - tvb, offset, 1, TRUE); + tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 1; /* name of computer to which to send reply */ @@ -726,7 +726,7 @@ dissect_mailslot_browse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tr case BROWSE_ELECTION_REQUEST: /* election version */ - proto_tree_add_item(tree, hf_election_version, tvb, offset, 1, TRUE); + proto_tree_add_item(tree, hf_election_version, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 1; /* criterion */ @@ -753,11 +753,11 @@ dissect_mailslot_browse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tr case BROWSE_BACKUP_LIST_REQUEST: /* backup list requested count */ - proto_tree_add_item(tree, hf_backup_count, tvb, offset, 1, TRUE); + proto_tree_add_item(tree, hf_backup_count, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 1; /* backup requested token */ - proto_tree_add_item(tree, hf_backup_token, tvb, offset, 4, TRUE); + proto_tree_add_item(tree, hf_backup_token, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; break; @@ -769,7 +769,7 @@ dissect_mailslot_browse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tr offset += 1; /* backup requested token */ - proto_tree_add_item(tree, hf_backup_token, tvb, offset, 4, TRUE); + proto_tree_add_item(tree, hf_backup_token, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; /* backup server names */ @@ -876,7 +876,7 @@ dissect_mailslot_lanman(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tr case BROWSE_HOST_ANNOUNCE: /* update count */ - proto_tree_add_item(tree, hf_update_count, tvb, offset, 1, TRUE); + proto_tree_add_item(tree, hf_update_count, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 1; /* server type flags */ @@ -893,11 +893,11 @@ dissect_mailslot_lanman(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tr proto_tree_add_text(tree, tvb, offset, 2, "Windows version: %s", windows_version); /* OS major version */ - proto_tree_add_item(tree, hf_os_major, tvb, offset, 1, TRUE); + proto_tree_add_item(tree, hf_os_major, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 1; /* OS minor version */ - proto_tree_add_item(tree, hf_os_minor, tvb, offset, 1, TRUE); + proto_tree_add_item(tree, hf_os_minor, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 1; /* periodicity (in seconds; convert to milliseconds) */ diff --git a/epan/dissectors/packet-smb-logon.c b/epan/dissectors/packet-smb-logon.c index 4a67cf8734..48f5ad99d8 100644 --- a/epan/dissectors/packet-smb-logon.c +++ b/epan/dissectors/packet-smb-logon.c @@ -254,11 +254,11 @@ dissect_smb_logon_request(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tre /*$$$$$ here add the Mailslot to the response list (if needed) */ /* Request count */ - proto_tree_add_item(tree, hf_request_count, tvb, offset, 1, TRUE); + proto_tree_add_item(tree, hf_request_count, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 1; /* NT version */ - proto_tree_add_item(tree, hf_nt_version, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_nt_version, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; /* LM token */ @@ -299,7 +299,7 @@ dissect_smb_logon_2(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, int offset = display_ms_string(tvb, tree, offset, hf_mailslot_name, NULL); /* NT version */ - proto_tree_add_item(tree, hf_nt_version, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_nt_version, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; /* LM token */ @@ -358,7 +358,7 @@ dissect_smb_pdc_query(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, i offset = display_unicode_string(tvb, tree, offset, hf_unicode_computer_name, NULL); /* NT version */ - proto_tree_add_item(tree, hf_nt_version, tvb, offset, 4, TRUE); + proto_tree_add_item(tree, hf_nt_version, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; /* LMNT token */ @@ -407,7 +407,7 @@ dissect_smb_pdc_startup(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, } /* NT version */ - proto_tree_add_item(tree, hf_nt_version, tvb, offset, 4, TRUE); + proto_tree_add_item(tree, hf_nt_version, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; /* LMNT token */ @@ -430,7 +430,7 @@ dissect_smb_pdc_failure(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, /*** 0x10 (LM 2.0 Unknown user response) ***/ /* NT version */ - proto_tree_add_item(tree, hf_nt_version, tvb, offset, 4, TRUE); + proto_tree_add_item(tree, hf_nt_version, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; /* LM token */ @@ -451,21 +451,21 @@ dissect_announce_change(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint32 domain_sid_size; /* low serial number */ - proto_tree_add_item(tree, hf_low_serial, tvb, offset, 4, TRUE); + proto_tree_add_item(tree, hf_low_serial, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; /* date/time */ /* XXX - what format is this? Neither SMB_Date/SMB_Time nor "time_t but in the local time zone" appear to be correct. */ - proto_tree_add_item(tree, hf_date_time, tvb, offset, 4, TRUE); + proto_tree_add_item(tree, hf_date_time, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; /* pulse */ - proto_tree_add_item(tree, hf_pulse, tvb, offset, 4, TRUE); + proto_tree_add_item(tree, hf_pulse, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; /* random */ - proto_tree_add_item(tree, hf_random, tvb, offset, 4, TRUE); + proto_tree_add_item(tree, hf_random, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; /* pdc name */ @@ -504,7 +504,7 @@ dissect_announce_change(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, offset += 4; proto_tree_add_item(info_tree, hf_large_serial, tvb, offset, 8, - TRUE); + ENC_LITTLE_ENDIAN); offset += 8; offset = dissect_nt_64bit_time(tvb, info_tree, offset, @@ -529,7 +529,7 @@ dissect_announce_change(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, } /* NT version */ - proto_tree_add_item(tree, hf_nt_version, tvb, offset, 4, TRUE); + proto_tree_add_item(tree, hf_nt_version, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; /* LMNT token */ @@ -551,7 +551,7 @@ dissect_smb_sam_logon_req(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tre guint32 domain_sid_size; /* Request count */ - proto_tree_add_item(tree, hf_request_count, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_request_count, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; /* computer name */ @@ -581,7 +581,7 @@ dissect_smb_sam_logon_req(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tre } /* NT version */ - proto_tree_add_item(tree, hf_nt_version, tvb, offset, 4, TRUE); + proto_tree_add_item(tree, hf_nt_version, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; /* LMNT token */ @@ -614,19 +614,19 @@ dissect_smb_relogon_resp(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree /*** 0x0d LanMan Response to relogon request ***/ /* Major version */ - proto_tree_add_item(tree, hf_major_version, tvb, offset, 1, TRUE); + proto_tree_add_item(tree, hf_major_version, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 1; /* Minor version */ - proto_tree_add_item(tree, hf_minor_version, tvb, offset, 1, TRUE); + proto_tree_add_item(tree, hf_minor_version, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 1; /* OS version */ - proto_tree_add_item(tree, hf_os_version, tvb, offset, 1, TRUE); + proto_tree_add_item(tree, hf_os_version, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 1; /* NT version */ - proto_tree_add_item(tree, hf_nt_version, tvb, offset, 4, TRUE); + proto_tree_add_item(tree, hf_nt_version, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; /* LM token */ @@ -655,7 +655,7 @@ dissect_smb_acc_update(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, /* date/time */ /* XXX - what format is this? Neither SMB_Date/SMB_Time nor "time_t but in the local time zone" appear to be correct. */ - proto_tree_add_item(tree, hf_date_time, tvb, offset, 4, TRUE); + proto_tree_add_item(tree, hf_date_time, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; /* computer name */ @@ -665,11 +665,11 @@ dissect_smb_acc_update(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, offset = display_ms_string(tvb, tree, offset, hf_user_name, NULL); /* update type */ - proto_tree_add_item(tree, hf_update_type, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_update_type, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; /* NT version */ - proto_tree_add_item(tree, hf_nt_version, tvb, offset, 4, TRUE); + proto_tree_add_item(tree, hf_nt_version, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; /* LM token */ @@ -686,19 +686,19 @@ dissect_smb_inter_resp(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, /* 0x0e LanMan Response to interrogate request */ /* Major version */ - proto_tree_add_item(tree, hf_major_version, tvb, offset, 1, TRUE); + proto_tree_add_item(tree, hf_major_version, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 1; /* Minor version */ - proto_tree_add_item(tree, hf_minor_version, tvb, offset, 1, TRUE); + proto_tree_add_item(tree, hf_minor_version, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 1; /* OS version */ - proto_tree_add_item(tree, hf_os_version, tvb, offset, 1, TRUE); + proto_tree_add_item(tree, hf_os_version, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 1; /* NT version */ - proto_tree_add_item(tree, hf_nt_version, tvb, offset, 4, TRUE); + proto_tree_add_item(tree, hf_nt_version, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; /* LMNT token */ @@ -728,7 +728,7 @@ dissect_smb_sam_logon_resp(tvbuff_t *tvb, packet_info *pinfo _U_, offset = display_unicode_string(tvb, tree, offset, hf_domain_name, NULL); /* NT version */ - proto_tree_add_item(tree, hf_nt_version, tvb, offset, 4, TRUE); + proto_tree_add_item(tree, hf_nt_version, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; /* LMNT token */ @@ -751,7 +751,7 @@ dissect_smb_pdc_response_ads(tvbuff_t *tvb, packet_info *pinfo _U_, offset = ((offset + 3)/4)*4; /* unknown uint32 type */ - proto_tree_add_item(tree, hf_unknown32, tvb, offset, 4, TRUE); + proto_tree_add_item(tree, hf_unknown32, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; /* Domain GUID */ @@ -783,11 +783,11 @@ dissect_smb_pdc_response_ads(tvbuff_t *tvb, packet_info *pinfo _U_, offset=dissect_ms_compressed_string(tvb, tree, offset, hf_client_site_name, NULL); /* unknown uint8 type */ - proto_tree_add_item(tree, hf_unknown8, tvb, offset, 1, TRUE); + proto_tree_add_item(tree, hf_unknown8, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 1; /* unknown uint32 type */ - proto_tree_add_item(tree, hf_unknown32, tvb, offset, 4, TRUE); + proto_tree_add_item(tree, hf_unknown32, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; /* server ip */ @@ -795,15 +795,15 @@ dissect_smb_pdc_response_ads(tvbuff_t *tvb, packet_info *pinfo _U_, offset += 4; /* unknown uint32 type */ - proto_tree_add_item(tree, hf_unknown32, tvb, offset, 4, TRUE); + proto_tree_add_item(tree, hf_unknown32, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; /* unknown uint32 type */ - proto_tree_add_item(tree, hf_unknown32, tvb, offset, 4, TRUE); + proto_tree_add_item(tree, hf_unknown32, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; /* NT version */ - proto_tree_add_item(tree, hf_nt_version, tvb, offset, 4, TRUE); + proto_tree_add_item(tree, hf_nt_version, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; /* LMNT token */ diff --git a/epan/dissectors/packet-smb-mailslot.c b/epan/dissectors/packet-smb-mailslot.c index 94f528d99e..88b7a1f3b1 100644 --- a/epan/dissectors/packet-smb-mailslot.c +++ b/epan/dissectors/packet-smb-mailslot.c @@ -169,11 +169,11 @@ dissect_mailslot_smb(tvbuff_t *mshdr_tvb, tvbuff_t *setup_tvb, /* priority */ proto_tree_add_item(tree, hf_priority, setup_tvb, offset, 2, - TRUE); + ENC_LITTLE_ENDIAN); offset += 2; /* class */ - proto_tree_add_item(tree, hf_class, setup_tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_class, setup_tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; /* These are in the rest of the data; use "mshdr_tvb", which @@ -181,7 +181,7 @@ dissect_mailslot_smb(tvbuff_t *mshdr_tvb, tvbuff_t *setup_tvb, /* size */ /* this is actually bytecount in the SMB Transaction command */ - proto_tree_add_item(tree, hf_size, mshdr_tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_size, mshdr_tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; /* mailslot name */ diff --git a/epan/dissectors/packet-smb-pipe.c b/epan/dissectors/packet-smb-pipe.c index 35675efb0d..e14e63510a 100644 --- a/epan/dissectors/packet-smb-pipe.c +++ b/epan/dissectors/packet-smb-pipe.c @@ -1805,7 +1805,7 @@ dissect_request_parameters(tvbuff_t *tvb, int offset, packet_info *pinfo, * 16-bit receive buffer length. */ proto_tree_add_item(tree, hf_recv_buf_len, tvb, - offset, 2, TRUE); + offset, 2, ENC_LITTLE_ENDIAN); offset += 2; break; @@ -1822,7 +1822,7 @@ dissect_request_parameters(tvbuff_t *tvb, int offset, packet_info *pinfo, * 16-bit send buffer length. */ proto_tree_add_item(tree, hf_send_buf_len, tvb, - offset, 2, TRUE); + offset, 2, ENC_LITTLE_ENDIAN); offset += 2; break; @@ -3594,7 +3594,7 @@ dissect_pipe_smb(tvbuff_t *sp_tvb, tvbuff_t *s_tvb, tvbuff_t *pd_tvb, * It's a priority. */ proto_tree_add_item(pipe_tree, hf_pipe_priority, s_tvb, - offset, 2, TRUE); + offset, 2, ENC_LITTLE_ENDIAN); break; case PEEK_NAMED_PIPE: @@ -3729,13 +3729,13 @@ dissect_pipe_smb(tvbuff_t *sp_tvb, tvbuff_t *s_tvb, tvbuff_t *pd_tvb, return FALSE; offset = 0; proto_tree_add_item(pipe_tree, hf_pipe_peek_available, - p_tvb, offset, 2, TRUE); + p_tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; proto_tree_add_item(pipe_tree, hf_pipe_peek_remaining, - p_tvb, offset, 2, TRUE); + p_tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; proto_tree_add_item(pipe_tree, hf_pipe_peek_status, - p_tvb, offset, 2, TRUE); + p_tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; } break; @@ -3788,19 +3788,19 @@ dissect_pipe_smb(tvbuff_t *sp_tvb, tvbuff_t *s_tvb, tvbuff_t *pd_tvb, case 1: proto_tree_add_item(pipe_tree, hf_pipe_getinfo_output_buffer_size, - d_tvb, offset, 2, TRUE); + d_tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; proto_tree_add_item(pipe_tree, hf_pipe_getinfo_input_buffer_size, - d_tvb, offset, 2, TRUE); + d_tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; proto_tree_add_item(pipe_tree, hf_pipe_getinfo_maximum_instances, - d_tvb, offset, 1, TRUE); + d_tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 1; proto_tree_add_item(pipe_tree, hf_pipe_getinfo_current_instances, - d_tvb, offset, 1, TRUE); + d_tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 1; pipe_namelen = tvb_get_guint8(d_tvb, offset); proto_tree_add_uint(pipe_tree, @@ -3844,7 +3844,7 @@ dissect_pipe_smb(tvbuff_t *sp_tvb, tvbuff_t *s_tvb, tvbuff_t *pd_tvb, return FALSE; proto_tree_add_item(pipe_tree, hf_pipe_write_raw_bytes_written, - p_tvb, offset, 2, TRUE); + p_tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; } break; diff --git a/epan/dissectors/packet-smb2.c b/epan/dissectors/packet-smb2.c index 1b5c57526f..49b457b63a 100644 --- a/epan/dissectors/packet-smb2.c +++ b/epan/dissectors/packet-smb2.c @@ -4857,7 +4857,7 @@ dissect_smb2_MxAc_buffer_response(tvbuff_t *tvb, packet_info *pinfo _U_, proto_t sub_tree = proto_item_add_subtree(sub_item, ett_smb2_MxAc_buffer); } - proto_tree_add_item(sub_tree, hf_smb2_mxac_status, tvb, offset, 4, FALSE); + proto_tree_add_item(sub_tree, hf_smb2_mxac_status, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; dissect_smb_access_mask(tvb, sub_tree, offset); @@ -6324,7 +6324,7 @@ dissect_smb2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, gboolea /* Next Command */ chain_offset=tvb_get_letohl(tvb, offset); - proto_tree_add_item(header_tree, hf_smb2_chain_offset, tvb, offset, 4, FALSE); + proto_tree_add_item(header_tree, hf_smb2_chain_offset, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; /* command sequence number*/ diff --git a/epan/dissectors/packet-sna.c b/epan/dissectors/packet-sna.c index 841332c117..ae1592e6af 100644 --- a/epan/dissectors/packet-sna.c +++ b/epan/dissectors/packet-sna.c @@ -824,7 +824,7 @@ dissect_optional_0d(tvbuff_t *tvb, proto_tree *tree) if (!tree) return; - proto_tree_add_item(tree, hf_sna_nlp_opti_0d_version, tvb, 2, 2, FALSE); + proto_tree_add_item(tree, hf_sna_nlp_opti_0d_version, tvb, 2, 2, ENC_BIG_ENDIAN); bits = tvb_get_guint8(tvb, 4); sub_ti = proto_tree_add_uint(tree, hf_sna_nlp_opti_0d_4, @@ -873,7 +873,7 @@ dissect_optional_0e(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { sub_ti = proto_tree_add_item(tree, hf_sna_nlp_opti_0e_stat, - tvb, 2, 1, FALSE); + tvb, 2, 1, ENC_BIG_ENDIAN); sub_tree = proto_item_add_subtree(sub_ti, ett_sna_nlp_opti_0e_stat); @@ -882,13 +882,13 @@ dissect_optional_0e(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_boolean(sub_tree, hf_sna_nlp_opti_0e_idle, tvb, 2, 1, bits); proto_tree_add_item(tree, hf_sna_nlp_opti_0e_nabsp, - tvb, 3, 1, FALSE); + tvb, 3, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_sna_nlp_opti_0e_sync, - tvb, 4, 2, FALSE); + tvb, 4, 2, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_sna_nlp_opti_0e_echo, - tvb, 6, 2, FALSE); + tvb, 6, 2, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_sna_nlp_opti_0e_rseq, - tvb, 8, 4, FALSE); + tvb, 8, 4, ENC_BIG_ENDIAN); proto_tree_add_text(tree, tvb, 12, 8, "Reserved"); if (tvb_offset_exists(tvb, offset)) @@ -908,7 +908,7 @@ dissect_optional_0f(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (!tree) return; - proto_tree_add_item(tree, hf_sna_nlp_opti_0f_bits, tvb, 2, 2, FALSE); + proto_tree_add_item(tree, hf_sna_nlp_opti_0f_bits, tvb, 2, 2, ENC_BIG_ENDIAN); if (tvb_offset_exists(tvb, 4)) call_dissector(data_handle, tvb_new_subset_remaining(tvb, 4), pinfo, tree); @@ -989,11 +989,11 @@ dissect_optional_14(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_text(sub_tree, tvb, offset+3, 1, "Reserved"); proto_tree_add_item(sub_tree, hf_sna_nlp_opti_14_si_maxpsize, - tvb, offset+4, 4, FALSE); + tvb, offset+4, 4, ENC_BIG_ENDIAN); proto_tree_add_item(sub_tree, hf_sna_nlp_opti_14_si_switch, - tvb, offset+8, 4, FALSE); + tvb, offset+8, 4, ENC_BIG_ENDIAN); proto_tree_add_item(sub_tree, hf_sna_nlp_opti_14_si_alive, - tvb, offset+12, 4, FALSE); + tvb, offset+12, 4, ENC_BIG_ENDIAN); dissect_control(tvb, offset+16, len-16, sub_tree, 1, LT); @@ -1090,15 +1090,15 @@ dissect_optional_22(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvb, 3, 1, bits); proto_tree_add_item(tree, hf_sna_nlp_opti_22_field1, - tvb, 4, 4, FALSE); + tvb, 4, 4, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_sna_nlp_opti_22_field2, - tvb, 8, 4, FALSE); + tvb, 8, 4, ENC_BIG_ENDIAN); if (type == 0) { proto_tree_add_item(tree, hf_sna_nlp_opti_22_field3, - tvb, 12, 4, FALSE); + tvb, 12, 4, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_sna_nlp_opti_22_field4, - tvb, 16, 4, FALSE); + tvb, 16, 4, ENC_BIG_ENDIAN); if (tvb_offset_exists(tvb, 20)) call_dissector(data_handle, @@ -1340,7 +1340,7 @@ dissect_nlp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_tree_add_uint(nlp_tree, hf_sna_nlp_dlf, tvb, index+12, 4, thdr_dlf); proto_tree_add_item(nlp_tree, hf_sna_nlp_bsn, tvb, index+16, - 4, FALSE); + 4, ENC_BIG_ENDIAN); } subindex = 20; @@ -1487,7 +1487,7 @@ dissect_xid3(tvbuff_t *tvb, proto_tree *tree) val = tvb_get_guint8(tvb, 6); sub_ti = proto_tree_add_item(tree, hf_sna_xid_3_12, tvb, - 6, 1, FALSE); + 6, 1, ENC_BIG_ENDIAN); sub_tree = proto_item_add_subtree(sub_ti, ett_sna_xid_3_12); proto_tree_add_boolean(sub_tree, hf_sna_xid_3_negcsup, tvb, 6, 1, val); @@ -1498,7 +1498,7 @@ dissect_xid3(tvbuff_t *tvb, proto_tree *tree) val = tvb_get_guint8(tvb, 9); sub_ti = proto_tree_add_item(tree, hf_sna_xid_3_15, tvb, - 9, 1, FALSE); + 9, 1, ENC_BIG_ENDIAN); sub_tree = proto_item_add_subtree(sub_ti, ett_sna_xid_3_15); proto_tree_add_boolean(sub_tree, hf_sna_xid_3_partg, tvb, 9, 1, val); @@ -1509,8 +1509,8 @@ dissect_xid3(tvbuff_t *tvb, proto_tree *tree) proto_tree_add_uint(sub_tree, hf_sna_xid_3_branch, tvb, 9, 1, val); proto_tree_add_boolean(sub_tree, hf_sna_xid_3_brnn, tvb, 9, 1, val); - proto_tree_add_item(tree, hf_sna_xid_3_tg, tvb, 10, 1, FALSE); - proto_tree_add_item(tree, hf_sna_xid_3_dlc, tvb, 11, 1, FALSE); + proto_tree_add_item(tree, hf_sna_xid_3_tg, tvb, 10, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_sna_xid_3_dlc, tvb, 11, 1, ENC_BIG_ENDIAN); dlen = tvb_get_guint8(tvb, 12); @@ -1550,7 +1550,7 @@ dissect_xid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (tree) { sub_ti = proto_tree_add_item(tree, hf_sna_xid_0, tvb, - 0, 1, FALSE); + 0, 1, ENC_BIG_ENDIAN); sub_tree = proto_item_add_subtree(sub_ti, ett_sna_xid_0); proto_tree_add_uint(sub_tree, hf_sna_xid_format, tvb, 0, 1, @@ -1561,7 +1561,7 @@ dissect_xid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_tree_add_uint(tree, hf_sna_xid_len, tvb, 1, 1, len); sub_ti = proto_tree_add_item(tree, hf_sna_xid_id, tvb, - 2, 4, FALSE); + 2, 4, ENC_BIG_ENDIAN); sub_tree = proto_item_add_subtree(sub_ti, ett_sna_xid_id); proto_tree_add_uint(sub_tree, hf_sna_xid_idblock, tvb, 2, 4, @@ -1745,7 +1745,7 @@ dissect_fid0_1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_text(tree, tvb, 1, 1, "Reserved"); /* Bytes 2-3 */ - proto_tree_add_item(tree, hf_sna_th_daf, tvb, 2, 2, FALSE); + proto_tree_add_item(tree, hf_sna_th_daf, tvb, 2, 2, ENC_BIG_ENDIAN); } /* Set DST addr */ @@ -1754,7 +1754,7 @@ dissect_fid0_1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) SET_ADDRESS(&pinfo->dst, AT_SNA, SNA_FID01_ADDR_LEN, ptr); if (tree) - proto_tree_add_item(tree, hf_sna_th_oaf, tvb, 4, 2, FALSE); + proto_tree_add_item(tree, hf_sna_th_oaf, tvb, 4, 2, ENC_BIG_ENDIAN); /* Set SRC addr */ ptr = tvb_get_ptr(tvb, 4, SNA_FID01_ADDR_LEN); @@ -1765,8 +1765,8 @@ dissect_fid0_1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) return bytes_in_header; - proto_tree_add_item(tree, hf_sna_th_snf, tvb, 6, 2, FALSE); - proto_tree_add_item(tree, hf_sna_th_dcf, tvb, 8, 2, FALSE); + proto_tree_add_item(tree, hf_sna_th_snf, tvb, 6, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_sna_th_dcf, tvb, 8, 2, ENC_BIG_ENDIAN); return bytes_in_header; } @@ -1872,7 +1872,7 @@ dissect_fid3(tvbuff_t *tvb, proto_tree *tree) proto_tree_add_uint(bf_tree, hf_sna_th_mpf, tvb, 0, 1, th_0); proto_tree_add_uint(bf_tree, hf_sna_th_efi, tvb, 0, 1, th_0); - proto_tree_add_item(tree, hf_sna_th_lsid, tvb, 1, 1, FALSE); + proto_tree_add_item(tree, hf_sna_th_lsid, tvb, 1, 1, ENC_BIG_ENDIAN); return bytes_in_header; } @@ -2064,8 +2064,8 @@ dissect_fid4(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) SET_ADDRESS(&pinfo->src, AT_SNA, SNA_FID_TYPE_4_ADDR_LEN, (guint8 *)&src); - proto_tree_add_item(tree, hf_sna_th_snf, tvb, offset+4, 2, FALSE); - proto_tree_add_item(tree, hf_sna_th_dcf, tvb, offset+6, 2, FALSE); + proto_tree_add_item(tree, hf_sna_th_snf, tvb, offset+4, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_sna_th_dcf, tvb, offset+6, 2, ENC_BIG_ENDIAN); return bytes_in_header; } @@ -2095,7 +2095,7 @@ dissect_fid5(tvbuff_t *tvb, proto_tree *tree) proto_tree_add_uint(bf_tree, hf_sna_th_efi, tvb, 0, 1, th_0); proto_tree_add_text(tree, tvb, 1, 1, "Reserved"); - proto_tree_add_item(tree, hf_sna_th_snf, tvb, 2, 2, FALSE); + proto_tree_add_item(tree, hf_sna_th_snf, tvb, 2, 2, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_sna_th_sa, tvb, 4, 8, ENC_NA); @@ -2126,14 +2126,14 @@ dissect_fidf(tvbuff_t *tvb, proto_tree *tree) proto_tree_add_uint(bf_tree, hf_sna_th_fid, tvb, 0, 1, th_0); proto_tree_add_text(tree, tvb, 1, 1, "Reserved"); - proto_tree_add_item(tree, hf_sna_th_cmd_fmt, tvb, 2, 1, FALSE); - proto_tree_add_item(tree, hf_sna_th_cmd_type, tvb, 3, 1, FALSE); - proto_tree_add_item(tree, hf_sna_th_cmd_sn, tvb, 4, 2, FALSE); + proto_tree_add_item(tree, hf_sna_th_cmd_fmt, tvb, 2, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_sna_th_cmd_type, tvb, 3, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_sna_th_cmd_sn, tvb, 4, 2, ENC_BIG_ENDIAN); /* Yup, bytes 6-23 are reserved! */ proto_tree_add_text(tree, tvb, 6, 18, "Reserved"); - proto_tree_add_item(tree, hf_sna_th_dcf, tvb, 24, 2, FALSE); + proto_tree_add_item(tree, hf_sna_th_dcf, tvb, 24, 2, ENC_BIG_ENDIAN); return bytes_in_header; } @@ -2389,7 +2389,7 @@ dissect_control_05(tvbuff_t *tvb, proto_tree *tree) if(!tree) return; - proto_tree_add_item(tree, hf_sna_control_05_delay, tvb, 2, 2, FALSE); + proto_tree_add_item(tree, hf_sna_control_05_delay, tvb, 2, 2, ENC_BIG_ENDIAN); } static void @@ -2401,7 +2401,7 @@ dissect_control_0e(tvbuff_t *tvb, proto_tree *tree) if (!tree) return; - proto_tree_add_item(tree, hf_sna_control_0e_type, tvb, 2, 1, FALSE); + proto_tree_add_item(tree, hf_sna_control_0e_type, tvb, 2, 1, ENC_BIG_ENDIAN); len = tvb_reported_length_remaining(tvb, 3); if (len <= 0) diff --git a/epan/dissectors/packet-socketcan.c b/epan/dissectors/packet-socketcan.c index 9145d84b5f..fbe6023e4f 100644 --- a/epan/dissectors/packet-socketcan.c +++ b/epan/dissectors/packet-socketcan.c @@ -106,11 +106,11 @@ dissect_socketcan(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_item *ti = proto_tree_add_item(tree, proto_can, tvb, 0, 1 , FALSE ); can_tree = proto_item_add_subtree(ti, ett_can); - proto_tree_add_item(can_tree, hf_can_ident, tvb, 0, 4, FALSE ); + proto_tree_add_item(can_tree, hf_can_ident, tvb, 0, 4, ENC_BIG_ENDIAN ); proto_tree_add_item(can_tree, hf_can_extflag, tvb, 0, 4, FALSE ); proto_tree_add_item(can_tree, hf_can_rtrflag, tvb, 0, 4, FALSE ); proto_tree_add_item(can_tree, hf_can_errflag, tvb, 0, 4, FALSE ); - proto_tree_add_item(can_tree, hf_can_len, tvb, CAN_LEN_OFFSET, 1, FALSE ); + proto_tree_add_item(can_tree, hf_can_len, tvb, CAN_LEN_OFFSET, 1, ENC_BIG_ENDIAN ); next_tvb = tvb_new_subset(tvb, CAN_DATA_OFFSET, tvb_get_guint8(tvb, CAN_LEN_OFFSET), 8 ); call_dissector(data_handle, next_tvb, pinfo, tree ); diff --git a/epan/dissectors/packet-socks.c b/epan/dissectors/packet-socks.c index e27e0ab565..1e98a93e22 100644 --- a/epan/dissectors/packet-socks.c +++ b/epan/dissectors/packet-socks.c @@ -487,7 +487,7 @@ display_socks_v4(tvbuff_t *tvb, int offset, packet_info *pinfo, /* Do remote port */ proto_tree_add_item( tree, hf_socks_dstport, tvb, offset, 2, - FALSE); + ENC_BIG_ENDIAN); offset += 2; /* Do destination address */ @@ -521,18 +521,18 @@ display_socks_v4(tvbuff_t *tvb, int offset, packet_info *pinfo, else if ( compare_packet( hash_info->cmd_reply_row)){ proto_tree_add_item( tree, hf_socks_ver, tvb, offset, 1, - FALSE); + ENC_BIG_ENDIAN); ++offset; /* Do results code */ - proto_tree_add_item( tree, hf_socks_results_4, tvb, offset, 1, FALSE); - hidden_item = proto_tree_add_item(tree, hf_socks_results, tvb, offset, 1, FALSE); + proto_tree_add_item( tree, hf_socks_results_4, tvb, offset, 1, ENC_BIG_ENDIAN); + hidden_item = proto_tree_add_item(tree, hf_socks_results, tvb, offset, 1, ENC_BIG_ENDIAN); PROTO_ITEM_SET_HIDDEN(hidden_item); ++offset; /* Do remote port */ proto_tree_add_item( tree, hf_socks_dstport, tvb, offset, 2, - FALSE); + ENC_BIG_ENDIAN); offset += 2; /* Do remote address */ proto_tree_add_item( tree, hf_socks_ip_dst, tvb, offset, 4, @@ -567,7 +567,7 @@ display_socks_v5(tvbuff_t *tvb, int offset, packet_info *pinfo, const char *AuthMethodStr; guint8 auth_status; - proto_tree_add_item( tree, hf_socks_ver, tvb, offset, 1, FALSE); + proto_tree_add_item( tree, hf_socks_ver, tvb, offset, 1, ENC_BIG_ENDIAN); ++offset; if (compare_packet( hash_info->connect_row)){ @@ -627,19 +627,19 @@ display_socks_v5(tvbuff_t *tvb, int offset, packet_info *pinfo, } else if (compare_packet( hash_info->gssapi_auth_row)) { guint16 len; - proto_tree_add_item( tree, hf_gssapi_command, tvb, offset, 1, FALSE); - proto_tree_add_item( tree, hf_gssapi_length, tvb, offset+1, 2, FALSE); + proto_tree_add_item( tree, hf_gssapi_command, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item( tree, hf_gssapi_length, tvb, offset+1, 2, ENC_BIG_ENDIAN); len = tvb_get_ntohs(tvb, offset+1); if (len > 0) proto_tree_add_item( tree, hf_gssapi_payload, tvb, offset+3, len, ENC_NA); } else if (compare_packet( hash_info->gssapi_auth_failure_row)) { - proto_tree_add_item( tree, hf_gssapi_command, tvb, offset, 1, FALSE); + proto_tree_add_item( tree, hf_gssapi_command, tvb, offset, 1, ENC_BIG_ENDIAN); } else if (compare_packet( hash_info->gssapi_auth_reply_row)) { guint16 len; - proto_tree_add_item( tree, hf_gssapi_command, tvb, offset, 1, FALSE); - proto_tree_add_item( tree, hf_gssapi_length, tvb, offset+1, 2, FALSE); + proto_tree_add_item( tree, hf_gssapi_command, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item( tree, hf_gssapi_length, tvb, offset+1, 2, ENC_BIG_ENDIAN); len = tvb_get_ntohs(tvb, offset+1); if (len > 0) proto_tree_add_item( tree, hf_gssapi_payload, tvb, offset+3, len, ENC_NA); @@ -656,8 +656,8 @@ display_socks_v5(tvbuff_t *tvb, int offset, packet_info *pinfo, else { proto_item *hidden_item; - proto_tree_add_item( tree, hf_socks_results_5, tvb, offset, 1, FALSE); - hidden_item = proto_tree_add_item(tree, hf_socks_results, tvb, offset, 1, FALSE); + proto_tree_add_item( tree, hf_socks_results_5, tvb, offset, 1, ENC_BIG_ENDIAN); + hidden_item = proto_tree_add_item(tree, hf_socks_results, tvb, offset, 1, ENC_BIG_ENDIAN); PROTO_ITEM_SET_HIDDEN(hidden_item); } diff --git a/epan/dissectors/packet-spice.c b/epan/dissectors/packet-spice.c index 1a501d1906..d28cd2b99a 100644 --- a/epan/dissectors/packet-spice.c +++ b/epan/dissectors/packet-spice.c @@ -1221,16 +1221,16 @@ dissect_ImageLZ_RGB(tvbuff_t *tvb, proto_tree *tree, guint32 offset) } */ offset += 2; /* TODO: not sure we need this! Understand what this is */ - proto_tree_add_item(LZ_RGB_tree, hf_GLZ_RGB_type, tvb, offset, 2, FALSE); + proto_tree_add_item(LZ_RGB_tree, hf_GLZ_RGB_type, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; /*FIXME: sometimes width is incorrect (bitmask?) */ - proto_tree_add_item(LZ_RGB_tree, hf_GLZ_RGB_width, tvb, offset, 4, FALSE); + proto_tree_add_item(LZ_RGB_tree, hf_GLZ_RGB_width, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(LZ_RGB_tree, hf_GLZ_RGB_height, tvb, offset, 4, FALSE); + proto_tree_add_item(LZ_RGB_tree, hf_GLZ_RGB_height, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(LZ_RGB_tree, hf_GLZ_RGB_stride, tvb, offset, 4, FALSE); + proto_tree_add_item(LZ_RGB_tree, hf_GLZ_RGB_stride, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(LZ_RGB_tree, hf_GLZ_RGB_dict_id, tvb, offset, 8, TRUE); + proto_tree_add_item(LZ_RGB_tree, hf_GLZ_RGB_dict_id, tvb, offset, 8, ENC_LITTLE_ENDIAN); offset += 8; /*TODO: show win_head_image_dist - not sure what it stands for though diff --git a/epan/dissectors/packet-spp.c b/epan/dissectors/packet-spp.c index 2d3f11b8be..05c9bafafe 100644 --- a/epan/dissectors/packet-spp.c +++ b/epan/dissectors/packet-spp.c @@ -166,14 +166,14 @@ dissect_spp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) "Datastream Type: 0x%02X", datastream_type); } - proto_tree_add_item(spp_tree, hf_spp_src_id, tvb, 2, 2, FALSE); - proto_tree_add_item(spp_tree, hf_spp_dst_id, tvb, 4, 2, FALSE); + proto_tree_add_item(spp_tree, hf_spp_src_id, tvb, 2, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(spp_tree, hf_spp_dst_id, tvb, 4, 2, ENC_BIG_ENDIAN); } spp_seq = tvb_get_ntohs(tvb, 6); if (tree) { proto_tree_add_uint(spp_tree, hf_spp_seq_nr, tvb, 6, 2, spp_seq); - proto_tree_add_item(spp_tree, hf_spp_ack_nr, tvb, 8, 2, FALSE); - proto_tree_add_item(spp_tree, hf_spp_all_nr, tvb, 10, 2, FALSE); + proto_tree_add_item(spp_tree, hf_spp_ack_nr, tvb, 8, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(spp_tree, hf_spp_all_nr, tvb, 10, 2, ENC_BIG_ENDIAN); } if (tvb_reported_length_remaining(tvb, SPP_HEADER_LEN) > 0) { diff --git a/epan/dissectors/packet-srp.c b/epan/dissectors/packet-srp.c index 7054a28601..9abc066f3e 100644 --- a/epan/dissectors/packet-srp.c +++ b/epan/dissectors/packet-srp.c @@ -104,7 +104,7 @@ static void dissect_srp_command(tvbuff_t * tvb, packet_info * pinfo, proto_tree guint payload_len; if( srp_tree ) - proto_tree_add_item(srp_tree,hf_srp_seqno,tvb,1,1,FALSE); + proto_tree_add_item(srp_tree,hf_srp_seqno,tvb,1,1,ENC_BIG_ENDIAN); payload_len = tvb_reported_length_remaining(tvb,4); next_tvb = tvb_new_subset(tvb, 2, payload_len, payload_len ); @@ -140,7 +140,7 @@ static void dissect_srp (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) case SRP_NSRP_RESPONSE: if( srp_tree ) - proto_tree_add_item(srp_tree,hf_srp_seqno,tvb,1,1,FALSE); + proto_tree_add_item(srp_tree,hf_srp_seqno,tvb,1,1,ENC_BIG_ENDIAN); break; default: diff --git a/epan/dissectors/packet-srvloc.c b/epan/dissectors/packet-srvloc.c index ad3a69316c..36686c0d7a 100644 --- a/epan/dissectors/packet-srvloc.c +++ b/epan/dissectors/packet-srvloc.c @@ -386,8 +386,8 @@ dissect_authblk_v2(tvbuff_t *tvb, int offset, proto_tree *tree) guint16 length; nstime_t ts; - proto_tree_add_item(tree, hf_srvloc_authblkv2_bsd, tvb, offset, 2, FALSE); - proto_tree_add_item(tree, hf_srvloc_authblkv2_len, tvb, offset+2, 2, FALSE); + proto_tree_add_item(tree, hf_srvloc_authblkv2_bsd, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_srvloc_authblkv2_len, tvb, offset+2, 2, ENC_BIG_ENDIAN); ts.nsecs = 0; ts.secs = tvb_get_ntohl(tvb, offset + 4); proto_tree_add_time(tree, hf_srvloc_authblkv2_timestamp, tvb, offset+4, 4, &ts); @@ -758,7 +758,7 @@ dissect_url_entry_v1(tvbuff_t *tvb, int offset, proto_tree *tree, guint16 url_len; proto_tree_add_item(tree, hf_srvloc_url_lifetime, tvb, offset, 2, - FALSE); + ENC_BIG_ENDIAN); offset += 2; url_len = tvb_get_ntohs(tvb, offset); proto_tree_add_uint(tree, hf_srvloc_url_urllen, tvb, offset, 2, @@ -783,7 +783,7 @@ dissect_url_entry_v2(tvbuff_t *tvb, int offset, proto_tree *tree) reserved); offset += 1; proto_tree_add_item(tree, hf_srvloc_url_lifetime, tvb, offset, 2, - FALSE); + ENC_BIG_ENDIAN); offset += 2; url_len = tvb_get_ntohs(tvb, offset); proto_tree_add_uint(tree, hf_srvloc_url_urllen, tvb, offset, 2, @@ -890,7 +890,7 @@ dissect_srvloc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; case SRVRPLY: - expert_item = proto_tree_add_item(srvloc_tree, hf_srvloc_error, tvb, offset, 2, FALSE); + expert_item = proto_tree_add_item(srvloc_tree, hf_srvloc_error, tvb, offset, 2, ENC_BIG_ENDIAN); expert_status = tvb_get_ntohs(tvb, offset); if (expert_status!=0) { expert_add_info_format(pinfo, expert_item, PI_RESPONSE_CODE, PI_ERROR, "Error: %s", val_to_str(expert_status, srvloc_errs, "Unknown SRVLOC Error (0x%02x)")); @@ -942,7 +942,7 @@ dissect_srvloc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; case SRVACK: - expert_item = proto_tree_add_item(srvloc_tree, hf_srvloc_error, tvb, offset, 2, FALSE); + expert_item = proto_tree_add_item(srvloc_tree, hf_srvloc_error, tvb, offset, 2, ENC_BIG_ENDIAN); expert_status = tvb_get_ntohs(tvb, offset); if (expert_status!=0) { expert_add_info_format(pinfo, expert_item, PI_RESPONSE_CODE, PI_ERROR, "Error: %s", val_to_str(expert_status, srvloc_errs, "Unknown SRVLOC Error (0x%02x)")); @@ -974,7 +974,7 @@ dissect_srvloc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; case ATTRRPLY: - expert_item = proto_tree_add_item(srvloc_tree, hf_srvloc_error_v2, tvb, offset, 2, FALSE); + expert_item = proto_tree_add_item(srvloc_tree, hf_srvloc_error_v2, tvb, offset, 2, ENC_BIG_ENDIAN); expert_status = tvb_get_ntohs(tvb, offset); if (expert_status!=0) { expert_add_info_format(pinfo, expert_item, PI_RESPONSE_CODE, PI_ERROR, "Error: %s", val_to_str(expert_status, srvloc_errs_v2, "Unknown SRVLOC Error (0x%02x)")); @@ -992,7 +992,7 @@ dissect_srvloc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; case DAADVERT: - expert_item = proto_tree_add_item(srvloc_tree, hf_srvloc_error, tvb, offset, 2, FALSE); + expert_item = proto_tree_add_item(srvloc_tree, hf_srvloc_error, tvb, offset, 2, ENC_BIG_ENDIAN); expert_status = tvb_get_ntohs(tvb, offset); if (expert_status!=0) { expert_add_info_format(pinfo, expert_item, PI_RESPONSE_CODE, PI_ERROR, "Error: %s", val_to_str(expert_status, srvloc_errs, "Unknown SRVLOC Error (0x%02x)")); @@ -1037,7 +1037,7 @@ dissect_srvloc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; case SRVTYPERPLY: - expert_item = proto_tree_add_item(srvloc_tree, hf_srvloc_error, tvb, offset, 2, FALSE); + expert_item = proto_tree_add_item(srvloc_tree, hf_srvloc_error, tvb, offset, 2, ENC_BIG_ENDIAN); expert_status = tvb_get_ntohs(tvb, offset); if (expert_status!=0) { expert_add_info_format(pinfo, expert_item, PI_RESPONSE_CODE, PI_ERROR, "Error: %s", val_to_str(expert_status, srvloc_errs, "Unknown SRVLOC Error (0x%02x)")); @@ -1130,7 +1130,7 @@ dissect_srvloc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; case SRVRPLY: /* RFC2608 8.2 */ - expert_item = proto_tree_add_item(srvloc_tree, hf_srvloc_error_v2, tvb, offset, 2, FALSE); + expert_item = proto_tree_add_item(srvloc_tree, hf_srvloc_error_v2, tvb, offset, 2, ENC_BIG_ENDIAN); expert_status = tvb_get_ntohs(tvb, offset); if (expert_status!=0) { expert_add_info_format(pinfo, expert_item, PI_RESPONSE_CODE, PI_ERROR, "Error: %s", val_to_str(expert_status, srvloc_errs_v2, "Unknown SRVLOC Error (0x%02x)")); @@ -1196,7 +1196,7 @@ dissect_srvloc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; case SRVACK: /* RFC2608 8.4 */ - expert_item = proto_tree_add_item(srvloc_tree, hf_srvloc_error_v2, tvb, offset, 2, FALSE); + expert_item = proto_tree_add_item(srvloc_tree, hf_srvloc_error_v2, tvb, offset, 2, ENC_BIG_ENDIAN); expert_status = tvb_get_ntohs(tvb, offset); if (expert_status!=0) { expert_add_info_format(pinfo, expert_item, PI_RESPONSE_CODE, PI_ERROR, "Error: %s", val_to_str(expert_status, srvloc_errs_v2, "Unknown SRVLOC Error (0x%02x)")); @@ -1243,7 +1243,7 @@ dissect_srvloc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; case ATTRRPLY: /* RFC2608 10.4 */ - expert_item = proto_tree_add_item(srvloc_tree, hf_srvloc_error_v2, tvb, offset, 2, FALSE); + expert_item = proto_tree_add_item(srvloc_tree, hf_srvloc_error_v2, tvb, offset, 2, ENC_BIG_ENDIAN); expert_status = tvb_get_ntohs(tvb, offset); if (expert_status!=0) { expert_add_info_format(pinfo, expert_item, PI_RESPONSE_CODE, PI_ERROR, "Error: %s", val_to_str(expert_status, srvloc_errs_v2, "Unknown SRVLOC Error (0x%02x)")); @@ -1266,7 +1266,7 @@ dissect_srvloc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; case DAADVERT: /* RCC 2608 8.5 */ - expert_item = proto_tree_add_item(srvloc_tree, hf_srvloc_error_v2, tvb, offset, 2, FALSE); + expert_item = proto_tree_add_item(srvloc_tree, hf_srvloc_error_v2, tvb, offset, 2, ENC_BIG_ENDIAN); expert_status = tvb_get_ntohs(tvb, offset); if (expert_status!=0) { expert_add_info_format(pinfo, expert_item, PI_RESPONSE_CODE, PI_ERROR, "Error: %s", val_to_str(expert_status, srvloc_errs_v2, "Unknown SRVLOC Error (0x%02x)")); @@ -1344,7 +1344,7 @@ dissect_srvloc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; case SRVTYPERPLY: /* rfc2608 10.2 */ - expert_item = proto_tree_add_item(srvloc_tree, hf_srvloc_error_v2, tvb, offset, 2, FALSE); + expert_item = proto_tree_add_item(srvloc_tree, hf_srvloc_error_v2, tvb, offset, 2, ENC_BIG_ENDIAN); expert_status = tvb_get_ntohs(tvb, offset); if (expert_status!=0) { expert_add_info_format(pinfo, expert_item, PI_RESPONSE_CODE, PI_ERROR, "Error: %s", val_to_str(expert_status, srvloc_errs_v2, "Unknown SRVLOC Error (0x%02x)")); diff --git a/epan/dissectors/packet-sscf-nni.c b/epan/dissectors/packet-sscf-nni.c index a073026933..8b84301d3f 100644 --- a/epan/dissectors/packet-sscf-nni.c +++ b/epan/dissectors/packet-sscf-nni.c @@ -100,9 +100,9 @@ dissect_sscf_nni(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(sscf_tree, hf_status, tvb, SSCF_STATUS_OFFSET, - SSCF_STATUS_LENGTH, FALSE); + SSCF_STATUS_LENGTH, ENC_BIG_ENDIAN); proto_tree_add_item(sscf_tree, hf_spare, tvb, SSCF_SPARE_OFFSET, - SSCF_SPARE_LENGTH, FALSE); + SSCF_SPARE_LENGTH, ENC_BIG_ENDIAN); } } diff --git a/epan/dissectors/packet-sscop.c b/epan/dissectors/packet-sscop.c index e8c82de8de..1a330d5441 100644 --- a/epan/dissectors/packet-sscop.c +++ b/epan/dissectors/packet-sscop.c @@ -172,7 +172,7 @@ static void dissect_stat_list(proto_tree *tree, tvbuff_t *tvb,guint h) { tree = proto_item_add_subtree(pi,ett_stat); for (i = 0; i < n; i++) { - proto_tree_add_item(tree, hf_sscop_stat_s, tvb, i*4 + 1,3,FALSE); + proto_tree_add_item(tree, hf_sscop_stat_s, tvb, i*4 + 1,3,ENC_BIG_ENDIAN); } } } @@ -238,15 +238,15 @@ dissect_sscop_and_payload(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, d pdu_len, "SSCOP"); sscop_tree = proto_item_add_subtree(ti, ett_sscop); - proto_tree_add_item(sscop_tree, hf_sscop_type, tvb, SSCOP_PDU_TYPE, 1,FALSE); + proto_tree_add_item(sscop_tree, hf_sscop_type, tvb, SSCOP_PDU_TYPE, 1,ENC_BIG_ENDIAN); switch (sscop_info.type) { case SSCOP_BGN: case SSCOP_RS: case SSCOP_ER: - proto_tree_add_item(sscop_tree, hf_sscop_sq, tvb, SSCOP_N_SQ, 1,FALSE); - proto_tree_add_item(sscop_tree, hf_sscop_mr, tvb, SSCOP_N_MR + 1, 3, FALSE); + proto_tree_add_item(sscop_tree, hf_sscop_sq, tvb, SSCOP_N_SQ, 1,ENC_BIG_ENDIAN); + proto_tree_add_item(sscop_tree, hf_sscop_mr, tvb, SSCOP_N_MR + 1, 3, ENC_BIG_ENDIAN); break; case SSCOP_END: @@ -256,35 +256,35 @@ dissect_sscop_and_payload(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, d case SSCOP_BGAK: case SSCOP_RSAK: - proto_tree_add_item(sscop_tree, hf_sscop_mr, tvb, SSCOP_N_MR + 1, 3, FALSE); + proto_tree_add_item(sscop_tree, hf_sscop_mr, tvb, SSCOP_N_MR + 1, 3, ENC_BIG_ENDIAN); break; case SSCOP_ERAK: - proto_tree_add_item(sscop_tree, hf_sscop_mr, tvb, SSCOP_N_MR + 1, 3, FALSE); + proto_tree_add_item(sscop_tree, hf_sscop_mr, tvb, SSCOP_N_MR + 1, 3, ENC_BIG_ENDIAN); break; case SSCOP_SD: - proto_tree_add_item(sscop_tree, hf_sscop_s, tvb, SSCOP_N_S + 1, 3, FALSE); + proto_tree_add_item(sscop_tree, hf_sscop_s, tvb, SSCOP_N_S + 1, 3, ENC_BIG_ENDIAN); break; #if 0 case SSCOP_SDP: #endif case SSCOP_POLL: - proto_tree_add_item(sscop_tree, hf_sscop_ps, tvb, SSCOP_N_PS + 1, 3,FALSE); - proto_tree_add_item(sscop_tree, hf_sscop_s, tvb, SSCOP_N_S + 1, 3,FALSE); + proto_tree_add_item(sscop_tree, hf_sscop_ps, tvb, SSCOP_N_PS + 1, 3,ENC_BIG_ENDIAN); + proto_tree_add_item(sscop_tree, hf_sscop_s, tvb, SSCOP_N_S + 1, 3,ENC_BIG_ENDIAN); break; case SSCOP_STAT: - proto_tree_add_item(sscop_tree, hf_sscop_ps, tvb, SSCOP_SS_N_PS + 1, 3,FALSE); - proto_tree_add_item(sscop_tree, hf_sscop_mr, tvb, SSCOP_SS_N_MR + 1, 3, FALSE); - proto_tree_add_item(sscop_tree, hf_sscop_r, tvb, SSCOP_SS_N_R + 1, 3,FALSE); + proto_tree_add_item(sscop_tree, hf_sscop_ps, tvb, SSCOP_SS_N_PS + 1, 3,ENC_BIG_ENDIAN); + proto_tree_add_item(sscop_tree, hf_sscop_mr, tvb, SSCOP_SS_N_MR + 1, 3, ENC_BIG_ENDIAN); + proto_tree_add_item(sscop_tree, hf_sscop_r, tvb, SSCOP_SS_N_R + 1, 3,ENC_BIG_ENDIAN); dissect_stat_list(sscop_tree,tvb,3); break; case SSCOP_USTAT: - proto_tree_add_item(sscop_tree, hf_sscop_mr, tvb, SSCOP_SS_N_MR + 1, 3, FALSE); - proto_tree_add_item(sscop_tree, hf_sscop_r, tvb, SSCOP_SS_N_R + 1, 3,FALSE); + proto_tree_add_item(sscop_tree, hf_sscop_mr, tvb, SSCOP_SS_N_MR + 1, 3, ENC_BIG_ENDIAN); + proto_tree_add_item(sscop_tree, hf_sscop_r, tvb, SSCOP_SS_N_R + 1, 3,ENC_BIG_ENDIAN); dissect_stat_list(sscop_tree,tvb,2); break; } diff --git a/epan/dissectors/packet-ssh.c b/epan/dissectors/packet-ssh.c index 5d7b639b2d..a9ff71da77 100644 --- a/epan/dissectors/packet-ssh.c +++ b/epan/dissectors/packet-ssh.c @@ -1067,7 +1067,7 @@ ssh_dissect_key_init(tvbuff_t *tvb, int offset, proto_tree *tree, } ssh_proto_tree_add_item(key_init_tree, hf_ssh_kex_first_packet_follows, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); offset+=1; ssh_proto_tree_add_item(key_init_tree, hf_ssh_kex_reserved, diff --git a/epan/dissectors/packet-ssl.c b/epan/dissectors/packet-ssl.c index 1a6b4f0f51..7de7e6f82d 100644 --- a/epan/dissectors/packet-ssl.c +++ b/epan/dissectors/packet-ssl.c @@ -1456,7 +1456,7 @@ dissect_ssl3_record(tvbuff_t *tvb, packet_info *pinfo, /* show the one-byte content type */ proto_tree_add_item(ssl_record_tree, hf_ssl_record_content_type, - tvb, offset, 1, 0); + tvb, offset, 1, ENC_BIG_ENDIAN); offset++; /* add the version */ @@ -2128,7 +2128,7 @@ dissect_ssl3_hnd_hello_common(tvbuff_t *tvb, proto_tree *tree, /* show the session id */ session_id_length = tvb_get_guint8(tvb, offset); proto_tree_add_item(tree, hf_ssl_handshake_session_id_len, - tvb, offset++, 1, 0); + tvb, offset++, 1, ENC_BIG_ENDIAN); if (session_id_length > 0) { tvb_ensure_bytes_exist(tvb, offset, session_id_length); diff --git a/epan/dissectors/packet-starteam.c b/epan/dissectors/packet-starteam.c index 19701a268d..2d6559192b 100644 --- a/epan/dissectors/packet-starteam.c +++ b/epan/dissectors/packet-starteam.c @@ -537,11 +537,11 @@ dissect_starteam(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ti = proto_tree_add_text(starteamroot_tree, tvb, offset, 20, STARTEAM_TEXT_MDH); starteam_tree = proto_item_add_subtree(ti, ett_starteam_mdh); - proto_tree_add_item(starteam_tree, hf_starteam_mdh_session_tag, tvb, offset + 0, 4, TRUE); - proto_tree_add_item(starteam_tree, hf_starteam_mdh_ctimestamp, tvb, offset + 4, 4, TRUE); - proto_tree_add_item(starteam_tree, hf_starteam_mdh_flags, tvb, offset + 8, 4, TRUE); - proto_tree_add_item(starteam_tree, hf_starteam_mdh_keyid, tvb, offset + 12, 4, TRUE); - proto_tree_add_item(starteam_tree, hf_starteam_mdh_reserved, tvb, offset + 16, 4, TRUE); + proto_tree_add_item(starteam_tree, hf_starteam_mdh_session_tag, tvb, offset + 0, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(starteam_tree, hf_starteam_mdh_ctimestamp, tvb, offset + 4, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(starteam_tree, hf_starteam_mdh_flags, tvb, offset + 8, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(starteam_tree, hf_starteam_mdh_keyid, tvb, offset + 12, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(starteam_tree, hf_starteam_mdh_reserved, tvb, offset + 16, 4, ENC_LITTLE_ENDIAN); offset += 20; } } @@ -551,9 +551,9 @@ dissect_starteam(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) starteam_tree = proto_item_add_subtree(ti, ett_starteam_ph); proto_tree_add_item(starteam_tree, hf_starteam_ph_signature, tvb, offset + 0, 4, FALSE); - proto_tree_add_item(starteam_tree, hf_starteam_ph_packet_size, tvb, offset + 4, 4, TRUE); - proto_tree_add_item(starteam_tree, hf_starteam_ph_data_size, tvb, offset + 8, 4, TRUE); - proto_tree_add_item(starteam_tree, hf_starteam_ph_data_flags, tvb, offset + 12, 4, TRUE); + proto_tree_add_item(starteam_tree, hf_starteam_ph_packet_size, tvb, offset + 4, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(starteam_tree, hf_starteam_ph_data_size, tvb, offset + 8, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(starteam_tree, hf_starteam_ph_data_flags, tvb, offset + 12, 4, ENC_LITTLE_ENDIAN); offset += 16; if(bRequest){ @@ -561,13 +561,13 @@ dissect_starteam(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ti = proto_tree_add_text(starteamroot_tree, tvb, offset, 38, STARTEAM_TEXT_ID); starteam_tree = proto_item_add_subtree(ti, ett_starteam_id); - proto_tree_add_item(starteam_tree, hf_starteam_id_revision_level, tvb, offset + 0, 2, TRUE); + proto_tree_add_item(starteam_tree, hf_starteam_id_revision_level, tvb, offset + 0, 2, ENC_LITTLE_ENDIAN); proto_tree_add_item(starteam_tree, hf_starteam_id_client, tvb, offset + 2, 16, TRUE); - proto_tree_add_item(starteam_tree, hf_starteam_id_connect, tvb, offset + 18, 4, TRUE); - proto_tree_add_item(starteam_tree, hf_starteam_id_component, tvb, offset + 22, 4, TRUE); - proto_tree_add_item(starteam_tree, hf_starteam_id_command, tvb, offset + 26, 4, TRUE); - proto_tree_add_item(starteam_tree, hf_starteam_id_command_time, tvb, offset + 30, 4, TRUE); - proto_tree_add_item(starteam_tree, hf_starteam_id_command_userid, tvb, offset + 34, 4, TRUE); + proto_tree_add_item(starteam_tree, hf_starteam_id_connect, tvb, offset + 18, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(starteam_tree, hf_starteam_id_component, tvb, offset + 22, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(starteam_tree, hf_starteam_id_command, tvb, offset + 26, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(starteam_tree, hf_starteam_id_command_time, tvb, offset + 30, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(starteam_tree, hf_starteam_id_command_userid, tvb, offset + 34, 4, ENC_LITTLE_ENDIAN); offset += 38; } } diff --git a/epan/dissectors/packet-synergy.c b/epan/dissectors/packet-synergy.c index 0ff44f8155..4008444644 100644 --- a/epan/dissectors/packet-synergy.c +++ b/epan/dissectors/packet-synergy.c @@ -187,21 +187,21 @@ dissect_synergy(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) else if(strncmp(buffer,"DKUP",4)==0) dissect_synergy_dkup(tvb,pinfo,synergy_tree,offset+4); else if(strncmp(buffer,"DMDN",4)==0) - proto_tree_add_item(synergy_tree,hf_synergy_dmdn,tvb,offset+4,1,FALSE); + proto_tree_add_item(synergy_tree,hf_synergy_dmdn,tvb,offset+4,1,ENC_BIG_ENDIAN); else if(strncmp(buffer,"DMUP",4)==0) - proto_tree_add_item(synergy_tree,hf_synergy_dmup,tvb,offset+4,1,FALSE); + proto_tree_add_item(synergy_tree,hf_synergy_dmup,tvb,offset+4,1,ENC_BIG_ENDIAN); else if(strncmp(buffer,"DMMV",4)==0) dissect_synergy_dmmv(tvb,pinfo,synergy_tree,offset+4); else if(strncmp(buffer,"DMRM",4)==0) dissect_synergy_dmrm(tvb,pinfo,synergy_tree,offset+4); else if(strncmp(buffer,"DMWM",4)==0) - proto_tree_add_item(synergy_tree,hf_synergy_dmwm,tvb,offset+4,2,FALSE); + proto_tree_add_item(synergy_tree,hf_synergy_dmwm,tvb,offset+4,2,ENC_BIG_ENDIAN); else if(strncmp(buffer,"DCLP",4)==0) dissect_synergy_dclp(tvb,pinfo,synergy_tree,offset+4); else if(strncmp(buffer,"DINF",4)==0) dissect_synergy_dinf(tvb,pinfo,synergy_tree,offset+4); else if(strncmp(buffer,"DSOP",4)==0) - proto_tree_add_item(synergy_tree,hf_synergy_dsop,tvb,offset+4,4,FALSE); + proto_tree_add_item(synergy_tree,hf_synergy_dsop,tvb,offset+4,4,ENC_BIG_ENDIAN); else if(strncmp(buffer,"QINF",4)==0) proto_tree_add_item(synergy_tree,hf_synergy_qinf,tvb,offset+4,-1,ENC_NA); else if(strncmp(buffer,"EICV",4)==0) @@ -224,8 +224,8 @@ static void dissect_synergy_handshake( tvbuff_t *tvb, packet_info *pinfo _U_, pr ti = proto_tree_add_item(tree, hf_synergy_handshake, tvb, offset, -1, ENC_NA); sub_tree = proto_item_add_subtree(ti, ett_synergy); - proto_tree_add_item(sub_tree, hf_synergy_handshake_majorversion, tvb, offset + 7, 2, FALSE); - proto_tree_add_item(sub_tree, hf_synergy_handshake_minorversion, tvb, offset + 9, 2, FALSE); + proto_tree_add_item(sub_tree, hf_synergy_handshake_majorversion, tvb, offset + 7, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_synergy_handshake_minorversion, tvb, offset + 9, 2, ENC_BIG_ENDIAN); if (tvb_length_remaining(tvb, offset + 11) != 0) { @@ -241,10 +241,10 @@ static void dissect_synergy_cinn( tvbuff_t *tvb, packet_info *pinfo _U_, proto_t ti = proto_tree_add_item(tree, hf_synergy_cinn, tvb, offset, -1, ENC_NA); sub_tree = proto_item_add_subtree(ti, ett_synergy); - proto_tree_add_item(sub_tree, hf_synergy_cinn_x, tvb, offset + 4, 2, FALSE); - proto_tree_add_item(sub_tree, hf_synergy_cinn_y, tvb, offset + 6, 2, FALSE); - proto_tree_add_item(sub_tree, hf_synergy_cinn_sequence, tvb, offset + 8, 4, FALSE); - proto_tree_add_item(sub_tree, hf_synergy_cinn_modifiermask, tvb, offset + 12, 2, FALSE); + proto_tree_add_item(sub_tree, hf_synergy_cinn_x, tvb, offset + 4, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_synergy_cinn_y, tvb, offset + 6, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_synergy_cinn_sequence, tvb, offset + 8, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_synergy_cinn_modifiermask, tvb, offset + 12, 2, ENC_BIG_ENDIAN); } static void dissect_synergy_cclp( tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, gint offset ) @@ -254,8 +254,8 @@ static void dissect_synergy_cclp( tvbuff_t *tvb, packet_info *pinfo _U_, proto_t ti = proto_tree_add_item(tree, hf_synergy_cclp, tvb, offset, -1, ENC_NA); sub_tree = proto_item_add_subtree(ti, ett_synergy); - proto_tree_add_item(sub_tree, hf_synergy_cclp_clipboardidentifier, tvb, offset + 4, 1, FALSE); - proto_tree_add_item(sub_tree, hf_synergy_cclp_sequencenumber, tvb, offset + 5, 4, FALSE); + proto_tree_add_item(sub_tree, hf_synergy_cclp_clipboardidentifier, tvb, offset + 4, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_synergy_cclp_sequencenumber, tvb, offset + 5, 4, ENC_BIG_ENDIAN); } static void dissect_synergy_dkdn( tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, gint offset ) @@ -265,11 +265,11 @@ static void dissect_synergy_dkdn( tvbuff_t *tvb, packet_info *pinfo _U_, proto_t ti = proto_tree_add_item(tree, hf_synergy_dkdn, tvb, offset, -1, ENC_NA); sub_tree = proto_item_add_subtree(ti, ett_synergy); - proto_tree_add_item(sub_tree, hf_synergy_dkdn_keyid, tvb, offset + 4, 2, FALSE); - proto_tree_add_item(sub_tree, hf_synergy_dkdn_keymodifiermask, tvb, offset + 6, 2, FALSE); + proto_tree_add_item(sub_tree, hf_synergy_dkdn_keyid, tvb, offset + 4, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_synergy_dkdn_keymodifiermask, tvb, offset + 6, 2, ENC_BIG_ENDIAN); if (tvb_length_remaining(tvb, offset + 8) != 0) - proto_tree_add_item(sub_tree, hf_synergy_dkdn_keybutton, tvb, offset + 8, 2, FALSE); + proto_tree_add_item(sub_tree, hf_synergy_dkdn_keybutton, tvb, offset + 8, 2, ENC_BIG_ENDIAN); } static void dissect_synergy_dkrp( tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, gint offset ) @@ -279,12 +279,12 @@ static void dissect_synergy_dkrp( tvbuff_t *tvb, packet_info *pinfo _U_, proto_t ti = proto_tree_add_item(tree, hf_synergy_dkrp, tvb, offset, -1, ENC_NA); sub_tree = proto_item_add_subtree(ti, ett_synergy); - proto_tree_add_item(sub_tree, hf_synergy_dkrp_keyid, tvb, offset + 4, 2, FALSE); - proto_tree_add_item(sub_tree, hf_synergy_dkrp_keymodifiermask, tvb, offset + 6, 2, FALSE); - proto_tree_add_item(sub_tree, hf_synergy_dkrp_numberofrepeats, tvb, offset + 8, 2, FALSE); + proto_tree_add_item(sub_tree, hf_synergy_dkrp_keyid, tvb, offset + 4, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_synergy_dkrp_keymodifiermask, tvb, offset + 6, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_synergy_dkrp_numberofrepeats, tvb, offset + 8, 2, ENC_BIG_ENDIAN); if (tvb_length_remaining(tvb, offset + 10) != 0) - proto_tree_add_item(sub_tree, hf_synergy_dkrp_keybutton, tvb, offset + 10, 2, FALSE); + proto_tree_add_item(sub_tree, hf_synergy_dkrp_keybutton, tvb, offset + 10, 2, ENC_BIG_ENDIAN); } static void dissect_synergy_dkup( tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, gint offset ) @@ -294,11 +294,11 @@ static void dissect_synergy_dkup( tvbuff_t *tvb, packet_info *pinfo _U_, proto_t ti = proto_tree_add_item(tree, hf_synergy_dkup, tvb, offset, -1, ENC_NA); sub_tree = proto_item_add_subtree(ti, ett_synergy); - proto_tree_add_item(sub_tree, hf_synergy_dkup_keyid, tvb, offset + 4, 2, FALSE); - proto_tree_add_item(sub_tree, hf_synergy_dkup_keymodifiermask, tvb, offset + 6, 2, FALSE); + proto_tree_add_item(sub_tree, hf_synergy_dkup_keyid, tvb, offset + 4, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_synergy_dkup_keymodifiermask, tvb, offset + 6, 2, ENC_BIG_ENDIAN); if (tvb_length_remaining(tvb, offset + 8) != 0) - proto_tree_add_item(sub_tree, hf_synergy_dkup_keybutton, tvb, offset + 8, 2, FALSE); + proto_tree_add_item(sub_tree, hf_synergy_dkup_keybutton, tvb, offset + 8, 2, ENC_BIG_ENDIAN); } static void dissect_synergy_dmmv( tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, gint offset ) @@ -308,8 +308,8 @@ static void dissect_synergy_dmmv( tvbuff_t *tvb, packet_info *pinfo _U_, proto_t ti = proto_tree_add_item(tree, hf_synergy_dmmv, tvb, offset, -1, ENC_NA); sub_tree = proto_item_add_subtree(ti, ett_synergy); - proto_tree_add_item(sub_tree, hf_synergy_dmmv_x, tvb, offset + 4, 2, FALSE); - proto_tree_add_item(sub_tree, hf_synergy_dmmv_y, tvb, offset + 6, 2, FALSE); + proto_tree_add_item(sub_tree, hf_synergy_dmmv_x, tvb, offset + 4, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_synergy_dmmv_y, tvb, offset + 6, 2, ENC_BIG_ENDIAN); } static void dissect_synergy_dmrm( tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, gint offset ) @@ -319,8 +319,8 @@ static void dissect_synergy_dmrm( tvbuff_t *tvb, packet_info *pinfo _U_, proto_t ti = proto_tree_add_item(tree, hf_synergy_dmrm, tvb, offset, -1, ENC_NA); sub_tree = proto_item_add_subtree(ti, ett_synergy); - proto_tree_add_item(sub_tree, hf_synergy_dmrm_x, tvb, offset + 4, 2, FALSE); - proto_tree_add_item(sub_tree, hf_synergy_dmrm_y, tvb, offset + 6, 2, FALSE); + proto_tree_add_item(sub_tree, hf_synergy_dmrm_x, tvb, offset + 4, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_synergy_dmrm_y, tvb, offset + 6, 2, ENC_BIG_ENDIAN); } static void dissect_synergy_dclp( tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, gint offset ) @@ -330,8 +330,8 @@ static void dissect_synergy_dclp( tvbuff_t *tvb, packet_info *pinfo _U_, proto_t ti = proto_tree_add_item(tree, hf_synergy_dclp, tvb, offset, -1, ENC_NA); sub_tree = proto_item_add_subtree(ti, ett_synergy); - proto_tree_add_item(sub_tree, hf_synergy_dclp_clipboardidentifier, tvb, offset + 4, 1, FALSE); - proto_tree_add_item(sub_tree, hf_synergy_dclp_sequencenumber, tvb, offset + 5, 4, FALSE); + proto_tree_add_item(sub_tree, hf_synergy_dclp_clipboardidentifier, tvb, offset + 4, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_synergy_dclp_sequencenumber, tvb, offset + 5, 4, ENC_BIG_ENDIAN); proto_tree_add_item(sub_tree, hf_synergy_dclp_clipboarddata, tvb, offset + 9, -1, FALSE); } @@ -342,13 +342,13 @@ static void dissect_synergy_dinf( tvbuff_t *tvb, packet_info *pinfo _U_, proto_t ti = proto_tree_add_item(tree, hf_synergy_dinf, tvb, offset, -1, ENC_NA); sub_tree = proto_item_add_subtree(ti, ett_synergy); - proto_tree_add_item(sub_tree, hf_synergy_dinf_clp, tvb, offset + 4, 2, FALSE); - proto_tree_add_item(sub_tree, hf_synergy_dinf_ctp, tvb, offset + 6, 2, FALSE); - proto_tree_add_item(sub_tree, hf_synergy_dinf_wsp, tvb, offset + 8, 2, FALSE); - proto_tree_add_item(sub_tree, hf_synergy_dinf_hsp, tvb, offset + 10, 2, FALSE); - proto_tree_add_item(sub_tree, hf_synergy_dinf_swz, tvb, offset + 12, 2, FALSE); - proto_tree_add_item(sub_tree, hf_synergy_dinf_x, tvb, offset + 14, 2, FALSE); - proto_tree_add_item(sub_tree, hf_synergy_dinf_y, tvb, offset + 16, 2, FALSE); + proto_tree_add_item(sub_tree, hf_synergy_dinf_clp, tvb, offset + 4, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_synergy_dinf_ctp, tvb, offset + 6, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_synergy_dinf_wsp, tvb, offset + 8, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_synergy_dinf_hsp, tvb, offset + 10, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_synergy_dinf_swz, tvb, offset + 12, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_synergy_dinf_x, tvb, offset + 14, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_synergy_dinf_y, tvb, offset + 16, 2, ENC_BIG_ENDIAN); } static void dissect_synergy_eicv( tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, gint offset ) @@ -358,8 +358,8 @@ static void dissect_synergy_eicv( tvbuff_t *tvb, packet_info *pinfo _U_, proto_t ti = proto_tree_add_item(tree, hf_synergy_eicv, tvb, offset, -1, ENC_NA); sub_tree = proto_item_add_subtree(ti, ett_synergy); - proto_tree_add_item(sub_tree, hf_synergy_eicv_majorversion, tvb, offset + 4, 2, FALSE); - proto_tree_add_item(sub_tree, hf_synergy_eicv_minorversion, tvb, offset + 6, 2, FALSE); + proto_tree_add_item(sub_tree, hf_synergy_eicv_majorversion, tvb, offset + 4, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_synergy_eicv_minorversion, tvb, offset + 6, 2, ENC_BIG_ENDIAN); } diff --git a/epan/dissectors/packet-tacacs.c b/epan/dissectors/packet-tacacs.c index 1dc9c09738..5a22ce069d 100644 --- a/epan/dissectors/packet-tacacs.c +++ b/epan/dissectors/packet-tacacs.c @@ -181,7 +181,7 @@ dissect_tacacs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_uint(tacacs_tree, hf_tacacs_type, tvb, 1, 1, type); proto_tree_add_item(tacacs_tree, hf_tacacs_nonce, tvb, 2, 2, - FALSE); + ENC_BIG_ENDIAN); if (version==0) { @@ -201,9 +201,9 @@ dissect_tacacs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) else { proto_tree_add_item(tacacs_tree, hf_tacacs_response, tvb, 4, 1, - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item(tacacs_tree, hf_tacacs_reason, tvb, 5, 1, - FALSE); + ENC_BIG_ENDIAN); } } else @@ -215,21 +215,21 @@ dissect_tacacs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_uint(tacacs_tree, hf_tacacs_passlen, tvb, 5, 1, passlen); proto_tree_add_item(tacacs_tree, hf_tacacs_response, tvb, 6, 1, - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item(tacacs_tree, hf_tacacs_reason, tvb, 7, 1, - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item(tacacs_tree, hf_tacacs_result1, tvb, 8, 4, - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item(tacacs_tree, hf_tacacs_destaddr, tvb, 12, 4, FALSE); proto_tree_add_item(tacacs_tree, hf_tacacs_destport, tvb, 16, 2, - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item(tacacs_tree, hf_tacacs_line, tvb, 18, 2, - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item(tacacs_tree, hf_tacacs_result2, tvb, 20, 4, - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item(tacacs_tree, hf_tacacs_result3, tvb, 24, 2, - FALSE); + ENC_BIG_ENDIAN); if (type!=TACACS_RESPONSE) { tvb_get_nstringz0(tvb,26,userlen+1,txt_buff); @@ -975,9 +975,9 @@ dissect_tacplus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_uint(tacplus_tree, hf_tacplus_minvers, tvb, 0, 1, version&0xf); proto_tree_add_item(tacplus_tree, hf_tacplus_type, tvb, 1, 1, - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item(tacplus_tree, hf_tacplus_seqno, tvb, 2, 1, - FALSE); + ENC_BIG_ENDIAN); flags = tvb_get_guint8(tvb,3); tf = proto_tree_add_uint_format(tacplus_tree, hf_tacplus_flags, tvb, 3, 1, flags, @@ -993,7 +993,7 @@ dissect_tacplus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_boolean(flags_tree, hf_tacplus_flags_connection_type, tvb, 3, 1, flags); proto_tree_add_item(tacplus_tree, hf_tacplus_session_id, tvb, 4, 4, - FALSE); + ENC_BIG_ENDIAN); if ((gint) len < 1) { proto_tree_add_text(tacplus_tree, tvb, 8, 4, diff --git a/epan/dissectors/packet-tcp.c b/epan/dissectors/packet-tcp.c index 38035c3270..9626f6a421 100644 --- a/epan/dissectors/packet-tcp.c +++ b/epan/dissectors/packet-tcp.c @@ -2272,8 +2272,8 @@ dissect_tcpopt_exp(const ip_tcp_opt *optp _U_, tvbuff_t *tvb, item = proto_tree_add_item(opt_tree, hf_tcp_option_exp, tvb, offset, optlen, ENC_NA); exp_tree = proto_item_add_subtree(item, ett_tcp_option_exp); - proto_tree_add_item(exp_tree, hf_tcp_option_kind, tvb, offset, 1, FALSE); - proto_tree_add_item(exp_tree, hf_tcp_option_len, tvb, offset + 1, 1, FALSE); + proto_tree_add_item(exp_tree, hf_tcp_option_kind, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(exp_tree, hf_tcp_option_len, tvb, offset + 1, 1, ENC_BIG_ENDIAN); proto_tree_add_item(exp_tree, hf_tcp_option_exp_data, tvb, offset + 2, optlen - 2, ENC_NA); tcp_info_append_uint(pinfo, "Expxx", TRUE); @@ -2290,8 +2290,8 @@ dissect_tcpopt_sack_perm(const ip_tcp_opt *optp _U_, tvbuff_t *tvb, item = proto_tree_add_boolean(opt_tree, hf_tcp_option_sack_perm, tvb, offset, optlen, TRUE); exp_tree = proto_item_add_subtree(item, ett_tcp_option_sack_perm); - proto_tree_add_item(exp_tree, hf_tcp_option_kind, tvb, offset, 1, FALSE); - proto_tree_add_item(exp_tree, hf_tcp_option_len, tvb, offset + 1, 1, FALSE); + proto_tree_add_item(exp_tree, hf_tcp_option_kind, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(exp_tree, hf_tcp_option_len, tvb, offset + 1, 1, ENC_BIG_ENDIAN); tcp_info_append_uint(pinfo, "SACK_PERM", TRUE); } @@ -2307,9 +2307,9 @@ dissect_tcpopt_mss(const ip_tcp_opt *optp, tvbuff_t *tvb, item = proto_tree_add_none_format(opt_tree, hf_tcp_option_mss, tvb, offset, optlen, "%s: %u bytes", optp->name, mss); exp_tree = proto_item_add_subtree(item, ett_tcp_option_mss); - proto_tree_add_item(exp_tree, hf_tcp_option_kind, tvb, offset, 1, FALSE); - proto_tree_add_item(exp_tree, hf_tcp_option_len, tvb, offset + 1, 1, FALSE); - proto_tree_add_item(exp_tree, hf_tcp_option_mss_val, tvb, offset + 2, 2, FALSE); + proto_tree_add_item(exp_tree, hf_tcp_option_kind, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(exp_tree, hf_tcp_option_len, tvb, offset + 1, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(exp_tree, hf_tcp_option_mss_val, tvb, offset + 2, 2, ENC_BIG_ENDIAN); tcp_info_append_uint(pinfo, "MSS", mss); } @@ -2373,10 +2373,10 @@ dissect_tcpopt_sack(const ip_tcp_opt *optp, tvbuff_t *tvb, } hidden_item = proto_tree_add_item(opt_tree, hf_tcp_option_kind, tvb, - offset, 1, FALSE); + offset, 1, ENC_BIG_ENDIAN); PROTO_ITEM_SET_HIDDEN(hidden_item); hidden_item = proto_tree_add_item(opt_tree, hf_tcp_option_len, tvb, - offset + 1, 1, FALSE); + offset + 1, 1, ENC_BIG_ENDIAN); PROTO_ITEM_SET_HIDDEN(hidden_item); tf = proto_tree_add_text(opt_tree, tvb, offset, optlen, "%s:", optp->name); @@ -2429,10 +2429,10 @@ dissect_tcpopt_echo(const ip_tcp_opt *optp, tvbuff_t *tvb, guint32 echo; hidden_item = proto_tree_add_item(opt_tree, hf_tcp_option_kind, tvb, - offset, 1, FALSE); + offset, 1, ENC_BIG_ENDIAN); PROTO_ITEM_SET_HIDDEN(hidden_item); hidden_item = proto_tree_add_item(opt_tree, hf_tcp_option_len, tvb, - offset + 1, 1, FALSE); + offset + 1, 1, ENC_BIG_ENDIAN); PROTO_ITEM_SET_HIDDEN(hidden_item); echo = tvb_get_ntohl(tvb, offset + 2); @@ -2489,10 +2489,10 @@ dissect_tcpopt_cc(const ip_tcp_opt *optp, tvbuff_t *tvb, guint32 cc; hidden_item = proto_tree_add_item(opt_tree, hf_tcp_option_kind, tvb, - offset, 1, FALSE); + offset, 1, ENC_BIG_ENDIAN); PROTO_ITEM_SET_HIDDEN(hidden_item); hidden_item = proto_tree_add_item(opt_tree, hf_tcp_option_len, tvb, - offset + 1, 1, FALSE); + offset + 1, 1, ENC_BIG_ENDIAN); PROTO_ITEM_SET_HIDDEN(hidden_item); cc = tvb_get_ntohl(tvb, offset + 2); @@ -2535,10 +2535,10 @@ dissect_tcpopt_qs(const ip_tcp_opt *optp, tvbuff_t *tvb, guint8 rate = tvb_get_guint8(tvb, offset + 2) & 0x0f; hidden_item = proto_tree_add_item(opt_tree, hf_tcp_option_kind, tvb, - offset, 1, FALSE); + offset, 1, ENC_BIG_ENDIAN); PROTO_ITEM_SET_HIDDEN(hidden_item); hidden_item = proto_tree_add_item(opt_tree, hf_tcp_option_len, tvb, - offset + 1, 1, FALSE); + offset + 1, 1, ENC_BIG_ENDIAN); PROTO_ITEM_SET_HIDDEN(hidden_item); hidden_item = proto_tree_add_boolean(opt_tree, hf_tcp_option_qs, tvb, offset, @@ -2569,10 +2569,10 @@ dissect_tcpopt_scps(const ip_tcp_opt *optp, tvbuff_t *tvb, guint8 connid; hidden_item = proto_tree_add_item(opt_tree, hf_tcp_option_kind, tvb, - offset, 1, FALSE); + offset, 1, ENC_BIG_ENDIAN); PROTO_ITEM_SET_HIDDEN(hidden_item); hidden_item = proto_tree_add_item(opt_tree, hf_tcp_option_len, tvb, - offset + 1, 1, FALSE); + offset + 1, 1, ENC_BIG_ENDIAN); PROTO_ITEM_SET_HIDDEN(hidden_item); tcpd = get_tcp_conversation_data(NULL,pinfo); @@ -2644,7 +2644,7 @@ dissect_tcpopt_scps(const ip_tcp_opt *optp, tvbuff_t *tvb, proto_tree_add_boolean(field_tree, hf_tcp_scpsoption_flags_resv1, tvb, offset + 2, 1, capvector); proto_tree_add_item(field_tree, hf_tcp_scpsoption_connection_id, tvb, - offset + 3, 1, 0); + offset + 3, 1, ENC_BIG_ENDIAN); tcp_info_append_str(pinfo, "SCPS", flags); @@ -2697,7 +2697,7 @@ dissect_tcpopt_scps(const ip_tcp_opt *optp, tvbuff_t *tvb, /* Convert the extended capabilities length into bytes for display */ extended_cap_length = (extended_cap_length << 1); - proto_tree_add_item(field_tree, hf_tcp_option_scps_binding, tvb, offset + local_offset, 1, 0); + proto_tree_add_item(field_tree, hf_tcp_option_scps_binding, tvb, offset + local_offset, 1, ENC_BIG_ENDIAN); proto_tree_add_uint(field_tree, hf_tcp_option_scps_binding_len, tvb, offset + local_offset + 1, 1, extended_cap_length); /* Step past the binding space and length octets */ @@ -2732,10 +2732,10 @@ dissect_tcpopt_user_to(const ip_tcp_opt *optp, tvbuff_t *tvb, guint16 to; hidden_item = proto_tree_add_item(opt_tree, hf_tcp_option_kind, tvb, - offset, 1, FALSE); + offset, 1, ENC_BIG_ENDIAN); PROTO_ITEM_SET_HIDDEN(hidden_item); hidden_item = proto_tree_add_item(opt_tree, hf_tcp_option_len, tvb, - offset + 1, 1, FALSE); + offset + 1, 1, ENC_BIG_ENDIAN); PROTO_ITEM_SET_HIDDEN(hidden_item); g = tvb_get_ntohs(tvb, offset + 2) & 0x8000; @@ -2748,7 +2748,7 @@ dissect_tcpopt_user_to(const ip_tcp_opt *optp, tvbuff_t *tvb, optlen, to, "%s: %u %s", optp->name, to, g ? "minutes" : "seconds"); field_tree = proto_item_add_subtree(tf, *optp->subtree_index); proto_tree_add_item(field_tree, hf_tcp_option_user_to_granularity, tvb, offset + 2, 2, FALSE); - proto_tree_add_item(field_tree, hf_tcp_option_user_to_val, tvb, offset + 2, 2, FALSE); + proto_tree_add_item(field_tree, hf_tcp_option_user_to_val, tvb, offset + 2, 2, ENC_BIG_ENDIAN); tcp_info_append_uint(pinfo, "USER_TO", to); } @@ -2774,10 +2774,10 @@ dissect_tcpopt_snack(const ip_tcp_opt *optp, tvbuff_t *tvb, proto_item *hidden_item; hidden_item = proto_tree_add_item(opt_tree, hf_tcp_option_kind, tvb, - offset, 1, FALSE); + offset, 1, ENC_BIG_ENDIAN); PROTO_ITEM_SET_HIDDEN(hidden_item); hidden_item = proto_tree_add_item(opt_tree, hf_tcp_option_len, tvb, - offset + 1, 1, FALSE); + offset + 1, 1, ENC_BIG_ENDIAN); PROTO_ITEM_SET_HIDDEN(hidden_item); tcpd = get_tcp_conversation_data(NULL,pinfo); @@ -2871,10 +2871,10 @@ dissect_tcpopt_mood(const ip_tcp_opt _U_*optp, tvbuff_t *tvb, mood = tvb_get_ephemeral_string(tvb, offset + 2, optlen-2); hidden_item = proto_tree_add_item(opt_tree, hf_tcp_option_kind, tvb, - offset, 1, FALSE); + offset, 1, ENC_BIG_ENDIAN); PROTO_ITEM_SET_HIDDEN(hidden_item); hidden_item = proto_tree_add_item(opt_tree, hf_tcp_option_len, tvb, - offset + 1, 1, FALSE); + offset + 1, 1, ENC_BIG_ENDIAN); PROTO_ITEM_SET_HIDDEN(hidden_item); hidden_item = proto_tree_add_boolean(opt_tree, hf_tcp_option_mood, tvb, offset+2, optlen-2, TRUE); @@ -2999,22 +2999,22 @@ dissect_tcpopt_rvbd_probe(const ip_tcp_opt *optp _U_, tvbuff_t *tvb, int offset, /* optlen, type, ver are common for all probes */ field_tree = proto_item_add_subtree(pitem, ett_tcp_opt_rvbd_probe); pitem = proto_tree_add_item(field_tree, hf_tcp_option_len, tvb, - offset + PROBE_OPTLEN_OFFSET, 1, FALSE); + offset + PROBE_OPTLEN_OFFSET, 1, ENC_BIG_ENDIAN); PROTO_ITEM_SET_HIDDEN(pitem); pitem = proto_tree_add_item(field_tree, hf_tcp_option_kind, tvb, - offset, 1, FALSE); + offset, 1, ENC_BIG_ENDIAN); PROTO_ITEM_SET_HIDDEN(pitem); proto_tree_add_item(field_tree, hf_tcp_option_rvbd_probe_optlen, tvb, - offset + PROBE_OPTLEN_OFFSET, 1, FALSE); + offset + PROBE_OPTLEN_OFFSET, 1, ENC_BIG_ENDIAN); if (ver == PROBE_VERSION_1) { guint32 ip; guint16 port; proto_tree_add_item(field_tree, hf_tcp_option_rvbd_probe_type1, tvb, - offset + PROBE_VERSION_TYPE_OFFSET, 1, FALSE); + offset + PROBE_VERSION_TYPE_OFFSET, 1, ENC_BIG_ENDIAN); proto_tree_add_item(field_tree, hf_tcp_option_rvbd_probe_version1, tvb, - offset + PROBE_VERSION_TYPE_OFFSET, 1, FALSE); + offset + PROBE_VERSION_TYPE_OFFSET, 1, ENC_BIG_ENDIAN); if (type == PROBE_INTERNAL) return; @@ -3033,7 +3033,7 @@ dissect_tcpopt_rvbd_probe(const ip_tcp_opt *optp _U_, tvbuff_t *tvb, int offset, case PROBE_TRACE: proto_tree_add_item(field_tree, hf_tcp_option_rvbd_probe_appli_ver, tvb, offset + PROBE_V1_APPLI_VERSION_OFFSET, 2, - FALSE); + ENC_BIG_ENDIAN); proto_item_append_text(pitem, ", CSH IP: %s", ip_to_str((guint8 *)&ip)); @@ -3062,7 +3062,7 @@ dissect_tcpopt_rvbd_probe(const ip_tcp_opt *optp _U_, tvbuff_t *tvb, int offset, port = tvb_get_ntohs(tvb, offset + PROBE_V1_PROXY_PORT_OFFSET); proto_tree_add_item(field_tree, hf_tcp_option_rvbd_probe_proxy_port, tvb, - offset + PROBE_V1_PROXY_PORT_OFFSET, 2, FALSE); + offset + PROBE_V1_PROXY_PORT_OFFSET, 2, ENC_BIG_ENDIAN); rvbd_probe_resp_add_info(pitem, pinfo, ip, port); break; @@ -3079,7 +3079,7 @@ dissect_tcpopt_rvbd_probe(const ip_tcp_opt *optp _U_, tvbuff_t *tvb, int offset, port = tvb_get_ntohs(tvb, offset + PROBE_V1_SH_PROXY_PORT_OFFSET); proto_tree_add_item(field_tree, hf_tcp_option_rvbd_probe_proxy_port, tvb, - offset + PROBE_V1_SH_PROXY_PORT_OFFSET, 2, FALSE); + offset + PROBE_V1_SH_PROXY_PORT_OFFSET, 2, ENC_BIG_ENDIAN); rvbd_probe_resp_add_info(pitem, pinfo, ip, port); break; @@ -3092,7 +3092,7 @@ dissect_tcpopt_rvbd_probe(const ip_tcp_opt *optp _U_, tvbuff_t *tvb, int offset, guint8 flags; proto_tree_add_item(field_tree, hf_tcp_option_rvbd_probe_type2, tvb, - offset + PROBE_VERSION_TYPE_OFFSET, 1, FALSE); + offset + PROBE_VERSION_TYPE_OFFSET, 1, ENC_BIG_ENDIAN); proto_tree_add_uint_format_value( field_tree, hf_tcp_option_rvbd_probe_version2, tvb, @@ -3130,7 +3130,7 @@ dissect_tcpopt_rvbd_probe(const ip_tcp_opt *optp _U_, tvbuff_t *tvb, int offset, proto_tree_add_item(flag_tree, hf_tcp_option_rvbd_probe_storeid, tvb, offset + PROBE_V2_INFO_STOREID_OFFSET, - 4, FALSE); + 4, ENC_BIG_ENDIAN); if (type != PROBE_QUERY_INFO_SID && check_col(pinfo->cinfo, COL_INFO) && @@ -3144,7 +3144,7 @@ dissect_tcpopt_rvbd_probe(const ip_tcp_opt *optp _U_, tvbuff_t *tvb, int offset, case PROBE_RESPONSE_INFO: flag_pi = proto_tree_add_item(field_tree, hf_tcp_option_rvbd_probe_flags, tvb, offset + PROBE_V2_INFO_OFFSET, - 1, FALSE); + 1, ENC_BIG_ENDIAN); flag_tree = proto_item_add_subtree(flag_pi, ett_tcp_opt_rvbd_probe_flags); proto_tree_add_item(flag_tree, @@ -3161,7 +3161,7 @@ dissect_tcpopt_rvbd_probe(const ip_tcp_opt *optp _U_, tvbuff_t *tvb, int offset, case PROBE_RST: proto_tree_add_item(field_tree, hf_tcp_option_rvbd_probe_flags, tvb, offset + PROBE_V2_INFO_OFFSET, - 1, FALSE); + 1, ENC_BIG_ENDIAN); break; } } @@ -3213,18 +3213,18 @@ dissect_tcpopt_rvbd_trpy(const ip_tcp_opt *optp _U_, tvbuff_t *tvb, field_tree = proto_item_add_subtree(pitem, ett_tcp_opt_rvbd_trpy); pitem = proto_tree_add_item(field_tree, hf_tcp_option_len, tvb, - offset + PROBE_OPTLEN_OFFSET, 1, FALSE); + offset + PROBE_OPTLEN_OFFSET, 1, ENC_BIG_ENDIAN); PROTO_ITEM_SET_HIDDEN(pitem); pitem = proto_tree_add_item(field_tree, hf_tcp_option_kind, tvb, - offset, 1, FALSE); + offset, 1, ENC_BIG_ENDIAN); PROTO_ITEM_SET_HIDDEN(pitem); proto_tree_add_item(field_tree, hf_tcp_option_rvbd_probe_optlen, tvb, - offset + PROBE_OPTLEN_OFFSET, 1, FALSE); + offset + PROBE_OPTLEN_OFFSET, 1, ENC_BIG_ENDIAN); flags = tvb_get_ntohs(tvb, offset + TRPY_OPTIONS_OFFSET); flag_pi = proto_tree_add_item(field_tree, hf_tcp_option_rvbd_trpy_flags, tvb, offset + TRPY_OPTIONS_OFFSET, - 2, FALSE); + 2, ENC_BIG_ENDIAN); flag_tree = proto_item_add_subtree(flag_pi, ett_tcp_opt_rvbd_trpy_flags); proto_tree_add_item(flag_tree, hf_tcp_option_rvbd_trpy_flag_fw_rst_probe, @@ -3250,11 +3250,11 @@ dissect_tcpopt_rvbd_trpy(const ip_tcp_opt *optp _U_, tvbuff_t *tvb, sport = tvb_get_ntohs(tvb, offset + TRPY_SRC_PORT_OFFSET); proto_tree_add_item(field_tree, hf_tcp_option_rvbd_trpy_src_port, - tvb, offset + TRPY_SRC_PORT_OFFSET, 2, FALSE); + tvb, offset + TRPY_SRC_PORT_OFFSET, 2, ENC_BIG_ENDIAN); dport = tvb_get_ntohs(tvb, offset + TRPY_DST_PORT_OFFSET); proto_tree_add_item(field_tree, hf_tcp_option_rvbd_trpy_dst_port, - tvb, offset + TRPY_DST_PORT_OFFSET, 2, FALSE); + tvb, offset + TRPY_DST_PORT_OFFSET, 2, ENC_BIG_ENDIAN); proto_item_append_text(pitem, "%s:%u -> %s:%u", ip_to_str((guint8 *)&src), sport, @@ -3263,7 +3263,7 @@ dissect_tcpopt_rvbd_trpy(const ip_tcp_opt *optp _U_, tvbuff_t *tvb, /* Client port only set on SYN: optlen == 18 */ if ((flags & RVBD_FLAGS_TRPY_OOB) && (optlen > TCPOLEN_RVBD_TRPY_MIN)) proto_tree_add_item(field_tree, hf_tcp_option_rvbd_trpy_client_port, - tvb, offset + TRPY_CLIENT_PORT_OFFSET, 2, FALSE); + tvb, offset + TRPY_CLIENT_PORT_OFFSET, 2, ENC_BIG_ENDIAN); /* We need to map this TCP session on our own dissector instead of what Wireshark thinks runs on these ports */ @@ -3788,7 +3788,7 @@ dissect_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) * g_str_has_suffix in glib2.2 */ if (strstr(pinfo->layer_names->str, "icmp:ip") != NULL) - proto_tree_add_item(tcp_tree, hf_tcp_seq, tvb, offset + 4, 4, FALSE); + proto_tree_add_item(tcp_tree, hf_tcp_seq, tvb, offset + 4, 4, ENC_BIG_ENDIAN); } } diff --git a/epan/dissectors/packet-tds.c b/epan/dissectors/packet-tds.c index 8921e5997d..ab90b0a0a4 100644 --- a/epan/dissectors/packet-tds.c +++ b/epan/dissectors/packet-tds.c @@ -898,7 +898,7 @@ dissect_tds_all_headers(tvbuff_t *tvb, guint *offset, packet_info *pinfo, proto_ return; item = proto_tree_add_item(tree, hf_tds_all_headers, tvb, *offset, total_length, ENC_NA); sub_tree = proto_item_add_subtree(item, ett_tds_all_headers); - total_length_item = proto_tree_add_item(sub_tree, hf_tds_all_headers_total_length, tvb, *offset, 4, TRUE); + total_length_item = proto_tree_add_item(sub_tree, hf_tds_all_headers_total_length, tvb, *offset, 4, ENC_LITTLE_ENDIAN); final_offset = *offset + total_length; *offset += 4; @@ -912,14 +912,14 @@ dissect_tds_all_headers(tvbuff_t *tvb, guint *offset, packet_info *pinfo, proto_ header_length = tvb_get_letohl(tvb, *offset); item = proto_tree_add_text(sub_tree, tvb, *offset, header_length, "Header"); header_sub_tree = proto_item_add_subtree(item, ett_tds_all_headers_header); - length_item = proto_tree_add_item(header_sub_tree, hf_tds_all_headers_header_length, tvb, *offset, 4, TRUE); + length_item = proto_tree_add_item(header_sub_tree, hf_tds_all_headers_header_length, tvb, *offset, 4, ENC_LITTLE_ENDIAN); if(header_length == 0 ) { expert_add_info_format(pinfo, length_item, PI_MALFORMED, PI_ERROR, "Empty header"); break; } header_type = tvb_get_letohs(tvb, *offset + 4); - type_item = proto_tree_add_item(header_sub_tree, hf_tds_all_headers_header_type, tvb, *offset + 4, 2, TRUE); + type_item = proto_tree_add_item(header_sub_tree, hf_tds_all_headers_header_type, tvb, *offset + 4, 2, ENC_LITTLE_ENDIAN); switch(header_type) { case TDS_HEADER_QUERY_NOTIF: @@ -928,7 +928,7 @@ dissect_tds_all_headers(tvbuff_t *tvb, guint *offset, packet_info *pinfo, proto_ if(header_length != 18) expert_add_info_format(pinfo, length_item, PI_MALFORMED, PI_ERROR, "Length should equal 18"); proto_tree_add_item(header_sub_tree, hf_tds_all_headers_trans_descr, tvb, *offset + 6, 8, TRUE); - proto_tree_add_item(header_sub_tree, hf_tds_all_headers_request_cnt, tvb, *offset + 14, 4, TRUE); + proto_tree_add_item(header_sub_tree, hf_tds_all_headers_request_cnt, tvb, *offset + 14, 4, ENC_LITTLE_ENDIAN); break; default: expert_add_info_format(pinfo, type_item, PI_MALFORMED, PI_ERROR, "Invalid header type"); @@ -1703,7 +1703,7 @@ dissect_tds_type_info(tvbuff_t *tvb, guint *offset, packet_info *pinfo, proto_tr data_type = tvb_get_guint8(tvb, *offset); proto_item_append_text(item, " (%s)", val_to_str(data_type, tds_data_type_names, "Invalid data type: %02X")); sub_tree = proto_item_add_subtree(item, ett_tds_type_info); - data_type_item = proto_tree_add_item(sub_tree, hf_tds_type_info_type, tvb, *offset, 1, TRUE); + data_type_item = proto_tree_add_item(sub_tree, hf_tds_type_info_type, tvb, *offset, 1, ENC_LITTLE_ENDIAN); *offset += 1; /* optional TYPE_VARLEN for variable length types */ @@ -1792,13 +1792,13 @@ dissect_tds_type_info(tvbuff_t *tvb, guint *offset, packet_info *pinfo, proto_tr case TDS_DATA_TYPE_NUMERIC: /* Numeric (legacy support) */ case TDS_DATA_TYPE_DECIMALN: /* Decimal */ case TDS_DATA_TYPE_NUMERICN: /* Numeric */ - proto_tree_add_item(sub_tree, hf_tds_type_info_precision, tvb, *offset, 1, TRUE); + proto_tree_add_item(sub_tree, hf_tds_type_info_precision, tvb, *offset, 1, ENC_LITTLE_ENDIAN); *offset += 1; /* SCALE */ case TDS_DATA_TYPE_TIMEN: /* (introduced in TDS 7.3) */ case TDS_DATA_TYPE_DATETIME2N: /* (introduced in TDS 7.3) */ case TDS_DATA_TYPE_DATETIMEOFFSETN: /* (introduced in TDS 7.3) */ - proto_tree_add_item(sub_tree, hf_tds_type_info_scale, tvb, *offset, 1, TRUE); + proto_tree_add_item(sub_tree, hf_tds_type_info_scale, tvb, *offset, 1, ENC_LITTLE_ENDIAN); *offset += 1; break; /* COLLATION */ @@ -1816,8 +1816,8 @@ dissect_tds_type_info(tvbuff_t *tvb, guint *offset, packet_info *pinfo, proto_tr proto_tree_add_item(collation_tree, hf_tds_type_info_collation_ign_kana, tvb, *offset, 4, TRUE); proto_tree_add_item(collation_tree, hf_tds_type_info_collation_ign_width, tvb, *offset, 4, TRUE); proto_tree_add_item(collation_tree, hf_tds_type_info_collation_binary, tvb, *offset, 4, TRUE); - proto_tree_add_item(collation_tree, hf_tds_type_info_collation_version, tvb, *offset, 4, TRUE); - proto_tree_add_item(collation_tree, hf_tds_type_info_collation_sortid, tvb, *offset + 4, 1, TRUE); + proto_tree_add_item(collation_tree, hf_tds_type_info_collation_version, tvb, *offset, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(collation_tree, hf_tds_type_info_collation_sortid, tvb, *offset + 4, 1, ENC_LITTLE_ENDIAN); *offset += 5; break; } @@ -1841,7 +1841,7 @@ dissect_tds_type_varbyte(tvbuff_t *tvb, guint *offset, packet_info *pinfo, proto if(plp) { enum { PLP_TERMINATOR = 0x00000000UL, UNKNOWN_PLP_LEN = 0xFFFFFFFFFFFFFFFEULL, PLP_NULL = 0xFFFFFFFFFFFFFFFFULL }; guint64 plp_length = tvb_get_letoh64(tvb, *offset); - length_item = proto_tree_add_item(sub_tree, hf_tds_type_varbyte_plp_len, tvb, *offset, 8, TRUE); + length_item = proto_tree_add_item(sub_tree, hf_tds_type_varbyte_plp_len, tvb, *offset, 8, ENC_LITTLE_ENDIAN); *offset += 8; if(plp_length == PLP_NULL) proto_item_append_text(length_item, " (PLP_NULL)"); @@ -1850,7 +1850,7 @@ dissect_tds_type_varbyte(tvbuff_t *tvb, guint *offset, packet_info *pinfo, proto proto_item_append_text(length_item, " (UNKNOWN_PLP_LEN)"); while(TRUE) { length = tvb_get_letohl(tvb, *offset); - length_item = proto_tree_add_item(sub_tree, hf_tds_type_varbyte_plp_chunk_len, tvb, *offset, 4, TRUE); + length_item = proto_tree_add_item(sub_tree, hf_tds_type_varbyte_plp_chunk_len, tvb, *offset, 4, ENC_LITTLE_ENDIAN); *offset += 4; if(length == PLP_TERMINATOR) { proto_item_append_text(length_item, " (PLP_TERMINATOR)"); @@ -1889,27 +1889,27 @@ dissect_tds_type_varbyte(tvbuff_t *tvb, guint *offset, packet_info *pinfo, proto *offset += 1; break; case TDS_DATA_TYPE_INT1: /* TinyInt (1 byte data representation) */ - proto_tree_add_item(sub_tree, hf_tds_type_varbyte_data_int1, tvb, *offset, 1, TRUE); + proto_tree_add_item(sub_tree, hf_tds_type_varbyte_data_int1, tvb, *offset, 1, ENC_LITTLE_ENDIAN); *offset += 1; break; case TDS_DATA_TYPE_INT2: /* SmallInt (2 byte data representation) */ - proto_tree_add_item(sub_tree, hf_tds_type_varbyte_data_int2, tvb, *offset, 2, TRUE); + proto_tree_add_item(sub_tree, hf_tds_type_varbyte_data_int2, tvb, *offset, 2, ENC_LITTLE_ENDIAN); *offset += 2; break; case TDS_DATA_TYPE_INT4: /* Int (4 byte data representation) */ - proto_tree_add_item(sub_tree, hf_tds_type_varbyte_data_int4, tvb, *offset, 4, TRUE); + proto_tree_add_item(sub_tree, hf_tds_type_varbyte_data_int4, tvb, *offset, 4, ENC_LITTLE_ENDIAN); *offset += 4; break; case TDS_DATA_TYPE_INT8: /* BigInt (8 byte data representation) */ - proto_tree_add_item(sub_tree, hf_tds_type_varbyte_data_int8, tvb, *offset, 8, TRUE); + proto_tree_add_item(sub_tree, hf_tds_type_varbyte_data_int8, tvb, *offset, 8, ENC_LITTLE_ENDIAN); *offset += 8; break; case TDS_DATA_TYPE_FLT4: /* Real (4 byte data representation) */ - proto_tree_add_item(sub_tree, hf_tds_type_varbyte_data_float, tvb, *offset, 4, TRUE); + proto_tree_add_item(sub_tree, hf_tds_type_varbyte_data_float, tvb, *offset, 4, ENC_LITTLE_ENDIAN); *offset += 4; break; case TDS_DATA_TYPE_FLT8: /* Float (8 byte data representation) */ - proto_tree_add_item(sub_tree, hf_tds_type_varbyte_data_double, tvb, *offset, 8, TRUE); + proto_tree_add_item(sub_tree, hf_tds_type_varbyte_data_double, tvb, *offset, 8, ENC_LITTLE_ENDIAN); *offset += 8; break; case TDS_DATA_TYPE_MONEY4: /* SmallMoney (4 byte data representation) */ @@ -1950,10 +1950,10 @@ dissect_tds_type_varbyte(tvbuff_t *tvb, guint *offset, packet_info *pinfo, proto length_item = proto_tree_add_uint(sub_tree, hf_tds_type_varbyte_length, tvb, *offset, 1, length); switch(length) { case GEN_NULL: proto_tree_add_item(sub_tree, hf_tds_type_varbyte_data_null, tvb, *offset, 0, ENC_NA); break; - case 1: proto_tree_add_item(sub_tree, hf_tds_type_varbyte_data_int1, tvb, *offset + 1, 1, TRUE); break; - case 2: proto_tree_add_item(sub_tree, hf_tds_type_varbyte_data_int2, tvb, *offset + 1, 2, TRUE); break; - case 4: proto_tree_add_item(sub_tree, hf_tds_type_varbyte_data_int4, tvb, *offset + 1, 4, TRUE); break; - case 8: proto_tree_add_item(sub_tree, hf_tds_type_varbyte_data_int8, tvb, *offset + 1, 8, TRUE); break; + case 1: proto_tree_add_item(sub_tree, hf_tds_type_varbyte_data_int1, tvb, *offset + 1, 1, ENC_LITTLE_ENDIAN); break; + case 2: proto_tree_add_item(sub_tree, hf_tds_type_varbyte_data_int2, tvb, *offset + 1, 2, ENC_LITTLE_ENDIAN); break; + case 4: proto_tree_add_item(sub_tree, hf_tds_type_varbyte_data_int4, tvb, *offset + 1, 4, ENC_LITTLE_ENDIAN); break; + case 8: proto_tree_add_item(sub_tree, hf_tds_type_varbyte_data_int8, tvb, *offset + 1, 8, ENC_LITTLE_ENDIAN); break; default: expert_add_info_format(pinfo, length_item, PI_MALFORMED, PI_ERROR, "Invalid length"); } *offset += 1 + length; @@ -1963,8 +1963,8 @@ dissect_tds_type_varbyte(tvbuff_t *tvb, guint *offset, packet_info *pinfo, proto length_item = proto_tree_add_uint(sub_tree, hf_tds_type_varbyte_length, tvb, *offset, 1, length); switch(length) { case GEN_NULL: proto_tree_add_item(sub_tree, hf_tds_type_varbyte_data_null, tvb, *offset, 0, ENC_NA); break; - case 4: proto_tree_add_item(sub_tree, hf_tds_type_varbyte_data_float, tvb, *offset + 1, 4, TRUE); break; - case 8: proto_tree_add_item(sub_tree, hf_tds_type_varbyte_data_double, tvb, *offset + 1, 8, TRUE); break; + case 4: proto_tree_add_item(sub_tree, hf_tds_type_varbyte_data_float, tvb, *offset + 1, 4, ENC_LITTLE_ENDIAN); break; + case 8: proto_tree_add_item(sub_tree, hf_tds_type_varbyte_data_double, tvb, *offset + 1, 8, ENC_LITTLE_ENDIAN); break; default: expert_add_info_format(pinfo, length_item, PI_MALFORMED, PI_ERROR, "Invalid length"); } *offset += 1 + length; @@ -2081,7 +2081,7 @@ dissect_tds_rpc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) switch(tds_protocol_type) { case TDS_PROTOCOL_4: len = tvb_get_guint8(tvb, offset); - proto_tree_add_item(tree, hf_tds_rpc_name_length8, tvb, offset, 1, TRUE); + proto_tree_add_item(tree, hf_tds_rpc_name_length8, tvb, offset, 1, ENC_LITTLE_ENDIAN); proto_tree_add_item(tree, hf_tds_rpc_name, tvb, offset + 1, len, TRUE); offset += 1 + len; break; @@ -2092,10 +2092,10 @@ dissect_tds_rpc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case TDS_PROTOCOL_7_3: default: /* unspecified: try as if TDS7 */ len = tvb_get_letohs(tvb, offset); - proto_tree_add_item(tree, hf_tds_rpc_name_length, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_tds_rpc_name_length, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; if (len == 0xFFFF) { - proto_tree_add_item(tree, hf_tds_rpc_proc_id, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_tds_rpc_proc_id, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; } else if (len != 0) { @@ -2105,7 +2105,7 @@ dissect_tds_rpc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } break; } - item = proto_tree_add_item(tree, hf_tds_rpc_options, tvb, offset, 2, TRUE); + item = proto_tree_add_item(tree, hf_tds_rpc_options, tvb, offset, 2, ENC_LITTLE_ENDIAN); sub_tree = proto_item_add_subtree(item, ett_tds_rpc_options); proto_tree_add_item(sub_tree, hf_tds_rpc_options_with_recomp, tvb, offset, 2, TRUE); proto_tree_add_item(sub_tree, hf_tds_rpc_options_no_metadata, tvb, offset, 2, TRUE); @@ -2119,20 +2119,20 @@ dissect_tds_rpc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) len = tvb_get_guint8(tvb, offset); /* check for BatchFlag or NoExecFlag */ if((gint8)len < 0) { - proto_tree_add_item(tree, hf_tds_rpc_separator, tvb, offset, 1, TRUE); + proto_tree_add_item(tree, hf_tds_rpc_separator, tvb, offset, 1, ENC_LITTLE_ENDIAN); ++offset; break; } param_item = proto_tree_add_item(tree, hf_tds_rpc_parameter, tvb, offset, 0, ENC_NA); sub_tree = proto_item_add_subtree(param_item, ett_tds_rpc_parameter); - proto_tree_add_item(sub_tree, hf_tds_rpc_parameter_name_length, tvb, offset, 1, TRUE); + proto_tree_add_item(sub_tree, hf_tds_rpc_parameter_name_length, tvb, offset, 1, ENC_LITTLE_ENDIAN); ++offset; if(len) { val = tvb_get_ephemeral_faked_unicode(tvb, offset, len, TRUE); proto_tree_add_string(sub_tree, hf_tds_rpc_parameter_name, tvb, offset, len * 2, val); offset += len * 2; } - item = proto_tree_add_item(sub_tree, hf_tds_rpc_parameter_status, tvb, offset, 1, TRUE); + item = proto_tree_add_item(sub_tree, hf_tds_rpc_parameter_status, tvb, offset, 1, ENC_LITTLE_ENDIAN); status_sub_tree = proto_item_add_subtree(item, ett_tds_rpc_parameter_status); proto_tree_add_item(status_sub_tree, hf_tds_rpc_parameter_status_by_ref, tvb, offset, 1, TRUE); proto_tree_add_item(status_sub_tree, hf_tds_rpc_parameter_status_default, tvb, offset, 1, TRUE); @@ -2288,18 +2288,18 @@ dissect_netlib_buffer(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* create display subtree for the protocol */ tds_item = proto_tree_add_item(tree, proto_tds, tvb, offset, -1, FALSE); tds_tree = proto_item_add_subtree(tds_item, ett_tds); - proto_tree_add_item(tds_tree, hf_tds_type, tvb, offset, 1, TRUE); - tds_item = proto_tree_add_item(tds_tree, hf_tds_status, tvb, offset + 1, 1, TRUE); + proto_tree_add_item(tds_tree, hf_tds_type, tvb, offset, 1, ENC_LITTLE_ENDIAN); + tds_item = proto_tree_add_item(tds_tree, hf_tds_status, tvb, offset + 1, 1, ENC_LITTLE_ENDIAN); tds_status_tree = proto_item_add_subtree(tds_item, ett_tds_status); proto_tree_add_item(tds_status_tree, hf_tds_status_eom, tvb, offset + 1, 1, FALSE); proto_tree_add_item(tds_status_tree, hf_tds_status_ignore, tvb, offset + 1, 1, FALSE); proto_tree_add_item(tds_status_tree, hf_tds_status_event_notif, tvb, offset + 1, 1, FALSE); proto_tree_add_item(tds_status_tree, hf_tds_status_reset_conn, tvb, offset + 1, 1, FALSE); proto_tree_add_item(tds_status_tree, hf_tds_status_reset_conn_skip_tran,tvb, offset + 1, 1, FALSE); - proto_tree_add_item(tds_tree, hf_tds_length, tvb, offset + 2, 2, FALSE); - proto_tree_add_item(tds_tree, hf_tds_channel, tvb, offset + 4, 2, FALSE); - proto_tree_add_item(tds_tree, hf_tds_packet_number, tvb, offset + 6, 1, TRUE); - proto_tree_add_item(tds_tree, hf_tds_window, tvb, offset + 7, 1, TRUE); + proto_tree_add_item(tds_tree, hf_tds_length, tvb, offset + 2, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(tds_tree, hf_tds_channel, tvb, offset + 4, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(tds_tree, hf_tds_packet_number, tvb, offset + 6, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tds_tree, hf_tds_window, tvb, offset + 7, 1, ENC_LITTLE_ENDIAN); offset += 8; /* skip Netlib header */ /* @@ -2443,7 +2443,7 @@ dissect_tds_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_uint(tds_tree, hf_tds_type, tvb, offset, 1, type); proto_tree_add_item(tds_tree, hf_tds_status, - tvb, offset + 1, 1, FALSE); + tvb, offset + 1, 1, ENC_BIG_ENDIAN); proto_tree_add_uint_format(tds_tree, hf_tds_length, tvb, offset + 2, 2, plen, "Size: %u (bogus, should be >= 8)", plen); diff --git a/epan/dissectors/packet-teamspeak2.c b/epan/dissectors/packet-teamspeak2.c index fc2bb0dee6..fe39f0f52f 100644 --- a/epan/dissectors/packet-teamspeak2.c +++ b/epan/dissectors/packet-teamspeak2.c @@ -387,7 +387,7 @@ static void ts2_standard_dissect(tvbuff_t *tvb, packet_info *pinfo, proto_tree * guint16 type = tvb_get_letohs(tvb, 2); /*guint16 klass = tvb_get_letohs(tvb, 0);*/ - proto_tree_add_item(ts2_tree, hf_ts2_seqnum, tvb, 12, 4, TRUE); + proto_tree_add_item(ts2_tree, hf_ts2_seqnum, tvb, 12, 4, ENC_LITTLE_ENDIAN); /* XXX: Following fragmentation stuff should be separate from the GUI stuff ?? */ /* Get our stored fragmentation data or create one! */ @@ -421,8 +421,8 @@ static void ts2_standard_dissect(tvbuff_t *tvb, packet_info *pinfo, proto_tree * /* Get our stored fragmentation data */ frag = p_get_proto_data(pinfo->fd, proto_ts2); - proto_tree_add_item(ts2_tree, hf_ts2_resend_count, tvb, 16, 2, TRUE); - proto_tree_add_item(ts2_tree, hf_ts2_fragmentnumber, tvb, 18, 2, TRUE); + proto_tree_add_item(ts2_tree, hf_ts2_resend_count, tvb, 16, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item(ts2_tree, hf_ts2_fragmentnumber, tvb, 18, 2, ENC_LITTLE_ENDIAN); ts2_add_checked_crc32(ts2_tree, hf_ts2_crc32, tvb, 20, tvb_get_letohl(tvb, 20)); /* Reassemble the packet if its fragmented */ @@ -503,9 +503,9 @@ static void ts2_parse_newplayerjoined(tvbuff_t *tvb, proto_tree *ts2_tree) { gint32 offset; offset=0; - proto_tree_add_item(ts2_tree, hf_ts2_player_id, tvb, offset, 4, TRUE); + proto_tree_add_item(ts2_tree, hf_ts2_player_id, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset+=4; - proto_tree_add_item(ts2_tree, hf_ts2_channel_id, tvb, offset, 4, TRUE); + proto_tree_add_item(ts2_tree, hf_ts2_channel_id, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset+=4; proto_tree_add_item(ts2_tree, hf_ts2_unknown, tvb, offset, 6, ENC_NA); offset+=6; @@ -526,9 +526,9 @@ static void ts2_parse_knownplayerupdate(tvbuff_t *tvb, proto_tree *ts2_tree) { gint32 offset; offset=0; - proto_tree_add_item(ts2_tree, hf_ts2_player_id, tvb, offset, 4, TRUE); + proto_tree_add_item(ts2_tree, hf_ts2_player_id, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset+=4; - proto_tree_add_item(ts2_tree, hf_ts2_player_status_flags, tvb, offset, 2, TRUE); + proto_tree_add_item(ts2_tree, hf_ts2_player_status_flags, tvb, offset, 2, ENC_LITTLE_ENDIAN); ts2_add_statusflags(tvb, ts2_tree, offset); } @@ -537,7 +537,7 @@ static void ts2_parse_switchchannel(tvbuff_t *tvb, proto_tree *ts2_tree) { gint32 offset; offset=0; - proto_tree_add_item(ts2_tree, hf_ts2_channel_id, tvb, offset, 4, TRUE); + proto_tree_add_item(ts2_tree, hf_ts2_channel_id, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset+=4; proto_tree_add_item(ts2_tree, hf_ts2_password, tvb, offset, 1, TRUE); offset+=30; @@ -548,11 +548,11 @@ static void ts2_parse_channelchange(tvbuff_t *tvb, proto_tree *ts2_tree) { gint32 offset; offset=0; - proto_tree_add_item(ts2_tree, hf_ts2_player_id, tvb, offset, 4, TRUE); + proto_tree_add_item(ts2_tree, hf_ts2_player_id, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset+=4; - proto_tree_add_item(ts2_tree, hf_ts2_channel_id, tvb, offset, 4, TRUE); + proto_tree_add_item(ts2_tree, hf_ts2_channel_id, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset+=4; - proto_tree_add_item(ts2_tree, hf_ts2_channel_id, tvb, offset, 4, TRUE); + proto_tree_add_item(ts2_tree, hf_ts2_channel_id, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset+=4; proto_tree_add_item(ts2_tree, hf_ts2_unknown, tvb, offset, 2, ENC_NA); @@ -563,7 +563,7 @@ static void ts2_parse_changestatus(tvbuff_t *tvb, proto_tree *ts2_tree) { gint32 offset; offset=0; - proto_tree_add_item(ts2_tree, hf_ts2_player_status_flags, tvb, offset, 2, TRUE); + proto_tree_add_item(ts2_tree, hf_ts2_player_status_flags, tvb, offset, 2, ENC_LITTLE_ENDIAN); ts2_add_statusflags(tvb, ts2_tree, offset); } @@ -573,7 +573,7 @@ static void ts2_parse_playerleft(tvbuff_t *tvb, proto_tree *ts2_tree) { gint32 offset; offset=0; - proto_tree_add_item(ts2_tree, hf_ts2_player_id, tvb, offset, 4, TRUE); + proto_tree_add_item(ts2_tree, hf_ts2_player_id, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset+=4; proto_tree_add_item(ts2_tree, hf_ts2_unknown, tvb, offset, 4, ENC_NA); offset+=4; @@ -607,15 +607,15 @@ static void ts2_parse_channellist(tvbuff_t *tvb, proto_tree *ts2_tree) proto_item *item; offset=0; - proto_tree_add_item(ts2_tree, hf_ts2_number_of_channels, tvb, offset, 4, TRUE); + proto_tree_add_item(ts2_tree, hf_ts2_number_of_channels, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset+=4; while(offset<tvb_length_remaining(tvb, 0)) { - proto_tree_add_item(ts2_tree, hf_ts2_channel_id, tvb, offset, 4, TRUE); + proto_tree_add_item(ts2_tree, hf_ts2_channel_id, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset+=4; /* Channel flags */ - item = proto_tree_add_item(ts2_tree, hf_ts2_channel_flags, tvb, offset, 1, TRUE); + item = proto_tree_add_item(ts2_tree, hf_ts2_channel_flags, tvb, offset, 1, ENC_LITTLE_ENDIAN); subtree = proto_item_add_subtree(item, ett_ts2_channel_flags); proto_tree_add_item(subtree, hf_ts2_channel_unregistered, tvb, offset, 1, FALSE); proto_tree_add_item(subtree, hf_ts2_channel_moderated, tvb, offset, 1, FALSE); @@ -626,13 +626,13 @@ static void ts2_parse_channellist(tvbuff_t *tvb, proto_tree *ts2_tree) proto_tree_add_item(ts2_tree, hf_ts2_unknown, tvb, offset, 1, ENC_NA); offset+=1; - proto_tree_add_item(ts2_tree, hf_ts2_codec, tvb, offset, 2, TRUE); + proto_tree_add_item(ts2_tree, hf_ts2_codec, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset+=2; - proto_tree_add_item(ts2_tree, hf_ts2_parent_channel_id, tvb, offset, 4, TRUE); + proto_tree_add_item(ts2_tree, hf_ts2_parent_channel_id, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset+=4; - proto_tree_add_item(ts2_tree, hf_ts2_channel_order, tvb, offset, 2, TRUE); + proto_tree_add_item(ts2_tree, hf_ts2_channel_order, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset+=2; - proto_tree_add_item(ts2_tree, hf_ts2_max_users, tvb, offset, 2, TRUE); + proto_tree_add_item(ts2_tree, hf_ts2_max_users, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset+=2; tvb_get_ephemeral_stringz(tvb, offset, &string_len); proto_tree_add_item(ts2_tree, hf_ts2_channel_name, tvb, offset,string_len , TRUE); @@ -664,18 +664,18 @@ static void ts2_parse_playerlist(tvbuff_t *tvb, proto_tree *ts2_tree) gint32 x; offset=0; x=0; - proto_tree_add_item(ts2_tree, hf_ts2_number_of_players, tvb, offset, 4, TRUE); + proto_tree_add_item(ts2_tree, hf_ts2_number_of_players, tvb, offset, 4, ENC_LITTLE_ENDIAN); number_of_players = tvb_get_letohl(tvb, 0); offset+=4; while(offset<tvb_length_remaining(tvb, 0) && x<number_of_players) { - proto_tree_add_item(ts2_tree, hf_ts2_player_id, tvb, offset, 4, TRUE); + proto_tree_add_item(ts2_tree, hf_ts2_player_id, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset+=4; - proto_tree_add_item(ts2_tree, hf_ts2_channel_id, tvb, offset, 4, TRUE); + proto_tree_add_item(ts2_tree, hf_ts2_channel_id, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset+=4; proto_tree_add_item(ts2_tree, hf_ts2_unknown, tvb, offset, 4, ENC_NA); offset+=4; - proto_tree_add_item(ts2_tree, hf_ts2_player_status_flags, tvb, offset, 2, TRUE); + proto_tree_add_item(ts2_tree, hf_ts2_player_status_flags, tvb, offset, 2, ENC_LITTLE_ENDIAN); ts2_add_statusflags(tvb, ts2_tree, offset); offset+=2; proto_tree_add_item(ts2_tree, hf_ts2_nick, tvb, offset, 1, TRUE); @@ -760,18 +760,18 @@ static void dissect_ts2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ti = proto_tree_add_item(tree, proto_ts2, tvb, 0, -1, TRUE); ts2_tree = proto_item_add_subtree(ti, ett_ts2); - proto_tree_add_item(ts2_tree, hf_ts2_class, tvb, 0, 2, TRUE); + proto_tree_add_item(ts2_tree, hf_ts2_class, tvb, 0, 2, ENC_LITTLE_ENDIAN); if(klass==TS2C_ACK) - proto_tree_add_item(ts2_tree, hf_ts2_resend_count, tvb, 2, 2, TRUE); + proto_tree_add_item(ts2_tree, hf_ts2_resend_count, tvb, 2, 2, ENC_LITTLE_ENDIAN); else - proto_tree_add_item(ts2_tree, hf_ts2_type, tvb, 2, 2, TRUE); + proto_tree_add_item(ts2_tree, hf_ts2_type, tvb, 2, 2, ENC_LITTLE_ENDIAN); - proto_tree_add_item(ts2_tree, hf_ts2_sessionkey, tvb, 4, 4, TRUE); - proto_tree_add_item(ts2_tree, hf_ts2_clientid, tvb, 8, 4, TRUE); + proto_tree_add_item(ts2_tree, hf_ts2_sessionkey, tvb, 4, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(ts2_tree, hf_ts2_clientid, tvb, 8, 4, ENC_LITTLE_ENDIAN); switch(klass) { case TS2C_CONNECTION: - proto_tree_add_item(ts2_tree, hf_ts2_seqnum, tvb, 12, 4, TRUE); + proto_tree_add_item(ts2_tree, hf_ts2_seqnum, tvb, 12, 4, ENC_LITTLE_ENDIAN); ts2_add_checked_crc32(ts2_tree, hf_ts2_crc32, tvb, 16, tvb_get_letohl(tvb, 16)); switch(type) @@ -779,7 +779,7 @@ static void dissect_ts2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case TS2T_PING: break; case TS2T_PINGREPLY: - proto_tree_add_item(ts2_tree, hf_ts2_ackto, tvb, 20, 4, TRUE); + proto_tree_add_item(ts2_tree, hf_ts2_ackto, tvb, 20, 4, ENC_LITTLE_ENDIAN); break; case TS2T_LOGINREQUEST: proto_tree_add_item(ts2_tree, hf_ts2_protocol_string, tvb, 20, 1, TRUE); @@ -800,7 +800,7 @@ static void dissect_ts2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(ts2_tree, hf_ts2_unknown, tvb, 80, 9, ENC_NA); proto_tree_add_item(ts2_tree, hf_ts2_badlogin, tvb, 89, 3, TRUE); proto_tree_add_item(ts2_tree, hf_ts2_unknown, tvb, 92, 80, ENC_NA); - proto_tree_add_item(ts2_tree, hf_ts2_sessionkey, tvb, 172, 4, TRUE); + proto_tree_add_item(ts2_tree, hf_ts2_sessionkey, tvb, 172, 4, ENC_LITTLE_ENDIAN); proto_tree_add_item(ts2_tree, hf_ts2_unknown, tvb, 178, 3, ENC_NA); proto_tree_add_item(ts2_tree, hf_ts2_server_welcome_message, tvb, 180, 1, TRUE); break; @@ -809,7 +809,7 @@ static void dissect_ts2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case TS2C_ACK: /* Ignore the type for ACK, its always zero and clashes with CELP_5_1 */ - proto_tree_add_item(ts2_tree, hf_ts2_seqnum, tvb, 12, 4, TRUE); + proto_tree_add_item(ts2_tree, hf_ts2_seqnum, tvb, 12, 4, ENC_LITTLE_ENDIAN); break; case TS2C_STANDARD: ts2_standard_dissect(tvb, pinfo, ts2_tree, conversation_data); diff --git a/epan/dissectors/packet-teimanagement.c b/epan/dissectors/packet-teimanagement.c index 75347901b7..ed93ad4919 100644 --- a/epan/dissectors/packet-teimanagement.c +++ b/epan/dissectors/packet-teimanagement.c @@ -81,8 +81,8 @@ dissect_teimanagement(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tei_ti = proto_tree_add_item(tree, proto_tei, tvb, 0, 5, FALSE); tei_tree = proto_item_add_subtree(tei_ti, lm_subtree); - proto_tree_add_item(tei_tree, lm_entity_id, tvb, 0, 1, FALSE); - proto_tree_add_item(tei_tree, lm_reference, tvb, 1, 2, FALSE); + proto_tree_add_item(tei_tree, lm_entity_id, tvb, 0, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tei_tree, lm_reference, tvb, 1, 2, ENC_BIG_ENDIAN); } message = tvb_get_guint8(tvb, 3); @@ -91,8 +91,8 @@ dissect_teimanagement(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) val_to_str(message, tei_msg_vals, "Unknown message type (0x%04x)")); if (tree) { proto_tree_add_uint(tei_tree, lm_message, tvb, 3, 1, message); - proto_tree_add_item(tei_tree, lm_action, tvb, 4, 1, FALSE); - proto_tree_add_item(tei_tree, lm_extend, tvb, 4, 1, FALSE); + proto_tree_add_item(tei_tree, lm_action, tvb, 4, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tei_tree, lm_extend, tvb, 4, 1, ENC_BIG_ENDIAN); } } diff --git a/epan/dissectors/packet-teredo.c b/epan/dissectors/packet-teredo.c index f24da70e34..50d5881016 100644 --- a/epan/dissectors/packet-teredo.c +++ b/epan/dissectors/packet-teredo.c @@ -111,9 +111,9 @@ parse_teredo_auth(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, tree = proto_item_add_subtree(ti, ett_teredo_auth); proto_tree_add_item(tree, hf_teredo_auth_idlen, tvb, - offset - 2, 1, FALSE); + offset - 2, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_teredo_auth_aulen, tvb, - offset - 1, 1, FALSE); + offset - 1, 1, ENC_BIG_ENDIAN); /* idlen is usually zero */ if (idlen) { diff --git a/epan/dissectors/packet-tipc.c b/epan/dissectors/packet-tipc.c index 1bf7fade59..6cf468455d 100644 --- a/epan/dissectors/packet-tipc.c +++ b/epan/dissectors/packet-tipc.c @@ -607,36 +607,36 @@ dissect_tipc_name_dist_data(tvbuff_t *tvb, proto_tree *tree, guint8 item_size) if ((handle_v2_as & V2_AS_1_6) || ((handle_v2_as & (V2_AS_ALL) && item_size == 0))) { /* TIPC 1.6 */ while (tvb_reported_length_remaining(tvb, offset) > 0) { - proto_tree_add_item(tree, hf_tipc_name_dist_type, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_tipc_name_dist_type, tvb, offset, 4, ENC_BIG_ENDIAN); offset = offset+4; - proto_tree_add_item(tree, hf_tipc_name_dist_lower, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_tipc_name_dist_lower, tvb, offset, 4, ENC_BIG_ENDIAN); offset = offset+4; - proto_tree_add_item(tree, hf_tipc_name_dist_upper, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_tipc_name_dist_upper, tvb, offset, 4, ENC_BIG_ENDIAN); offset = offset+4; - proto_tree_add_item(tree, hf_tipc_name_dist_port, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_tipc_name_dist_port, tvb, offset, 4, ENC_BIG_ENDIAN); offset = offset+4; - proto_tree_add_item(tree, hf_tipc_name_dist_key, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_tipc_name_dist_key, tvb, offset, 4, ENC_BIG_ENDIAN); offset = offset+4; } } else { /* TIPC 1.7 */ while (tvb_reported_length_remaining(tvb, offset) > 0) { - proto_tree_add_item(tree, hf_tipc_name_dist_type, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_tipc_name_dist_type, tvb, offset, 4, ENC_BIG_ENDIAN); offset = offset+4; - proto_tree_add_item(tree, hf_tipc_name_dist_lower, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_tipc_name_dist_lower, tvb, offset, 4, ENC_BIG_ENDIAN); offset = offset+4; - proto_tree_add_item(tree, hf_tipc_name_dist_upper, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_tipc_name_dist_upper, tvb, offset, 4, ENC_BIG_ENDIAN); offset = offset+4; - proto_tree_add_item(tree, hf_tipc_name_dist_port, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_tipc_name_dist_port, tvb, offset, 4, ENC_BIG_ENDIAN); offset = offset+4; - proto_tree_add_item(tree, hf_tipc_name_dist_key, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_tipc_name_dist_key, tvb, offset, 4, ENC_BIG_ENDIAN); offset = offset+4; dword = tvb_get_ntohl(tvb, offset); addr_str_ptr = tipc_addr_to_str(dword); proto_tree_add_string(tree, hf_tipcv2_name_dist_port_id_node, tvb, offset, 4, addr_str_ptr); offset = offset+4; - proto_tree_add_item(tree, hf_tipcv2_dist_dist, tvb, offset, 4, FALSE); - proto_tree_add_item(tree, hf_tipcv2_dist_scope, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_tipcv2_dist_dist, tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_tipcv2_dist_scope, tvb, offset, 4, ENC_BIG_ENDIAN); offset = offset + 4; if (item_size == 7) continue; /* if item_size is >7, the following fields are ignored @@ -841,14 +841,14 @@ dissect_tipc_v2_internal_msg(tvbuff_t *tipc_tvb, proto_tree *tipc_tree, packet_i switch (user) { case TIPCv2_BCAST_PROTOCOL: /* W1 */ - proto_tree_add_item(tipc_tree, hf_tipcv2_bcast_mtype, tipc_tvb, offset, 4, FALSE); + proto_tree_add_item(tipc_tree, hf_tipcv2_bcast_mtype, tipc_tvb, offset, 4, ENC_BIG_ENDIAN); /* NO bcstsqgap */ /* NO sequence gap */ - proto_tree_add_item(tipc_tree, hf_tipcv2_broadcast_ack_no, tipc_tvb, offset, 4, FALSE); + proto_tree_add_item(tipc_tree, hf_tipcv2_broadcast_ack_no, tipc_tvb, offset, 4, ENC_BIG_ENDIAN); offset = offset + 4; /* W2 */ - proto_tree_add_item(tipc_tree, hf_tipcv2_link_level_ack_no, tipc_tvb, offset, 4, FALSE); - proto_tree_add_item(tipc_tree, hf_tipcv2_link_level_seq_no, tipc_tvb, offset, 4, FALSE); + proto_tree_add_item(tipc_tree, hf_tipcv2_link_level_ack_no, tipc_tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(tipc_tree, hf_tipcv2_link_level_seq_no, tipc_tvb, offset, 4, ENC_BIG_ENDIAN); offset = offset + 4; /* W3 */ dword = tvb_get_ntohl(tipc_tvb, offset); @@ -864,7 +864,7 @@ dissect_tipc_v2_internal_msg(tvbuff_t *tipc_tvb, proto_tree *tipc_tree, packet_i proto_tree_add_text(tipc_tree, tipc_tvb, offset, 4, "word 4 unused for this user"); offset = offset + 4; /* W5 */ - proto_tree_add_item(tipc_tree, hf_tipcv2_network_id, tipc_tvb, offset, 4, FALSE); + proto_tree_add_item(tipc_tree, hf_tipcv2_network_id, tipc_tvb, offset, 4, ENC_BIG_ENDIAN); offset = offset + 4; /* W6 */ dword = tvb_get_ntohl(tipc_tvb, offset); @@ -881,7 +881,7 @@ dissect_tipc_v2_internal_msg(tvbuff_t *tipc_tvb, proto_tree *tipc_tree, packet_i offset = offset + 4; } /* W9 */ - proto_tree_add_item(tipc_tree, hf_tipcv2_bcast_tag, tipc_tvb, offset, 4, FALSE); + proto_tree_add_item(tipc_tree, hf_tipcv2_bcast_tag, tipc_tvb, offset, 4, ENC_BIG_ENDIAN); /* NO link tolerance */ offset = offset + 4; break; @@ -893,12 +893,12 @@ dissect_tipc_v2_internal_msg(tvbuff_t *tipc_tvb, proto_tree *tipc_tree, packet_i offset = offset + 8; } else { /* W1 */ - proto_tree_add_item(tipc_tree, hf_tipcv2_bundler_mtype, tipc_tvb, offset, 4, FALSE); - proto_tree_add_item(tipc_tree, hf_tipcv2_broadcast_ack_no, tipc_tvb, offset, 4, FALSE); + proto_tree_add_item(tipc_tree, hf_tipcv2_bundler_mtype, tipc_tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(tipc_tree, hf_tipcv2_broadcast_ack_no, tipc_tvb, offset, 4, ENC_BIG_ENDIAN); offset = offset + 4; /* W2 */ - proto_tree_add_item(tipc_tree, hf_tipcv2_link_level_ack_no, tipc_tvb, offset, 4, FALSE); - proto_tree_add_item(tipc_tree, hf_tipcv2_link_level_seq_no, tipc_tvb, offset, 4, FALSE); + proto_tree_add_item(tipc_tree, hf_tipcv2_link_level_ack_no, tipc_tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(tipc_tree, hf_tipcv2_link_level_seq_no, tipc_tvb, offset, 4, ENC_BIG_ENDIAN); offset = offset + 4; } /* W3 */ @@ -930,12 +930,12 @@ dissect_tipc_v2_internal_msg(tvbuff_t *tipc_tvb, proto_tree *tipc_tree, packet_i } /* W9 */ /* Message Count: 16 bits. */ - proto_tree_add_item(tipc_tree, hf_tipcv2_msg_count, tipc_tvb, offset, 4, FALSE); + proto_tree_add_item(tipc_tree, hf_tipcv2_msg_count, tipc_tvb, offset, 4, ENC_BIG_ENDIAN); message_count = tvb_get_ntohs(tipc_tvb, offset); /* According to the spec this should not be set here, * while there is data != 0 in this field when capturing * - proto_tree_add_item(tipc_tree, hf_tipcv2_link_tolerance, tipc_tvb, offset, 4, FALSE); + proto_tree_add_item(tipc_tree, hf_tipcv2_link_tolerance, tipc_tvb, offset, 4, ENC_BIG_ENDIAN); */ offset = offset + 4; /* This should give equal results like @@ -964,16 +964,16 @@ dissect_tipc_v2_internal_msg(tvbuff_t *tipc_tvb, proto_tree *tipc_tree, packet_i break; case TIPCv2_LINK_PROTOCOL: /* W1 */ - proto_tree_add_item(tipc_tree, hf_tipcv2_link_mtype, tipc_tvb, offset, 4, FALSE); + proto_tree_add_item(tipc_tree, hf_tipcv2_link_mtype, tipc_tvb, offset, 4, ENC_BIG_ENDIAN); /* Broadcast Sequence Gap: 5 bits. */ - proto_tree_add_item(tipc_tree, hf_tipcv2_bcast_seq_gap, tipc_tvb, offset, 4, FALSE); + proto_tree_add_item(tipc_tree, hf_tipcv2_bcast_seq_gap, tipc_tvb, offset, 4, ENC_BIG_ENDIAN); /* Sequence Gap: 8 bits. */ - proto_tree_add_item(tipc_tree, hf_tipcv2_sequence_gap, tipc_tvb, offset, 4, FALSE); - proto_tree_add_item(tipc_tree, hf_tipcv2_broadcast_ack_no, tipc_tvb, offset, 4, FALSE); + proto_tree_add_item(tipc_tree, hf_tipcv2_sequence_gap, tipc_tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(tipc_tree, hf_tipcv2_broadcast_ack_no, tipc_tvb, offset, 4, ENC_BIG_ENDIAN); offset = offset + 4; /* W2 */ - proto_tree_add_item(tipc_tree, hf_tipcv2_link_level_ack_no, tipc_tvb, offset, 4, FALSE); - proto_tree_add_item(tipc_tree, hf_tipcv2_link_level_seq_no, tipc_tvb, offset, 4, FALSE); + proto_tree_add_item(tipc_tree, hf_tipcv2_link_level_ack_no, tipc_tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(tipc_tree, hf_tipcv2_link_level_seq_no, tipc_tvb, offset, 4, ENC_BIG_ENDIAN); offset = offset + 4; /* W3 */ dword = tvb_get_ntohl(tipc_tvb, offset); @@ -982,26 +982,26 @@ dissect_tipc_v2_internal_msg(tvbuff_t *tipc_tvb, proto_tree *tipc_tree, packet_i offset = offset + 4; /* W4 */ /* Next Sent Broadcast: 16 bits */ - proto_tree_add_item(tipc_tree, hf_tipcv2_next_sent_broadcast, tipc_tvb, offset, 4, FALSE); + proto_tree_add_item(tipc_tree, hf_tipcv2_next_sent_broadcast, tipc_tvb, offset, 4, ENC_BIG_ENDIAN); /* Next Sent Packet: 16 bits. */ - proto_tree_add_item(tipc_tree, hf_tipcv2_next_sent_packet, tipc_tvb, offset, 4, FALSE); + proto_tree_add_item(tipc_tree, hf_tipcv2_next_sent_packet, tipc_tvb, offset, 4, ENC_BIG_ENDIAN); offset = offset + 4; /* W5 */ /* Session Number: 16 bits. */ - proto_tree_add_item(tipc_tree, hf_tipcv2_session_no, tipc_tvb, offset, 4, FALSE); + proto_tree_add_item(tipc_tree, hf_tipcv2_session_no, tipc_tvb, offset, 4, ENC_BIG_ENDIAN); /* Reserved: 3 bits Must be set to zero. */ /* the following two fields appear in this user according to */ /* Jon Maloy on the tipc-discussion mailing list */ /* Redundant Link: 1 bit */ - proto_tree_add_item(tipc_tree, hf_tipcv2_redundant_link, tipc_tvb, offset, 4, FALSE); + proto_tree_add_item(tipc_tree, hf_tipcv2_redundant_link, tipc_tvb, offset, 4, ENC_BIG_ENDIAN); /* Bearer Identity: 3 bits */ - proto_tree_add_item(tipc_tree, hf_tipcv2_bearer_id, tipc_tvb, offset, 4, FALSE); + proto_tree_add_item(tipc_tree, hf_tipcv2_bearer_id, tipc_tvb, offset, 4, ENC_BIG_ENDIAN); /* Link Priority: 5 bits. */ - proto_tree_add_item(tipc_tree, hf_tipcv2_link_prio, tipc_tvb, offset, 4, FALSE); + proto_tree_add_item(tipc_tree, hf_tipcv2_link_prio, tipc_tvb, offset, 4, ENC_BIG_ENDIAN); /* Network Plane: 3 bits. */ - proto_tree_add_item(tipc_tree, hf_tipcv2_network_plane, tipc_tvb, offset, 4, FALSE); + proto_tree_add_item(tipc_tree, hf_tipcv2_network_plane, tipc_tvb, offset, 4, ENC_BIG_ENDIAN); /* Probe: 1 bit. */ - proto_tree_add_item(tipc_tree, hf_tipcv2_probe, tipc_tvb, offset, 4, FALSE); + proto_tree_add_item(tipc_tree, hf_tipcv2_probe, tipc_tvb, offset, 4, ENC_BIG_ENDIAN); offset = offset + 4; if (handle_v2_as & (V2_AS_1_6)) { /* W6-8 */ @@ -1019,13 +1019,13 @@ dissect_tipc_v2_internal_msg(tvbuff_t *tipc_tvb, proto_tree *tipc_tree, packet_i proto_tree_add_string(tipc_tree, hf_tipcv2_dest_node, tipc_tvb, offset, 4, addr_str_ptr); offset = offset + 4; /* W8 */ - proto_tree_add_item(tipc_tree, hf_tipcv2_timestamp, tipc_tvb, offset, 4, FALSE); + proto_tree_add_item(tipc_tree, hf_tipcv2_timestamp, tipc_tvb, offset, 4, ENC_BIG_ENDIAN); offset = offset + 4; } /* W9 */ - proto_tree_add_item(tipc_tree, hf_tipcv2_max_packet, tipc_tvb, offset, 4, FALSE); + proto_tree_add_item(tipc_tree, hf_tipcv2_max_packet, tipc_tvb, offset, 4, ENC_BIG_ENDIAN); /* Link Tolerance: 16 bits */ - proto_tree_add_item(tipc_tree, hf_tipcv2_link_tolerance, tipc_tvb, offset, 4, FALSE); + proto_tree_add_item(tipc_tree, hf_tipcv2_link_tolerance, tipc_tvb, offset, 4, ENC_BIG_ENDIAN); offset = offset + 4; if ((message_type == TIPCv2_RESET_MSG) @@ -1045,25 +1045,25 @@ dissect_tipc_v2_internal_msg(tvbuff_t *tipc_tvb, proto_tree *tipc_tree, packet_i case TIPCv2_CONN_MANAGER: /* CONN_MANAGER uses the 36-byte header format of CONN_MSG payload messages */ /* W1 */ - proto_tree_add_item(tipc_tree, hf_tipcv2_connmgr_mtype, tipc_tvb, offset, 4, FALSE); - proto_tree_add_item(tipc_tree, hf_tipcv2_errorcode, tipc_tvb, offset, 4, FALSE); - proto_tree_add_item(tipc_tree, hf_tipcv2_rer_cnt, tipc_tvb, offset, 4, FALSE); - proto_tree_add_item(tipc_tree, hf_tipcv2_lookup_scope, tipc_tvb, offset, 4, FALSE); + proto_tree_add_item(tipc_tree, hf_tipcv2_connmgr_mtype, tipc_tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(tipc_tree, hf_tipcv2_errorcode, tipc_tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(tipc_tree, hf_tipcv2_rer_cnt, tipc_tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(tipc_tree, hf_tipcv2_lookup_scope, tipc_tvb, offset, 4, ENC_BIG_ENDIAN); /* Options Position: 3 bits */ /* this is not used by this user according to Jon Maloy in tipc-discussion mailing list opt_p = tvb_get_guint8(tipc_tvb, offset+1) & 0x7; - proto_tree_add_item(tipc_tree, hf_tipcv2_opt_p , tipc_tvb, offset, 4, FALSE); + proto_tree_add_item(tipc_tree, hf_tipcv2_opt_p , tipc_tvb, offset, 4, ENC_BIG_ENDIAN); if (opt_p != 0) { hdr_size = hdr_size - (opt_p << 2); } */ - proto_tree_add_item(tipc_tree, hf_tipcv2_broadcast_ack_no , tipc_tvb, offset, 4, FALSE); + proto_tree_add_item(tipc_tree, hf_tipcv2_broadcast_ack_no , tipc_tvb, offset, 4, ENC_BIG_ENDIAN); offset = offset + 4; /* W2 */ - proto_tree_add_item(tipc_tree, hf_tipcv2_link_level_ack_no , tipc_tvb, offset, 4, FALSE); - proto_tree_add_item(tipc_tree, hf_tipcv2_link_level_seq_no , tipc_tvb, offset, 4, FALSE); + proto_tree_add_item(tipc_tree, hf_tipcv2_link_level_ack_no , tipc_tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(tipc_tree, hf_tipcv2_link_level_seq_no , tipc_tvb, offset, 4, ENC_BIG_ENDIAN); offset = offset + 4; /* W3 */ @@ -1073,11 +1073,11 @@ dissect_tipc_v2_internal_msg(tvbuff_t *tipc_tvb, proto_tree *tipc_tree, packet_i offset = offset + 4; /* W4 */ - proto_tree_add_item(tipc_tree, hf_tipc_org_port , tipc_tvb, offset, 4, FALSE); + proto_tree_add_item(tipc_tree, hf_tipc_org_port , tipc_tvb, offset, 4, ENC_BIG_ENDIAN); offset = offset + 4; /* W5 */ - proto_tree_add_item(tipc_tree, hf_tipc_dst_port , tipc_tvb, offset, 4, FALSE); + proto_tree_add_item(tipc_tree, hf_tipc_dst_port , tipc_tvb, offset, 4, ENC_BIG_ENDIAN); offset = offset + 4; /* W6 */ @@ -1094,7 +1094,7 @@ dissect_tipc_v2_internal_msg(tvbuff_t *tipc_tvb, proto_tree *tipc_tree, packet_i /* W8 */ /* according to Allan Stephens this was never verfied by the receiver - proto_tree_add_item(tipc_tree, hf_tipcv2_transport_seq_no, tipc_tvb, offset, 4, FALSE); + proto_tree_add_item(tipc_tree, hf_tipcv2_transport_seq_no, tipc_tvb, offset, 4, ENC_BIG_ENDIAN); */ proto_tree_add_text(tipc_tree, tipc_tvb, offset, 4, "word 8 unused for this user (might be set prior to 1.7.3 but was never verified)"); offset = offset + 4; @@ -1122,15 +1122,15 @@ dissect_tipc_v2_internal_msg(tvbuff_t *tipc_tvb, proto_tree *tipc_tree, packet_i dword = tvb_get_ntohl(tipc_tvb, offset+28); item_size = (dword >> 24) & 0xff; if ((handle_v2_as & V2_AS_1_6) || ((handle_v2_as & V2_AS_ALL) == 0)) { - proto_tree_add_item(tipc_tree, hf_tipcv2_route_mtype_1_6, tipc_tvb, offset, 4, FALSE); + proto_tree_add_item(tipc_tree, hf_tipcv2_route_mtype_1_6, tipc_tvb, offset, 4, ENC_BIG_ENDIAN); } else { - proto_tree_add_item(tipc_tree, hf_tipcv2_route_mtype_1_7, tipc_tvb, offset, 4, FALSE); + proto_tree_add_item(tipc_tree, hf_tipcv2_route_mtype_1_7, tipc_tvb, offset, 4, ENC_BIG_ENDIAN); } - proto_tree_add_item(tipc_tree, hf_tipcv2_broadcast_ack_no, tipc_tvb, offset, 4, FALSE); + proto_tree_add_item(tipc_tree, hf_tipcv2_broadcast_ack_no, tipc_tvb, offset, 4, ENC_BIG_ENDIAN); offset = offset + 4; /* W2 */ - proto_tree_add_item(tipc_tree, hf_tipcv2_link_level_ack_no, tipc_tvb, offset, 4, FALSE); - proto_tree_add_item(tipc_tree, hf_tipcv2_link_level_seq_no, tipc_tvb, offset, 4, FALSE); + proto_tree_add_item(tipc_tree, hf_tipcv2_link_level_ack_no, tipc_tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(tipc_tree, hf_tipcv2_link_level_seq_no, tipc_tvb, offset, 4, ENC_BIG_ENDIAN); offset = offset + 4; /* W3 */ dword = tvb_get_ntohl(tipc_tvb, offset); @@ -1148,7 +1148,7 @@ dissect_tipc_v2_internal_msg(tvbuff_t *tipc_tvb, proto_tree *tipc_tree, packet_i proto_tree_add_text(tipc_tree, tipc_tvb, offset, 4, "word 4 unused for this user"); offset = offset + 4; /* W5 */ - proto_tree_add_item(tipc_tree, hf_tipc_dst_port, tipc_tvb, offset, 4, FALSE); + proto_tree_add_item(tipc_tree, hf_tipc_dst_port, tipc_tvb, offset, 4, ENC_BIG_ENDIAN); offset = offset + 4; /* W6 */ dword = tvb_get_ntohl(tipc_tvb, offset); @@ -1166,7 +1166,7 @@ dissect_tipc_v2_internal_msg(tvbuff_t *tipc_tvb, proto_tree *tipc_tree, packet_i /* W9 */ dword = tvb_get_ntohl(tipc_tvb, offset); item_size = (dword >> 24) & 0xff; - proto_tree_add_item(tipc_tree, hf_tipcv2_item_size, tipc_tvb, offset, 4, FALSE); + proto_tree_add_item(tipc_tree, hf_tipcv2_item_size, tipc_tvb, offset, 4, ENC_BIG_ENDIAN); offset = offset + 4; } @@ -1209,20 +1209,20 @@ dissect_tipc_v2_internal_msg(tvbuff_t *tipc_tvb, proto_tree *tipc_tree, packet_i addr_str_ptr = tipc_addr_to_str(dword); proto_tree_add_string(tipc_tree, hf_tipcv2_remote_router, tipc_tvb, offset, 4, addr_str_ptr); offset += 4; - proto_tree_add_item(tipc_tree, hf_tipcv2_dist_dist, tipc_tvb, offset, 4, FALSE); - proto_tree_add_item(tipc_tree, hf_tipcv2_dist_scope, tipc_tvb, offset, 4, FALSE); + proto_tree_add_item(tipc_tree, hf_tipcv2_dist_dist, tipc_tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(tipc_tree, hf_tipcv2_dist_scope, tipc_tvb, offset, 4, ENC_BIG_ENDIAN); offset = offset + 4; } break; case TIPCv2_CHANGEOVER_PROTOCOL: /* W1 */ - proto_tree_add_item(tipc_tree, hf_tipcv2_changeover_mtype, tipc_tvb, offset, 4, FALSE); - proto_tree_add_item(tipc_tree, hf_tipcv2_broadcast_ack_no, tipc_tvb, offset, 4, FALSE); + proto_tree_add_item(tipc_tree, hf_tipcv2_changeover_mtype, tipc_tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(tipc_tree, hf_tipcv2_broadcast_ack_no, tipc_tvb, offset, 4, ENC_BIG_ENDIAN); offset = offset + 4; /* W2 */ - proto_tree_add_item(tipc_tree, hf_tipcv2_link_level_ack_no, tipc_tvb, offset, 4, FALSE); - proto_tree_add_item(tipc_tree, hf_tipcv2_link_level_seq_no, tipc_tvb, offset, 4, FALSE); + proto_tree_add_item(tipc_tree, hf_tipcv2_link_level_ack_no, tipc_tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(tipc_tree, hf_tipcv2_link_level_seq_no, tipc_tvb, offset, 4, ENC_BIG_ENDIAN); offset = offset + 4; /* W3 */ dword = tvb_get_ntohl(tipc_tvb, offset); @@ -1237,10 +1237,10 @@ dissect_tipc_v2_internal_msg(tvbuff_t *tipc_tvb, proto_tree *tipc_tree, packet_i /* Jon Maloy on the tipc-discussion mailing list */ /* Redundant Link: 1 bit */ if (handle_v2_as & (V2_AS_1_6)) { - proto_tree_add_item(tipc_tree, hf_tipcv2_redundant_link, tipc_tvb, offset, 4, FALSE); + proto_tree_add_item(tipc_tree, hf_tipcv2_redundant_link, tipc_tvb, offset, 4, ENC_BIG_ENDIAN); } /* Bearer Identity: 3 bits */ - proto_tree_add_item(tipc_tree, hf_tipcv2_bearer_id, tipc_tvb, offset, 4, FALSE); + proto_tree_add_item(tipc_tree, hf_tipcv2_bearer_id, tipc_tvb, offset, 4, ENC_BIG_ENDIAN); offset = offset + 4; /* W6-W8 */ if (handle_v2_as & (V2_AS_1_6)) { @@ -1272,7 +1272,7 @@ dissect_tipc_v2_internal_msg(tvbuff_t *tipc_tvb, proto_tree *tipc_tree, packet_i case 1: /* ORIGINAL_MSG */ /* Message Count: 16 bits. */ - proto_tree_add_item(tipc_tree, hf_tipcv2_msg_count, tipc_tvb, offset, 4, FALSE); + proto_tree_add_item(tipc_tree, hf_tipcv2_msg_count, tipc_tvb, offset, 4, ENC_BIG_ENDIAN); break; default: break; @@ -1281,12 +1281,12 @@ dissect_tipc_v2_internal_msg(tvbuff_t *tipc_tvb, proto_tree *tipc_tree, packet_i break; case TIPCv2_NAME_DISTRIBUTOR: /* W1 */ - proto_tree_add_item(tipc_tree, hf_tipcv2_naming_mtype, tipc_tvb, offset, 4, FALSE); - proto_tree_add_item(tipc_tree, hf_tipcv2_broadcast_ack_no, tipc_tvb, offset, 4, FALSE); + proto_tree_add_item(tipc_tree, hf_tipcv2_naming_mtype, tipc_tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(tipc_tree, hf_tipcv2_broadcast_ack_no, tipc_tvb, offset, 4, ENC_BIG_ENDIAN); offset = offset + 4; /* W2 */ - proto_tree_add_item(tipc_tree, hf_tipcv2_link_level_ack_no, tipc_tvb, offset, 4, FALSE); - proto_tree_add_item(tipc_tree, hf_tipcv2_link_level_seq_no, tipc_tvb, offset, 4, FALSE); + proto_tree_add_item(tipc_tree, hf_tipcv2_link_level_ack_no, tipc_tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(tipc_tree, hf_tipcv2_link_level_seq_no, tipc_tvb, offset, 4, ENC_BIG_ENDIAN); offset = offset + 4; /* W3 */ dword = tvb_get_ntohl(tipc_tvb, offset); @@ -1311,7 +1311,7 @@ dissect_tipc_v2_internal_msg(tvbuff_t *tipc_tvb, proto_tree *tipc_tree, packet_i if (handle_v2_as & (V2_AS_1_6 + V2_AS_ALL)) { /* W8 */ /* Transport Level Sequence Number: 32 bits */ - proto_tree_add_item(tipc_tree, hf_tipcv2_transport_seq_no, tipc_tvb, offset, 4, FALSE); + proto_tree_add_item(tipc_tree, hf_tipcv2_transport_seq_no, tipc_tvb, offset, 4, ENC_BIG_ENDIAN); offset = offset + 4; } else { proto_tree_add_text(tipc_tree, tipc_tvb, offset, 4, "word 8 unused for this user"); @@ -1324,7 +1324,7 @@ dissect_tipc_v2_internal_msg(tvbuff_t *tipc_tvb, proto_tree *tipc_tree, packet_i } else { dword = tvb_get_ntohl(tipc_tvb, offset); item_size = (dword >> 24) & 0xff; - proto_tree_add_item(tipc_tree, hf_tipcv2_item_size, tipc_tvb, offset, 4, FALSE); + proto_tree_add_item(tipc_tree, hf_tipcv2_item_size, tipc_tvb, offset, 4, ENC_BIG_ENDIAN); offset = offset + 4; } /* W10 */ @@ -1334,12 +1334,12 @@ dissect_tipc_v2_internal_msg(tvbuff_t *tipc_tvb, proto_tree *tipc_tree, packet_i break; case TIPCv2_MSG_FRAGMENTER: /* W1 */ - proto_tree_add_item(tipc_tree, hf_tipcv2_fragmenter_mtype, tipc_tvb, offset, 4, FALSE); - proto_tree_add_item(tipc_tree, hf_tipcv2_broadcast_ack_no, tipc_tvb, offset, 4, FALSE); + proto_tree_add_item(tipc_tree, hf_tipcv2_fragmenter_mtype, tipc_tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(tipc_tree, hf_tipcv2_broadcast_ack_no, tipc_tvb, offset, 4, ENC_BIG_ENDIAN); offset = offset + 4; /* W2 */ - proto_tree_add_item(tipc_tree, hf_tipcv2_link_level_ack_no, tipc_tvb, offset, 4, FALSE); - proto_tree_add_item(tipc_tree, hf_tipcv2_link_level_seq_no, tipc_tvb, offset, 4, FALSE); + proto_tree_add_item(tipc_tree, hf_tipcv2_link_level_ack_no, tipc_tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(tipc_tree, hf_tipcv2_link_level_seq_no, tipc_tvb, offset, 4, ENC_BIG_ENDIAN); offset = offset + 4; /* W3 */ dword = tvb_get_ntohl(tipc_tvb, offset); @@ -1349,10 +1349,10 @@ dissect_tipc_v2_internal_msg(tvbuff_t *tipc_tvb, proto_tree *tipc_tree, packet_i /* W4 */ dword = tvb_get_ntohl(tipc_tvb, offset); /* Fragment Number: 16 Bits. */ - proto_tree_add_item(tipc_tree, hf_tipcv2_fragment_number, tipc_tvb, offset, 4, FALSE); + proto_tree_add_item(tipc_tree, hf_tipcv2_fragment_number, tipc_tvb, offset, 4, ENC_BIG_ENDIAN); frag_no = (dword >> 16) & 0x0000ffff; /* Fragment msg Number: 16 bits */ - proto_tree_add_item(tipc_tree, hf_tipcv2_fragment_msg_number, tipc_tvb, offset, 4, FALSE); + proto_tree_add_item(tipc_tree, hf_tipcv2_fragment_msg_number, tipc_tvb, offset, 4, ENC_BIG_ENDIAN); frag_msg_no = dword & 0x0000ffff; offset = offset + 4; if (handle_v2_as & (V2_AS_1_6)) { @@ -1462,10 +1462,10 @@ w9:| | +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ */ /* W1 */ - proto_tree_add_item(tipc_tree, hf_tipcv2_neighbour_mtype, tipc_tvb, offset, 4, FALSE); + proto_tree_add_item(tipc_tree, hf_tipcv2_neighbour_mtype, tipc_tvb, offset, 4, ENC_BIG_ENDIAN); /* Requested Links (12 bits) */ - proto_tree_add_item(tipc_tree, hf_tipcv2_req_links, tipc_tvb, offset, 4, FALSE); - proto_tree_add_item(tipc_tree, hf_tipcv2_broadcast_ack_no, tipc_tvb, offset, 4, FALSE); + proto_tree_add_item(tipc_tree, hf_tipcv2_req_links, tipc_tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(tipc_tree, hf_tipcv2_broadcast_ack_no, tipc_tvb, offset, 4, ENC_BIG_ENDIAN); offset = offset + 4; /* W2 */ /* Destination Domain */ @@ -1480,7 +1480,7 @@ w9:| | offset = offset + 4; /* W4 */ /* Network Identity: */ - proto_tree_add_item(tipc_tree, hf_tipcv2_network_id, tipc_tvb, offset, 4, FALSE); + proto_tree_add_item(tipc_tree, hf_tipcv2_network_id, tipc_tvb, offset, 4, ENC_BIG_ENDIAN); offset = offset + 4; if (handle_v2_as & (V2_AS_1_6)) { /* W5 - W9 Bearer Level Originating Address: */ @@ -1488,7 +1488,7 @@ w9:| | offset = offset + 20; } else { /* W5 */ - proto_tree_add_item(tipc_tree, hf_tipcv2_media_id, tipc_tvb, offset, 4, FALSE); + proto_tree_add_item(tipc_tree, hf_tipcv2_media_id, tipc_tvb, offset, 4, ENC_BIG_ENDIAN); offset = offset + 4; /* W6 - W9 Bearer Level Originating Address: */ proto_tree_add_item(tipc_tree, hf_tipcv2_bearer_level_orig_addr, tipc_tvb, offset, 16, ENC_NA); @@ -1626,24 +1626,24 @@ dissect_tipc_v2(tvbuff_t *tipc_tvb, proto_tree *tipc_tree, packet_info *pinfo, i /* Word 0 */ /* Version: 3 bits */ - proto_tree_add_item(tipc_tree, hf_tipc_ver, tipc_tvb, offset, 4, FALSE); + proto_tree_add_item(tipc_tree, hf_tipc_ver, tipc_tvb, offset, 4, ENC_BIG_ENDIAN); /* User: 4 bits */ - proto_tree_add_item(tipc_tree, hf_tipcv2_usr, tipc_tvb, offset, 4, FALSE); + proto_tree_add_item(tipc_tree, hf_tipcv2_usr, tipc_tvb, offset, 4, ENC_BIG_ENDIAN); /* Header Size: 4 bits */ - item = proto_tree_add_item(tipc_tree, hf_tipc_hdr_size, tipc_tvb, offset, 4, FALSE); + item = proto_tree_add_item(tipc_tree, hf_tipc_hdr_size, tipc_tvb, offset, 4, ENC_BIG_ENDIAN); proto_item_append_text(item, " = %u bytes", (hdr_size * 4)); /* Non-sequenced: 1 bit */ - proto_tree_add_item(tipc_tree, hf_tipc_nonsequenced, tipc_tvb, offset, 4, FALSE); + proto_tree_add_item(tipc_tree, hf_tipc_nonsequenced, tipc_tvb, offset, 4, ENC_BIG_ENDIAN); if (datatype_hdr) { /* Destination Droppable: 1 bit */ - proto_tree_add_item(tipc_tree, hf_tipc_destdrop, tipc_tvb, offset, 4, FALSE); + proto_tree_add_item(tipc_tree, hf_tipc_destdrop, tipc_tvb, offset, 4, ENC_BIG_ENDIAN); /* Source Droppable: 1 bit */ - proto_tree_add_item(tipc_tree, hf_tipcv2_srcdrop, tipc_tvb, offset, 4, FALSE); + proto_tree_add_item(tipc_tree, hf_tipcv2_srcdrop, tipc_tvb, offset, 4, ENC_BIG_ENDIAN); } /* Reserved: 1 bits */ /* Message Size: 17 bits */ - proto_tree_add_item(tipc_tree, hf_tipc_msg_size, tipc_tvb, offset, 4, FALSE); + proto_tree_add_item(tipc_tree, hf_tipc_msg_size, tipc_tvb, offset, 4, ENC_BIG_ENDIAN); offset = offset + 4; if (!datatype_hdr) { @@ -1653,32 +1653,32 @@ dissect_tipc_v2(tvbuff_t *tipc_tvb, proto_tree *tipc_tree, packet_info *pinfo, i /* Word 1 */ /* Message Type: 3 bits */ - proto_tree_add_item(tipc_tree, hf_tipcv2_data_msg_type, tipc_tvb, offset, 4, FALSE); + proto_tree_add_item(tipc_tree, hf_tipcv2_data_msg_type, tipc_tvb, offset, 4, ENC_BIG_ENDIAN); /* Error Code: 4 bits */ - proto_tree_add_item(tipc_tree, hf_tipcv2_errorcode, tipc_tvb, offset, 4, FALSE); + proto_tree_add_item(tipc_tree, hf_tipcv2_errorcode, tipc_tvb, offset, 4, ENC_BIG_ENDIAN); /* Reroute Counter: 4 bits */ - proto_tree_add_item(tipc_tree, hf_tipcv2_rer_cnt, tipc_tvb, offset, 4, FALSE); + proto_tree_add_item(tipc_tree, hf_tipcv2_rer_cnt, tipc_tvb, offset, 4, ENC_BIG_ENDIAN); /* Lookup Scope: 2 bits */ - proto_tree_add_item(tipc_tree, hf_tipcv2_lookup_scope, tipc_tvb, offset, 4, FALSE); + proto_tree_add_item(tipc_tree, hf_tipcv2_lookup_scope, tipc_tvb, offset, 4, ENC_BIG_ENDIAN); /* Options Position: 3 bits */ if (handle_v2_as & (V2_AS_ALL + V2_AS_1_6)) { opt_p = tvb_get_guint8(tipc_tvb, offset+1) & 0x7; - proto_tree_add_item(tipc_tree, hf_tipcv2_opt_p, tipc_tvb, offset, 4, FALSE); + proto_tree_add_item(tipc_tree, hf_tipcv2_opt_p, tipc_tvb, offset, 4, ENC_BIG_ENDIAN); if (opt_p != 0) { hdr_size = hdr_size - (opt_p << 2); } } /* Broadcast Acknowledge Number: 16 bits */ - proto_tree_add_item(tipc_tree, hf_tipcv2_broadcast_ack_no, tipc_tvb, offset, 4, FALSE); + proto_tree_add_item(tipc_tree, hf_tipcv2_broadcast_ack_no, tipc_tvb, offset, 4, ENC_BIG_ENDIAN); offset = offset + 4; /* W2 */ /* Link Level Acknowledge Number: 16 bits */ - proto_tree_add_item(tipc_tree, hf_tipcv2_link_level_ack_no, tipc_tvb, offset, 4, FALSE); + proto_tree_add_item(tipc_tree, hf_tipcv2_link_level_ack_no, tipc_tvb, offset, 4, ENC_BIG_ENDIAN); /* broadcast/link level seq no */ - proto_tree_add_item(tipc_tree, hf_tipcv2_link_level_seq_no, tipc_tvb, offset, 4, FALSE); + proto_tree_add_item(tipc_tree, hf_tipcv2_link_level_seq_no, tipc_tvb, offset, 4, ENC_BIG_ENDIAN); offset = offset + 4; /* W3 previous node */ dword = tvb_get_ntohl(tipc_tvb, offset); @@ -1687,11 +1687,11 @@ dissect_tipc_v2(tvbuff_t *tipc_tvb, proto_tree *tipc_tree, packet_info *pinfo, i offset = offset + 4; /* W4 Originating Port: 32 bits */ - proto_tree_add_item(tipc_tree, hf_tipc_org_port, tipc_tvb, offset, 4, FALSE); + proto_tree_add_item(tipc_tree, hf_tipc_org_port, tipc_tvb, offset, 4, ENC_BIG_ENDIAN); offset = offset + 4; /* W5 Destination Port: 32 bits */ - proto_tree_add_item(tipc_tree, hf_tipc_dst_port, tipc_tvb, offset, 4, FALSE); + proto_tree_add_item(tipc_tree, hf_tipc_dst_port, tipc_tvb, offset, 4, ENC_BIG_ENDIAN); offset = offset + 4; if (hdr_size > 6) { @@ -1709,7 +1709,7 @@ dissect_tipc_v2(tvbuff_t *tipc_tvb, proto_tree *tipc_tree, packet_info *pinfo, i /* W8 name type / transport sequence number */ /* Transport Level Sequence Number: 32 bits */ /* Port Name Type: 32 bits */ - proto_tree_add_item(tipc_tree, hf_tipcv2_port_name_type, tipc_tvb, offset, 4, FALSE); + proto_tree_add_item(tipc_tree, hf_tipcv2_port_name_type, tipc_tvb, offset, 4, ENC_BIG_ENDIAN); name_type = tvb_get_ntohl(tipc_tvb, offset); name_type_p = &name_type; offset = offset + 4; @@ -1719,17 +1719,17 @@ dissect_tipc_v2(tvbuff_t *tipc_tvb, proto_tree *tipc_tree, packet_info *pinfo, i if (hdr_size < 11) /* no multicast */ /* Port Name Instance: 32 bits */ - proto_tree_add_item(tipc_tree, hf_tipcv2_port_name_instance, tipc_tvb, offset, 4, FALSE); + proto_tree_add_item(tipc_tree, hf_tipcv2_port_name_instance, tipc_tvb, offset, 4, ENC_BIG_ENDIAN); else /* multicast */ /* Port Name Sequence Lower: 32 bits */ - proto_tree_add_item(tipc_tree, hf_tipcv2_multicast_lower, tipc_tvb, offset, 4, FALSE); + proto_tree_add_item(tipc_tree, hf_tipcv2_multicast_lower, tipc_tvb, offset, 4, ENC_BIG_ENDIAN); offset = offset + 4; if (hdr_size > 10) { /* W10 multicast upper bound */ /* Port Name Sequence Upper: 32 bits */ - proto_tree_add_item(tipc_tree, hf_tipcv2_multicast_upper, tipc_tvb, offset, 4, FALSE); + proto_tree_add_item(tipc_tree, hf_tipcv2_multicast_upper, tipc_tvb, offset, 4, ENC_BIG_ENDIAN); offset = offset + 4; } } @@ -1821,70 +1821,70 @@ dissect_tipc_int_prot_msg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tipc_tr /* W3 */ dword = tvb_get_ntohl(tvb, offset); link_sel = dword & 0x7; - proto_tree_add_item(tipc_tree, hf_tipc_unused2, tvb, offset, 4, FALSE); + proto_tree_add_item(tipc_tree, hf_tipc_unused2, tvb, offset, 4, ENC_BIG_ENDIAN); /* Importance */ if (user == TIPC_SEGMENTATION_MANAGER) - proto_tree_add_item(tipc_tree, hf_tipc_importance, tvb, offset, 4, FALSE); + proto_tree_add_item(tipc_tree, hf_tipc_importance, tvb, offset, 4, ENC_BIG_ENDIAN); /* Link selector */ if (user == TIPC_SEGMENTATION_MANAGER || user == TIPC_NAME_DISTRIBUTOR || user == TIPC_CHANGEOVER_PROTOCOL) - proto_tree_add_item(tipc_tree, hf_tipc_link_selector, tvb, offset, 4, FALSE); + proto_tree_add_item(tipc_tree, hf_tipc_link_selector, tvb, offset, 4, ENC_BIG_ENDIAN); /* Message count */ if (user == TIPC_MSG_BUNDLER || user == TIPC_CHANGEOVER_PROTOCOL) { - proto_tree_add_item(tipc_tree, hf_tipc_msg_cnt, tvb, offset, 4, FALSE); + proto_tree_add_item(tipc_tree, hf_tipc_msg_cnt, tvb, offset, 4, ENC_BIG_ENDIAN); } /* Unused */ /* Probe */ if (user == TIPC_LINK_PROTOCOL) - proto_tree_add_item(tipc_tree, hf_tipc_probe, tvb, offset, 4, FALSE); + proto_tree_add_item(tipc_tree, hf_tipc_probe, tvb, offset, 4, ENC_BIG_ENDIAN); /* Bearer identity */ if (user == TIPC_LINK_PROTOCOL || user == TIPC_CHANGEOVER_PROTOCOL) - proto_tree_add_item(tipc_tree, hf_tipc_bearer_id, tvb, offset, 4, FALSE); + proto_tree_add_item(tipc_tree, hf_tipc_bearer_id, tvb, offset, 4, ENC_BIG_ENDIAN); /* Link selector */ if (user == TIPC_SEGMENTATION_MANAGER || user == TIPC_NAME_DISTRIBUTOR || user == TIPC_CHANGEOVER_PROTOCOL) - proto_tree_add_item(tipc_tree, hf_tipc_link_selector2, tvb, offset, 4, FALSE); + proto_tree_add_item(tipc_tree, hf_tipc_link_selector2, tvb, offset, 4, ENC_BIG_ENDIAN); offset = offset + 4; /* W4 */ /* Remote address */ if (user == TIPC_ROUTING_MANAGER) - proto_tree_add_item(tipc_tree, hf_tipc_remote_addr, tvb, offset, 4, FALSE); + proto_tree_add_item(tipc_tree, hf_tipc_remote_addr, tvb, offset, 4, ENC_BIG_ENDIAN); offset = offset + 4; /* W5 */ /* Message type */ switch (user) { case TIPC_ROUTING_MANAGER: - proto_tree_add_item(tipc_tree, hf_tipc_rm_msg_type, tvb, offset, 4, FALSE); + proto_tree_add_item(tipc_tree, hf_tipc_rm_msg_type, tvb, offset, 4, ENC_BIG_ENDIAN); break; case TIPC_NAME_DISTRIBUTOR: - proto_tree_add_item(tipc_tree, hf_tipc_nd_msg_type, tvb, offset, 4, FALSE); + proto_tree_add_item(tipc_tree, hf_tipc_nd_msg_type, tvb, offset, 4, ENC_BIG_ENDIAN); break; case TIPC_CONNECTION_MANAGER: break; case TIPC_LINK_PROTOCOL: - proto_tree_add_item(tipc_tree, hf_tipc_lp_msg_type, tvb, offset, 4, FALSE); + proto_tree_add_item(tipc_tree, hf_tipc_lp_msg_type, tvb, offset, 4, ENC_BIG_ENDIAN); break; case TIPC_CHANGEOVER_PROTOCOL: - proto_tree_add_item(tipc_tree, hf_tipc_cng_prot_msg_type, tvb, offset, 4, FALSE); + proto_tree_add_item(tipc_tree, hf_tipc_cng_prot_msg_type, tvb, offset, 4, ENC_BIG_ENDIAN); break; case TIPC_SEGMENTATION_MANAGER: - proto_tree_add_item(tipc_tree, hf_tipc_sm_msg_type, tvb, offset, 4, FALSE); + proto_tree_add_item(tipc_tree, hf_tipc_sm_msg_type, tvb, offset, 4, ENC_BIG_ENDIAN); break; default: - proto_tree_add_item(tipc_tree, hf_tipc_unknown_msg_type, tvb, offset, 4, FALSE); + proto_tree_add_item(tipc_tree, hf_tipc_unknown_msg_type, tvb, offset, 4, ENC_BIG_ENDIAN); break; } /* Sequence gap */ if (user == TIPC_LINK_PROTOCOL && msg_type == TIPC_LINK_PROTOCO_STATE_MSG) - proto_tree_add_item(tipc_tree, hf_tipc_seq_gap, tvb, offset, 4, FALSE); + proto_tree_add_item(tipc_tree, hf_tipc_seq_gap, tvb, offset, 4, ENC_BIG_ENDIAN); /* Next sent packet */ - proto_tree_add_item(tipc_tree, hf_tipc_nxt_snt_pkg, tvb, offset, 4, FALSE); + proto_tree_add_item(tipc_tree, hf_tipc_nxt_snt_pkg, tvb, offset, 4, ENC_BIG_ENDIAN); offset = offset + 4; /* W6 */ /* Unused */ - proto_tree_add_item(tipc_tree, hf_tipc_unused3, tvb, offset, 4, FALSE); + proto_tree_add_item(tipc_tree, hf_tipc_unused3, tvb, offset, 4, ENC_BIG_ENDIAN); offset = offset + 4; /* W7 */ if (msg_size == 28) /* No data */ @@ -2136,23 +2136,23 @@ dissect_tipc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Word 0-2 common for all messages */ /* Word 0 */ - proto_tree_add_item(tipc_tree, hf_tipc_ver, tipc_tvb, offset, 4, FALSE); - proto_tree_add_item(tipc_tree, hf_tipc_usr, tipc_tvb, offset, 4, FALSE); - item = proto_tree_add_item(tipc_tree, hf_tipc_hdr_size, tipc_tvb, offset, 4, FALSE); + proto_tree_add_item(tipc_tree, hf_tipc_ver, tipc_tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(tipc_tree, hf_tipc_usr, tipc_tvb, offset, 4, ENC_BIG_ENDIAN); + item = proto_tree_add_item(tipc_tree, hf_tipc_hdr_size, tipc_tvb, offset, 4, ENC_BIG_ENDIAN); proto_item_append_text(item, " = %u bytes", (hdr_size * 4)); - proto_tree_add_item(tipc_tree, hf_tipc_nonsequenced, tipc_tvb, offset, 4, FALSE); - proto_tree_add_item(tipc_tree, hf_tipc_unused, tipc_tvb, offset, 4, FALSE); + proto_tree_add_item(tipc_tree, hf_tipc_nonsequenced, tipc_tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(tipc_tree, hf_tipc_unused, tipc_tvb, offset, 4, ENC_BIG_ENDIAN); if (datatype_hdr) { - proto_tree_add_item(tipc_tree, hf_tipc_destdrop, tipc_tvb, offset, 4, FALSE); - proto_tree_add_item(tipc_tree, hf_tipcv2_srcdrop, tipc_tvb, offset, 4, FALSE); + proto_tree_add_item(tipc_tree, hf_tipc_destdrop, tipc_tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(tipc_tree, hf_tipcv2_srcdrop, tipc_tvb, offset, 4, ENC_BIG_ENDIAN); } - proto_tree_add_item(tipc_tree, hf_tipc_msg_size, tipc_tvb, offset, 4, FALSE); + proto_tree_add_item(tipc_tree, hf_tipc_msg_size, tipc_tvb, offset, 4, ENC_BIG_ENDIAN); offset = offset + 4; /* Word 1 */ - proto_tree_add_item(tipc_tree, hf_tipc_ack_link_lev_seq, tipc_tvb, offset, 4, FALSE); - proto_tree_add_item(tipc_tree, hf_tipc_link_lev_seq, tipc_tvb, offset, 4, FALSE); + proto_tree_add_item(tipc_tree, hf_tipc_ack_link_lev_seq, tipc_tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(tipc_tree, hf_tipc_link_lev_seq, tipc_tvb, offset, 4, ENC_BIG_ENDIAN); offset = offset + 4; /* Word 2 */ @@ -2176,12 +2176,12 @@ dissect_tipc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) dword = tvb_get_ntohl(tipc_tvb, offset); pinfo->ptype = PT_TIPC; pinfo->srcport = dword; - proto_tree_add_item(tipc_tree, hf_tipc_org_port, tipc_tvb, offset, 4, FALSE); + proto_tree_add_item(tipc_tree, hf_tipc_org_port, tipc_tvb, offset, 4, ENC_BIG_ENDIAN); offset = offset + 4; if (user != TIPC_NAME_DISTRIBUTOR) { dword = tvb_get_ntohl(tipc_tvb, offset); pinfo->destport = dword; - proto_tree_add_item(tipc_tree, hf_tipc_dst_port, tipc_tvb, offset, 4, FALSE); + proto_tree_add_item(tipc_tree, hf_tipc_dst_port, tipc_tvb, offset, 4, ENC_BIG_ENDIAN); } offset = offset + 4; /* 20 - 24 Bytes @@ -2203,18 +2203,18 @@ dissect_tipc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } else { switch (user) { case TIPC_NAME_DISTRIBUTOR: - proto_tree_add_item(tipc_tree, hf_tipc_nd_msg_type, tipc_tvb, offset, 4, FALSE); + proto_tree_add_item(tipc_tree, hf_tipc_nd_msg_type, tipc_tvb, offset, 4, ENC_BIG_ENDIAN); break; case TIPC_CONNECTION_MANAGER: - proto_tree_add_item(tipc_tree, hf_tipc_cm_msg_type, tipc_tvb, offset, 4, FALSE); + proto_tree_add_item(tipc_tree, hf_tipc_cm_msg_type, tipc_tvb, offset, 4, ENC_BIG_ENDIAN); break; default: - proto_tree_add_item(tipc_tree, hf_tipc_data_msg_type, tipc_tvb, offset, 4, FALSE); + proto_tree_add_item(tipc_tree, hf_tipc_data_msg_type, tipc_tvb, offset, 4, ENC_BIG_ENDIAN); break; } - proto_tree_add_item(tipc_tree, hf_tipc_err_code, tipc_tvb, offset, 4, FALSE); - proto_tree_add_item(tipc_tree, hf_tipc_reroute_cnt, tipc_tvb, offset, 4, FALSE); - proto_tree_add_item(tipc_tree, hf_tipc_act_id, tipc_tvb, offset, 4, FALSE); + proto_tree_add_item(tipc_tree, hf_tipc_err_code, tipc_tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(tipc_tree, hf_tipc_reroute_cnt, tipc_tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(tipc_tree, hf_tipc_act_id, tipc_tvb, offset, 4, ENC_BIG_ENDIAN); offset = offset + 4; dword = tvb_get_ntohl(tipc_tvb, offset); diff --git a/epan/dissectors/packet-tnef.c b/epan/dissectors/packet-tnef.c index ac0436381c..0f49fb9626 100644 --- a/epan/dissectors/packet-tnef.c +++ b/epan/dissectors/packet-tnef.c @@ -250,7 +250,7 @@ static gint dissect_counted_values(tvbuff_t *tvb, gint offset, int hf_id, packe guint32 length, count, i; count = tvb_get_letohl(tvb, offset); - proto_tree_add_item(tree, hf_tnef_values_count, tvb, offset, 4, TRUE); + proto_tree_add_item(tree, hf_tnef_values_count, tvb, offset, 4, ENC_LITTLE_ENDIAN); if(count > 1) { if(single) { @@ -267,7 +267,7 @@ static gint dissect_counted_values(tvbuff_t *tvb, gint offset, int hf_id, packe for(i = 0; i < count; i++) { length = tvb_get_letohl(tvb, offset); - proto_tree_add_item(tree, hf_tnef_value_length, tvb, offset, 4, TRUE); + proto_tree_add_item(tree, hf_tnef_value_length, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; if (unicode) { @@ -290,14 +290,14 @@ static gint dissect_counted_address(tvbuff_t *tvb, gint offset, packet_info *pin guint16 length; length = tvb_get_letohs(tvb, offset); - proto_tree_add_item(tree, hf_tnef_value_length, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_tnef_value_length, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; proto_tree_add_item(tree, hf_tnef_attribute_display_name, tvb, offset, length, FALSE); offset += length; length = tvb_get_letohs(tvb, offset); - proto_tree_add_item(tree, hf_tnef_value_length, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_tnef_value_length, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; proto_tree_add_item(tree, hf_tnef_attribute_email_address, tvb, offset, length, FALSE); @@ -313,25 +313,25 @@ static void dissect_DTR(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) offset = 0; - proto_tree_add_item(tree, hf_tnef_attribute_date_year, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_tnef_attribute_date_year, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset +=2; - proto_tree_add_item(tree, hf_tnef_attribute_date_month, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_tnef_attribute_date_month, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset +=2; - proto_tree_add_item(tree, hf_tnef_attribute_date_day, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_tnef_attribute_date_day, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset +=2; - proto_tree_add_item(tree, hf_tnef_attribute_date_hour, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_tnef_attribute_date_hour, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset +=2; - proto_tree_add_item(tree, hf_tnef_attribute_date_minute, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_tnef_attribute_date_minute, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset +=2; - proto_tree_add_item(tree, hf_tnef_attribute_date_second, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_tnef_attribute_date_second, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset +=2; - proto_tree_add_item(tree, hf_tnef_attribute_date_day_of_week, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_tnef_attribute_date_day_of_week, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset +=2; } @@ -359,7 +359,7 @@ static void dissect_mapiprops(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre pinfo->private_data = &di; /* first the count */ - proto_tree_add_item(tree, hf_tnef_mapi_props_count, tvb, offset, 4, TRUE); + proto_tree_add_item(tree, hf_tnef_mapi_props_count, tvb, offset, 4, ENC_LITTLE_ENDIAN); /*count = tvb_get_letohl(tvb, offset);*/ offset += 4; @@ -373,17 +373,17 @@ static void dissect_mapiprops(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre prop_item = proto_tree_add_item(tree, hf_tnef_property, tvb, offset, -1, ENC_NA); prop_tree = proto_item_add_subtree(prop_item, ett_tnef_property); - item = proto_tree_add_item(prop_tree, hf_tnef_property_tag, tvb, offset, 4, TRUE); + item = proto_tree_add_item(prop_tree, hf_tnef_property_tag, tvb, offset, 4, ENC_LITTLE_ENDIAN); tag_tree = proto_item_add_subtree(item, ett_tnef_property_tag); /* add a nice name to the property */ tag = tvb_get_letohl(tvb, offset); proto_item_append_text(prop_item, " %s", val_to_str(tag, nspi_MAPITAGS_vals, "Unknown tag (0x%08lx)")); - proto_tree_add_item(tag_tree, hf_tnef_property_tag_type, tvb, offset, 2, TRUE); + proto_tree_add_item(tag_tree, hf_tnef_property_tag_type, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; - proto_tree_add_item(tag_tree, hf_tnef_property_tag_id, tvb, offset, 2, TRUE); + proto_tree_add_item(tag_tree, hf_tnef_property_tag_id, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; if(tag & 0x80000000) { @@ -393,11 +393,11 @@ static void dissect_mapiprops(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre offset += 16; tag_kind = tvb_get_letohl(tvb, offset); - proto_tree_add_item(tag_tree, hf_tnef_property_tag_kind, tvb, offset, 4, TRUE); + proto_tree_add_item(tag_tree, hf_tnef_property_tag_kind, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; if(tag_kind == 0) { - proto_tree_add_item(tag_tree, hf_tnef_property_tag_name_id, tvb, offset, 4, TRUE); + proto_tree_add_item(tag_tree, hf_tnef_property_tag_name_id, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; proto_item_append_text(prop_item, " [Named Property]"); @@ -405,7 +405,7 @@ static void dissect_mapiprops(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre char *name_string = NULL; tag_length = tvb_get_letohl(tvb, offset); - proto_tree_add_item(tag_tree, hf_tnef_property_tag_name_length, tvb, offset, 4, TRUE); + proto_tree_add_item(tag_tree, hf_tnef_property_tag_name_length, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; name_string = tvb_get_ephemeral_faked_unicode (tvb, offset, tag_length / 2, TRUE); @@ -519,7 +519,7 @@ static void dissect_tnef(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* first the signature */ signature = tvb_get_letohl(tvb, offset); - item = proto_tree_add_item(tree, hf_tnef_signature, tvb, offset, 4, TRUE); + item = proto_tree_add_item(tree, hf_tnef_signature, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; /* check the signature */ @@ -537,7 +537,7 @@ static void dissect_tnef(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } - proto_tree_add_item(tree, hf_tnef_key, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_tnef_key, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; while(tvb_reported_length_remaining(tvb, offset) > 9 ) { /* there must be at least a level (1), tag (4) and length (4) to be valid */ @@ -547,33 +547,33 @@ static void dissect_tnef(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) attr_item = proto_tree_add_item(tree, hf_tnef_attribute, tvb, offset, -1, ENC_NA); attr_tree = proto_item_add_subtree(attr_item, ett_tnef_attribute); - proto_tree_add_item(attr_tree, hf_tnef_attribute_lvl, tvb, offset, 1, TRUE); + proto_tree_add_item(attr_tree, hf_tnef_attribute_lvl, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 1; - item = proto_tree_add_item(attr_tree, hf_tnef_attribute_tag, tvb, offset, 4, TRUE); + item = proto_tree_add_item(attr_tree, hf_tnef_attribute_tag, tvb, offset, 4, ENC_LITTLE_ENDIAN); tag_tree = proto_item_add_subtree(item, ett_tnef_attribute_tag); /* add a nice name to the property */ tag = tvb_get_letohl(tvb, offset); proto_item_append_text(attr_item, " %s", val_to_str(tag, tnef_Attribute_vals, "Unknown tag (0x%08lx)")); - proto_tree_add_item(tag_tree, hf_tnef_attribute_tag_id, tvb, offset, 2, TRUE); + proto_tree_add_item(tag_tree, hf_tnef_attribute_tag_id, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; - proto_tree_add_item(tag_tree, hf_tnef_attribute_tag_type, tvb, offset, 2, TRUE); + proto_tree_add_item(tag_tree, hf_tnef_attribute_tag_type, tvb, offset, 2, ENC_LITTLE_ENDIAN); /* remember the type for the value dissection */ offset += 2; length = tvb_get_letohl(tvb, offset); - proto_tree_add_item(attr_tree, hf_tnef_attribute_length, tvb, offset, 4, TRUE); + proto_tree_add_item(attr_tree, hf_tnef_attribute_length, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; switch(tag) { case ATT_OEM_CODEPAGE: - proto_tree_add_item(attr_tree, hf_tnef_oem_codepage, tvb, offset, length, TRUE); + proto_tree_add_item(attr_tree, hf_tnef_oem_codepage, tvb, offset, length, ENC_LITTLE_ENDIAN); break; case ATT_TNEF_VERSION: - proto_tree_add_item(attr_tree, hf_tnef_version, tvb, offset, length, TRUE); + proto_tree_add_item(attr_tree, hf_tnef_version, tvb, offset, length, ENC_LITTLE_ENDIAN); break; case ATT_MESSAGE_CLASS: proto_tree_add_item(attr_tree, hf_tnef_message_class, tvb, offset, length, TRUE); @@ -598,7 +598,7 @@ static void dissect_tnef(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; case ATT_PRIORITY: - proto_tree_add_item(attr_tree, hf_tnef_priority, tvb, offset, length, TRUE); + proto_tree_add_item(attr_tree, hf_tnef_priority, tvb, offset, length, ENC_LITTLE_ENDIAN); break; default: /* just do it on the type */ @@ -624,7 +624,7 @@ static void dissect_tnef(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset += length; - proto_tree_add_item(attr_tree, hf_tnef_attribute_checksum, tvb, offset, 2, TRUE); + proto_tree_add_item(attr_tree, hf_tnef_attribute_checksum, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; proto_item_set_len(attr_item, offset - start_offset); diff --git a/epan/dissectors/packet-tns.c b/epan/dissectors/packet-tns.c index 56b76efe3e..cf9a1090ed 100644 --- a/epan/dissectors/packet-tns.c +++ b/epan/dissectors/packet-tns.c @@ -277,7 +277,7 @@ static void dissect_tns_data(tvbuff_t *tvb, int offset, packet_info *pinfo, { proto_tree *df_tree = NULL; - ti = proto_tree_add_item(data_tree, hf_tns_data_flag, tvb, offset, 2, FALSE); + ti = proto_tree_add_item(data_tree, hf_tns_data_flag, tvb, offset, 2, ENC_BIG_ENDIAN); df_tree = proto_item_add_subtree(ti, ett_tns_data_flag); proto_tree_add_item(df_tree, hf_tns_data_flag_send, tvb, offset, 2, FALSE); @@ -338,14 +338,14 @@ static void dissect_tns_connect(tvbuff_t *tvb, int offset, packet_info *pinfo, if ( connect_tree ) { proto_tree_add_item(connect_tree, hf_tns_version, tvb, - offset, 2, FALSE); + offset, 2, ENC_BIG_ENDIAN); } offset += 2; if ( connect_tree ) { proto_tree_add_item(connect_tree, hf_tns_compat_version, tvb, - offset, 2, FALSE); + offset, 2, ENC_BIG_ENDIAN); } offset += 2; @@ -354,7 +354,7 @@ static void dissect_tns_connect(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *sopt_tree = NULL; ti = proto_tree_add_item(connect_tree, hf_tns_service_options, tvb, - offset, 2, FALSE); + offset, 2, ENC_BIG_ENDIAN); sopt_tree = proto_item_add_subtree(ti, ett_tns_sopt_flag); @@ -367,14 +367,14 @@ static void dissect_tns_connect(tvbuff_t *tvb, int offset, packet_info *pinfo, if ( connect_tree ) { proto_tree_add_item(connect_tree, hf_tns_sdu_size, tvb, - offset, 2, FALSE); + offset, 2, ENC_BIG_ENDIAN); } offset += 2; if ( connect_tree ) { proto_tree_add_item(connect_tree, hf_tns_max_tdu_size, tvb, - offset, 2, FALSE); + offset, 2, ENC_BIG_ENDIAN); } offset += 2; @@ -383,7 +383,7 @@ static void dissect_tns_connect(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *ntp_tree = NULL; ti = proto_tree_add_item(connect_tree, hf_tns_nt_proto_characteristics, tvb, - offset, 2, FALSE); + offset, 2, ENC_BIG_ENDIAN); ntp_tree = proto_item_add_subtree(ti, ett_tns_ntp_flag); @@ -409,7 +409,7 @@ static void dissect_tns_connect(tvbuff_t *tvb, int offset, packet_info *pinfo, if ( connect_tree ) { proto_tree_add_item(connect_tree, hf_tns_line_turnaround, tvb, - offset, 2, FALSE); + offset, 2, ENC_BIG_ENDIAN); } offset += 2; @@ -439,7 +439,7 @@ static void dissect_tns_connect(tvbuff_t *tvb, int offset, packet_info *pinfo, if ( connect_tree ) { proto_tree_add_item(connect_tree, hf_tns_connect_data_max, tvb, - offset, 4, FALSE); + offset, 4, ENC_BIG_ENDIAN); } offset += 4; @@ -448,7 +448,7 @@ static void dissect_tns_connect(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *cflag_tree = NULL; ti = proto_tree_add_item(connect_tree, hf_tns_connect_flags0, tvb, - offset, 1, FALSE); + offset, 1, ENC_BIG_ENDIAN); cflag_tree = proto_item_add_subtree(ti, ett_tns_conn_flag); @@ -461,7 +461,7 @@ static void dissect_tns_connect(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *cflag_tree = NULL; ti = proto_tree_add_item(connect_tree, hf_tns_connect_flags1, tvb, - offset, 1, FALSE); + offset, 1, ENC_BIG_ENDIAN); cflag_tree = proto_item_add_subtree(ti, ett_tns_conn_flag); @@ -478,21 +478,21 @@ static void dissect_tns_connect(tvbuff_t *tvb, int offset, packet_info *pinfo, if ( connect_tree ) { proto_tree_add_item(connect_tree, hf_tns_trace_cf1, tvb, - offset, 4, FALSE); + offset, 4, ENC_BIG_ENDIAN); } offset += 4; if ( connect_tree ) { proto_tree_add_item(connect_tree, hf_tns_trace_cf2, tvb, - offset, 4, FALSE); + offset, 4, ENC_BIG_ENDIAN); } offset += 4; if ( connect_tree ) { proto_tree_add_item(connect_tree, hf_tns_trace_cid, tvb, - offset, 8, FALSE); + offset, 8, ENC_BIG_ENDIAN); } offset += 8; } @@ -530,7 +530,7 @@ static void dissect_tns_accept(tvbuff_t *tvb, int offset, packet_info *pinfo, if ( accept_tree ) { proto_tree_add_item(accept_tree, hf_tns_version, tvb, - offset, 2, FALSE); + offset, 2, ENC_BIG_ENDIAN); } offset += 2; @@ -539,7 +539,7 @@ static void dissect_tns_accept(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *sopt_tree = NULL; ti = proto_tree_add_item(accept_tree, hf_tns_service_options, - tvb, offset, 2, FALSE); + tvb, offset, 2, ENC_BIG_ENDIAN); sopt_tree = proto_item_add_subtree(ti, ett_tns_sopt_flag); @@ -551,14 +551,14 @@ static void dissect_tns_accept(tvbuff_t *tvb, int offset, packet_info *pinfo, if ( accept_tree ) { proto_tree_add_item(accept_tree, hf_tns_sdu_size, tvb, - offset, 2, FALSE); + offset, 2, ENC_BIG_ENDIAN); } offset += 2; if ( accept_tree ) { proto_tree_add_item(accept_tree, hf_tns_max_tdu_size, tvb, - offset, 2, FALSE); + offset, 2, ENC_BIG_ENDIAN); } offset += 2; @@ -590,7 +590,7 @@ static void dissect_tns_accept(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *cflag_tree = NULL; ti = proto_tree_add_item(accept_tree, hf_tns_connect_flags0, tvb, - offset, 1, FALSE); + offset, 1, ENC_BIG_ENDIAN); cflag_tree = proto_item_add_subtree(ti, ett_tns_conn_flag); @@ -604,7 +604,7 @@ static void dissect_tns_accept(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *cflag_tree = NULL; ti = proto_tree_add_item(accept_tree, hf_tns_connect_flags1, tvb, - offset, 1, FALSE); + offset, 1, ENC_BIG_ENDIAN); cflag_tree = proto_item_add_subtree(ti, ett_tns_conn_flag); @@ -644,21 +644,21 @@ static void dissect_tns_refuse(tvbuff_t *tvb, int offset, packet_info *pinfo, if ( refuse_tree ) { proto_tree_add_item(refuse_tree, hf_tns_refuse_reason_user, tvb, - offset, 1, FALSE); + offset, 1, ENC_BIG_ENDIAN); } offset += 1; if ( refuse_tree ) { proto_tree_add_item(refuse_tree, hf_tns_refuse_reason_system, tvb, - offset, 1, FALSE); + offset, 1, ENC_BIG_ENDIAN); } offset += 1; if ( refuse_tree ) { proto_tree_add_item(refuse_tree, hf_tns_refuse_data_length, tvb, - offset, 2, FALSE); + offset, 2, ENC_BIG_ENDIAN); } offset += 2; @@ -693,14 +693,14 @@ static void dissect_tns_abort(tvbuff_t *tvb, int offset, packet_info *pinfo, if ( abort_tree ) { proto_tree_add_item(abort_tree, hf_tns_abort_reason_user, tvb, - offset, 1, FALSE); + offset, 1, ENC_BIG_ENDIAN); } offset += 1; if ( abort_tree ) { proto_tree_add_item(abort_tree, hf_tns_abort_reason_system, tvb, - offset, 1, FALSE); + offset, 1, ENC_BIG_ENDIAN); } offset += 1; @@ -753,21 +753,21 @@ static void dissect_tns_marker(tvbuff_t *tvb, int offset, packet_info *pinfo, if ( marker_tree ) { proto_tree_add_item(marker_tree, hf_tns_marker_type, tvb, - offset, 1, FALSE); + offset, 1, ENC_BIG_ENDIAN); } offset += 1; if ( marker_tree ) { proto_tree_add_item(marker_tree, hf_tns_marker_data_byte, tvb, - offset, 1, FALSE); + offset, 1, ENC_BIG_ENDIAN); } offset += 1; if ( marker_tree ) { proto_tree_add_item(marker_tree, hf_tns_marker_data_byte, tvb, - offset, 1, FALSE); + offset, 1, ENC_BIG_ENDIAN); } offset += 1; @@ -796,7 +796,7 @@ static void dissect_tns_redirect(tvbuff_t *tvb, int offset, packet_info *pinfo, if ( redirect_tree ) { proto_tree_add_item(redirect_tree, hf_tns_redirect_data_length, tvb, - offset, 2, FALSE); + offset, 2, ENC_BIG_ENDIAN); } offset += 2; @@ -830,7 +830,7 @@ static void dissect_tns_control(tvbuff_t *tvb, int offset, packet_info *pinfo, if ( control_tree ) { proto_tree_add_item(control_tree, hf_tns_control_cmd, tvb, - offset, 2, FALSE); + offset, 2, ENC_BIG_ENDIAN); } offset += 2; @@ -921,7 +921,7 @@ dissect_tns_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if ( tree ) { proto_tree_add_item(tns_tree, hf_tns_packet_checksum, tvb, - offset, 2, FALSE); + offset, 2, ENC_BIG_ENDIAN); } offset += 2; @@ -949,7 +949,7 @@ dissect_tns_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if ( tree ) { proto_tree_add_item(tns_tree, hf_tns_header_checksum, tvb, - offset, 2, FALSE); + offset, 2, ENC_BIG_ENDIAN); } offset += 2; diff --git a/epan/dissectors/packet-trill.c b/epan/dissectors/packet-trill.c index 7d2bfed9d6..9c7ffe8b9a 100644 --- a/epan/dissectors/packet-trill.c +++ b/epan/dissectors/packet-trill.c @@ -111,25 +111,25 @@ dissect_trill( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) /* Parse the bit fields, i.e. V, R, M, Op-Length, Hop Count. */ proto_tree_add_item( trill_tree, hf_trill_version, tvb, offset, - TRILL_BIT_FIELDS_LEN, FALSE ) ; + TRILL_BIT_FIELDS_LEN, ENC_BIG_ENDIAN ) ; proto_tree_add_item( trill_tree, hf_trill_reserved, tvb, offset, - TRILL_BIT_FIELDS_LEN, FALSE ) ; + TRILL_BIT_FIELDS_LEN, ENC_BIG_ENDIAN ) ; proto_tree_add_item( trill_tree, hf_trill_multi_dst, tvb, offset, TRILL_BIT_FIELDS_LEN, FALSE ) ; proto_tree_add_item( trill_tree, hf_trill_op_len, tvb, offset, - TRILL_BIT_FIELDS_LEN, FALSE ) ; + TRILL_BIT_FIELDS_LEN, ENC_BIG_ENDIAN ) ; proto_tree_add_item( trill_tree, hf_trill_hop_cnt, tvb, offset, - TRILL_BIT_FIELDS_LEN, FALSE ) ; + TRILL_BIT_FIELDS_LEN, ENC_BIG_ENDIAN ) ; /* Parse the egress nickname. */ offset += TRILL_BIT_FIELDS_LEN ; proto_tree_add_item( trill_tree, hf_trill_egress_nick, tvb, offset, - TRILL_NICKNAME_LEN, FALSE ) ; + TRILL_NICKNAME_LEN, ENC_BIG_ENDIAN ) ; /* Parse the ingress nickname. */ offset += TRILL_NICKNAME_LEN ; proto_tree_add_item( trill_tree, hf_trill_ingress_nick, tvb, offset, - TRILL_NICKNAME_LEN , FALSE ) ; + TRILL_NICKNAME_LEN , ENC_BIG_ENDIAN ) ; /* Parse the options field. */ offset += TRILL_NICKNAME_LEN ; diff --git a/epan/dissectors/packet-tsp.c b/epan/dissectors/packet-tsp.c index 5c28b6c4c1..dc6e8a1982 100644 --- a/epan/dissectors/packet-tsp.c +++ b/epan/dissectors/packet-tsp.c @@ -135,9 +135,9 @@ dissect_tsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_uint(tsp_tree, hf_tsp_type, tvb, 0, 1, tsp_type); proto_tree_add_item(tsp_tree, hf_tsp_vers, - tvb, 1, 1, FALSE); + tvb, 1, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tsp_tree, hf_tsp_seq, - tvb, 2, 2, FALSE); + tvb, 2, 2, ENC_BIG_ENDIAN); } switch (tsp_type) { @@ -145,7 +145,7 @@ dissect_tsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case TSP_LOOP: if (tsp_tree) proto_tree_add_item(tsp_tree, hf_tsp_hopcnt, - tvb, 4, 1, FALSE); + tvb, 4, 1, ENC_BIG_ENDIAN); break; case TSP_SETTIME: @@ -154,9 +154,9 @@ dissect_tsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case TSP_SETDATEREQ: if (tsp_tree) { proto_tree_add_item(tsp_tree, hf_tsp_time_sec, - tvb, 4, 4, FALSE); + tvb, 4, 4, ENC_BIG_ENDIAN); proto_tree_add_item(tsp_tree, hf_tsp_time_usec, - tvb, 8, 4, FALSE); + tvb, 8, 4, ENC_BIG_ENDIAN); } break; } diff --git a/epan/dissectors/packet-tte-pcf.c b/epan/dissectors/packet-tte-pcf.c index e80465c077..fb44e6a72b 100644 --- a/epan/dissectors/packet-tte-pcf.c +++ b/epan/dissectors/packet-tte-pcf.c @@ -105,28 +105,28 @@ dissect_tte_pcf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tte_pcf_tree = proto_item_add_subtree(tte_pcf_root_item, ett_tte_pcf); proto_tree_add_item(tte_pcf_tree, - hf_tte_pcf_ic, tvb, 0, TTE_PCF_IC_LENGTH, FALSE); + hf_tte_pcf_ic, tvb, 0, TTE_PCF_IC_LENGTH, ENC_BIG_ENDIAN); proto_tree_add_item(tte_pcf_tree, - hf_tte_pcf_mn, tvb, TTE_PCF_IC_LENGTH, TTE_PCF_MN_LENGTH, FALSE); + hf_tte_pcf_mn, tvb, TTE_PCF_IC_LENGTH, TTE_PCF_MN_LENGTH, ENC_BIG_ENDIAN); /* RESERVED FIELD --- will not be displayed */ /* proto_tree_add_item(tte_pcf_tree, hf_tte_pcf_res0, tvb, TTE_PCF_IC_LENGTH+TTE_PCF_MN_LENGTH, - TTE_PCF_RES0_LENGTH, FALSE); */ + TTE_PCF_RES0_LENGTH, ENC_BIG_ENDIAN); */ proto_tree_add_item(tte_pcf_tree, hf_tte_pcf_sp, tvb, TTE_PCF_IC_LENGTH+TTE_PCF_MN_LENGTH+ - TTE_PCF_RES0_LENGTH, TTE_PCF_SP_LENGTH, FALSE); + TTE_PCF_RES0_LENGTH, TTE_PCF_SP_LENGTH, ENC_BIG_ENDIAN); proto_tree_add_item(tte_pcf_tree, hf_tte_pcf_sd, tvb, TTE_PCF_IC_LENGTH+TTE_PCF_MN_LENGTH+ - TTE_PCF_RES0_LENGTH+TTE_PCF_SP_LENGTH, TTE_PCF_SD_LENGTH, FALSE); + TTE_PCF_RES0_LENGTH+TTE_PCF_SP_LENGTH, TTE_PCF_SD_LENGTH, ENC_BIG_ENDIAN); proto_tree_add_item(tte_pcf_tree, hf_tte_pcf_type, tvb, TTE_PCF_IC_LENGTH+TTE_PCF_MN_LENGTH+ TTE_PCF_RES0_LENGTH+TTE_PCF_SP_LENGTH+TTE_PCF_SD_LENGTH, - TTE_PCF_TYPE_LENGTH, FALSE); + TTE_PCF_TYPE_LENGTH, ENC_BIG_ENDIAN); /* RESERVED FIELD --- will not be displayed */ /* proto_tree_add_item(tte_pcf_tree, @@ -137,7 +137,7 @@ dissect_tte_pcf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(tte_pcf_tree, hf_tte_pcf_tc, tvb, TTE_PCF_IC_LENGTH+TTE_PCF_MN_LENGTH+ TTE_PCF_RES0_LENGTH+TTE_PCF_SP_LENGTH+TTE_PCF_SD_LENGTH+ - TTE_PCF_TYPE_LENGTH+TTE_PCF_RES1_LENGTH, TTE_PCF_TC_LENGTH, FALSE); + TTE_PCF_TYPE_LENGTH+TTE_PCF_RES1_LENGTH, TTE_PCF_TC_LENGTH, ENC_BIG_ENDIAN); } } diff --git a/epan/dissectors/packet-tte.c b/epan/dissectors/packet-tte.c index 4d00af2583..2bec53e756 100644 --- a/epan/dissectors/packet-tte.c +++ b/epan/dissectors/packet-tte.c @@ -112,11 +112,11 @@ dissect_tte(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ett_tte_macdest); proto_tree_add_item(tte_macdest_tree, - hf_tte_dst_cf, tvb, 0, TTE_MACDEST_CF_LENGTH, FALSE); + hf_tte_dst_cf, tvb, 0, TTE_MACDEST_CF_LENGTH, ENC_BIG_ENDIAN); proto_tree_add_item(tte_macdest_tree, hf_tte_ctid, tvb, TTE_MACDEST_CF_LENGTH, - TTE_MACDEST_CTID_LENGTH, FALSE); + TTE_MACDEST_CTID_LENGTH, ENC_BIG_ENDIAN); } /* prevent clearing the Columns...appending cannot be prevented */ diff --git a/epan/dissectors/packet-turbocell.c b/epan/dissectors/packet-turbocell.c index e536de4f0f..1de7884633 100644 --- a/epan/dissectors/packet-turbocell.c +++ b/epan/dissectors/packet-turbocell.c @@ -149,24 +149,24 @@ static void dissect_turbocell(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre turbocell_tree = proto_item_add_subtree(ti, ett_turbocell); - proto_tree_add_item(turbocell_tree, hf_turbocell_type, tvb, 0, 1, FALSE); - proto_tree_add_item(turbocell_tree, hf_turbocell_satmode, tvb, 1, 1, FALSE); - proto_tree_add_item(turbocell_tree, hf_turbocell_nwid, tvb, 1, 1, FALSE); + proto_tree_add_item(turbocell_tree, hf_turbocell_type, tvb, 0, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(turbocell_tree, hf_turbocell_satmode, tvb, 1, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(turbocell_tree, hf_turbocell_nwid, tvb, 1, 1, ENC_BIG_ENDIAN); /* 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)){ - proto_tree_add_item(turbocell_tree, hf_turbocell_counter, tvb, 0x02, 2, FALSE); + 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, FALSE); - proto_tree_add_item(turbocell_tree, hf_turbocell_timestamp, tvb, 0x0A, 3, FALSE); + proto_tree_add_item(turbocell_tree, hf_turbocell_timestamp, tvb, 0x0A, 3, ENC_BIG_ENDIAN); } else { - proto_tree_add_item(turbocell_tree, hf_turbocell_timestamp, tvb, 0x02, 3, FALSE); - proto_tree_add_item(turbocell_tree, hf_turbocell_counter, tvb, 0x05, 3, FALSE); + proto_tree_add_item(turbocell_tree, hf_turbocell_timestamp, tvb, 0x02, 3, ENC_BIG_ENDIAN); + proto_tree_add_item(turbocell_tree, hf_turbocell_counter, tvb, 0x05, 3, ENC_BIG_ENDIAN); proto_tree_add_item(turbocell_tree, hf_turbocell_dst, tvb, 0x08, 6, FALSE); } - proto_tree_add_item(turbocell_tree, hf_turbocell_unknown, tvb, 0x0E, 2, FALSE); + proto_tree_add_item(turbocell_tree, hf_turbocell_unknown, tvb, 0x0E, 2, ENC_BIG_ENDIAN); proto_tree_add_item(turbocell_tree, hf_turbocell_ip, tvb, 0x10, 4, FALSE); } @@ -212,8 +212,8 @@ static void dissect_turbocell(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre parent_item = proto_tree_add_protocol_format(tree, proto_aggregate, next_tvb, 0, tvb_reported_length_remaining(next_tvb, 0), "Turbocell Aggregate Frames"); mpdu_tree = proto_item_add_subtree(parent_item, ett_msdu_aggregation_parent_tree); - proto_tree_add_item(mpdu_tree, hf_turbocell_aggregate_len, next_tvb, 0x00, 2, FALSE); - proto_tree_add_item(mpdu_tree, hf_turbocell_aggregate_unknown1, next_tvb, 0x02, 2, FALSE); + proto_tree_add_item(mpdu_tree, hf_turbocell_aggregate_len, next_tvb, 0x00, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(mpdu_tree, hf_turbocell_aggregate_unknown1, next_tvb, 0x02, 2, ENC_BIG_ENDIAN); remaining_length=tvb_length_remaining(next_tvb, msdu_offset); diff --git a/epan/dissectors/packet-tuxedo.c b/epan/dissectors/packet-tuxedo.c index e629a704f3..4bcd15d6fc 100644 --- a/epan/dissectors/packet-tuxedo.c +++ b/epan/dissectors/packet-tuxedo.c @@ -127,8 +127,8 @@ dissect_tuxedo(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ti = proto_tree_add_item(tree, proto_tuxedo, tvb, 0, -1, FALSE); tuxedoroot_tree = proto_item_add_subtree(ti, ett_tuxedo); - proto_tree_add_item(tuxedoroot_tree, hf_tuxedo_magic, tvb, 0, 4, FALSE); - proto_tree_add_item(tuxedoroot_tree, hf_tuxedo_opcode, tvb, 4, 4, FALSE); + proto_tree_add_item(tuxedoroot_tree, hf_tuxedo_magic, tvb, 0, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(tuxedoroot_tree, hf_tuxedo_opcode, tvb, 4, 4, ENC_BIG_ENDIAN); } } else diff --git a/epan/dissectors/packet-tzsp.c b/epan/dissectors/packet-tzsp.c index 4f6f1448b0..b5781fb926 100644 --- a/epan/dissectors/packet-tzsp.c +++ b/epan/dissectors/packet-tzsp.c @@ -323,7 +323,7 @@ dissect_tzsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tzsp_tree = proto_item_add_subtree(ti, ett_tzsp); proto_tree_add_item (tzsp_tree, hf_tzsp_version, tvb, 0, 1, - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_uint (tzsp_tree, hf_tzsp_type, tvb, 1, 1, type); proto_tree_add_uint_format (tzsp_tree, hf_tzsp_encap, tvb, 2, 2, diff --git a/epan/dissectors/packet-udld.c b/epan/dissectors/packet-udld.c index fa9a084bdf..68bedc501d 100644 --- a/epan/dissectors/packet-udld.c +++ b/epan/dissectors/packet-udld.c @@ -120,15 +120,15 @@ dissect_udld(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) udld_tree = proto_item_add_subtree(ti, ett_udld); /* UDLD header */ - proto_tree_add_item(udld_tree, hf_udld_version, tvb, offset, 1, FALSE); - proto_tree_add_item(udld_tree, hf_udld_opcode, tvb, offset, 1, FALSE); + proto_tree_add_item(udld_tree, hf_udld_version, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(udld_tree, hf_udld_opcode, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - flags_ti = proto_tree_add_item(udld_tree, hf_udld_flags, tvb, offset, 1, FALSE); + flags_ti = proto_tree_add_item(udld_tree, hf_udld_flags, tvb, offset, 1, ENC_BIG_ENDIAN); flags_tree = proto_item_add_subtree(flags_ti, ett_udld_flags); - proto_tree_add_item(flags_tree, hf_udld_flags_rt, tvb, offset, 1, FALSE); - proto_tree_add_item(flags_tree, hf_udld_flags_rsy, tvb, offset, 1, FALSE); + proto_tree_add_item(flags_tree, hf_udld_flags_rt, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(flags_tree, hf_udld_flags_rsy, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(udld_tree, hf_udld_checksum, tvb, offset, 2, FALSE); + proto_tree_add_item(udld_tree, hf_udld_checksum, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; } else { offset += 4; /* The version/opcode/flags/checksum fields from above */ diff --git a/epan/dissectors/packet-uma.c b/epan/dissectors/packet-uma.c index 322c809449..ec79657979 100644 --- a/epan/dissectors/packet-uma.c +++ b/epan/dissectors/packet-uma.c @@ -934,7 +934,7 @@ dissect_uma_IE(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset) val_to_str_ext(ie_value, &uma_urr_IE_type_vals_ext, "Unknown IE (%u)")); urr_ie_tree = proto_item_add_subtree(urr_ie_item, ett_urr_ie); - proto_tree_add_item(urr_ie_tree, hf_uma_urr_IE, tvb, offset, 1, FALSE); + proto_tree_add_item(urr_ie_tree, hf_uma_urr_IE, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; /* Some IE:s might have a length field of 2 octets */ ie_len = tvb_get_guint8(tvb,offset); @@ -947,7 +947,7 @@ dissect_uma_IE(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset) ie_offset = offset +1; }else{ proto_item_set_len(urr_ie_item, ie_len + 2); - proto_tree_add_item(urr_ie_tree, hf_uma_urr_IE_len, tvb, offset, 1, FALSE); + proto_tree_add_item(urr_ie_tree, hf_uma_urr_IE_len, tvb, offset, 1, ENC_BIG_ENDIAN); ie_offset = offset +1; } @@ -963,10 +963,10 @@ dissect_uma_IE(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset) case 2: /* UMA Release Indicator */ - proto_tree_add_item(urr_ie_tree, hf_uma_urr_uri, tvb, ie_offset, 1, FALSE); + proto_tree_add_item(urr_ie_tree, hf_uma_urr_uri, tvb, ie_offset, 1, ENC_BIG_ENDIAN); break; case 3: /* Radio Identity */ - proto_tree_add_item(urr_ie_tree, hf_uma_urr_radio_type_of_id, tvb, ie_offset, 1, FALSE); + proto_tree_add_item(urr_ie_tree, hf_uma_urr_radio_type_of_id, tvb, ie_offset, 1, ENC_BIG_ENDIAN); octet = tvb_get_guint8(tvb,ie_offset); if (( octet & 0xf) == 0){ /* IEEE MAC-address format */ ie_offset++; @@ -979,7 +979,7 @@ dissect_uma_IE(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset) /* Cell Identity * The rest of the IE is coded as in [TS 24.008] not including IEI and length, if present. */ - proto_tree_add_item(urr_ie_tree, hf_uma_urr_cell_id, tvb, ie_offset, 2, FALSE); + proto_tree_add_item(urr_ie_tree, hf_uma_urr_cell_id, tvb, ie_offset, 2, ENC_BIG_ENDIAN); break; case 5: /* Location Area Identification @@ -1002,7 +1002,7 @@ dissect_uma_IE(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset) ie_offset++; proto_tree_add_item(urr_ie_tree, hf_uma_urr_gmsi, tvb, ie_offset, 1, FALSE); proto_tree_add_item(urr_ie_tree, hf_uma_urr_psho, tvb, ie_offset, 1, FALSE); - proto_tree_add_item(urr_ie_tree, hf_uma_urr_rrs, tvb, ie_offset, 1, FALSE); + proto_tree_add_item(urr_ie_tree, hf_uma_urr_rrs, tvb, ie_offset, 1, ENC_BIG_ENDIAN); } break; case 8: @@ -1018,7 +1018,7 @@ dissect_uma_IE(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset) * IP Address type */ octet = tvb_get_guint8(tvb,ie_offset); - proto_tree_add_item(urr_ie_tree, hf_uma_urr_IP_Address_type, tvb, ie_offset, 1, FALSE); + proto_tree_add_item(urr_ie_tree, hf_uma_urr_IP_Address_type, tvb, ie_offset, 1, ENC_BIG_ENDIAN); ie_offset++; if ( octet == 0x57 ){ /* IPv6 */ @@ -1037,10 +1037,10 @@ dissect_uma_IE(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset) } break; case 11: /* Redirection Counter */ - proto_tree_add_item(urr_ie_tree, hf_uma_urr_redirection_counter, tvb, ie_offset, 1, FALSE); + proto_tree_add_item(urr_ie_tree, hf_uma_urr_redirection_counter, tvb, ie_offset, 1, ENC_BIG_ENDIAN); break; case 12: /* 11.2.12 Discovery Reject Cause */ - proto_tree_add_item(urr_ie_tree, hf_uma_urr_dis_rej_cau, tvb, ie_offset, 1, FALSE); + proto_tree_add_item(urr_ie_tree, hf_uma_urr_dis_rej_cau, tvb, ie_offset, 1, ENC_BIG_ENDIAN); break; case 13: /* 11.2.13 GAN Cell Description @@ -1060,13 +1060,13 @@ dissect_uma_IE(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset) proto_tree_add_item(urr_ie_tree, hf_uma_urr_MSCR, tvb, ie_offset, 1, FALSE); /* T3212 timeout value */ ie_offset++; - proto_tree_add_item(urr_ie_tree, hf_uma_urr_T3212_timer, tvb, ie_offset, 1, FALSE); + proto_tree_add_item(urr_ie_tree, hf_uma_urr_T3212_timer, tvb, ie_offset, 1, ENC_BIG_ENDIAN); /* RAC, Routing Area Code (octet 5) */ ie_offset++; - proto_tree_add_item(urr_ie_tree, hf_uma_urr_RAC, tvb, ie_offset, 1, FALSE); + proto_tree_add_item(urr_ie_tree, hf_uma_urr_RAC, tvb, ie_offset, 1, ENC_BIG_ENDIAN); ie_offset++; /* SGSNR, SGSN Release (octet 6) B1*/ - proto_tree_add_item(urr_ie_tree, hf_uma_urr_SGSNR, tvb, ie_offset, 1, FALSE); + proto_tree_add_item(urr_ie_tree, hf_uma_urr_SGSNR, tvb, ie_offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(urr_ie_tree, hf_uma_urr_ECMP, tvb, ie_offset, 1, FALSE); proto_tree_add_item(urr_ie_tree, hf_uma_urr_RE, tvb, ie_offset, 1, FALSE); proto_tree_add_item(urr_ie_tree, hf_uma_urr_PFCFM, tvb, ie_offset, 1, FALSE); @@ -1084,40 +1084,40 @@ dissect_uma_IE(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset) be_cell_id_list(tvb, urr_ie_tree, pinfo, ie_offset, ie_len, NULL, 0); break; case 16: /* TU3907 Timer */ - proto_tree_add_item(urr_ie_tree, hf_uma_urr_TU3907_timer, tvb, ie_offset, 2, FALSE); + proto_tree_add_item(urr_ie_tree, hf_uma_urr_TU3907_timer, tvb, ie_offset, 2, ENC_BIG_ENDIAN); break; case 17: /* 11.2.17 GSM RR/UTRAN RRC State */ - proto_tree_add_item(urr_ie_tree, hf_uma_urr_GSM_RR_state, tvb, ie_offset, 1, FALSE); + proto_tree_add_item(urr_ie_tree, hf_uma_urr_GSM_RR_state, tvb, ie_offset, 1, ENC_BIG_ENDIAN); break; case 18: /* 11.2.18 Routing Area Identification */ /* The rest of the IE is coded as in [TS 24.008] not including IEI and length, if present.*/ de_gmm_rai(tvb, urr_ie_tree, pinfo, ie_offset, ie_len, NULL, 0); break; case 19: /* 11.2.19 GAN Band */ - proto_tree_add_item(urr_ie_tree, hf_uma_urr_gan_band, tvb, ie_offset, 1, FALSE); + proto_tree_add_item(urr_ie_tree, hf_uma_urr_gan_band, tvb, ie_offset, 1, ENC_BIG_ENDIAN); break; case 20: /* 11.2.20 GAN State */ /* URS, GA-RC/GA-CSR State (octet 3) Bits 2-1 */ - proto_tree_add_item(urr_ie_tree, hf_uma_urr_URR_state, tvb, ie_offset, 1, FALSE); + proto_tree_add_item(urr_ie_tree, hf_uma_urr_URR_state, tvb, ie_offset, 1, ENC_BIG_ENDIAN); /* UPS, GA-PSR State (octet 3) Bit 3 */ /* GA-RRC-CS, GA-RRC (CS) State (octet 3) Bit 4 */ /* GA-RRC-PS, GA-RRC (PS) State (octet 3) Bit 5 */ break; case 21: /* 11.2.21 Register Reject Cause */ - proto_tree_add_item(urr_ie_tree, hf_uma_urr_register_reject_cause, tvb, ie_offset, 1, FALSE); + proto_tree_add_item(urr_ie_tree, hf_uma_urr_register_reject_cause, tvb, ie_offset, 1, ENC_BIG_ENDIAN); break; case 22: /* 11.2.22 TU3906 Timer */ - proto_tree_add_item(urr_ie_tree, hf_uma_urr_TU3906_timer, tvb, ie_offset, 2, FALSE); + proto_tree_add_item(urr_ie_tree, hf_uma_urr_TU3906_timer, tvb, ie_offset, 2, ENC_BIG_ENDIAN); break; case 23: /* 11.2.23 TU3910 Timer */ - proto_tree_add_item(urr_ie_tree, hf_uma_urr_TU3910_timer, tvb, ie_offset, 2, FALSE); + proto_tree_add_item(urr_ie_tree, hf_uma_urr_TU3910_timer, tvb, ie_offset, 2, ENC_BIG_ENDIAN); break; case 24: /* 11.2.24 TU3902 Timer */ - proto_tree_add_item(urr_ie_tree, hf_uma_urr_TU3902_timer, tvb, ie_offset, 2, FALSE); + proto_tree_add_item(urr_ie_tree, hf_uma_urr_TU3902_timer, tvb, ie_offset, 2, ENC_BIG_ENDIAN); break; case 25: /* 11.2.25 Communication Port Identity */ - proto_tree_add_item(urr_ie_tree, hf_uma_urr_communication_port, tvb, ie_offset, 2, FALSE); + proto_tree_add_item(urr_ie_tree, hf_uma_urr_communication_port, tvb, ie_offset, 2, ENC_BIG_ENDIAN); break; case 26: @@ -1125,7 +1125,7 @@ dissect_uma_IE(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset) * The L3 Message information element contains the upper layer message to be transported * using the GA-CSR protocol or the GA-RRC protocol between the MS and the core network. */ - proto_tree_add_item(urr_ie_tree, hf_uma_urr_L3_protocol_discriminator, tvb, ie_offset, 1, FALSE); + proto_tree_add_item(urr_ie_tree, hf_uma_urr_L3_protocol_discriminator, tvb, ie_offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(urr_ie_tree, hf_uma_urr_L3_Message, tvb, ie_offset, ie_len, ENC_NA); l3_tvb = tvb_new_subset(tvb, ie_offset,ie_len, ie_len ); if (!dissector_try_uint(bssap_pdu_type_table,BSSAP_PDU_TYPE_DTAP, l3_tvb, pinfo, urr_ie_tree)) @@ -1160,7 +1160,7 @@ dissect_uma_IE(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset) /* 11.2.31 GPRS Resumption * The rest of the IE is coded as in [TS 44.018], not including IEI and length, if present */ - proto_tree_add_item(urr_ie_tree, hf_uma_urr_GPRS_resumption, tvb, ie_offset, 1, FALSE); + proto_tree_add_item(urr_ie_tree, hf_uma_urr_GPRS_resumption, tvb, ie_offset, 1, ENC_BIG_ENDIAN); break; case 32: /* 11.2.32 Handover From GAN Command @@ -1168,7 +1168,7 @@ dissect_uma_IE(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset) * If the target RAT is UTRAN, the rest of the IE is coded as * HANDOVER TO UTRAN COMMAND message in [TS 25.331]. */ - proto_tree_add_item(urr_ie_tree, hf_uma_urr_L3_protocol_discriminator, tvb, ie_offset, 1, FALSE); + proto_tree_add_item(urr_ie_tree, hf_uma_urr_L3_protocol_discriminator, tvb, ie_offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(urr_ie_tree, hf_uma_urr_L3_Message, tvb, ie_offset, ie_len, ENC_NA); /* XXX the dissector to call should depend on the RAT type ??? */ l3_tvb = tvb_new_subset(tvb, ie_offset,ie_len, ie_len ); @@ -1200,7 +1200,7 @@ dissect_uma_IE(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset) de_rr_sus_cau(tvb, urr_ie_tree, pinfo, ie_offset, ie_len, NULL, 0); break; case 37: /* 11.2.37 TU3920 Timer */ - proto_tree_add_item(urr_ie_tree, hf_uma_urr_TU3920_timer, tvb, ie_offset, 2, FALSE); + proto_tree_add_item(urr_ie_tree, hf_uma_urr_TU3920_timer, tvb, ie_offset, 2, ENC_BIG_ENDIAN); break; /* 11.2.38 QoS */ case 38: @@ -1210,15 +1210,15 @@ dissect_uma_IE(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset) * the Channel Request Description information * element specified in [TS 44.060] */ - proto_tree_add_item(urr_ie_tree, hf_uma_urr_peak_tpt_cls, tvb, ie_offset, 1, FALSE); + proto_tree_add_item(urr_ie_tree, hf_uma_urr_peak_tpt_cls, tvb, ie_offset, 1, ENC_BIG_ENDIAN); /* RADIO_PRIORITY (octet 3, bits 5-6) */ - proto_tree_add_item(urr_ie_tree, hf_uma_urr_radio_pri, tvb, ie_offset, 1, FALSE); + proto_tree_add_item(urr_ie_tree, hf_uma_urr_radio_pri, tvb, ie_offset, 1, ENC_BIG_ENDIAN); /* RLC_MODE (octet 3, bit 7) */ - proto_tree_add_item(urr_ie_tree, hf_uma_urr_rlc_mode, tvb, ie_offset, 1, FALSE); + proto_tree_add_item(urr_ie_tree, hf_uma_urr_rlc_mode, tvb, ie_offset, 1, ENC_BIG_ENDIAN); /* PEAK_THROUGHPUT_CLASS (octet 3, bits 1-4)*/ break; case 39: /* 11.2.39 GA-PSR Cause */ - proto_tree_add_item(urr_ie_tree, hf_uma_urr_ga_psr_cause, tvb, ie_offset, 1, FALSE); + proto_tree_add_item(urr_ie_tree, hf_uma_urr_ga_psr_cause, tvb, ie_offset, 1, ENC_BIG_ENDIAN); break; case 40: /* 11.2.40 User Data Rate */ /* The R field is the binary encoding of the rate information expressed in 100 bits/sec @@ -1231,7 +1231,7 @@ dissect_uma_IE(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset) /* 11.2.41 Routing Area Code * The rest of the IE is coded as in [TS 23.003] not including IEI and length, if present. */ - proto_tree_add_item(urr_ie_tree, hf_uma_urr_RAC, tvb, ie_offset, 1, FALSE); + proto_tree_add_item(urr_ie_tree, hf_uma_urr_RAC, tvb, ie_offset, 1, ENC_BIG_ENDIAN); break; case 42: /* 11.2.42 AP Location @@ -1241,13 +1241,13 @@ dissect_uma_IE(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset) proto_tree_add_item(urr_ie_tree, hf_uma_urr_ap_location, tvb, ie_offset, ie_len, ENC_NA); break; case 43: /* 11.2.43 TU4001 Timer */ - proto_tree_add_item(urr_ie_tree, hf_uma_urr_TU4001_timer, tvb, ie_offset, 2, FALSE); + proto_tree_add_item(urr_ie_tree, hf_uma_urr_TU4001_timer, tvb, ie_offset, 2, ENC_BIG_ENDIAN); break; case 44: /* 11.2.44 Location Status */ - proto_tree_add_item(urr_ie_tree, hf_uma_urr_LS, tvb, ie_offset, 1, FALSE); + proto_tree_add_item(urr_ie_tree, hf_uma_urr_LS, tvb, ie_offset, 1, ENC_BIG_ENDIAN); break; case 45: /* Cipher Response */ - proto_tree_add_item(urr_ie_tree, hf_uma_urr_cipher_res, tvb, ie_offset, 1, FALSE); + proto_tree_add_item(urr_ie_tree, hf_uma_urr_cipher_res, tvb, ie_offset, 1, ENC_BIG_ENDIAN); break; case 46: /* Ciphering Command RAND */ proto_tree_add_item(urr_ie_tree, hf_uma_urr_rand_val, tvb, ie_offset, ie_len, ENC_NA); @@ -1256,16 +1256,16 @@ dissect_uma_IE(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset) proto_tree_add_item(urr_ie_tree, hf_uma_urr_ciphering_command_mac, tvb, ie_offset, ie_len, ENC_NA); break; case 48: /* Ciphering Key Sequence Number */ - proto_tree_add_item(urr_ie_tree, hf_uma_urr_ciphering_key_seq_num, tvb, ie_offset, 1, FALSE); + proto_tree_add_item(urr_ie_tree, hf_uma_urr_ciphering_key_seq_num, tvb, ie_offset, 1, ENC_BIG_ENDIAN); break; case 49: /* SAPI ID */ - proto_tree_add_item(urr_ie_tree, hf_uma_urr_sapi_id, tvb, ie_offset, 1, FALSE); + proto_tree_add_item(urr_ie_tree, hf_uma_urr_sapi_id, tvb, ie_offset, 1, ENC_BIG_ENDIAN); break; case 50: /* 11.2.50 Establishment Cause */ - proto_tree_add_item(urr_ie_tree, hf_uma_urr_establishment_cause, tvb, ie_offset, 1, FALSE); + proto_tree_add_item(urr_ie_tree, hf_uma_urr_establishment_cause, tvb, ie_offset, 1, ENC_BIG_ENDIAN); break; case 51: /* Channel Needed */ - proto_tree_add_item(urr_ie_tree, hf_uma_urr_channel, tvb, ie_offset, 1, FALSE); + proto_tree_add_item(urr_ie_tree, hf_uma_urr_channel, tvb, ie_offset, 1, ENC_BIG_ENDIAN); break; case 52: /* PDU in Error */ proto_tree_add_item(urr_ie_tree, hf_uma_urr_PDU_in_error, tvb, ie_offset, ie_len, FALSE); @@ -1273,13 +1273,13 @@ dissect_uma_IE(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset) case 53: /* Sample Size */ - proto_tree_add_item(urr_ie_tree, hf_uma_urr_sample_size, tvb, ie_offset, 1, FALSE); + proto_tree_add_item(urr_ie_tree, hf_uma_urr_sample_size, tvb, ie_offset, 1, ENC_BIG_ENDIAN); break; case 54: /* 11.2.54 Payload Type * Payload Type (octet 3) Allowed values are between 96 and 127. */ - proto_tree_add_item(urr_ie_tree, hf_uma_urr_payload_type, tvb, ie_offset, 1, FALSE); + proto_tree_add_item(urr_ie_tree, hf_uma_urr_payload_type, tvb, ie_offset, 1, ENC_BIG_ENDIAN); break; /* 11.2.55 Multirate Configuration */ case 55: @@ -1313,14 +1313,14 @@ dissect_uma_IE(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset) proto_tree_add_item(urr_ie_tree, hf_uma_urr_LBLI, tvb, ie_offset, 1, FALSE); break; case 59: /* 11.2.59 Reset Indicator */ - proto_tree_add_item(urr_ie_tree, hf_uma_urr_RI, tvb, ie_offset, 1, FALSE); + proto_tree_add_item(urr_ie_tree, hf_uma_urr_RI, tvb, ie_offset, 1, ENC_BIG_ENDIAN); break; case 60: /* TU4003 Timer */ - proto_tree_add_item(urr_ie_tree, hf_uma_urr_TU4003_timer, tvb, ie_offset, 2, FALSE); + proto_tree_add_item(urr_ie_tree, hf_uma_urr_TU4003_timer, tvb, ie_offset, 2, ENC_BIG_ENDIAN); break; case 61: /* AP Service Name */ - proto_tree_add_item(urr_ie_tree, hf_uma_urr_ap_service_name_type, tvb, ie_offset, 1, FALSE); + proto_tree_add_item(urr_ie_tree, hf_uma_urr_ap_service_name_type, tvb, ie_offset, 1, ENC_BIG_ENDIAN); ie_offset++; /* AP Service Name value (octet 4 to octet n) * The AP Service Name is coded as a string according to UTF-8 format defined in RFC @@ -1333,10 +1333,10 @@ dissect_uma_IE(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset) /* 11.2.62 GAN Service Zone Information * UMA Service Zone Icon Indicator, octet 3 */ - proto_tree_add_item(urr_ie_tree, hf_uma_urr_uma_service_zone_icon_ind, tvb, ie_offset, 1, FALSE); + proto_tree_add_item(urr_ie_tree, hf_uma_urr_uma_service_zone_icon_ind, tvb, ie_offset, 1, ENC_BIG_ENDIAN); ie_offset++; /* Length of UMA Service Zone string */ - proto_tree_add_item(urr_ie_tree, hf_uma_urr_uma_service_zone_str_len, tvb, ie_offset, 1, FALSE); + proto_tree_add_item(urr_ie_tree, hf_uma_urr_uma_service_zone_str_len, tvb, ie_offset, 1, ENC_BIG_ENDIAN); str_len = tvb_get_guint8(tvb,ie_offset); ie_offset++; /* UMA Service Zone string, 1st character */ @@ -1351,11 +1351,11 @@ dissect_uma_IE(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset) */ /* XXX TODO: loop ower the octets */ /* Window Size (octet 3 to octet n) Bits 2 1 */ - proto_tree_add_item(urr_ie_tree, hf_uma_urr_window_size, tvb, ie_offset, 1, FALSE); + proto_tree_add_item(urr_ie_tree, hf_uma_urr_window_size, tvb, ie_offset, 1, ENC_BIG_ENDIAN); /* GAN A/Gb Mode Codec Mode (octet 3 to octet n) Bits 8 7 * The GAN A/Gb Mode Codec Mode is coded as in [47] sub-clause 3.4.1 */ - proto_tree_add_item(urr_ie_tree, hf_uma_urr_uma_codec_mode, tvb, ie_offset, 1, FALSE); + proto_tree_add_item(urr_ie_tree, hf_uma_urr_uma_codec_mode, tvb, ie_offset, 1, ENC_BIG_ENDIAN); /* GAN Iu Mode Codec Mode (octet 3 to octet n) Bits 6 5 4 3 */ break; case 64: @@ -1376,12 +1376,12 @@ dissect_uma_IE(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset) /* 11.2.66 UTRAN Cell Identifier List * UTRAN Cell Identification Discriminator */ - proto_tree_add_item(urr_ie_tree, hf_uma_urr_UTRAN_cell_id_disc, tvb, ie_offset, 1, FALSE); + proto_tree_add_item(urr_ie_tree, hf_uma_urr_UTRAN_cell_id_disc, tvb, ie_offset, 1, ENC_BIG_ENDIAN); octet = tvb_get_guint8(tvb,ie_offset); ie_offset++; if ( octet == 0 ){ ie_offset = dissect_e212_mcc_mnc(tvb, pinfo, urr_ie_tree, ie_offset, TRUE); - proto_tree_add_item(urr_ie_tree, hf_uma_urr_lac, tvb, ie_offset, 2, FALSE); + proto_tree_add_item(urr_ie_tree, hf_uma_urr_lac, tvb, ie_offset, 2, ENC_BIG_ENDIAN); ie_offset = ie_offset + 2; /* The octets 9-12 are coded as shown in 3GPP TS 25.331, Table 'Cell identity'. * 10.3.2.2 Cell identity @@ -1405,24 +1405,24 @@ dissect_uma_IE(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset) octet = tvb_get_guint8(tvb,ie_offset); proto_tree_add_uint(urr_ie_tree, hf_uma_urr_num_of_plms , tvb, ie_offset, 1, octet); /* TODO insert while loop here */ - proto_tree_add_item(urr_ie_tree, hf_uma_urr_lac, tvb, ie_offset, 2, FALSE); + proto_tree_add_item(urr_ie_tree, hf_uma_urr_lac, tvb, ie_offset, 2, ENC_BIG_ENDIAN); break; case 70: /* 11.2.70 GERAN Received Signal Level List */ while(ie_offset<=(offset + ie_len)){ - proto_tree_add_item(urr_ie_tree, hf_uma_urr_RXLEV_NCELL, tvb, ie_offset, 1, FALSE); + proto_tree_add_item(urr_ie_tree, hf_uma_urr_RXLEV_NCELL, tvb, ie_offset, 1, ENC_BIG_ENDIAN); ie_offset++; } break; case 71: /* 11.2.71 Required GAN Services */ /* CBS Cell Broadcast Service (octet 3) */ - proto_tree_add_item(urr_ie_tree, hf_uma_urr_cbs, tvb, ie_offset, 1, FALSE); + proto_tree_add_item(urr_ie_tree, hf_uma_urr_cbs, tvb, ie_offset, 1, ENC_BIG_ENDIAN); break; case 72: /* 11.2.72 Broadcast Container */ octet = tvb_get_guint8(tvb,ie_offset); - proto_tree_add_item(urr_ie_tree, hf_uma_urr_num_of_cbs_frms , tvb, ie_offset, 1, FALSE); + proto_tree_add_item(urr_ie_tree, hf_uma_urr_num_of_cbs_frms , tvb, ie_offset, 1, ENC_BIG_ENDIAN); /* The coding of the page of the CBS message is defined in sub-clause 9.4.1 in TS 23.041. */ proto_tree_add_text(urr_ie_tree, tvb, ie_offset + 1, ie_len-1,"CBS Frames - Not decoded"); break; @@ -1469,7 +1469,7 @@ dissect_uma_IE(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset) proto_tree_add_text(urr_ie_tree,tvb,ie_offset,ie_len,"DATA"); break; case 96: /* MS Radio Identity */ - proto_tree_add_item(urr_ie_tree, hf_uma_urr_radio_type_of_id, tvb, ie_offset, 1, FALSE); + proto_tree_add_item(urr_ie_tree, hf_uma_urr_radio_type_of_id, tvb, ie_offset, 1, ENC_BIG_ENDIAN); octet = tvb_get_guint8(tvb,ie_offset); if (( octet & 0xf) == 0){ /* IEEE MAC-address format */ ie_offset++; @@ -1484,7 +1484,7 @@ dissect_uma_IE(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset) * IP Address type */ octet = tvb_get_guint8(tvb,ie_offset); - proto_tree_add_item(urr_ie_tree, hf_uma_urr_IP_Address_type, tvb, ie_offset, 1, FALSE); + proto_tree_add_item(urr_ie_tree, hf_uma_urr_IP_Address_type, tvb, ie_offset, 1, ENC_BIG_ENDIAN); if (ie_len > 4 ) ie_offset++; if ( octet == 0x57 ){ /* IPv6 */ @@ -1508,7 +1508,7 @@ dissect_uma_IE(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset) * IP Address type */ octet = tvb_get_guint8(tvb,ie_offset); - proto_tree_add_item(urr_ie_tree, hf_uma_urr_IP_Address_type, tvb, ie_offset, 1, FALSE); + proto_tree_add_item(urr_ie_tree, hf_uma_urr_IP_Address_type, tvb, ie_offset, 1, ENC_BIG_ENDIAN); ie_offset++; if ( octet == 0x57 ){ /* IPv6 */ @@ -1520,7 +1520,7 @@ dissect_uma_IE(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset) break; case 100: /* UDP Port for GPRS user data transport */ GPRS_user_data_transport_UDP_port = tvb_get_ntohs(tvb,ie_offset); - proto_tree_add_item(urr_ie_tree, hf_uma_urr_GPRS_port, tvb, ie_offset, 2, FALSE); + proto_tree_add_item(urr_ie_tree, hf_uma_urr_GPRS_port, tvb, ie_offset, 2, ENC_BIG_ENDIAN); /* * If this isn't the first time this packet has been processed, * we've already done this work, so we don't need to do it @@ -1586,7 +1586,7 @@ dissect_uma_IE(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset) break; case 104: /* RTP UDP port */ RTP_UDP_port = tvb_get_ntohs(tvb,ie_offset); - proto_tree_add_item(urr_ie_tree, hf_uma_urr_RTP_port, tvb, ie_offset, 2, FALSE); + proto_tree_add_item(urr_ie_tree, hf_uma_urr_RTP_port, tvb, ie_offset, 2, ENC_BIG_ENDIAN); /* TODO find out exactly which element contains IP addr */ /* Debug proto_tree_add_text(urr_ie_tree,tvb,ie_offset,ie_len,"IP %u, Port %u Handle %u", @@ -1611,7 +1611,7 @@ dissect_uma_IE(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset) break; case 105: /* RTCP UDP port */ RTCP_UDP_port = tvb_get_ntohs(tvb,ie_offset); - proto_tree_add_item(urr_ie_tree, hf_uma_urr_RTCP_port, tvb, ie_offset, 2, FALSE); + proto_tree_add_item(urr_ie_tree, hf_uma_urr_RTCP_port, tvb, ie_offset, 2, ENC_BIG_ENDIAN); /* TODO find out exactly which element contains IP addr */ if((!pinfo->fd->flags.visited) && rtcp_ipv4_address!=0 && RTCP_UDP_port!=0 && rtcp_handle){ src_addr.type=AT_IPv4; @@ -1624,14 +1624,14 @@ dissect_uma_IE(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset) case 106: /* 11.2.70 GERAN Received Signal Level List */ while(ie_offset<=(offset + ie_len)){ - proto_tree_add_item(urr_ie_tree, hf_uma_urr_RXLEV_NCELL, tvb, ie_offset, 1, FALSE); + proto_tree_add_item(urr_ie_tree, hf_uma_urr_RXLEV_NCELL, tvb, ie_offset, 1, ENC_BIG_ENDIAN); ie_offset++; } break; case 107: /* 11.2.70 UTRAN Received Signal Level List */ while(ie_offset<=(offset + ie_len)){ - proto_tree_add_item(urr_ie_tree, hf_uma_urr_RXLEV_NCELL, tvb, ie_offset, 1, FALSE); + proto_tree_add_item(urr_ie_tree, hf_uma_urr_RXLEV_NCELL, tvb, ie_offset, 1, ENC_BIG_ENDIAN); ie_offset++; } break; @@ -1699,23 +1699,23 @@ dissect_uma(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* add an item to the subtree, see section 1.6 for more information */ msg_len = tvb_get_ntohs(tvb,offset); - proto_tree_add_item(uma_tree, hf_uma_length_indicator, tvb, offset, 2, FALSE); + proto_tree_add_item(uma_tree, hf_uma_length_indicator, tvb, offset, 2, ENC_BIG_ENDIAN); offset = offset + 2; octet = tvb_get_guint8(tvb,offset); pd = octet & 0x0f; - proto_tree_add_item(uma_tree, hf_uma_skip_ind, tvb, offset, 1, FALSE); + proto_tree_add_item(uma_tree, hf_uma_skip_ind, tvb, offset, 1, ENC_BIG_ENDIAN); if ((octet & 0xf0) != 0 ){ proto_tree_add_text(uma_tree, tvb,offset,-1,"Skip this message"); return; } - proto_tree_add_item(uma_tree, hf_uma_pd, tvb, offset, 1, FALSE); + proto_tree_add_item(uma_tree, hf_uma_pd, tvb, offset, 1, ENC_BIG_ENDIAN); switch ( pd ){ case 0: /* URR_C */ case 1: /* URR */ offset++; octet = tvb_get_guint8(tvb,offset); - proto_tree_add_item(uma_tree, hf_uma_urr_msg_type, tvb, offset, 1, FALSE); + proto_tree_add_item(uma_tree, hf_uma_urr_msg_type, tvb, offset, 1, ENC_BIG_ENDIAN); col_add_str(pinfo->cinfo, COL_INFO, val_to_str_ext(octet, &uma_urr_msg_type_vals_ext, "Unknown URR (%u)")); while ((msg_len + 1) > offset ){ offset++; @@ -1725,7 +1725,7 @@ dissect_uma(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case 2: /* URLC */ offset++; octet = tvb_get_guint8(tvb,offset); - proto_tree_add_item(uma_tree, hf_uma_urlc_msg_type, tvb, offset, 1, FALSE); + proto_tree_add_item(uma_tree, hf_uma_urlc_msg_type, tvb, offset, 1, ENC_BIG_ENDIAN); col_add_str(pinfo->cinfo, COL_INFO, val_to_str_ext(octet, &uma_urlc_msg_type_vals_ext, "Unknown URLC (%u)")); col_set_fence(pinfo->cinfo,COL_INFO); offset++; @@ -1776,7 +1776,7 @@ dissect_uma_urlc_udp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) uma_tree = proto_item_add_subtree(ti, ett_uma); octet = tvb_get_guint8(tvb,offset); - proto_tree_add_item(uma_tree, hf_uma_urlc_msg_type, tvb, offset, 1, FALSE); + proto_tree_add_item(uma_tree, hf_uma_urlc_msg_type, tvb, offset, 1, ENC_BIG_ENDIAN); col_add_fstr(pinfo->cinfo, COL_INFO, "%s ",val_to_str_ext(octet, &uma_urlc_msg_type_vals_ext, "Unknown URLC (%u)")); col_set_fence(pinfo->cinfo,COL_INFO); msg_len = tvb_length_remaining(tvb,offset) - 1; diff --git a/epan/dissectors/packet-usb-hid.c b/epan/dissectors/packet-usb-hid.c index b6e35253dc..f9f11e907e 100644 --- a/epan/dissectors/packet-usb-hid.c +++ b/epan/dissectors/packet-usb-hid.c @@ -311,7 +311,7 @@ dissect_usb_hid_report_mainitem_data(packet_info *pinfo _U_, proto_tree *tree, t } break; case USBHID_MAINITEM_TAG_COLLECTION: - proto_tree_add_item(tree, hf_usb_hid_mainitem_colltype, tvb, offset, 1, TRUE); + proto_tree_add_item(tree, hf_usb_hid_mainitem_colltype, tvb, offset, 1, ENC_LITTLE_ENDIAN); break; case USBHID_MAINITEM_TAG_ENDCOLLECTION: /* No item data */ @@ -337,46 +337,46 @@ dissect_usb_hid_report_globalitem_data(packet_info *pinfo _U_, proto_tree *tree, case 4: global->usage_page = tvb_get_letohl(tvb, offset); break; default: global->usage_page = 0; break; } - proto_tree_add_item(tree, hf_usb_hid_globalitem_usage, tvb, offset, bSize, TRUE); + proto_tree_add_item(tree, hf_usb_hid_globalitem_usage, tvb, offset, bSize, ENC_LITTLE_ENDIAN); break; case USBHID_GLOBALITEM_TAG_LOG_MIN: - proto_tree_add_item(tree, hf_usb_hid_globalitem_log_min, tvb, offset, bSize, TRUE); + proto_tree_add_item(tree, hf_usb_hid_globalitem_log_min, tvb, offset, bSize, ENC_LITTLE_ENDIAN); break; case USBHID_GLOBALITEM_TAG_LOG_MAX: - proto_tree_add_item(tree, hf_usb_hid_globalitem_log_max, tvb, offset, bSize, TRUE); + proto_tree_add_item(tree, hf_usb_hid_globalitem_log_max, tvb, offset, bSize, ENC_LITTLE_ENDIAN); break; case USBHID_GLOBALITEM_TAG_PHY_MIN: - proto_tree_add_item(tree, hf_usb_hid_globalitem_phy_min, tvb, offset, bSize, TRUE); + proto_tree_add_item(tree, hf_usb_hid_globalitem_phy_min, tvb, offset, bSize, ENC_LITTLE_ENDIAN); break; case USBHID_GLOBALITEM_TAG_PHY_MAX: - proto_tree_add_item(tree, hf_usb_hid_globalitem_phy_max, tvb, offset, bSize, TRUE); + proto_tree_add_item(tree, hf_usb_hid_globalitem_phy_max, tvb, offset, bSize, ENC_LITTLE_ENDIAN); break; case USBHID_GLOBALITEM_TAG_UNIT_EXP: - proto_tree_add_item(tree, hf_usb_hid_globalitem_unit_exp, tvb, offset, bSize, TRUE); + proto_tree_add_item(tree, hf_usb_hid_globalitem_unit_exp, tvb, offset, bSize, ENC_LITTLE_ENDIAN); break; case USBHID_GLOBALITEM_TAG_UNIT: - proto_tree_add_item(tree, hf_usb_hid_globalitem_unit_sys, tvb, offset, bSize, TRUE); - proto_tree_add_item(tree, hf_usb_hid_globalitem_unit_len, tvb, offset, bSize, TRUE); - proto_tree_add_item(tree, hf_usb_hid_globalitem_unit_mass, tvb, offset, bSize, TRUE); - proto_tree_add_item(tree, hf_usb_hid_globalitem_unit_time, tvb, offset, bSize, TRUE); - proto_tree_add_item(tree, hf_usb_hid_globalitem_unit_temp, tvb, offset, bSize, TRUE); - proto_tree_add_item(tree, hf_usb_hid_globalitem_unit_current, tvb, offset, bSize, TRUE); - proto_tree_add_item(tree, hf_usb_hid_globalitem_unit_brightness, tvb, offset, bSize, TRUE); + proto_tree_add_item(tree, hf_usb_hid_globalitem_unit_sys, tvb, offset, bSize, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_usb_hid_globalitem_unit_len, tvb, offset, bSize, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_usb_hid_globalitem_unit_mass, tvb, offset, bSize, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_usb_hid_globalitem_unit_time, tvb, offset, bSize, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_usb_hid_globalitem_unit_temp, tvb, offset, bSize, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_usb_hid_globalitem_unit_current, tvb, offset, bSize, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_usb_hid_globalitem_unit_brightness, tvb, offset, bSize, ENC_LITTLE_ENDIAN); break; case USBHID_GLOBALITEM_TAG_REPORT_SIZE: - proto_tree_add_item(tree, hf_usb_hid_globalitem_report_size, tvb, offset, bSize, TRUE); + proto_tree_add_item(tree, hf_usb_hid_globalitem_report_size, tvb, offset, bSize, ENC_LITTLE_ENDIAN); break; case USBHID_GLOBALITEM_TAG_REPORT_ID: - proto_tree_add_item(tree, hf_usb_hid_globalitem_report_id, tvb, offset, bSize, TRUE); + proto_tree_add_item(tree, hf_usb_hid_globalitem_report_id, tvb, offset, bSize, ENC_LITTLE_ENDIAN); break; case USBHID_GLOBALITEM_TAG_REPORT_COUNT: - proto_tree_add_item(tree, hf_usb_hid_globalitem_report_count, tvb, offset, bSize, TRUE); + proto_tree_add_item(tree, hf_usb_hid_globalitem_report_count, tvb, offset, bSize, ENC_LITTLE_ENDIAN); break; case USBHID_GLOBALITEM_TAG_PUSH: - proto_tree_add_item(tree, hf_usb_hid_globalitem_push, tvb, offset, bSize, TRUE); + proto_tree_add_item(tree, hf_usb_hid_globalitem_push, tvb, offset, bSize, ENC_LITTLE_ENDIAN); break; case USBHID_GLOBALITEM_TAG_POP: - proto_tree_add_item(tree, hf_usb_hid_globalitem_pop, tvb, offset, bSize, TRUE); + proto_tree_add_item(tree, hf_usb_hid_globalitem_pop, tvb, offset, bSize, ENC_LITTLE_ENDIAN); break; default: proto_tree_add_item(tree, hf_usb_hid_item_unk_data, tvb, offset, bSize, ENC_NA); @@ -396,7 +396,7 @@ dissect_usb_hid_report_localitem_data(packet_info *pinfo _U_, proto_tree *tree, case USBHID_LOCALITEM_TAG_USAGE_PAGE: if (bSize > 2) { /* Full page ID */ - proto_tree_add_item(tree, hf_usb_hid_localitem_usage, tvb, offset, bSize, TRUE); + proto_tree_add_item(tree, hf_usb_hid_localitem_usage, tvb, offset, bSize, ENC_LITTLE_ENDIAN); } else { /* Only lower few bits given, need to combine with last global ID */ if (bSize == 1) @@ -409,31 +409,31 @@ dissect_usb_hid_report_localitem_data(packet_info *pinfo _U_, proto_tree *tree, } break; case USBHID_LOCALITEM_TAG_USAGE_MIN: - proto_tree_add_item(tree, hf_usb_hid_localitem_usage_min, tvb, offset, bSize, TRUE); + proto_tree_add_item(tree, hf_usb_hid_localitem_usage_min, tvb, offset, bSize, ENC_LITTLE_ENDIAN); break; case USBHID_LOCALITEM_TAG_USAGE_MAX: - proto_tree_add_item(tree, hf_usb_hid_localitem_usage, tvb, offset, bSize, TRUE); + proto_tree_add_item(tree, hf_usb_hid_localitem_usage, tvb, offset, bSize, ENC_LITTLE_ENDIAN); break; case USBHID_LOCALITEM_TAG_DESIG_INDEX: - proto_tree_add_item(tree, hf_usb_hid_localitem_desig_index, tvb, offset, bSize, TRUE); + proto_tree_add_item(tree, hf_usb_hid_localitem_desig_index, tvb, offset, bSize, ENC_LITTLE_ENDIAN); break; case USBHID_LOCALITEM_TAG_DESIG_MIN: - proto_tree_add_item(tree, hf_usb_hid_localitem_desig_min, tvb, offset, bSize, TRUE); + proto_tree_add_item(tree, hf_usb_hid_localitem_desig_min, tvb, offset, bSize, ENC_LITTLE_ENDIAN); break; case USBHID_LOCALITEM_TAG_DESIG_MAX: - proto_tree_add_item(tree, hf_usb_hid_localitem_desig_max, tvb, offset, bSize, TRUE); + proto_tree_add_item(tree, hf_usb_hid_localitem_desig_max, tvb, offset, bSize, ENC_LITTLE_ENDIAN); break; case USBHID_LOCALITEM_TAG_STRING_INDEX: - proto_tree_add_item(tree, hf_usb_hid_localitem_string_index, tvb, offset, bSize, TRUE); + proto_tree_add_item(tree, hf_usb_hid_localitem_string_index, tvb, offset, bSize, ENC_LITTLE_ENDIAN); break; case USBHID_LOCALITEM_TAG_STRING_MIN: - proto_tree_add_item(tree, hf_usb_hid_localitem_string_min, tvb, offset, bSize, TRUE); + proto_tree_add_item(tree, hf_usb_hid_localitem_string_min, tvb, offset, bSize, ENC_LITTLE_ENDIAN); break; case USBHID_LOCALITEM_TAG_STRING_MAX: - proto_tree_add_item(tree, hf_usb_hid_localitem_string_max, tvb, offset, bSize, TRUE); + proto_tree_add_item(tree, hf_usb_hid_localitem_string_max, tvb, offset, bSize, ENC_LITTLE_ENDIAN); break; case USBHID_LOCALITEM_TAG_DELIMITER: - proto_tree_add_item(tree, hf_usb_hid_localitem_delimiter, tvb, offset, bSize, TRUE); + proto_tree_add_item(tree, hf_usb_hid_localitem_delimiter, tvb, offset, bSize, ENC_LITTLE_ENDIAN); break; default: proto_tree_add_item(tree, hf_usb_hid_item_unk_data, tvb, offset, bSize, ENC_NA); @@ -494,16 +494,16 @@ dissect_usb_hid_report_item(packet_info *pinfo _U_, proto_tree *parent_tree, tvb item = proto_tree_add_text(subtree, tvb, offset, 1, "Header"); tree = proto_item_add_subtree(item, ett_usb_hid_item_header); - proto_tree_add_item(tree, hf_usb_hid_item_bSize, tvb, offset, 1, TRUE); - proto_tree_add_item(tree, hf_usb_hid_item_bType, tvb, offset, 1, TRUE); + proto_tree_add_item(tree, hf_usb_hid_item_bSize, tvb, offset, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_usb_hid_item_bType, tvb, offset, 1, ENC_LITTLE_ENDIAN); proto_tree_add_item(tree, hf_usb_hid_curitem_bTag, tvb, offset, 1, TRUE); offset++; if ((bType == 3) && (bTag == 16)) { /* Long item */ bSize = tvb_get_guint8(tvb, offset); - proto_tree_add_item(subtree, hf_usb_hid_item_bDataSize, tvb, offset, 1, TRUE); + proto_tree_add_item(subtree, hf_usb_hid_item_bDataSize, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; - proto_tree_add_item(subtree, hf_usb_hid_item_bLongItemTag, tvb, offset, 1, TRUE); + proto_tree_add_item(subtree, hf_usb_hid_item_bLongItemTag, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; proto_tree_add_item(subtree, hf_usb_hid_item_unk_data, tvb, offset, bSize, ENC_NA); offset += bSize; @@ -570,19 +570,19 @@ dissect_usb_hid_get_report(packet_info *pinfo _U_, proto_tree *tree, tvbuff_t *t proto_tree *subtree = NULL; if (is_request) { - item = proto_tree_add_item(tree, hf_usb_hid_value, tvb, offset, 2, TRUE); + item = proto_tree_add_item(tree, hf_usb_hid_value, tvb, offset, 2, ENC_LITTLE_ENDIAN); subtree = proto_item_add_subtree(item, ett_usb_hid_wValue); /* Report Type in the high byte, Report ID in the low byte */ - proto_tree_add_item(subtree, hf_usb_hid_report_id, tvb, offset, 1, TRUE); + proto_tree_add_item(subtree, hf_usb_hid_report_id, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; - proto_tree_add_item(subtree, hf_usb_hid_report_type, tvb, offset, 1, TRUE); + proto_tree_add_item(subtree, hf_usb_hid_report_type, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; - proto_tree_add_item(tree, hf_usb_hid_index, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_usb_hid_index, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; - proto_tree_add_item(tree, hf_usb_hid_length, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_usb_hid_length, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; } else { } @@ -596,18 +596,18 @@ dissect_usb_hid_set_report(packet_info *pinfo _U_, proto_tree *tree, tvbuff_t *t proto_tree *subtree = NULL; if (is_request) { - item = proto_tree_add_item(tree, hf_usb_hid_value, tvb, offset, 2, TRUE); + item = proto_tree_add_item(tree, hf_usb_hid_value, tvb, offset, 2, ENC_LITTLE_ENDIAN); subtree = proto_item_add_subtree(item, ett_usb_hid_wValue); - proto_tree_add_item(subtree, hf_usb_hid_report_id, tvb, offset, 1, TRUE); + proto_tree_add_item(subtree, hf_usb_hid_report_id, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; - proto_tree_add_item(subtree, hf_usb_hid_report_type, tvb, offset, 1, TRUE); + proto_tree_add_item(subtree, hf_usb_hid_report_type, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; - proto_tree_add_item(tree, hf_usb_hid_index, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_usb_hid_index, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; - proto_tree_add_item(tree, hf_usb_hid_length, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_usb_hid_length, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; } else { } @@ -622,18 +622,18 @@ dissect_usb_hid_get_idle(packet_info *pinfo _U_, proto_tree *tree, tvbuff_t *tvb proto_tree *subtree = NULL; if (is_request) { - item = proto_tree_add_item(tree, hf_usb_hid_value, tvb, offset, 2, TRUE); + item = proto_tree_add_item(tree, hf_usb_hid_value, tvb, offset, 2, ENC_LITTLE_ENDIAN); subtree = proto_item_add_subtree(item, ett_usb_hid_wValue); - proto_tree_add_item(subtree, hf_usb_hid_report_id, tvb, offset, 1, TRUE); + proto_tree_add_item(subtree, hf_usb_hid_report_id, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; - proto_tree_add_item(subtree, hf_usb_hid_zero, tvb, offset, 1, TRUE); + proto_tree_add_item(subtree, hf_usb_hid_zero, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; - proto_tree_add_item(tree, hf_usb_hid_index, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_usb_hid_index, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; - proto_tree_add_item(tree, hf_usb_hid_length, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_usb_hid_length, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; } else { } @@ -647,19 +647,19 @@ dissect_usb_hid_set_idle(packet_info *pinfo _U_, proto_tree *tree, tvbuff_t *tvb proto_tree *subtree = NULL; if (is_request) { - item = proto_tree_add_item(tree, hf_usb_hid_value, tvb, offset, 2, TRUE); + item = proto_tree_add_item(tree, hf_usb_hid_value, tvb, offset, 2, ENC_LITTLE_ENDIAN); subtree = proto_item_add_subtree(item, ett_usb_hid_wValue); /* Duration in the high byte, Report ID in the low byte */ - proto_tree_add_item(subtree, hf_usb_hid_report_id, tvb, offset, 1, TRUE); + proto_tree_add_item(subtree, hf_usb_hid_report_id, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; - proto_tree_add_item(subtree, hf_usb_hid_duration, tvb, offset, 1, TRUE); + proto_tree_add_item(subtree, hf_usb_hid_duration, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; - proto_tree_add_item(tree, hf_usb_hid_index, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_usb_hid_index, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; - proto_tree_add_item(tree, hf_usb_hid_length, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_usb_hid_length, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; } else { } @@ -670,13 +670,13 @@ static void dissect_usb_hid_get_protocol(packet_info *pinfo _U_, proto_tree *tree, tvbuff_t *tvb, int offset, gboolean is_request, usb_trans_info_t *usb_trans_info _U_, usb_conv_info_t *usb_conv_info _U_) { if (is_request) { - proto_tree_add_item(tree, hf_usb_hid_value, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_usb_hid_value, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; - proto_tree_add_item(tree, hf_usb_hid_index, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_usb_hid_index, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; - proto_tree_add_item(tree, hf_usb_hid_length, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_usb_hid_length, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; } else { } @@ -687,13 +687,13 @@ static void dissect_usb_hid_set_protocol(packet_info *pinfo _U_, proto_tree *tree, tvbuff_t *tvb, int offset, gboolean is_request, usb_trans_info_t *usb_trans_info _U_, usb_conv_info_t *usb_conv_info _U_) { if (is_request) { - proto_tree_add_item(tree, hf_usb_hid_value, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_usb_hid_value, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; - proto_tree_add_item(tree, hf_usb_hid_index, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_usb_hid_index, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; - proto_tree_add_item(tree, hf_usb_hid_length, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_usb_hid_length, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; } else { } @@ -793,7 +793,7 @@ dissect_usb_hid_control(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } if (is_request) { - proto_tree_add_item(tree, hf_usb_hid_request, tvb, offset, 1, TRUE); + proto_tree_add_item(tree, hf_usb_hid_request, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 1; } diff --git a/epan/dissectors/packet-usb-hub.c b/epan/dissectors/packet-usb-hub.c index d9e0f7c0e4..bdf3a438be 100644 --- a/epan/dissectors/packet-usb-hub.c +++ b/epan/dissectors/packet-usb-hub.c @@ -138,19 +138,19 @@ dissect_usb_hub_clear_hub_feature(packet_info *pinfo _U_, proto_tree *tree, tvbu proto_tree *subtree = NULL; if (is_request) { - item = proto_tree_add_item(tree, hf_usb_hub_value, tvb, offset, 2, TRUE); + item = proto_tree_add_item(tree, hf_usb_hub_value, tvb, offset, 2, ENC_LITTLE_ENDIAN); subtree = proto_item_add_subtree(item, ett_usb_hub_wValue); - proto_tree_add_item(subtree, hf_usb_hub_hub_feature_selector, tvb, offset, 2, TRUE); + proto_tree_add_item(subtree, hf_usb_hub_hub_feature_selector, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; - item = proto_tree_add_item(tree, hf_usb_hub_index, tvb, offset, 2, TRUE); + item = proto_tree_add_item(tree, hf_usb_hub_index, tvb, offset, 2, ENC_LITTLE_ENDIAN); subtree = proto_item_add_subtree(item, ett_usb_hub_wIndex); - proto_tree_add_item(subtree, hf_usb_hub_zero, tvb, offset, 2, TRUE); + proto_tree_add_item(subtree, hf_usb_hub_zero, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; - item = proto_tree_add_item(tree, hf_usb_hub_length, tvb, offset, 2, TRUE); + item = proto_tree_add_item(tree, hf_usb_hub_length, tvb, offset, 2, ENC_LITTLE_ENDIAN); subtree = proto_item_add_subtree(item, ett_usb_hub_wLength); - proto_tree_add_item(subtree, hf_usb_hub_zero, tvb, offset, 2, TRUE); + proto_tree_add_item(subtree, hf_usb_hub_zero, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; } else { } @@ -164,21 +164,21 @@ dissect_usb_hub_clear_port_feature(packet_info *pinfo _U_, proto_tree *tree, tvb proto_tree *subtree = NULL; if (is_request) { - item = proto_tree_add_item(tree, hf_usb_hub_value, tvb, offset, 2, TRUE); + item = proto_tree_add_item(tree, hf_usb_hub_value, tvb, offset, 2, ENC_LITTLE_ENDIAN); subtree = proto_item_add_subtree(item, ett_usb_hub_wValue); - proto_tree_add_item(subtree, hf_usb_hub_port_feature_selector, tvb, offset, 2, TRUE); + proto_tree_add_item(subtree, hf_usb_hub_port_feature_selector, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; - item = proto_tree_add_item(tree, hf_usb_hub_index, tvb, offset, 2, TRUE); + item = proto_tree_add_item(tree, hf_usb_hub_index, tvb, offset, 2, ENC_LITTLE_ENDIAN); subtree = proto_item_add_subtree(item, ett_usb_hub_wIndex); - proto_tree_add_item(subtree, hf_usb_hub_port, tvb, offset, 1, TRUE); + proto_tree_add_item(subtree, hf_usb_hub_port, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; - proto_tree_add_item(subtree, hf_usb_hub_port_selector, tvb, offset, 1, TRUE); + proto_tree_add_item(subtree, hf_usb_hub_port_selector, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; - item = proto_tree_add_item(tree, hf_usb_hub_length, tvb, offset, 2, TRUE); + item = proto_tree_add_item(tree, hf_usb_hub_length, tvb, offset, 2, ENC_LITTLE_ENDIAN); subtree = proto_item_add_subtree(item, ett_usb_hub_wLength); - proto_tree_add_item(subtree, hf_usb_hub_zero, tvb, offset, 2, TRUE); + proto_tree_add_item(subtree, hf_usb_hub_zero, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; } else { } @@ -192,21 +192,21 @@ dissect_usb_hub_clear_tt_buffer(packet_info *pinfo _U_, proto_tree *tree, tvbuff proto_tree *subtree = NULL; if (is_request) { - item = proto_tree_add_item(tree, hf_usb_hub_value, tvb, offset, 2, TRUE); + item = proto_tree_add_item(tree, hf_usb_hub_value, tvb, offset, 2, ENC_LITTLE_ENDIAN); subtree = proto_item_add_subtree(item, ett_usb_hub_wValue); - proto_tree_add_item(subtree, hf_usb_hub_ep_num, tvb, offset, 1, TRUE); + proto_tree_add_item(subtree, hf_usb_hub_ep_num, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; - proto_tree_add_item(subtree, hf_usb_hub_dev_addr, tvb, offset, 1, TRUE); + proto_tree_add_item(subtree, hf_usb_hub_dev_addr, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; - proto_tree_add_item(tree, hf_usb_hub_index, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_usb_hub_index, tvb, offset, 2, ENC_LITTLE_ENDIAN); subtree = proto_item_add_subtree(item, ett_usb_hub_wIndex); - proto_tree_add_item(subtree, hf_usb_hub_tt_port, tvb, offset, 2, TRUE); + proto_tree_add_item(subtree, hf_usb_hub_tt_port, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; - proto_tree_add_item(tree, hf_usb_hub_length, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_usb_hub_length, tvb, offset, 2, ENC_LITTLE_ENDIAN); subtree = proto_item_add_subtree(item, ett_usb_hub_wLength); - proto_tree_add_item(subtree, hf_usb_hub_zero, tvb, offset, 2, TRUE); + proto_tree_add_item(subtree, hf_usb_hub_zero, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; } else { } @@ -220,21 +220,21 @@ dissect_usb_hub_get_hub_descriptor(packet_info *pinfo _U_, proto_tree *tree, tvb proto_tree *subtree = NULL; if (is_request) { - item = proto_tree_add_item(tree, hf_usb_hub_value, tvb, offset, 2, TRUE); + item = proto_tree_add_item(tree, hf_usb_hub_value, tvb, offset, 2, ENC_LITTLE_ENDIAN); subtree = proto_item_add_subtree(item, ett_usb_hub_wValue); - proto_tree_add_item(subtree, hf_usb_hub_descriptor_index, tvb, offset, 1, TRUE); + proto_tree_add_item(subtree, hf_usb_hub_descriptor_index, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; - proto_tree_add_item(subtree, hf_usb_hub_descriptor_type, tvb, offset, 1, TRUE); + proto_tree_add_item(subtree, hf_usb_hub_descriptor_type, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; - item = proto_tree_add_item(tree, hf_usb_hub_index, tvb, offset, 2, TRUE); + item = proto_tree_add_item(tree, hf_usb_hub_index, tvb, offset, 2, ENC_LITTLE_ENDIAN); subtree = proto_item_add_subtree(item, ett_usb_hub_wIndex); - proto_tree_add_item(subtree, hf_usb_hub_zero, tvb, offset, 2, TRUE); + proto_tree_add_item(subtree, hf_usb_hub_zero, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; - item = proto_tree_add_item(tree, hf_usb_hub_length, tvb, offset, 2, TRUE); + item = proto_tree_add_item(tree, hf_usb_hub_length, tvb, offset, 2, ENC_LITTLE_ENDIAN); subtree = proto_item_add_subtree(item, ett_usb_hub_wLength); - proto_tree_add_item(subtree, hf_usb_hub_descriptor_length, tvb, offset, 2, TRUE); + proto_tree_add_item(subtree, hf_usb_hub_descriptor_length, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; } else { } @@ -248,17 +248,17 @@ dissect_usb_hub_get_hub_status(packet_info *pinfo _U_, proto_tree *tree, tvbuff_ proto_tree *subtree = NULL; if (is_request) { - item = proto_tree_add_item(tree, hf_usb_hub_value, tvb, offset, 2, TRUE); + item = proto_tree_add_item(tree, hf_usb_hub_value, tvb, offset, 2, ENC_LITTLE_ENDIAN); subtree = proto_item_add_subtree(item, ett_usb_hub_wValue); - proto_tree_add_item(subtree, hf_usb_hub_zero, tvb, offset, 2, TRUE); + proto_tree_add_item(subtree, hf_usb_hub_zero, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; - item = proto_tree_add_item(tree, hf_usb_hub_index, tvb, offset, 2, TRUE); + item = proto_tree_add_item(tree, hf_usb_hub_index, tvb, offset, 2, ENC_LITTLE_ENDIAN); subtree = proto_item_add_subtree(item, ett_usb_hub_wIndex); - proto_tree_add_item(subtree, hf_usb_hub_zero, tvb, offset, 2, TRUE); + proto_tree_add_item(subtree, hf_usb_hub_zero, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; - proto_tree_add_item(tree, hf_usb_hub_length, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_usb_hub_length, tvb, offset, 2, ENC_LITTLE_ENDIAN); /* length shall always contain 4 */ offset += 2; } else { @@ -273,17 +273,17 @@ dissect_usb_hub_get_port_status(packet_info *pinfo _U_, proto_tree *tree, tvbuff proto_tree *subtree = NULL; if (is_request) { - item = proto_tree_add_item(tree, hf_usb_hub_value, tvb, offset, 2, TRUE); + item = proto_tree_add_item(tree, hf_usb_hub_value, tvb, offset, 2, ENC_LITTLE_ENDIAN); subtree = proto_item_add_subtree(item, ett_usb_hub_wValue); - proto_tree_add_item(subtree, hf_usb_hub_zero, tvb, offset, 2, TRUE); + proto_tree_add_item(subtree, hf_usb_hub_zero, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; - item = proto_tree_add_item(tree, hf_usb_hub_index, tvb, offset, 2, TRUE); + item = proto_tree_add_item(tree, hf_usb_hub_index, tvb, offset, 2, ENC_LITTLE_ENDIAN); subtree = proto_item_add_subtree(item, ett_usb_hub_wIndex); - proto_tree_add_item(subtree, hf_usb_hub_port, tvb, offset, 2, TRUE); + proto_tree_add_item(subtree, hf_usb_hub_port, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; - proto_tree_add_item(tree, hf_usb_hub_length, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_usb_hub_length, tvb, offset, 2, ENC_LITTLE_ENDIAN); /* length shall always contain 4 */ offset += 2; } else { @@ -298,19 +298,19 @@ dissect_usb_hub_get_tt_state(packet_info *pinfo _U_, proto_tree *tree, tvbuff_t proto_tree *subtree = NULL; if (is_request) { - item = proto_tree_add_item(tree, hf_usb_hub_value, tvb, offset, 2, TRUE); + item = proto_tree_add_item(tree, hf_usb_hub_value, tvb, offset, 2, ENC_LITTLE_ENDIAN); subtree = proto_item_add_subtree(item, ett_usb_hub_wValue); - proto_tree_add_item(subtree, hf_usb_hub_tt_flags, tvb, offset, 1, TRUE); + proto_tree_add_item(subtree, hf_usb_hub_tt_flags, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 2; - item = proto_tree_add_item(tree, hf_usb_hub_index, tvb, offset, 2, TRUE); + item = proto_tree_add_item(tree, hf_usb_hub_index, tvb, offset, 2, ENC_LITTLE_ENDIAN); subtree = proto_item_add_subtree(item, ett_usb_hub_wIndex); - proto_tree_add_item(subtree, hf_usb_hub_tt_port, tvb, offset, 1, TRUE); + proto_tree_add_item(subtree, hf_usb_hub_tt_port, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 2; - item = proto_tree_add_item(tree, hf_usb_hub_length, tvb, offset, 2, TRUE); + item = proto_tree_add_item(tree, hf_usb_hub_length, tvb, offset, 2, ENC_LITTLE_ENDIAN); subtree = proto_item_add_subtree(item, ett_usb_hub_wLength); - proto_tree_add_item(subtree, hf_usb_hub_tt_state_length, tvb, offset, 1, TRUE); + proto_tree_add_item(subtree, hf_usb_hub_tt_state_length, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 2; } else { } @@ -324,19 +324,19 @@ dissect_usb_hub_reset_tt(packet_info *pinfo _U_, proto_tree *tree, tvbuff_t *tvb proto_tree *subtree = NULL; if (is_request) { - item = proto_tree_add_item(tree, hf_usb_hub_value, tvb, offset, 2, TRUE); + item = proto_tree_add_item(tree, hf_usb_hub_value, tvb, offset, 2, ENC_LITTLE_ENDIAN); subtree = proto_item_add_subtree(item, ett_usb_hub_wValue); - proto_tree_add_item(subtree, hf_usb_hub_zero, tvb, offset, 1, TRUE); + proto_tree_add_item(subtree, hf_usb_hub_zero, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 2; - item = proto_tree_add_item(tree, hf_usb_hub_index, tvb, offset, 2, TRUE); + item = proto_tree_add_item(tree, hf_usb_hub_index, tvb, offset, 2, ENC_LITTLE_ENDIAN); subtree = proto_item_add_subtree(item, ett_usb_hub_wIndex); - proto_tree_add_item(subtree, hf_usb_hub_tt_port, tvb, offset, 1, TRUE); + proto_tree_add_item(subtree, hf_usb_hub_tt_port, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 2; - item = proto_tree_add_item(tree, hf_usb_hub_length, tvb, offset, 2, TRUE); + item = proto_tree_add_item(tree, hf_usb_hub_length, tvb, offset, 2, ENC_LITTLE_ENDIAN); subtree = proto_item_add_subtree(item, ett_usb_hub_wLength); - proto_tree_add_item(subtree, hf_usb_hub_zero, tvb, offset, 1, TRUE); + proto_tree_add_item(subtree, hf_usb_hub_zero, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 2; } else { } @@ -350,21 +350,21 @@ dissect_usb_hub_set_hub_descriptor(packet_info *pinfo _U_, proto_tree *tree, tvb proto_tree *subtree = NULL; if (is_request) { - item = proto_tree_add_item(tree, hf_usb_hub_value, tvb, offset, 2, TRUE); + item = proto_tree_add_item(tree, hf_usb_hub_value, tvb, offset, 2, ENC_LITTLE_ENDIAN); subtree = proto_item_add_subtree(item, ett_usb_hub_wValue); - proto_tree_add_item(subtree, hf_usb_hub_descriptor_index, tvb, offset, 1, TRUE); + proto_tree_add_item(subtree, hf_usb_hub_descriptor_index, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; - proto_tree_add_item(subtree, hf_usb_hub_descriptor_type, tvb, offset, 1, TRUE); + proto_tree_add_item(subtree, hf_usb_hub_descriptor_type, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; - item = proto_tree_add_item(tree, hf_usb_hub_index, tvb, offset, 2, TRUE); + item = proto_tree_add_item(tree, hf_usb_hub_index, tvb, offset, 2, ENC_LITTLE_ENDIAN); subtree = proto_item_add_subtree(item, ett_usb_hub_wIndex); - proto_tree_add_item(subtree, hf_usb_hub_zero, tvb, offset, 2, TRUE); + proto_tree_add_item(subtree, hf_usb_hub_zero, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; - item = proto_tree_add_item(tree, hf_usb_hub_length, tvb, offset, 2, TRUE); + item = proto_tree_add_item(tree, hf_usb_hub_length, tvb, offset, 2, ENC_LITTLE_ENDIAN); subtree = proto_item_add_subtree(item, ett_usb_hub_wLength); - proto_tree_add_item(subtree, hf_usb_hub_descriptor_length, tvb, offset, 2, TRUE); + proto_tree_add_item(subtree, hf_usb_hub_descriptor_length, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; } else { } @@ -378,19 +378,19 @@ dissect_usb_hub_stop_tt(packet_info *pinfo _U_, proto_tree *tree, tvbuff_t *tvb, proto_tree *subtree = NULL; if (is_request) { - item = proto_tree_add_item(tree, hf_usb_hub_value, tvb, offset, 2, TRUE); + item = proto_tree_add_item(tree, hf_usb_hub_value, tvb, offset, 2, ENC_LITTLE_ENDIAN); subtree = proto_item_add_subtree(item, ett_usb_hub_wValue); - proto_tree_add_item(subtree, hf_usb_hub_zero, tvb, offset, 1, TRUE); + proto_tree_add_item(subtree, hf_usb_hub_zero, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 2; - item = proto_tree_add_item(tree, hf_usb_hub_index, tvb, offset, 2, TRUE); + item = proto_tree_add_item(tree, hf_usb_hub_index, tvb, offset, 2, ENC_LITTLE_ENDIAN); subtree = proto_item_add_subtree(item, ett_usb_hub_wIndex); - proto_tree_add_item(subtree, hf_usb_hub_tt_port, tvb, offset, 2, TRUE); + proto_tree_add_item(subtree, hf_usb_hub_tt_port, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; - item = proto_tree_add_item(tree, hf_usb_hub_length, tvb, offset, 2, TRUE); + item = proto_tree_add_item(tree, hf_usb_hub_length, tvb, offset, 2, ENC_LITTLE_ENDIAN); subtree = proto_item_add_subtree(item, ett_usb_hub_wLength); - proto_tree_add_item(subtree, hf_usb_hub_zero, tvb, offset, 2, TRUE); + proto_tree_add_item(subtree, hf_usb_hub_zero, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; } else { } @@ -404,19 +404,19 @@ dissect_usb_hub_set_hub_feature(packet_info *pinfo _U_, proto_tree *tree, tvbuff proto_tree *subtree = NULL; if (is_request) { - item = proto_tree_add_item(tree, hf_usb_hub_value, tvb, offset, 2, TRUE); + item = proto_tree_add_item(tree, hf_usb_hub_value, tvb, offset, 2, ENC_LITTLE_ENDIAN); subtree = proto_item_add_subtree(item, ett_usb_hub_wValue); - proto_tree_add_item(subtree, hf_usb_hub_hub_feature_selector, tvb, offset, 2, TRUE); + proto_tree_add_item(subtree, hf_usb_hub_hub_feature_selector, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; - item = proto_tree_add_item(tree, hf_usb_hub_index, tvb, offset, 2, TRUE); + item = proto_tree_add_item(tree, hf_usb_hub_index, tvb, offset, 2, ENC_LITTLE_ENDIAN); subtree = proto_item_add_subtree(item, ett_usb_hub_wIndex); - proto_tree_add_item(subtree, hf_usb_hub_zero, tvb, offset, 2, TRUE); + proto_tree_add_item(subtree, hf_usb_hub_zero, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; - item = proto_tree_add_item(tree, hf_usb_hub_length, tvb, offset, 2, TRUE); + item = proto_tree_add_item(tree, hf_usb_hub_length, tvb, offset, 2, ENC_LITTLE_ENDIAN); subtree = proto_item_add_subtree(item, ett_usb_hub_wLength); - proto_tree_add_item(subtree, hf_usb_hub_zero, tvb, offset, 2, TRUE); + proto_tree_add_item(subtree, hf_usb_hub_zero, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; } else { } @@ -430,21 +430,21 @@ dissect_usb_hub_set_port_feature(packet_info *pinfo _U_, proto_tree *tree, tvbuf proto_tree *subtree = NULL; if (is_request) { - item = proto_tree_add_item(tree, hf_usb_hub_value, tvb, offset, 2, TRUE); + item = proto_tree_add_item(tree, hf_usb_hub_value, tvb, offset, 2, ENC_LITTLE_ENDIAN); subtree = proto_item_add_subtree(item, ett_usb_hub_wValue); - proto_tree_add_item(subtree, hf_usb_hub_port_feature_selector, tvb, offset, 2, TRUE); + proto_tree_add_item(subtree, hf_usb_hub_port_feature_selector, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; - item = proto_tree_add_item(tree, hf_usb_hub_index, tvb, offset, 2, TRUE); + item = proto_tree_add_item(tree, hf_usb_hub_index, tvb, offset, 2, ENC_LITTLE_ENDIAN); subtree = proto_item_add_subtree(item, ett_usb_hub_wValue); - proto_tree_add_item(subtree, hf_usb_hub_port, tvb, offset, 1, TRUE); + proto_tree_add_item(subtree, hf_usb_hub_port, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; - proto_tree_add_item(subtree, hf_usb_hub_port_selector, tvb, offset, 1, TRUE); + proto_tree_add_item(subtree, hf_usb_hub_port_selector, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; - item = proto_tree_add_item(tree, hf_usb_hub_length, tvb, offset, 2, TRUE); + item = proto_tree_add_item(tree, hf_usb_hub_length, tvb, offset, 2, ENC_LITTLE_ENDIAN); subtree = proto_item_add_subtree(item, ett_usb_hub_wLength); - proto_tree_add_item(subtree, hf_usb_hub_zero, tvb, offset, 2, TRUE); + proto_tree_add_item(subtree, hf_usb_hub_zero, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; } else { } @@ -572,7 +572,7 @@ dissect_usb_hub_control(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } if (is_request) { - proto_tree_add_item(tree, hf_usb_hub_request, tvb, offset, 1, TRUE); + proto_tree_add_item(tree, hf_usb_hub_request, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 1; } diff --git a/epan/dissectors/packet-usb-masstorage.c b/epan/dissectors/packet-usb-masstorage.c index c89a616fd4..cd53ba29d4 100644 --- a/epan/dissectors/packet-usb-masstorage.c +++ b/epan/dissectors/packet-usb-masstorage.c @@ -73,13 +73,13 @@ static void dissect_usb_ms_reset(packet_info *pinfo _U_, proto_tree *tree, tvbuff_t *tvb, int offset, gboolean is_request, usb_trans_info_t *usb_trans_info _U_, usb_conv_info_t *usb_conv_info _U_) { if(is_request){ - proto_tree_add_item(tree, hf_usb_ms_value, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_usb_ms_value, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(tree, hf_usb_ms_index, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_usb_ms_index, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(tree, hf_usb_ms_length, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_usb_ms_length, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; } else { /* no data in reset response */ @@ -90,16 +90,16 @@ static void dissect_usb_ms_get_max_lun(packet_info *pinfo _U_, proto_tree *tree, tvbuff_t *tvb, int offset, gboolean is_request, usb_trans_info_t *usb_trans_info _U_, usb_conv_info_t *usb_conv_info _U_) { if(is_request){ - proto_tree_add_item(tree, hf_usb_ms_value, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_usb_ms_value, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(tree, hf_usb_ms_index, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_usb_ms_index, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(tree, hf_usb_ms_length, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_usb_ms_length, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; } else { - proto_tree_add_item(tree, hf_usb_ms_maxlun, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_usb_ms_maxlun, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; } } @@ -170,7 +170,7 @@ dissect_usb_ms_control(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } if(is_request){ - proto_tree_add_item(tree, hf_usb_ms_request, tvb, offset, 1, TRUE); + proto_tree_add_item(tree, hf_usb_ms_request, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 1; } @@ -230,25 +230,25 @@ dissect_usb_ms_bulk(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) guint32 datalen; /* dCBWSignature */ - proto_tree_add_item(tree, hf_usb_ms_dCBWSignature, tvb, offset, 4, TRUE); + proto_tree_add_item(tree, hf_usb_ms_dCBWSignature, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset+=4; /* dCBWTag */ - proto_tree_add_item(tree, hf_usb_ms_dCBWTag, tvb, offset, 4, TRUE); + proto_tree_add_item(tree, hf_usb_ms_dCBWTag, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset+=4; /* dCBWDataTransferLength */ - proto_tree_add_item(tree, hf_usb_ms_dCBWDataTransferLength, tvb, offset, 4, TRUE); + proto_tree_add_item(tree, hf_usb_ms_dCBWDataTransferLength, tvb, offset, 4, ENC_LITTLE_ENDIAN); datalen=tvb_get_letohl(tvb, offset); offset+=4; /* dCBWFlags */ - proto_tree_add_item(tree, hf_usb_ms_dCBWFlags, tvb, offset, 1, TRUE); + proto_tree_add_item(tree, hf_usb_ms_dCBWFlags, tvb, offset, 1, ENC_LITTLE_ENDIAN); flags=tvb_get_guint8(tvb, offset); offset+=1; /* dCBWLUN */ - proto_tree_add_item(tree, hf_usb_ms_dCBWLUN, tvb, offset, 1, TRUE); + proto_tree_add_item(tree, hf_usb_ms_dCBWLUN, tvb, offset, 1, ENC_LITTLE_ENDIAN); lun=tvb_get_guint8(tvb, offset)&0x0f; offset+=1; @@ -287,7 +287,7 @@ dissect_usb_ms_bulk(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) } /* dCBWCBLength */ - proto_tree_add_item(tree, hf_usb_ms_dCBWCBLength, tvb, offset, 1, TRUE); + proto_tree_add_item(tree, hf_usb_ms_dCBWCBLength, tvb, offset, 1, ENC_LITTLE_ENDIAN); cdbrlen=tvb_get_guint8(tvb, offset)&0x1f; offset+=1; @@ -310,19 +310,19 @@ dissect_usb_ms_bulk(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) guint8 status; /* dCSWSignature */ - proto_tree_add_item(tree, hf_usb_ms_dCSWSignature, tvb, offset, 4, TRUE); + proto_tree_add_item(tree, hf_usb_ms_dCSWSignature, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset+=4; /* dCSWTag */ - proto_tree_add_item(tree, hf_usb_ms_dCBWTag, tvb, offset, 4, TRUE); + proto_tree_add_item(tree, hf_usb_ms_dCBWTag, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset+=4; /* dCSWDataResidue */ - proto_tree_add_item(tree, hf_usb_ms_dCSWDataResidue, tvb, offset, 4, TRUE); + proto_tree_add_item(tree, hf_usb_ms_dCSWDataResidue, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset+=4; /* dCSWStatus */ - proto_tree_add_item(tree, hf_usb_ms_dCSWStatus, tvb, offset, 1, TRUE); + proto_tree_add_item(tree, hf_usb_ms_dCSWStatus, tvb, offset, 1, ENC_LITTLE_ENDIAN); status=tvb_get_guint8(tvb, offset); offset+=1; diff --git a/epan/dissectors/packet-usb.c b/epan/dissectors/packet-usb.c index a33f12b358..fea1518e06 100644 --- a/epan/dissectors/packet-usb.c +++ b/epan/dissectors/packet-usb.c @@ -792,16 +792,16 @@ static int dissect_usb_setup_clear_feature_request(packet_info *pinfo _U_, proto_tree *tree, tvbuff_t *tvb, int offset, usb_trans_info_t *usb_trans_info _U_, usb_conv_info_t *usb_conv_info _U_) { /* feature selector */ - proto_tree_add_item(tree, hf_usb_wFeatureSelector, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_usb_wFeatureSelector, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; /* zero/interface/endpoint */ /* XXX - check based on request type */ - proto_tree_add_item(tree, hf_usb_wInterface, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_usb_wInterface, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; /* length */ - proto_tree_add_item(tree, hf_usb_length, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_usb_length, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; return offset; @@ -824,7 +824,7 @@ dissect_usb_setup_clear_feature_response(packet_info *pinfo _U_, proto_tree *tre static int dissect_usb_setup_get_configuration_response(packet_info *pinfo _U_, proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset, usb_trans_info_t *usb_trans_info _U_, usb_conv_info_t *usb_conv_info _U_) { - proto_tree_add_item(tree, hf_usb_bConfigurationValue, tvb, offset, 1, TRUE); + proto_tree_add_item(tree, hf_usb_bConfigurationValue, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; return offset; @@ -851,35 +851,35 @@ dissect_usb_device_qualifier_descriptor(packet_info *pinfo _U_, proto_tree *pare } /* bLength */ - proto_tree_add_item(tree, hf_usb_bLength, tvb, offset, 1, TRUE); + proto_tree_add_item(tree, hf_usb_bLength, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; /* bDescriptorType */ - proto_tree_add_item(tree, hf_usb_bDescriptorType, tvb, offset, 1, TRUE); + proto_tree_add_item(tree, hf_usb_bDescriptorType, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; /* bcdUSB */ - proto_tree_add_item(tree, hf_usb_bcdUSB, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_usb_bcdUSB, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset+=2; /* bDeviceClass */ - proto_tree_add_item(tree, hf_usb_bDeviceClass, tvb, offset, 1, TRUE); + proto_tree_add_item(tree, hf_usb_bDeviceClass, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; /* bDeviceSubClass */ - proto_tree_add_item(tree, hf_usb_bDeviceSubClass, tvb, offset, 1, TRUE); + proto_tree_add_item(tree, hf_usb_bDeviceSubClass, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; /* bDeviceProtocol */ - proto_tree_add_item(tree, hf_usb_bDeviceProtocol, tvb, offset, 1, TRUE); + proto_tree_add_item(tree, hf_usb_bDeviceProtocol, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; /* bMaxPacketSize0 */ - proto_tree_add_item(tree, hf_usb_bMaxPacketSize0, tvb, offset, 1, TRUE); + proto_tree_add_item(tree, hf_usb_bMaxPacketSize0, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; /* bNumConfigurations */ - proto_tree_add_item(tree, hf_usb_bNumConfigurations, tvb, offset, 1, TRUE); + proto_tree_add_item(tree, hf_usb_bNumConfigurations, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; /* one reserved byte */ @@ -906,59 +906,59 @@ dissect_usb_device_descriptor(packet_info *pinfo _U_, proto_tree *parent_tree, t } /* bLength */ - proto_tree_add_item(tree, hf_usb_bLength, tvb, offset, 1, TRUE); + proto_tree_add_item(tree, hf_usb_bLength, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; /* bDescriptorType */ - proto_tree_add_item(tree, hf_usb_bDescriptorType, tvb, offset, 1, TRUE); + proto_tree_add_item(tree, hf_usb_bDescriptorType, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; /* bcdUSB */ - proto_tree_add_item(tree, hf_usb_bcdUSB, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_usb_bcdUSB, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset+=2; /* bDeviceClass */ - proto_tree_add_item(tree, hf_usb_bDeviceClass, tvb, offset, 1, TRUE); + proto_tree_add_item(tree, hf_usb_bDeviceClass, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; /* bDeviceSubClass */ - proto_tree_add_item(tree, hf_usb_bDeviceSubClass, tvb, offset, 1, TRUE); + proto_tree_add_item(tree, hf_usb_bDeviceSubClass, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; /* bDeviceProtocol */ - proto_tree_add_item(tree, hf_usb_bDeviceProtocol, tvb, offset, 1, TRUE); + proto_tree_add_item(tree, hf_usb_bDeviceProtocol, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; /* bMaxPacketSize0 */ - proto_tree_add_item(tree, hf_usb_bMaxPacketSize0, tvb, offset, 1, TRUE); + proto_tree_add_item(tree, hf_usb_bMaxPacketSize0, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; /* idVendor */ - proto_tree_add_item(tree, hf_usb_idVendor, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_usb_idVendor, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset+=2; /* idProduct */ - proto_tree_add_item(tree, hf_usb_idProduct, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_usb_idProduct, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset+=2; /* bcdDevice */ - proto_tree_add_item(tree, hf_usb_bcdDevice, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_usb_bcdDevice, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset+=2; /* iManufacturer */ - proto_tree_add_item(tree, hf_usb_iManufacturer, tvb, offset, 1, TRUE); + proto_tree_add_item(tree, hf_usb_iManufacturer, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; /* iProduct */ - proto_tree_add_item(tree, hf_usb_iProduct, tvb, offset, 1, TRUE); + proto_tree_add_item(tree, hf_usb_iProduct, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; /* iSerialNumber */ - proto_tree_add_item(tree, hf_usb_iSerialNumber, tvb, offset, 1, TRUE); + proto_tree_add_item(tree, hf_usb_iSerialNumber, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; /* bNumConfigurations */ - proto_tree_add_item(tree, hf_usb_bNumConfigurations, tvb, offset, 1, TRUE); + proto_tree_add_item(tree, hf_usb_bNumConfigurations, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; if(item){ @@ -983,19 +983,19 @@ dissect_usb_string_descriptor(packet_info *pinfo _U_, proto_tree *parent_tree, t } /* bLength */ - proto_tree_add_item(tree, hf_usb_bLength, tvb, offset, 1, TRUE); + proto_tree_add_item(tree, hf_usb_bLength, tvb, offset, 1, ENC_LITTLE_ENDIAN); len=tvb_get_guint8(tvb, offset); offset++; /* bDescriptorType */ - proto_tree_add_item(tree, hf_usb_bDescriptorType, tvb, offset, 1, TRUE); + proto_tree_add_item(tree, hf_usb_bDescriptorType, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; if(!usb_trans_info->u.get_descriptor.index){ /* list of languanges */ while(len>(offset-old_offset)){ /* wLANGID */ - proto_tree_add_item(tree, hf_usb_wLANGID, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_usb_wLANGID, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset+=2; } } else { @@ -1031,28 +1031,28 @@ dissect_usb_interface_descriptor(packet_info *pinfo, proto_tree *parent_tree, tv } /* bLength */ - proto_tree_add_item(tree, hf_usb_bLength, tvb, offset, 1, TRUE); + proto_tree_add_item(tree, hf_usb_bLength, tvb, offset, 1, ENC_LITTLE_ENDIAN); len = tvb_get_guint8(tvb, offset); offset++; /* bDescriptorType */ - proto_tree_add_item(tree, hf_usb_bDescriptorType, tvb, offset, 1, TRUE); + proto_tree_add_item(tree, hf_usb_bDescriptorType, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; /* bInterfaceNumber */ - proto_tree_add_item(tree, hf_usb_bInterfaceNumber, tvb, offset, 1, TRUE); + proto_tree_add_item(tree, hf_usb_bInterfaceNumber, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; /* bAlternateSetting */ - proto_tree_add_item(tree, hf_usb_bAlternateSetting, tvb, offset, 1, TRUE); + proto_tree_add_item(tree, hf_usb_bAlternateSetting, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; /* bNumEndpoints */ - proto_tree_add_item(tree, hf_usb_bNumEndpoints, tvb, offset, 1, TRUE); + proto_tree_add_item(tree, hf_usb_bNumEndpoints, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; /* bInterfaceClass */ - proto_tree_add_item(tree, hf_usb_bInterfaceClass, tvb, offset, 1, TRUE); + proto_tree_add_item(tree, hf_usb_bInterfaceClass, tvb, offset, 1, ENC_LITTLE_ENDIAN); /* save the class so we can access it later in the endpoint descriptor */ usb_conv_info->interfaceClass=tvb_get_guint8(tvb, offset); if(!pinfo->fd->flags.visited){ @@ -1063,15 +1063,15 @@ dissect_usb_interface_descriptor(packet_info *pinfo, proto_tree *parent_tree, tv offset++; /* bInterfaceSubClass */ - proto_tree_add_item(tree, hf_usb_bInterfaceSubClass, tvb, offset, 1, TRUE); + proto_tree_add_item(tree, hf_usb_bInterfaceSubClass, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; /* bInterfaceProtocol */ - proto_tree_add_item(tree, hf_usb_bInterfaceProtocol, tvb, offset, 1, TRUE); + proto_tree_add_item(tree, hf_usb_bInterfaceProtocol, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; /* iInterface */ - proto_tree_add_item(tree, hf_usb_iInterface, tvb, offset, 1, TRUE); + proto_tree_add_item(tree, hf_usb_iInterface, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; if(item){ @@ -1109,23 +1109,23 @@ dissect_usb_endpoint_descriptor(packet_info *pinfo, proto_tree *parent_tree, tvb } /* bLength */ - proto_tree_add_item(tree, hf_usb_bLength, tvb, offset, 1, TRUE); + proto_tree_add_item(tree, hf_usb_bLength, tvb, offset, 1, ENC_LITTLE_ENDIAN); len = tvb_get_guint8(tvb, offset); offset++; /* bDescriptorType */ - proto_tree_add_item(tree, hf_usb_bDescriptorType, tvb, offset, 1, TRUE); + proto_tree_add_item(tree, hf_usb_bDescriptorType, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; /* bEndpointAddress */ if(tree){ - endpoint_item=proto_tree_add_item(tree, hf_usb_bEndpointAddress, tvb, offset, 1, TRUE); + endpoint_item=proto_tree_add_item(tree, hf_usb_bEndpointAddress, tvb, offset, 1, ENC_LITTLE_ENDIAN); endpoint_tree=proto_item_add_subtree(endpoint_item, ett_configuration_bEndpointAddress); } endpoint=tvb_get_guint8(tvb, offset)&0x0f; proto_tree_add_item(endpoint_tree, hf_usb_bEndpointAddress_direction, tvb, offset, 1, TRUE); proto_item_append_text(endpoint_item, " %s", (tvb_get_guint8(tvb, offset)&0x80)?"IN":"OUT"); - proto_tree_add_item(endpoint_tree, hf_usb_bEndpointAddress_number, tvb, offset, 1, TRUE); + proto_tree_add_item(endpoint_tree, hf_usb_bEndpointAddress_number, tvb, offset, 1, ENC_LITTLE_ENDIAN); proto_item_append_text(endpoint_item, " Endpoint:%d", endpoint); offset++; @@ -1169,22 +1169,22 @@ dissect_usb_endpoint_descriptor(packet_info *pinfo, proto_tree *parent_tree, tvb /* bmAttributes */ if (tree) { - ep_attrib_item=proto_tree_add_item(tree, hf_usb_bmAttributes, tvb, offset, 1, TRUE); + ep_attrib_item=proto_tree_add_item(tree, hf_usb_bmAttributes, tvb, offset, 1, ENC_LITTLE_ENDIAN); ep_attrib_tree=proto_item_add_subtree(ep_attrib_item, ett_endpoint_bmAttributes); } - proto_tree_add_item(ep_attrib_tree, hf_usb_bEndpointAttributeTransfer, tvb, offset, 1, TRUE); + proto_tree_add_item(ep_attrib_tree, hf_usb_bEndpointAttributeTransfer, tvb, offset, 1, ENC_LITTLE_ENDIAN); /* isochronous only */ - proto_tree_add_item(ep_attrib_tree, hf_usb_bEndpointAttributeSynchonisation, tvb, offset, 1, TRUE); + proto_tree_add_item(ep_attrib_tree, hf_usb_bEndpointAttributeSynchonisation, tvb, offset, 1, ENC_LITTLE_ENDIAN); /* isochronous only */ - proto_tree_add_item(ep_attrib_tree, hf_usb_bEndpointAttributeBehaviour, tvb, offset, 1, TRUE); + proto_tree_add_item(ep_attrib_tree, hf_usb_bEndpointAttributeBehaviour, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; /* wMaxPacketSize */ - proto_tree_add_item(tree, hf_usb_wMaxPacketSize, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_usb_wMaxPacketSize, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset+=2; /* bInterval */ - proto_tree_add_item(tree, hf_usb_bInterval, tvb, offset, 1, TRUE); + proto_tree_add_item(tree, hf_usb_bInterval, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; if(item){ @@ -1212,7 +1212,7 @@ dissect_usb_unknown_descriptor(packet_info *pinfo _U_, proto_tree *parent_tree, } /* bLength */ - proto_tree_add_item(tree, hf_usb_bLength, tvb, offset, 1, TRUE); + proto_tree_add_item(tree, hf_usb_bLength, tvb, offset, 1, ENC_LITTLE_ENDIAN); bLength = tvb_get_guint8(tvb, offset); offset++; if (bLength < 3) { @@ -1229,7 +1229,7 @@ dissect_usb_unknown_descriptor(packet_info *pinfo _U_, proto_tree *parent_tree, } /* bDescriptorType */ - proto_tree_add_item(tree, hf_usb_bDescriptorType, tvb, offset, 1, TRUE); + proto_tree_add_item(tree, hf_usb_bDescriptorType, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; offset += bLength - 2; @@ -1273,33 +1273,33 @@ dissect_usb_configuration_descriptor(packet_info *pinfo _U_, proto_tree *parent_ } /* bLength */ - proto_tree_add_item(tree, hf_usb_bLength, tvb, offset, 1, TRUE); + proto_tree_add_item(tree, hf_usb_bLength, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; /* bDescriptorType */ - proto_tree_add_item(tree, hf_usb_bDescriptorType, tvb, offset, 1, TRUE); + proto_tree_add_item(tree, hf_usb_bDescriptorType, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; /* wTotalLength */ - proto_tree_add_item(tree, hf_usb_wTotalLength, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_usb_wTotalLength, tvb, offset, 2, ENC_LITTLE_ENDIAN); len=tvb_get_letohs(tvb, offset); offset+=2; /* bNumInterfaces */ - proto_tree_add_item(tree, hf_usb_bNumInterfaces, tvb, offset, 1, TRUE); + proto_tree_add_item(tree, hf_usb_bNumInterfaces, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; /* bConfigurationValue */ - proto_tree_add_item(tree, hf_usb_bConfigurationValue, tvb, offset, 1, TRUE); + proto_tree_add_item(tree, hf_usb_bConfigurationValue, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; /* iConfiguration */ - proto_tree_add_item(tree, hf_usb_iConfiguration, tvb, offset, 1, TRUE); + proto_tree_add_item(tree, hf_usb_iConfiguration, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; /* bmAttributes */ if(tree){ - flags_item=proto_tree_add_item(tree, hf_usb_configuration_bmAttributes, tvb, offset, 1, TRUE); + flags_item=proto_tree_add_item(tree, hf_usb_configuration_bmAttributes, tvb, offset, 1, ENC_LITTLE_ENDIAN); flags_tree=proto_item_add_subtree(flags_item, ett_configuration_bmAttributes); } flags=tvb_get_guint8(tvb, offset); @@ -1311,7 +1311,7 @@ dissect_usb_configuration_descriptor(packet_info *pinfo _U_, proto_tree *parent_ offset++; /* bMaxPower */ - power_item=proto_tree_add_item(tree, hf_usb_bMaxPower, tvb, offset, 1, TRUE); + power_item=proto_tree_add_item(tree, hf_usb_bMaxPower, tvb, offset, 1, ENC_LITTLE_ENDIAN); power=tvb_get_guint8(tvb, offset); proto_item_append_text(power_item, " (%dmA)", power*2); offset++; @@ -1353,12 +1353,12 @@ static int dissect_usb_setup_get_descriptor_request(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset, usb_trans_info_t *usb_trans_info, usb_conv_info_t *usb_conv_info _U_) { /* descriptor index */ - proto_tree_add_item(tree, hf_usb_descriptor_index, tvb, offset, 1, TRUE); + proto_tree_add_item(tree, hf_usb_descriptor_index, tvb, offset, 1, ENC_LITTLE_ENDIAN); usb_trans_info->u.get_descriptor.index=tvb_get_guint8(tvb, offset); offset++; /* descriptor type */ - proto_tree_add_item(tree, hf_usb_bDescriptorType, tvb, offset, 1, TRUE); + proto_tree_add_item(tree, hf_usb_bDescriptorType, tvb, offset, 1, ENC_LITTLE_ENDIAN); usb_trans_info->u.get_descriptor.type=tvb_get_guint8(tvb, offset); offset++; if (check_col(pinfo->cinfo, COL_INFO)) { @@ -1367,11 +1367,11 @@ dissect_usb_setup_get_descriptor_request(packet_info *pinfo, proto_tree *tree, t } /* language id */ - proto_tree_add_item(tree, hf_usb_language_id, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_usb_language_id, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset+=2; /* length */ - proto_tree_add_item(tree, hf_usb_length, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_usb_length, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; return offset; @@ -1437,15 +1437,15 @@ static int dissect_usb_setup_get_interface_request(packet_info *pinfo _U_, proto_tree *tree, tvbuff_t *tvb, int offset, usb_trans_info_t *usb_trans_info _U_, usb_conv_info_t *usb_conv_info _U_) { /* zero */ - proto_tree_add_item(tree, hf_usb_value, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_usb_value, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; /* interface */ - proto_tree_add_item(tree, hf_usb_wInterface, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_usb_wInterface, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; /* length */ - proto_tree_add_item(tree, hf_usb_length, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_usb_length, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; return offset; @@ -1455,7 +1455,7 @@ static int dissect_usb_setup_get_interface_response(packet_info *pinfo _U_, proto_tree *tree, tvbuff_t *tvb, int offset, usb_trans_info_t *usb_trans_info _U_, usb_conv_info_t *usb_conv_info _U_) { /* alternate setting */ - proto_tree_add_item(tree, hf_usb_bAlternateSetting, tvb, offset, 1, TRUE); + proto_tree_add_item(tree, hf_usb_bAlternateSetting, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; return offset; @@ -1473,16 +1473,16 @@ static int dissect_usb_setup_get_status_request(packet_info *pinfo _U_, proto_tree *tree, tvbuff_t *tvb, int offset, usb_trans_info_t *usb_trans_info _U_, usb_conv_info_t *usb_conv_info _U_) { /* zero */ - proto_tree_add_item(tree, hf_usb_value, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_usb_value, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; /* zero/interface/endpoint */ /* XXX - check based on request type */ - proto_tree_add_item(tree, hf_usb_wInterface, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_usb_wInterface, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; /* length */ - proto_tree_add_item(tree, hf_usb_length, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_usb_length, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; return offset; @@ -1493,7 +1493,7 @@ dissect_usb_setup_get_status_response(packet_info *pinfo _U_, proto_tree *tree, { /* status */ /* XXX - show bits */ - proto_tree_add_item(tree, hf_usb_wStatus, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_usb_wStatus, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; return offset; @@ -1511,15 +1511,15 @@ static int dissect_usb_setup_set_address_request(packet_info *pinfo _U_, proto_tree *tree, tvbuff_t *tvb, int offset, usb_trans_info_t *usb_trans_info _U_, usb_conv_info_t *usb_conv_info _U_) { /* device address */ - proto_tree_add_item(tree, hf_usb_device_address, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_usb_device_address, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; /* zero */ - proto_tree_add_item(tree, hf_usb_index, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_usb_index, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; /* zero */ - proto_tree_add_item(tree, hf_usb_length, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_usb_length, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; return offset; @@ -1543,15 +1543,15 @@ static int dissect_usb_setup_set_configuration_request(packet_info *pinfo _U_, proto_tree *tree, tvbuff_t *tvb, int offset, usb_trans_info_t *usb_trans_info _U_, usb_conv_info_t *usb_conv_info _U_) { /* configuration value */ - proto_tree_add_item(tree, hf_usb_bConfigurationValue, tvb, offset, 1, TRUE); + proto_tree_add_item(tree, hf_usb_bConfigurationValue, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 2; /* zero */ - proto_tree_add_item(tree, hf_usb_index, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_usb_index, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; /* zero */ - proto_tree_add_item(tree, hf_usb_length, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_usb_length, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; return offset; @@ -1575,16 +1575,16 @@ static int dissect_usb_setup_set_feature_request(packet_info *pinfo _U_, proto_tree *tree, tvbuff_t *tvb, int offset, usb_trans_info_t *usb_trans_info _U_, usb_conv_info_t *usb_conv_info _U_) { /* feature selector */ - proto_tree_add_item(tree, hf_usb_wFeatureSelector, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_usb_wFeatureSelector, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; /* zero/interface/endpoint or test selector */ /* XXX - check based on request type */ - proto_tree_add_item(tree, hf_usb_wInterface, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_usb_wInterface, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; /* zero */ - proto_tree_add_item(tree, hf_usb_length, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_usb_length, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; return offset; @@ -1608,15 +1608,15 @@ static int dissect_usb_setup_set_interface_request(packet_info *pinfo _U_, proto_tree *tree, tvbuff_t *tvb, int offset, usb_trans_info_t *usb_trans_info _U_, usb_conv_info_t *usb_conv_info _U_) { /* alternate setting */ - proto_tree_add_item(tree, hf_usb_bAlternateSetting, tvb, offset, 1, TRUE); + proto_tree_add_item(tree, hf_usb_bAlternateSetting, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 2; /* interface */ - proto_tree_add_item(tree, hf_usb_wInterface, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_usb_wInterface, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; /* zero */ - proto_tree_add_item(tree, hf_usb_length, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_usb_length, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; return offset; @@ -1640,16 +1640,16 @@ static int dissect_usb_setup_synch_frame_request(packet_info *pinfo _U_, proto_tree *tree, tvbuff_t *tvb, int offset, usb_trans_info_t *usb_trans_info _U_, usb_conv_info_t *usb_conv_info _U_) { /* zero */ - proto_tree_add_item(tree, hf_usb_value, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_usb_value, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; /* endpoint */ /* XXX */ - proto_tree_add_item(tree, hf_usb_wInterface, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_usb_wInterface, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; /* two */ - proto_tree_add_item(tree, hf_usb_length, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_usb_length, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; return offset; @@ -1659,7 +1659,7 @@ static int dissect_usb_setup_synch_frame_response(packet_info *pinfo _U_, proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset, usb_trans_info_t *usb_trans_info _U_, usb_conv_info_t *usb_conv_info _U_) { /* frame number */ - proto_tree_add_item(tree, hf_usb_wFrameNumber, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_usb_wFrameNumber, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; return offset; @@ -1756,14 +1756,14 @@ dissect_usb_bmrequesttype(proto_tree *parent_tree, tvbuff_t *tvb, int offset, proto_tree *tree=NULL; if(parent_tree){ - item=proto_tree_add_item(parent_tree, hf_usb_bmRequestType, tvb, offset, 1, TRUE); + item=proto_tree_add_item(parent_tree, hf_usb_bmRequestType, tvb, offset, 1, ENC_LITTLE_ENDIAN); tree = proto_item_add_subtree(item, ett_usb_setup_bmrequesttype); } *type = USB_TYPE(tvb_get_guint8(tvb, offset)); proto_tree_add_item(tree, hf_usb_bmRequestType_direction, tvb, offset, 1, TRUE); - proto_tree_add_item(tree, hf_usb_bmRequestType_type, tvb, offset, 1, TRUE); - proto_tree_add_item(tree, hf_usb_bmRequestType_recipient, tvb, offset, 1, TRUE); + proto_tree_add_item(tree, hf_usb_bmRequestType_type, tvb, offset, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_usb_bmRequestType_recipient, tvb, offset, 1, ENC_LITTLE_ENDIAN); return ++offset; } @@ -1793,7 +1793,7 @@ dissect_linux_usb_pseudo_header(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t proto_tree_add_uint_format_value(tree, hf_usb_urb_type, tvb, 8, 1, type, "%s ('%c')", val_to_str(type, usb_urb_type_vals, "Unknown %d"), isprint(type) ? type : '.'); - proto_tree_add_item(tree, hf_usb_transfer_type, tvb, 9, 1, FALSE); + proto_tree_add_item(tree, hf_usb_transfer_type, tvb, 9, 1, ENC_BIG_ENDIAN); if (check_col(pinfo->cinfo, COL_INFO)) { transfer_type = tvb_get_guint8(tvb, 9); @@ -1804,7 +1804,7 @@ dissect_linux_usb_pseudo_header(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t } proto_tree_add_bitmask(tree, tvb, 10, hf_usb_endpoint_number, ett_usb_endpoint, usb_endpoint_fields, FALSE); - proto_tree_add_item(tree, hf_usb_device_address, tvb, 11, 1, FALSE); + proto_tree_add_item(tree, hf_usb_device_address, tvb, 11, 1, ENC_BIG_ENDIAN); tvb_memcpy(tvb, (guint8 *)&val16, 12, 2); proto_tree_add_uint(tree, hf_usb_bus_id, tvb, 12, 2, val16); @@ -2055,7 +2055,7 @@ dissect_linux_usb_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent, * This is a standard request which is managed by this * dissector */ - proto_tree_add_item(setup_tree, hf_usb_request, tvb, offset, 1, TRUE); + proto_tree_add_item(setup_tree, hf_usb_request, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; if (check_col(pinfo->cinfo, COL_INFO)) { @@ -2074,11 +2074,11 @@ dissect_linux_usb_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent, if(dissector){ offset=dissector(pinfo, setup_tree, tvb, offset, usb_trans_info, usb_conv_info); } else { - proto_tree_add_item(setup_tree, hf_usb_value, tvb, offset, 2, TRUE); + proto_tree_add_item(setup_tree, hf_usb_value, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; - proto_tree_add_item(setup_tree, hf_usb_index, tvb, offset, 2, TRUE); + proto_tree_add_item(setup_tree, hf_usb_index, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; - proto_tree_add_item(setup_tree, hf_usb_length, tvb, offset, 2, TRUE); + proto_tree_add_item(setup_tree, hf_usb_length, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; } break; @@ -2090,24 +2090,24 @@ dissect_linux_usb_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent, return; } /* Else no class dissector, just display generic fields */ - proto_tree_add_item(setup_tree, hf_usb_request_unknown_class, tvb, offset, 1, TRUE); + proto_tree_add_item(setup_tree, hf_usb_request_unknown_class, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; - proto_tree_add_item(setup_tree, hf_usb_value, tvb, offset, 2, TRUE); + proto_tree_add_item(setup_tree, hf_usb_value, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; - proto_tree_add_item(setup_tree, hf_usb_index, tvb, offset, 2, TRUE); + proto_tree_add_item(setup_tree, hf_usb_index, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; - proto_tree_add_item(setup_tree, hf_usb_length, tvb, offset, 2, TRUE); + proto_tree_add_item(setup_tree, hf_usb_length, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; break; default: - proto_tree_add_item(setup_tree, hf_usb_request_unknown_class, tvb, offset, 1, TRUE); + proto_tree_add_item(setup_tree, hf_usb_request_unknown_class, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; - proto_tree_add_item(setup_tree, hf_usb_value, tvb, offset, 2, TRUE); + proto_tree_add_item(setup_tree, hf_usb_value, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; - proto_tree_add_item(setup_tree, hf_usb_index, tvb, offset, 2, TRUE); + proto_tree_add_item(setup_tree, hf_usb_index, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; - proto_tree_add_item(setup_tree, hf_usb_length, tvb, offset, 2, TRUE); + proto_tree_add_item(setup_tree, hf_usb_length, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; } } else { @@ -2213,13 +2213,13 @@ dissect_linux_usb_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent, setup_tree = proto_item_add_subtree(ti, usb_setup_hdr); offset = dissect_usb_bmrequesttype(setup_tree, tvb, offset, &type_2); - proto_tree_add_item(setup_tree, hf_usb_request, tvb, offset, 1, TRUE); + proto_tree_add_item(setup_tree, hf_usb_request, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; - proto_tree_add_item(tree, hf_usb_value, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_usb_value, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; - proto_tree_add_item(tree, hf_usb_index, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_usb_index, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; - proto_tree_add_item(tree, hf_usb_length, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_usb_length, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; } else { @@ -2318,13 +2318,13 @@ dissect_linux_usb_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent, setup_tree = proto_item_add_subtree(ti, usb_setup_hdr); offset=dissect_usb_bmrequesttype(setup_tree, tvb, offset, &type_2); - proto_tree_add_item(setup_tree, hf_usb_request, tvb, offset, 1, TRUE); + proto_tree_add_item(setup_tree, hf_usb_request, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; - proto_tree_add_item(tree, hf_usb_value, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_usb_value, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; - proto_tree_add_item(tree, hf_usb_index, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_usb_index, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; - proto_tree_add_item(tree, hf_usb_length, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_usb_length, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; } else { /* Skip setup/isochronous header - it's not applicable */ diff --git a/epan/dissectors/packet-v52.c b/epan/dissectors/packet-v52.c index 514dc97663..497cf87e8f 100644 --- a/epan/dissectors/packet-v52.c +++ b/epan/dissectors/packet-v52.c @@ -705,10 +705,10 @@ dissect_pstn_sequence_number(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree if (info_tree != NULL) { pstn_sequence_number_tmp = tvb_get_guint8(info_tvb, info_offset+2)-0x80; - proto_tree_add_item(info_tree, hf_v52_info_element, info_tvb, info_offset, info_element_length, FALSE); - proto_tree_add_item(info_tree, hf_v52_info_length, info_tvb, info_offset+1, info_element_length, FALSE); + proto_tree_add_item(info_tree, hf_v52_info_element, info_tvb, info_offset, info_element_length, ENC_BIG_ENDIAN); + proto_tree_add_item(info_tree, hf_v52_info_length, info_tvb, info_offset+1, info_element_length, ENC_BIG_ENDIAN); proto_item_append_text(ti_info, " %s (0x%x)",val_to_str(info_element, info_element_values, "unknown info element"),info_element); - proto_tree_add_item(info_tree, hf_v52_pstn_sequence_number, info_tvb, info_offset+2, info_element_length, FALSE); + proto_tree_add_item(info_tree, hf_v52_pstn_sequence_number, info_tvb, info_offset+2, info_element_length, ENC_BIG_ENDIAN); col_append_fstr(pinfo->cinfo, COL_INFO, " | SN: %u", pstn_sequence_number_tmp); } @@ -738,10 +738,10 @@ dissect_cadenced_ring(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int o if (info_tree != NULL) { cadenced_ring_tmp = tvb_get_guint8(info_tvb, info_offset+2)-0x80; - proto_tree_add_item(info_tree, hf_v52_info_element, info_tvb, info_offset, info_element_length, FALSE); - proto_tree_add_item(info_tree, hf_v52_info_length, info_tvb, info_offset+1, info_element_length, FALSE); + proto_tree_add_item(info_tree, hf_v52_info_element, info_tvb, info_offset, info_element_length, ENC_BIG_ENDIAN); + proto_tree_add_item(info_tree, hf_v52_info_length, info_tvb, info_offset+1, info_element_length, ENC_BIG_ENDIAN); proto_item_append_text(ti_info, " %s (0x%x)",val_to_str(info_element, info_element_values, "unknown info element"),info_element); - proto_tree_add_item(info_tree, hf_v52_cadenced_ring, info_tvb, info_offset+2, info_element_length, FALSE); + proto_tree_add_item(info_tree, hf_v52_cadenced_ring, info_tvb, info_offset+2, info_element_length, ENC_BIG_ENDIAN); col_append_str(pinfo->cinfo, COL_INFO, " | "); col_append_str(pinfo->cinfo, COL_INFO, val_to_str(tvb_get_guint8(info_tvb, info_offset), info_element_values_short, "Unknown element")); @@ -774,19 +774,19 @@ dissect_pulsed_signal(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int o } if (info_tree != NULL) { - proto_tree_add_item(info_tree, hf_v52_info_element, info_tvb, info_offset, info_element_length, FALSE); - proto_tree_add_item(info_tree, hf_v52_info_length, info_tvb, info_offset+1, info_element_length, FALSE); + proto_tree_add_item(info_tree, hf_v52_info_element, info_tvb, info_offset, info_element_length, ENC_BIG_ENDIAN); + proto_tree_add_item(info_tree, hf_v52_info_length, info_tvb, info_offset+1, info_element_length, ENC_BIG_ENDIAN); proto_item_append_text(ti_info, " %s (0x%x)",val_to_str(info_element, info_element_values, "unknown info element"),info_element); - proto_tree_add_item(info_tree, hf_v52_pulse_type, info_tvb, info_offset+2, 1, FALSE); + proto_tree_add_item(info_tree, hf_v52_pulse_type, info_tvb, info_offset+2, 1, ENC_BIG_ENDIAN); if (data_length > 3) { - proto_tree_add_item(info_tree, hf_v52_suppression_indicator, info_tvb, info_offset+3, 1, FALSE); - proto_tree_add_item(info_tree, hf_v52_pulse_duration, info_tvb, info_offset+3, 1, FALSE); + proto_tree_add_item(info_tree, hf_v52_suppression_indicator, info_tvb, info_offset+3, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(info_tree, hf_v52_pulse_duration, info_tvb, info_offset+3, 1, ENC_BIG_ENDIAN); } if (data_length > 4) { - proto_tree_add_item(info_tree, hf_v52_ack_request_indicator, info_tvb, info_offset+4, 1, FALSE); - proto_tree_add_item(info_tree, hf_v52_number_of_pulses, info_tvb, info_offset+4, 1, FALSE); + proto_tree_add_item(info_tree, hf_v52_ack_request_indicator, info_tvb, info_offset+4, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(info_tree, hf_v52_number_of_pulses, info_tvb, info_offset+4, 1, ENC_BIG_ENDIAN); } col_append_str(pinfo->cinfo, COL_INFO, " | "); @@ -822,10 +822,10 @@ dissect_steady_signal(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int o } if (info_tree != NULL) { - proto_tree_add_item(info_tree, hf_v52_info_element, info_tvb, info_offset, info_element_length, FALSE); - proto_tree_add_item(info_tree, hf_v52_info_length, info_tvb, info_offset+1, info_element_length, FALSE); + proto_tree_add_item(info_tree, hf_v52_info_element, info_tvb, info_offset, info_element_length, ENC_BIG_ENDIAN); + proto_tree_add_item(info_tree, hf_v52_info_length, info_tvb, info_offset+1, info_element_length, ENC_BIG_ENDIAN); proto_item_append_text(ti_info, " %s (0x%x)",val_to_str(info_element, info_element_values, "unknown info element"),info_element); - proto_tree_add_item(info_tree, hf_v52_steady_signal, info_tvb, info_offset+2, 1, FALSE); + proto_tree_add_item(info_tree, hf_v52_steady_signal, info_tvb, info_offset+2, 1, ENC_BIG_ENDIAN); col_append_str(pinfo->cinfo, COL_INFO, " | "); col_append_str(pinfo->cinfo, COL_INFO, val_to_str(tvb_get_guint8(info_tvb, info_offset), info_element_values_short, "Unknown element")); @@ -859,8 +859,8 @@ dissect_digit_signal(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int of } if (info_tree != NULL) { - proto_tree_add_item(info_tree, hf_v52_info_element, info_tvb, info_offset, info_element_length, FALSE); - proto_tree_add_item(info_tree, hf_v52_info_length, info_tvb, info_offset+1, info_element_length, FALSE); + proto_tree_add_item(info_tree, hf_v52_info_element, info_tvb, info_offset, info_element_length, ENC_BIG_ENDIAN); + proto_tree_add_item(info_tree, hf_v52_info_length, info_tvb, info_offset+1, info_element_length, ENC_BIG_ENDIAN); proto_item_append_text(ti_info, " %s (0x%x)",val_to_str(info_element, info_element_values, "unknown info element"),info_element); buffer = tvb_get_guint8(info_tvb, info_offset+2)>>6; @@ -872,8 +872,8 @@ dissect_digit_signal(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int of buffer = tvb_get_guint8(info_tvb, info_offset+2)>>4; buffer = buffer&0x03; - proto_tree_add_item(info_tree, hf_v52_digit_spare, info_tvb, info_offset+2, info_element_length, FALSE); - proto_tree_add_item(info_tree, hf_v52_digit_info, info_tvb, info_offset+2, info_element_length, FALSE); + proto_tree_add_item(info_tree, hf_v52_digit_spare, info_tvb, info_offset+2, info_element_length, ENC_BIG_ENDIAN); + proto_tree_add_item(info_tree, hf_v52_digit_info, info_tvb, info_offset+2, info_element_length, ENC_BIG_ENDIAN); col_append_str(pinfo->cinfo, COL_INFO, " | "); col_append_str(pinfo->cinfo, COL_INFO, val_to_str(tvb_get_guint8(info_tvb, info_offset), info_element_values_short, "Unknown element")); @@ -908,19 +908,19 @@ dissect_recognition_time(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, in } if (info_tree != NULL) { - proto_tree_add_item(info_tree, hf_v52_info_element, info_tvb, info_offset, info_element_length, FALSE); - proto_tree_add_item(info_tree, hf_v52_info_length, info_tvb, info_offset+1, info_element_length, FALSE); + proto_tree_add_item(info_tree, hf_v52_info_element, info_tvb, info_offset, info_element_length, ENC_BIG_ENDIAN); + proto_tree_add_item(info_tree, hf_v52_info_length, info_tvb, info_offset+1, info_element_length, ENC_BIG_ENDIAN); proto_item_append_text(ti_info, " %s (0x%x)",val_to_str(info_element, info_element_values, "unknown info element"),info_element); buffer = tvb_get_guint8(info_tvb, info_offset+2)&0x7f; /*Signal = Coding of pulse type*/ if(buffer>=0x6b) - proto_tree_add_item(info_tree, hf_v52_pulse_type, info_tvb, info_offset+2, 1, FALSE); + proto_tree_add_item(info_tree, hf_v52_pulse_type, info_tvb, info_offset+2, 1, ENC_BIG_ENDIAN); /*Signal = Coding of steady signal type*/ else if(buffer<=0x1a) - proto_tree_add_item(info_tree, hf_v52_steady_signal, info_tvb, info_offset+2, 1, FALSE); + proto_tree_add_item(info_tree, hf_v52_steady_signal, info_tvb, info_offset+2, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(info_tree, hf_v52_duration_type, info_tvb, info_offset+3, 1, FALSE); + proto_tree_add_item(info_tree, hf_v52_duration_type, info_tvb, info_offset+3, 1, ENC_BIG_ENDIAN); col_append_str(pinfo->cinfo, COL_INFO, " | "); col_append_str(pinfo->cinfo, COL_INFO, val_to_str(tvb_get_guint8(info_tvb, info_offset), info_element_values_short, "Unknown element")); @@ -951,31 +951,31 @@ dissect_enable_auto_ack(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int } if (info_tree != NULL) { - proto_tree_add_item(info_tree, hf_v52_info_element, info_tvb, info_offset, info_element_length, FALSE); - proto_tree_add_item(info_tree, hf_v52_info_length, info_tvb, info_offset+1, info_element_length, FALSE); + proto_tree_add_item(info_tree, hf_v52_info_element, info_tvb, info_offset, info_element_length, ENC_BIG_ENDIAN); + proto_tree_add_item(info_tree, hf_v52_info_length, info_tvb, info_offset+1, info_element_length, ENC_BIG_ENDIAN); proto_item_append_text(ti_info, " %s (0x%x)",val_to_str(info_element, info_element_values, "unknown info element"),info_element); buffer = tvb_get_guint8(info_tvb, info_offset+2)&0x7f; /*Signal*/ if(buffer>=0x6b) - proto_tree_add_item(info_tree, hf_v52_pulse_type, info_tvb, info_offset+2, 1, FALSE); + proto_tree_add_item(info_tree, hf_v52_pulse_type, info_tvb, info_offset+2, 1, ENC_BIG_ENDIAN); else if(buffer<=0x1a) - proto_tree_add_item(info_tree, hf_v52_steady_signal, info_tvb, info_offset+2, 1, FALSE); + proto_tree_add_item(info_tree, hf_v52_steady_signal, info_tvb, info_offset+2, 1, ENC_BIG_ENDIAN); buffer = tvb_get_guint8(info_tvb, info_offset+3)&0x7f; /*Response*/ if(buffer>=0x6b) - proto_tree_add_item(info_tree, hf_v52_pulse_type, info_tvb, info_offset+3, 1, FALSE); + proto_tree_add_item(info_tree, hf_v52_pulse_type, info_tvb, info_offset+3, 1, ENC_BIG_ENDIAN); else if(buffer<=0x1a) - proto_tree_add_item(info_tree, hf_v52_steady_signal, info_tvb, info_offset+3,1,FALSE); + proto_tree_add_item(info_tree, hf_v52_steady_signal, info_tvb, info_offset+3,1,ENC_BIG_ENDIAN); if(tvb_length_remaining(info_tvb, info_offset+4)){ - proto_tree_add_item(info_tree, hf_v52_suppression_indicator, info_tvb, info_offset+4,1,FALSE); - proto_tree_add_item(info_tree, hf_v52_pulse_duration, info_tvb, info_offset+4,1,FALSE); + proto_tree_add_item(info_tree, hf_v52_suppression_indicator, info_tvb, info_offset+4,1,ENC_BIG_ENDIAN); + proto_tree_add_item(info_tree, hf_v52_pulse_duration, info_tvb, info_offset+4,1,ENC_BIG_ENDIAN); } if(tvb_length_remaining(info_tvb, info_offset+5)){ - proto_tree_add_item(info_tree, hf_v52_ack_request_indicator, info_tvb, info_offset+5,1,FALSE); - proto_tree_add_item(info_tree, hf_v52_number_of_pulses, info_tvb, info_offset+5,1,FALSE); + proto_tree_add_item(info_tree, hf_v52_ack_request_indicator, info_tvb, info_offset+5,1,ENC_BIG_ENDIAN); + proto_tree_add_item(info_tree, hf_v52_number_of_pulses, info_tvb, info_offset+5,1,ENC_BIG_ENDIAN); } col_append_str(pinfo->cinfo, COL_INFO, " | "); @@ -1007,16 +1007,16 @@ dissect_disable_auto_ack(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, in } if (info_tree != NULL) { - proto_tree_add_item(info_tree, hf_v52_info_element, info_tvb, info_offset, info_element_length, FALSE); - proto_tree_add_item(info_tree, hf_v52_info_length, info_tvb, info_offset+1, info_element_length, FALSE); + proto_tree_add_item(info_tree, hf_v52_info_element, info_tvb, info_offset, info_element_length, ENC_BIG_ENDIAN); + proto_tree_add_item(info_tree, hf_v52_info_length, info_tvb, info_offset+1, info_element_length, ENC_BIG_ENDIAN); proto_item_append_text(ti_info, " %s (0x%x)",val_to_str(info_element, info_element_values, "unknown info element"),info_element); buffer = tvb_get_guint8(info_tvb, info_offset+2)&0x7f; if(buffer>=0x6b) - proto_tree_add_item(info_tree, hf_v52_pulse_type, info_tvb, info_offset+2, 1, FALSE); + proto_tree_add_item(info_tree, hf_v52_pulse_type, info_tvb, info_offset+2, 1, ENC_BIG_ENDIAN); else if(buffer<=0x1a) - proto_tree_add_item(info_tree, hf_v52_steady_signal, info_tvb, info_offset+2, 1, FALSE); + proto_tree_add_item(info_tree, hf_v52_steady_signal, info_tvb, info_offset+2, 1, ENC_BIG_ENDIAN); col_append_str(pinfo->cinfo, COL_INFO, " | "); col_append_str(pinfo->cinfo, COL_INFO, val_to_str(tvb_get_guint8(info_tvb, info_offset), info_element_values_short, "Unknown element")); @@ -1046,10 +1046,10 @@ dissect_cause(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset) } if (info_tree != NULL) { - proto_tree_add_item(info_tree, hf_v52_info_element, info_tvb, info_offset, info_element_length, FALSE); - proto_tree_add_item(info_tree, hf_v52_info_length, info_tvb, info_offset+1, info_element_length, FALSE); + proto_tree_add_item(info_tree, hf_v52_info_element, info_tvb, info_offset, info_element_length, ENC_BIG_ENDIAN); + proto_tree_add_item(info_tree, hf_v52_info_length, info_tvb, info_offset+1, info_element_length, ENC_BIG_ENDIAN); proto_item_append_text(ti_info, " %s (0x%x)",val_to_str(info_element, info_element_values, "unknown info element"), info_element); - proto_tree_add_item(info_tree, hf_v52_cause_type, info_tvb, info_offset+2, 1, FALSE); + proto_tree_add_item(info_tree, hf_v52_cause_type, info_tvb, info_offset+2, 1, ENC_BIG_ENDIAN); if(tvb_length_remaining(info_tvb, info_offset+3)) proto_tree_add_uint_format(info_tree, hf_v52_msg_type, info_tvb, info_offset+3, 1, tvb_get_guint8(info_tvb, info_offset+3), @@ -1086,8 +1086,8 @@ dissect_resource_unavailable(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree } if (info_tree != NULL) { - proto_tree_add_item(info_tree, hf_v52_info_element, info_tvb, info_offset, info_element_length, FALSE); - proto_tree_add_item(info_tree, hf_v52_info_length, info_tvb, info_offset+1, info_element_length, FALSE); + proto_tree_add_item(info_tree, hf_v52_info_element, info_tvb, info_offset, info_element_length, ENC_BIG_ENDIAN); + proto_tree_add_item(info_tree, hf_v52_info_length, info_tvb, info_offset+1, info_element_length, ENC_BIG_ENDIAN); proto_item_append_text(ti_info, " %s (0x%x)",val_to_str(info_element, info_element_values, "unknown info element"),info_element); proto_tree_add_item(info_tree, hf_v52_res_unavailable, info_tvb, info_offset+2, info_element_length, FALSE); @@ -1120,7 +1120,7 @@ dissect_pulse_notification(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (info_tree != NULL) { proto_item_append_text(ti_info, " %s (0x%x)",val_to_str(info_element, info_element_values, "unknown info element"),info_element); - proto_tree_add_item(info_tree, hf_v52_pulse_notification, info_tvb, info_offset, info_element_length, FALSE); + proto_tree_add_item(info_tree, hf_v52_pulse_notification, info_tvb, info_offset, info_element_length, ENC_BIG_ENDIAN); col_append_str(pinfo->cinfo, COL_INFO, " | "); col_append_str(pinfo->cinfo, COL_INFO, val_to_str(tvb_get_guint8(info_tvb, info_offset), info_element_values_short, "Unknown element")); @@ -1151,7 +1151,7 @@ dissect_line_information(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, in if (info_tree != NULL) { proto_item_append_text(ti_info, " %s (0x%x)",val_to_str(info_element, info_element_values, "unknown info element"),info_element); - proto_tree_add_item(info_tree, hf_v52_line_info, info_tvb, info_offset, info_element_length, FALSE); + proto_tree_add_item(info_tree, hf_v52_line_info, info_tvb, info_offset, info_element_length, ENC_BIG_ENDIAN); col_append_str(pinfo->cinfo, COL_INFO, " | "); col_append_str(pinfo->cinfo, COL_INFO, val_to_str(tvb_get_guint8(info_tvb, info_offset), info_element_values_short, "Unknown element")); @@ -1182,7 +1182,7 @@ dissect_state(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset) if (info_tree != NULL) { proto_item_append_text(ti_info, " %s (0x%x)",val_to_str(info_element, info_element_values, "unknown info element"),info_element); - proto_tree_add_item(info_tree, hf_v52_state, info_tvb, info_offset, info_element_length, FALSE); + proto_tree_add_item(info_tree, hf_v52_state, info_tvb, info_offset, info_element_length, ENC_BIG_ENDIAN); col_append_str(pinfo->cinfo, COL_INFO, " | "); col_append_str(pinfo->cinfo, COL_INFO, val_to_str(tvb_get_guint8(info_tvb, info_offset), info_element_values_short, "Unknown element")); @@ -1213,7 +1213,7 @@ dissect_auto_sig_sequence(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, i if (info_tree != NULL) { proto_item_append_text(ti_info, " %s (0x%x)",val_to_str(info_element, info_element_values, "unknown info element"),info_element); - proto_tree_add_item(info_tree, hf_v52_auto_signalling_sequence, info_tvb, info_offset, info_element_length, FALSE); + proto_tree_add_item(info_tree, hf_v52_auto_signalling_sequence, info_tvb, info_offset, info_element_length, ENC_BIG_ENDIAN); col_append_str(pinfo->cinfo, COL_INFO, " | "); col_append_str(pinfo->cinfo, COL_INFO, val_to_str(tvb_get_guint8(info_tvb, info_offset), info_element_values_short, "Unknown element")); @@ -1244,7 +1244,7 @@ dissect_sequence_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, i if (info_tree != NULL) { proto_item_append_text(ti_info, " %s (0x%x)",val_to_str(info_element, info_element_values, "unknown info element"),info_element); - proto_tree_add_item(info_tree, hf_v52_sequence_response, info_tvb, info_offset, info_element_length, FALSE); + proto_tree_add_item(info_tree, hf_v52_sequence_response, info_tvb, info_offset, info_element_length, ENC_BIG_ENDIAN); col_append_str(pinfo->cinfo, COL_INFO, " | "); col_append_str(pinfo->cinfo, COL_INFO, val_to_str(tvb_get_guint8(info_tvb, info_offset), info_element_values_short, "Unknown element")); @@ -1274,10 +1274,10 @@ dissect_control_function_element(tvbuff_t *tvb, packet_info *pinfo, proto_tree * } if (info_tree != NULL) { - proto_tree_add_item(info_tree, hf_v52_info_element, info_tvb, info_offset, info_element_length, FALSE); - proto_tree_add_item(info_tree, hf_v52_info_length, info_tvb, info_offset+1, info_element_length, FALSE); + proto_tree_add_item(info_tree, hf_v52_info_element, info_tvb, info_offset, info_element_length, ENC_BIG_ENDIAN); + proto_tree_add_item(info_tree, hf_v52_info_length, info_tvb, info_offset+1, info_element_length, ENC_BIG_ENDIAN); proto_item_append_text(ti_info, " %s (0x%x)",val_to_str(info_element, info_element_values, "unknown info element"),info_element); - proto_tree_add_item(info_tree, hf_v52_control_function_element, info_tvb, info_offset+2, info_element_length, FALSE); + proto_tree_add_item(info_tree, hf_v52_control_function_element, info_tvb, info_offset+2, info_element_length, ENC_BIG_ENDIAN); if (message_type_tmp == 0x11) {} else { @@ -1310,10 +1310,10 @@ dissect_control_function_id(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, } if (info_tree != NULL) { - proto_tree_add_item(info_tree, hf_v52_info_element, info_tvb, info_offset, info_element_length, FALSE); - proto_tree_add_item(info_tree, hf_v52_info_length, info_tvb, info_offset+1, info_element_length, FALSE); + proto_tree_add_item(info_tree, hf_v52_info_element, info_tvb, info_offset, info_element_length, ENC_BIG_ENDIAN); + proto_tree_add_item(info_tree, hf_v52_info_length, info_tvb, info_offset+1, info_element_length, ENC_BIG_ENDIAN); proto_item_append_text(ti_info, " %s (0x%x)",val_to_str(info_element, info_element_values, "unknown info element"),info_element); - proto_tree_add_item(info_tree, hf_v52_control_function_id, info_tvb, info_offset+2, info_element_length, FALSE); + proto_tree_add_item(info_tree, hf_v52_control_function_id, info_tvb, info_offset+2, info_element_length, ENC_BIG_ENDIAN); if (message_type_tmp == 0x13) {} else { @@ -1347,10 +1347,10 @@ dissect_variant(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset) } if (info_tree != NULL) { - proto_tree_add_item(info_tree, hf_v52_info_element, info_tvb, info_offset, info_element_length, FALSE); - proto_tree_add_item(info_tree, hf_v52_info_length, info_tvb, info_offset+1, info_element_length, FALSE); + proto_tree_add_item(info_tree, hf_v52_info_element, info_tvb, info_offset, info_element_length, ENC_BIG_ENDIAN); + proto_tree_add_item(info_tree, hf_v52_info_length, info_tvb, info_offset+1, info_element_length, ENC_BIG_ENDIAN); proto_item_append_text(ti_info, " %s (0x%x)",val_to_str(info_element, info_element_values, "unknown info element"),info_element); - proto_tree_add_item(info_tree, hf_v52_variant, info_tvb, info_offset+2, info_element_length, FALSE); + proto_tree_add_item(info_tree, hf_v52_variant, info_tvb, info_offset+2, info_element_length, ENC_BIG_ENDIAN); variantValue = tvb_get_guint8(info_tvb, info_offset+2)-0x80; col_append_fstr(pinfo->cinfo, COL_INFO, " | Var: %u", variantValue); @@ -1381,13 +1381,13 @@ dissect_interface_id(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int of } if (info_tree != NULL) { - proto_tree_add_item(info_tree, hf_v52_info_element, info_tvb, info_offset, info_element_length, FALSE); - proto_tree_add_item(info_tree, hf_v52_info_length, info_tvb, info_offset+1, info_element_length, FALSE); + proto_tree_add_item(info_tree, hf_v52_info_element, info_tvb, info_offset, info_element_length, ENC_BIG_ENDIAN); + proto_tree_add_item(info_tree, hf_v52_info_length, info_tvb, info_offset+1, info_element_length, ENC_BIG_ENDIAN); proto_item_append_text(ti_info, " %s (0x%x)",val_to_str(info_element, info_element_values, "unknown info element"),info_element); - proto_tree_add_item(info_tree, hf_v52_if_up_id, info_tvb, info_offset+2, info_element_length, FALSE); - proto_tree_add_item(info_tree, hf_v52_if_id, info_tvb, info_offset+3, info_element_length, FALSE); - proto_tree_add_item(info_tree, hf_v52_if_low_id, info_tvb, info_offset+4, info_element_length, FALSE); - proto_tree_add_item(info_tree, hf_v52_if_all_id, info_tvb, info_offset+2, info_element_length, FALSE); + proto_tree_add_item(info_tree, hf_v52_if_up_id, info_tvb, info_offset+2, info_element_length, ENC_BIG_ENDIAN); + proto_tree_add_item(info_tree, hf_v52_if_id, info_tvb, info_offset+3, info_element_length, ENC_BIG_ENDIAN); + proto_tree_add_item(info_tree, hf_v52_if_low_id, info_tvb, info_offset+4, info_element_length, ENC_BIG_ENDIAN); + proto_tree_add_item(info_tree, hf_v52_if_all_id, info_tvb, info_offset+2, info_element_length, ENC_BIG_ENDIAN); interfaceAllIdValue = (tvb_get_guint8(info_tvb, info_offset+2)<<16)+(tvb_get_guint8(info_tvb, info_offset+3)<<8)+(tvb_get_guint8(info_tvb, info_offset+4)); @@ -1419,10 +1419,10 @@ dissect_sequence_number(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int if (info_tree != NULL) { hf_v52_sequence_number_tmp = tvb_get_guint8(info_tvb, info_offset+2)-0x80; - proto_tree_add_item(info_tree, hf_v52_info_element, info_tvb, info_offset, info_element_length, FALSE); - proto_tree_add_item(info_tree, hf_v52_info_length, info_tvb, info_offset+1, info_element_length, FALSE); + proto_tree_add_item(info_tree, hf_v52_info_element, info_tvb, info_offset, info_element_length, ENC_BIG_ENDIAN); + proto_tree_add_item(info_tree, hf_v52_info_length, info_tvb, info_offset+1, info_element_length, ENC_BIG_ENDIAN); proto_item_append_text(ti_info, " %s (0x%x)",val_to_str(info_element, info_element_values, "unknown info element"),info_element); - proto_tree_add_item(info_tree, hf_v52_sequence_number, info_tvb, info_offset+2, info_element_length, FALSE); + proto_tree_add_item(info_tree, hf_v52_sequence_number, info_tvb, info_offset+2, info_element_length, ENC_BIG_ENDIAN); col_append_str(pinfo->cinfo, COL_INFO, " | "); col_append_str(pinfo->cinfo, COL_INFO, val_to_str(tvb_get_guint8(info_tvb, info_offset), info_element_values_short, "Unknown element")); @@ -1458,11 +1458,11 @@ dissect_physical_c_channel_id(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre } if (info_tree != NULL) { - proto_tree_add_item(info_tree, hf_v52_info_element, info_tvb, info_offset, info_element_length, FALSE); - proto_tree_add_item(info_tree, hf_v52_info_length, info_tvb, info_offset+1, info_element_length, FALSE); + proto_tree_add_item(info_tree, hf_v52_info_element, info_tvb, info_offset, info_element_length, ENC_BIG_ENDIAN); + proto_tree_add_item(info_tree, hf_v52_info_length, info_tvb, info_offset+1, info_element_length, ENC_BIG_ENDIAN); proto_item_append_text(ti_info, " %s (0x%x)",val_to_str(info_element, info_element_values, "unknown info element"),info_element); - proto_tree_add_item(info_tree, hf_v52_v5_link_id, info_tvb, info_offset+2, info_element_length, FALSE); - proto_tree_add_item(info_tree, hf_v52_v5_time_slot, info_tvb, info_offset+3, info_element_length, FALSE); + proto_tree_add_item(info_tree, hf_v52_v5_link_id, info_tvb, info_offset+2, info_element_length, ENC_BIG_ENDIAN); + proto_tree_add_item(info_tree, hf_v52_v5_time_slot, info_tvb, info_offset+3, info_element_length, ENC_BIG_ENDIAN); hf_v52_v5_link_id_cc_tmp = tvb_get_guint8(info_tvb, info_offset+2); hf_v52_v5_time_slot_cc_tmp =tvb_get_guint8(info_tvb, info_offset+3); @@ -1494,10 +1494,10 @@ dissect_pp_rejection_cause(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, } if (info_tree != NULL) { - proto_tree_add_item(info_tree, hf_v52_info_element, info_tvb, info_offset, info_element_length, FALSE); - proto_tree_add_item(info_tree, hf_v52_info_length, info_tvb, info_offset+1, info_element_length, FALSE); + proto_tree_add_item(info_tree, hf_v52_info_element, info_tvb, info_offset, info_element_length, ENC_BIG_ENDIAN); + proto_tree_add_item(info_tree, hf_v52_info_length, info_tvb, info_offset+1, info_element_length, ENC_BIG_ENDIAN); proto_item_append_text(ti_info, " %s (0x%x)",val_to_str(info_element, info_element_values, "unknown info element"),info_element); - proto_tree_add_item(info_tree, hf_v52_rejection_cause, info_tvb, info_offset+2, info_element_length, FALSE); + proto_tree_add_item(info_tree, hf_v52_rejection_cause, info_tvb, info_offset+2, info_element_length, ENC_BIG_ENDIAN); col_append_str(pinfo->cinfo, COL_INFO, " | "); col_append_str(pinfo->cinfo, COL_INFO, val_to_str(tvb_get_guint8(info_tvb, info_offset+2)-0x80, rejection_cause_values, "Unknown element")); @@ -1527,12 +1527,12 @@ dissect_protocol_error(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int } if (info_tree != NULL) { - proto_tree_add_item(info_tree, hf_v52_info_element, info_tvb, info_offset, info_element_length, FALSE); - proto_tree_add_item(info_tree, hf_v52_info_length, info_tvb, info_offset+1, info_element_length, FALSE); + proto_tree_add_item(info_tree, hf_v52_info_element, info_tvb, info_offset, info_element_length, ENC_BIG_ENDIAN); + proto_tree_add_item(info_tree, hf_v52_info_length, info_tvb, info_offset+1, info_element_length, ENC_BIG_ENDIAN); proto_item_append_text(ti_info, " %s (0x%x)",val_to_str(info_element, info_element_values, "unknown info element"),info_element); - proto_tree_add_item(info_tree, hf_v52_error_cause, info_tvb, info_offset+2, info_element_length, FALSE); - proto_tree_add_item(info_tree, hf_v52_diagnostic_msg, info_tvb, info_offset+3, info_element_length, FALSE); - proto_tree_add_item(info_tree, hf_v52_diagnostic_element, info_tvb, info_offset+4, info_element_length, FALSE); + proto_tree_add_item(info_tree, hf_v52_error_cause, info_tvb, info_offset+2, info_element_length, ENC_BIG_ENDIAN); + proto_tree_add_item(info_tree, hf_v52_diagnostic_msg, info_tvb, info_offset+3, info_element_length, ENC_BIG_ENDIAN); + proto_tree_add_item(info_tree, hf_v52_diagnostic_element, info_tvb, info_offset+4, info_element_length, ENC_BIG_ENDIAN); col_append_str(pinfo->cinfo, COL_INFO, " | "); col_append_str(pinfo->cinfo, COL_INFO, val_to_str(tvb_get_guint8(info_tvb, info_offset+2)-0x80, error_cause_values, "Unknown element")); @@ -1564,7 +1564,7 @@ dissect_performance_grading(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (info_tree != NULL) { proto_item_append_text(ti_info, " %s (0x%x)",val_to_str(info_element, info_element_values, "unknown info element"),info_element); - proto_tree_add_item(info_tree, hf_v52_performance_grading, info_tvb, info_offset, info_element_length, FALSE); + proto_tree_add_item(info_tree, hf_v52_performance_grading, info_tvb, info_offset, info_element_length, ENC_BIG_ENDIAN); col_append_str(pinfo->cinfo, COL_INFO, " | "); col_append_str(pinfo->cinfo, COL_INFO, val_to_str(tvb_get_guint8(info_tvb, info_offset)-0xe0, performance_grading_values, "Unknown element")); @@ -1596,7 +1596,7 @@ dissect_cp_rejection_cause(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (info_tree != NULL) { proto_item_append_text(ti_info, " %s (0x%x)",val_to_str(info_element, info_element_values, "unknown info element"),info_element); - proto_tree_add_item(info_tree, hf_v52_cp_rejection_cause, info_tvb, info_offset, info_element_length, FALSE); + proto_tree_add_item(info_tree, hf_v52_cp_rejection_cause, info_tvb, info_offset, info_element_length, ENC_BIG_ENDIAN); col_append_str(pinfo->cinfo, COL_INFO, " | "); col_append_str(pinfo->cinfo, COL_INFO, val_to_str(tvb_get_guint8(info_tvb, info_offset)-0xe0, cp_rejection_cause_values, "Unknown element")); @@ -1629,23 +1629,23 @@ dissect_user_port_identification(tvbuff_t *tvb, packet_info *pinfo, proto_tree * } if (info_tree != NULL) { - proto_tree_add_item(info_tree, hf_v52_info_element, info_tvb, info_offset, info_element_length, FALSE); - proto_tree_add_item(info_tree, hf_v52_info_length, info_tvb, info_offset+1, info_element_length, FALSE); + proto_tree_add_item(info_tree, hf_v52_info_element, info_tvb, info_offset, info_element_length, ENC_BIG_ENDIAN); + proto_tree_add_item(info_tree, hf_v52_info_length, info_tvb, info_offset+1, info_element_length, ENC_BIG_ENDIAN); proto_item_append_text(ti_info, " %s (0x%x)",val_to_str(info_element, info_element_values, "unknown info element"),info_element); buffer = tvb_get_guint8(info_tvb, info_offset+2)&0x01; if(buffer==0x01){ - proto_tree_add_item(info_tree, hf_v52_pstn_user_port_id, info_tvb, info_offset+2, 1, FALSE); - proto_tree_add_item(info_tree, hf_v52_pstn_user_port_id_lower, info_tvb, info_offset+3, 1, FALSE); + proto_tree_add_item(info_tree, hf_v52_pstn_user_port_id, info_tvb, info_offset+2, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(info_tree, hf_v52_pstn_user_port_id_lower, info_tvb, info_offset+3, 1, ENC_BIG_ENDIAN); hf_v52_pstn_user_port_tmp = (((tvb_get_guint8(info_tvb, info_offset+2)>>1)<<8)+(tvb_get_guint8(info_tvb, info_offset+3))); col_append_fstr(pinfo->cinfo, COL_INFO, " | PSTN port: %u", hf_v52_pstn_user_port_tmp); } else if(buffer == 0x00){ - proto_tree_add_item(info_tree, hf_v52_isdn_user_port_id, info_tvb, info_offset+2, 1, FALSE); - proto_tree_add_item(info_tree, hf_v52_isdn_user_port_id_lower, info_tvb, info_offset+3, 1, FALSE); + proto_tree_add_item(info_tree, hf_v52_isdn_user_port_id, info_tvb, info_offset+2, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(info_tree, hf_v52_isdn_user_port_id_lower, info_tvb, info_offset+3, 1, ENC_BIG_ENDIAN); hf_v52_isdn_user_port_tmp = (((tvb_get_guint8(info_tvb, info_offset+2)>>2)<<7)+((tvb_get_guint8( info_tvb, info_offset+3)>>1))); @@ -1678,10 +1678,10 @@ dissect_isdn_port_time_slot_identification(tvbuff_t *tvb, packet_info *pinfo, pr } if (info_tree != NULL) { - proto_tree_add_item(info_tree, hf_v52_info_element, info_tvb, info_offset, info_element_length, FALSE); - proto_tree_add_item(info_tree, hf_v52_info_length, info_tvb, info_offset+1, info_element_length, FALSE); + proto_tree_add_item(info_tree, hf_v52_info_element, info_tvb, info_offset, info_element_length, ENC_BIG_ENDIAN); + proto_tree_add_item(info_tree, hf_v52_info_length, info_tvb, info_offset+1, info_element_length, ENC_BIG_ENDIAN); proto_item_append_text(ti_info, " %s (0x%x)",val_to_str(info_element, info_element_values, "unknown info element"),info_element); - proto_tree_add_item(info_tree, hf_v52_isdn_user_port_ts_num, info_tvb, info_offset+2, info_element_length, FALSE); + proto_tree_add_item(info_tree, hf_v52_isdn_user_port_ts_num, info_tvb, info_offset+2, info_element_length, ENC_BIG_ENDIAN); isdn_user_port_ts_num_tmp = (tvb_get_guint8(info_tvb, info_offset+2)) - 128; col_append_str(pinfo->cinfo, COL_INFO, ", "); @@ -1714,12 +1714,12 @@ dissect_v5_time_slot_identification(tvbuff_t *tvb, packet_info *pinfo, proto_tre } if (info_tree != NULL) { - proto_tree_add_item(info_tree, hf_v52_info_element, info_tvb, info_offset, info_element_length, FALSE); - proto_tree_add_item(info_tree, hf_v52_info_length, info_tvb, info_offset+1, info_element_length, FALSE); + proto_tree_add_item(info_tree, hf_v52_info_element, info_tvb, info_offset, info_element_length, ENC_BIG_ENDIAN); + proto_tree_add_item(info_tree, hf_v52_info_length, info_tvb, info_offset+1, info_element_length, ENC_BIG_ENDIAN); proto_item_append_text(ti_info, " %s (0x%x)",val_to_str(info_element, info_element_values, "unknown info element"),info_element); - proto_tree_add_item(info_tree, hf_v52_v5_link_id, info_tvb, info_offset+2, info_element_length, FALSE); + proto_tree_add_item(info_tree, hf_v52_v5_link_id, info_tvb, info_offset+2, info_element_length, ENC_BIG_ENDIAN); proto_tree_add_item(info_tree, hf_v52_override, info_tvb, info_offset+3, info_element_length, FALSE); - proto_tree_add_item(info_tree, hf_v52_v5_time_slot, info_tvb, info_offset+3, info_element_length, FALSE); + proto_tree_add_item(info_tree, hf_v52_v5_time_slot, info_tvb, info_offset+3, info_element_length, ENC_BIG_ENDIAN); v5_link_id_tmp = tvb_get_guint8(info_tvb, info_offset+2); v5_time_slot_tmp = tvb_get_guint8(info_tvb, info_offset+3); @@ -1759,29 +1759,29 @@ dissect_multi_slot_map(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int } if (info_tree != NULL) { - proto_tree_add_item(info_tree, hf_v52_info_element, info_tvb, info_offset, info_element_length, FALSE); - proto_tree_add_item(info_tree, hf_v52_info_length, info_tvb, info_offset+1, info_element_length, FALSE); + proto_tree_add_item(info_tree, hf_v52_info_element, info_tvb, info_offset, info_element_length, ENC_BIG_ENDIAN); + proto_tree_add_item(info_tree, hf_v52_info_length, info_tvb, info_offset+1, info_element_length, ENC_BIG_ENDIAN); proto_item_append_text(ti_info, " %s (0x%x)",val_to_str(info_element, info_element_values, "unknown info element"),info_element); - proto_tree_add_item(info_tree, hf_v52_v5_link_id, info_tvb, info_offset+2, info_element_length, FALSE); + proto_tree_add_item(info_tree, hf_v52_v5_link_id, info_tvb, info_offset+2, info_element_length, ENC_BIG_ENDIAN); col_append_fstr(pinfo->cinfo, COL_INFO, " | V5MSlink ID:%u",tvb_get_guint8(info_tvb, info_offset+2)); if(tvb_length_remaining(info_tvb, info_offset+3)) - proto_tree_add_item(info_tree, hf_v52_v5_multi_slot_elements, info_tvb, info_offset+3, info_element_length, FALSE); + proto_tree_add_item(info_tree, hf_v52_v5_multi_slot_elements, info_tvb, info_offset+3, info_element_length, ENC_BIG_ENDIAN); if(tvb_length_remaining(info_tvb, info_offset+4)) - proto_tree_add_item(info_tree, hf_v52_v5_multi_slot_elements, info_tvb, info_offset+4, info_element_length, FALSE); + proto_tree_add_item(info_tree, hf_v52_v5_multi_slot_elements, info_tvb, info_offset+4, info_element_length, ENC_BIG_ENDIAN); if(tvb_length_remaining(info_tvb, info_offset+5)) - proto_tree_add_item(info_tree, hf_v52_v5_multi_slot_elements, info_tvb, info_offset+5, info_element_length, FALSE); + proto_tree_add_item(info_tree, hf_v52_v5_multi_slot_elements, info_tvb, info_offset+5, info_element_length, ENC_BIG_ENDIAN); if(tvb_length_remaining(info_tvb, info_offset+6)) - proto_tree_add_item(info_tree, hf_v52_v5_multi_slot_elements, info_tvb, info_offset+6, info_element_length, FALSE); + proto_tree_add_item(info_tree, hf_v52_v5_multi_slot_elements, info_tvb, info_offset+6, info_element_length, ENC_BIG_ENDIAN); if(tvb_length_remaining(info_tvb, info_offset+7)) - proto_tree_add_item(info_tree, hf_v52_v5_multi_slot_elements, info_tvb, info_offset+7, info_element_length, FALSE); + proto_tree_add_item(info_tree, hf_v52_v5_multi_slot_elements, info_tvb, info_offset+7, info_element_length, ENC_BIG_ENDIAN); if(tvb_length_remaining(info_tvb, info_offset+8)) - proto_tree_add_item(info_tree, hf_v52_v5_multi_slot_elements, info_tvb, info_offset+8, info_element_length, FALSE); + proto_tree_add_item(info_tree, hf_v52_v5_multi_slot_elements, info_tvb, info_offset+8, info_element_length, ENC_BIG_ENDIAN); if(tvb_length_remaining(info_tvb, info_offset+9)) - proto_tree_add_item(info_tree, hf_v52_v5_multi_slot_elements, info_tvb, info_offset+9, info_element_length, FALSE); + proto_tree_add_item(info_tree, hf_v52_v5_multi_slot_elements, info_tvb, info_offset+9, info_element_length, ENC_BIG_ENDIAN); if(tvb_length_remaining(info_tvb, info_offset+10)) - proto_tree_add_item(info_tree, hf_v52_v5_multi_slot_elements, info_tvb, info_offset+10, info_element_length, FALSE); + proto_tree_add_item(info_tree, hf_v52_v5_multi_slot_elements, info_tvb, info_offset+10, info_element_length, ENC_BIG_ENDIAN); } } @@ -1808,10 +1808,10 @@ dissect_bcc_rejct_cause(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int } if (info_tree != NULL) { - proto_tree_add_item(info_tree, hf_v52_info_element, info_tvb, info_offset, info_element_length, FALSE); - proto_tree_add_item(info_tree, hf_v52_info_length, info_tvb, info_offset+1, info_element_length, FALSE); + proto_tree_add_item(info_tree, hf_v52_info_element, info_tvb, info_offset, info_element_length, ENC_BIG_ENDIAN); + proto_tree_add_item(info_tree, hf_v52_info_length, info_tvb, info_offset+1, info_element_length, ENC_BIG_ENDIAN); proto_item_append_text(ti_info, " %s (0x%x)",val_to_str(info_element, info_element_values, "unknown info element"),info_element); - proto_tree_add_item(info_tree, hf_v52_reject_cause_type, info_tvb, info_offset+2, info_element_length, FALSE); + proto_tree_add_item(info_tree, hf_v52_reject_cause_type, info_tvb, info_offset+2, info_element_length, ENC_BIG_ENDIAN); col_append_str(pinfo->cinfo, COL_INFO, " | "); col_append_str(pinfo->cinfo, COL_INFO, val_to_str(tvb_get_guint8(info_tvb, info_offset+2)-0x80, reject_cause_type_values, "Unknown element")); @@ -1841,18 +1841,18 @@ dissect_bcc_protocol_error_cause(tvbuff_t *tvb, packet_info *pinfo, proto_tree * } if (info_tree != NULL) { - proto_tree_add_item(info_tree, hf_v52_info_element, info_tvb, info_offset, info_element_length, FALSE); - proto_tree_add_item(info_tree, hf_v52_info_length, info_tvb, info_offset+1, info_element_length, FALSE); + proto_tree_add_item(info_tree, hf_v52_info_element, info_tvb, info_offset, info_element_length, ENC_BIG_ENDIAN); + proto_tree_add_item(info_tree, hf_v52_info_length, info_tvb, info_offset+1, info_element_length, ENC_BIG_ENDIAN); proto_item_append_text(ti_info, " %s (0x%x)",val_to_str(info_element, info_element_values, "unknown info element"),info_element); - proto_tree_add_item(info_tree, hf_v52_bcc_protocol_error_cause, info_tvb, info_offset+2, info_element_length, FALSE); + proto_tree_add_item(info_tree, hf_v52_bcc_protocol_error_cause, info_tvb, info_offset+2, info_element_length, ENC_BIG_ENDIAN); col_append_str(pinfo->cinfo, COL_INFO, " | "); col_append_str(pinfo->cinfo, COL_INFO, val_to_str(tvb_get_guint8(info_tvb, info_offset+2)-0x80, bcc_protocol_error_cause_type_values, "Unknown element")); if(tvb_length_remaining(info_tvb, info_offset+3)) - proto_tree_add_item(info_tree, hf_v52_diagnostic_message, info_tvb, info_offset+3, info_element_length, FALSE); + proto_tree_add_item(info_tree, hf_v52_diagnostic_message, info_tvb, info_offset+3, info_element_length, ENC_BIG_ENDIAN); if(tvb_length_remaining(info_tvb, info_offset+4)) - proto_tree_add_item(info_tree, hf_v52_diagnostic_information, info_tvb, info_offset+4, info_element_length, FALSE); + proto_tree_add_item(info_tree, hf_v52_diagnostic_information, info_tvb, info_offset+4, info_element_length, ENC_BIG_ENDIAN); } } @@ -1879,10 +1879,10 @@ dissect_connection_incomplete(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre } if (info_tree != NULL) { - proto_tree_add_item(info_tree, hf_v52_info_element, info_tvb, info_offset, info_element_length, FALSE); - proto_tree_add_item(info_tree, hf_v52_info_length, info_tvb, info_offset+1, info_element_length, FALSE); + proto_tree_add_item(info_tree, hf_v52_info_element, info_tvb, info_offset, info_element_length, ENC_BIG_ENDIAN); + proto_tree_add_item(info_tree, hf_v52_info_length, info_tvb, info_offset+1, info_element_length, ENC_BIG_ENDIAN); proto_item_append_text(ti_info, " %s (0x%x)",val_to_str(info_element, info_element_values, "unknown info element"),info_element); - proto_tree_add_item(info_tree, hf_v52_connection_incomplete_reason, info_tvb, info_offset+2, info_element_length, FALSE); + proto_tree_add_item(info_tree, hf_v52_connection_incomplete_reason, info_tvb, info_offset+2, info_element_length, ENC_BIG_ENDIAN); col_append_str(pinfo->cinfo, COL_INFO, " | "); @@ -1919,10 +1919,10 @@ dissect_link_control_function(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre } if (info_tree != NULL) { - proto_tree_add_item(info_tree, hf_v52_info_element, info_tvb, info_offset, info_element_length, FALSE); - proto_tree_add_item(info_tree, hf_v52_info_length, info_tvb, info_offset+1, info_element_length, FALSE); + proto_tree_add_item(info_tree, hf_v52_info_element, info_tvb, info_offset, info_element_length, ENC_BIG_ENDIAN); + proto_tree_add_item(info_tree, hf_v52_info_length, info_tvb, info_offset+1, info_element_length, ENC_BIG_ENDIAN); proto_item_append_text(ti_info, " %s (0x%x)",val_to_str(info_element, info_element_values, "unknown info element"),info_element); - proto_tree_add_item(info_tree, hf_v52_link_control_function, info_tvb, info_offset+2, info_element_length, FALSE); + proto_tree_add_item(info_tree, hf_v52_link_control_function, info_tvb, info_offset+2, info_element_length, ENC_BIG_ENDIAN); if (message_type_tmp == 0x31) {} else { @@ -2150,8 +2150,8 @@ dissect_v52_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if ((message_type_tmp >= 0x00) && (message_type_tmp <= 0x0e)) { addr = TRUE; - proto_tree_add_item(v52_tree, hf_v52_pstn_address, tvb, ADDRESS_OFFSET, ADDRESS_LENGTH, FALSE); - proto_tree_add_item(v52_tree, hf_v52_pstn_low_address, tvb, LOW_ADDRESS_OFFSET, LOW_ADDRESS_LENGTH, FALSE); + proto_tree_add_item(v52_tree, hf_v52_pstn_address, tvb, ADDRESS_OFFSET, ADDRESS_LENGTH, ENC_BIG_ENDIAN); + proto_tree_add_item(v52_tree, hf_v52_pstn_low_address, tvb, LOW_ADDRESS_OFFSET, LOW_ADDRESS_LENGTH, ENC_BIG_ENDIAN); pstn_all_address_tmp = (((tvb_get_guint8(tvb,ADDRESS_OFFSET)>>1)<<8)+(tvb_get_guint8(tvb,LOW_ADDRESS_OFFSET))); @@ -2163,15 +2163,15 @@ dissect_v52_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) addr = TRUE; if ((tvb_get_guint8(tvb, ADDRESS_OFFSET)&0x01) == 0x1) { pstn_all_address_tmp = (((tvb_get_guint8(tvb, ADDRESS_OFFSET)>>1)<<8)+(tvb_get_guint8(tvb, LOW_ADDRESS_OFFSET))); - proto_tree_add_item(v52_tree, hf_v52_pstn_address, tvb, ADDRESS_OFFSET, ADDRESS_LENGTH, FALSE); - proto_tree_add_item(v52_tree, hf_v52_pstn_low_address, tvb, LOW_ADDRESS_OFFSET, LOW_ADDRESS_LENGTH, FALSE); + proto_tree_add_item(v52_tree, hf_v52_pstn_address, tvb, ADDRESS_OFFSET, ADDRESS_LENGTH, ENC_BIG_ENDIAN); + proto_tree_add_item(v52_tree, hf_v52_pstn_low_address, tvb, LOW_ADDRESS_OFFSET, LOW_ADDRESS_LENGTH, ENC_BIG_ENDIAN); col_append_fstr(pinfo->cinfo, COL_INFO, " | PSTN: %u", pstn_all_address_tmp); } else { isdn_all_address_tmp = (((tvb_get_guint8(tvb, ADDRESS_OFFSET)>>2)<<7)+((tvb_get_guint8(tvb, LOW_ADDRESS_OFFSET)>>1))); - proto_tree_add_item(v52_tree, hf_v52_isdn_address, tvb, ADDRESS_OFFSET, ADDRESS_LENGTH, FALSE); - proto_tree_add_item(v52_tree, hf_v52_isdn_low_address, tvb, LOW_ADDRESS_OFFSET, LOW_ADDRESS_LENGTH, FALSE); + proto_tree_add_item(v52_tree, hf_v52_isdn_address, tvb, ADDRESS_OFFSET, ADDRESS_LENGTH, ENC_BIG_ENDIAN); + proto_tree_add_item(v52_tree, hf_v52_isdn_low_address, tvb, LOW_ADDRESS_OFFSET, LOW_ADDRESS_LENGTH, ENC_BIG_ENDIAN); col_append_fstr(pinfo->cinfo, COL_INFO, " | ISDN: %u", isdn_all_address_tmp); } @@ -2180,16 +2180,16 @@ dissect_v52_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if ((message_type_tmp == 0x30) || (message_type_tmp == 0x31)) { addr = TRUE; link_all_address_tmp = tvb_get_guint8(tvb, LOW_ADDRESS_OFFSET); - proto_tree_add_item(v52_tree, hf_v52_link_address, tvb, ADDRESS_OFFSET, ADDRESS_LENGTH, FALSE); - proto_tree_add_item(v52_tree, hf_v52_link_low_address, tvb, LOW_ADDRESS_OFFSET, LOW_ADDRESS_LENGTH, FALSE); + proto_tree_add_item(v52_tree, hf_v52_link_address, tvb, ADDRESS_OFFSET, ADDRESS_LENGTH, ENC_BIG_ENDIAN); + proto_tree_add_item(v52_tree, hf_v52_link_low_address, tvb, LOW_ADDRESS_OFFSET, LOW_ADDRESS_LENGTH, ENC_BIG_ENDIAN); col_append_fstr(pinfo->cinfo, COL_INFO, " | LinkId: %u", link_all_address_tmp); } if ((message_type_tmp >= 0x20) && (message_type_tmp <= 0x2a)) { addr = TRUE; - proto_tree_add_item(v52_tree, hf_v52_bcc_address, tvb, ADDRESS_OFFSET, ADDRESS_LENGTH, FALSE); - proto_tree_add_item(v52_tree, hf_v52_bcc_low_address, tvb, LOW_ADDRESS_OFFSET, LOW_ADDRESS_LENGTH, FALSE); + proto_tree_add_item(v52_tree, hf_v52_bcc_address, tvb, ADDRESS_OFFSET, ADDRESS_LENGTH, ENC_BIG_ENDIAN); + proto_tree_add_item(v52_tree, hf_v52_bcc_low_address, tvb, LOW_ADDRESS_OFFSET, LOW_ADDRESS_LENGTH, ENC_BIG_ENDIAN); bcc_all_address_tmp_up = tvb_get_guint8(tvb, ADDRESS_OFFSET); if (bcc_all_address_tmp_up >= 128) { @@ -2203,8 +2203,8 @@ dissect_v52_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if ((message_type_tmp >= 0x18) && (message_type_tmp <= 0x1f)) { addr = TRUE; prot_all_address_tmp = (tvb_get_guint8(tvb, ADDRESS_OFFSET)<<8) + (tvb_get_guint8(tvb,LOW_ADDRESS_OFFSET)); - proto_tree_add_item(v52_tree, hf_v52_prot_address, tvb, ADDRESS_OFFSET, ADDRESS_LENGTH, FALSE); - proto_tree_add_item(v52_tree, hf_v52_prot_low_address, tvb, LOW_ADDRESS_OFFSET, LOW_ADDRESS_LENGTH, FALSE); + proto_tree_add_item(v52_tree, hf_v52_prot_address, tvb, ADDRESS_OFFSET, ADDRESS_LENGTH, ENC_BIG_ENDIAN); + proto_tree_add_item(v52_tree, hf_v52_prot_low_address, tvb, LOW_ADDRESS_OFFSET, LOW_ADDRESS_LENGTH, ENC_BIG_ENDIAN); if ((message_type_tmp == 0x1e) || (message_type_tmp == 0x1f)) {} else { @@ -2215,23 +2215,23 @@ dissect_v52_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (addr == FALSE) { if ((tvb_get_guint8(tvb, ADDRESS_OFFSET)&0x01) == 0x1) { pstn_all_address_tmp = (((tvb_get_guint8(tvb, ADDRESS_OFFSET)>>1)<<8)+(tvb_get_guint8(tvb, LOW_ADDRESS_OFFSET))); - proto_tree_add_item(v52_tree, hf_v52_pstn_address, tvb, ADDRESS_OFFSET, ADDRESS_LENGTH, FALSE); - proto_tree_add_item(v52_tree, hf_v52_pstn_low_address, tvb, LOW_ADDRESS_OFFSET, LOW_ADDRESS_LENGTH, FALSE); + proto_tree_add_item(v52_tree, hf_v52_pstn_address, tvb, ADDRESS_OFFSET, ADDRESS_LENGTH, ENC_BIG_ENDIAN); + proto_tree_add_item(v52_tree, hf_v52_pstn_low_address, tvb, LOW_ADDRESS_OFFSET, LOW_ADDRESS_LENGTH, ENC_BIG_ENDIAN); col_append_fstr(pinfo->cinfo, COL_INFO, " | PSTN: %u", pstn_all_address_tmp); } else { isdn_all_address_tmp = (((tvb_get_guint8(tvb, ADDRESS_OFFSET)>>2)<<7)+((tvb_get_guint8(tvb, LOW_ADDRESS_OFFSET)>>1))); - proto_tree_add_item(v52_tree, hf_v52_isdn_address, tvb, ADDRESS_OFFSET, ADDRESS_LENGTH, FALSE); - proto_tree_add_item(v52_tree, hf_v52_isdn_low_address, tvb, LOW_ADDRESS_OFFSET, LOW_ADDRESS_LENGTH, FALSE); + proto_tree_add_item(v52_tree, hf_v52_isdn_address, tvb, ADDRESS_OFFSET, ADDRESS_LENGTH, ENC_BIG_ENDIAN); + proto_tree_add_item(v52_tree, hf_v52_isdn_low_address, tvb, LOW_ADDRESS_OFFSET, LOW_ADDRESS_LENGTH, ENC_BIG_ENDIAN); col_append_fstr(pinfo->cinfo, COL_INFO, " | ISDN: %u", isdn_all_address_tmp); } } - proto_tree_add_item(v52_tree, hf_v52_msg_type, tvb, MSG_TYPE_OFFSET, MSG_TYPE_LENGTH, FALSE); + proto_tree_add_item(v52_tree, hf_v52_msg_type, tvb, MSG_TYPE_OFFSET, MSG_TYPE_LENGTH, ENC_BIG_ENDIAN); col_append_str(pinfo->cinfo, COL_INFO, " | "); diff --git a/epan/dissectors/packet-v5ua.c b/epan/dissectors/packet-v5ua.c index 6829919f4c..c3cf35db6b 100644 --- a/epan/dissectors/packet-v5ua.c +++ b/epan/dissectors/packet-v5ua.c @@ -169,7 +169,7 @@ dissect_int_interface_identifier_parameter(tvbuff_t *parameter_tvb, proto_tree * identifier = tvb_get_ntohl(parameter_tvb,INT_IF_ID_LINK_OFFSET)>>5; proto_item_append_text(parameter_item, "("); for (id_number = 1; id_number <= number_of_ids; id_number++) { - proto_tree_add_item(parameter_tree, hf_link_id, parameter_tvb, offset, INT_IF_ID_LINK_LENGTH, FALSE); + proto_tree_add_item(parameter_tree, hf_link_id, parameter_tvb, offset, INT_IF_ID_LINK_LENGTH, ENC_BIG_ENDIAN); identifier = tvb_get_ntohl(parameter_tvb,offset)>>5; if (id_number < 2) { proto_item_append_text(parameter_item, "L:%d",identifier); @@ -178,7 +178,7 @@ dissect_int_interface_identifier_parameter(tvbuff_t *parameter_tvb, proto_tree * } linkIdentifier = identifier; - proto_tree_add_item(parameter_tree, hf_chnl_id, parameter_tvb, offset+3, INT_IF_ID_CHNL_LENGTH, FALSE); + proto_tree_add_item(parameter_tree, hf_chnl_id, parameter_tvb, offset+3, INT_IF_ID_CHNL_LENGTH, ENC_BIG_ENDIAN); identifier = tvb_get_guint8(parameter_tvb,offset+3)&0x1f; proto_item_append_text(parameter_item, " C:%d", identifier); offset += INT_INTERFACE_ID_LENGTH; @@ -242,11 +242,11 @@ guint8 tei = -1; proto_tree_add_item(parameter_tree, hf_dlci_zero_bit, parameter_tvb, offset, DLCI_SAPI_LENGTH, FALSE); proto_tree_add_item(parameter_tree, hf_dlci_spare_bit, parameter_tvb, offset, DLCI_SAPI_LENGTH, FALSE); - proto_tree_add_item(parameter_tree, hf_dlci_sapi, parameter_tvb, offset, DLCI_SAPI_LENGTH, FALSE); + proto_tree_add_item(parameter_tree, hf_dlci_sapi, parameter_tvb, offset, DLCI_SAPI_LENGTH, ENC_BIG_ENDIAN); offset += DLCI_SAPI_LENGTH; proto_tree_add_item(parameter_tree, hf_dlci_one_bit, parameter_tvb, offset, DLCI_TEI_LENGTH, FALSE); - proto_tree_add_item(parameter_tree, hf_dlci_tei, parameter_tvb, offset, DLCI_TEI_LENGTH, FALSE); + proto_tree_add_item(parameter_tree, hf_dlci_tei, parameter_tvb, offset, DLCI_TEI_LENGTH, ENC_BIG_ENDIAN); sapi = tvb_get_ntohs(parameter_tvb, offset-DLCI_TEI_LENGTH-DLCI_SAPI_LENGTH)>>2; tei = tvb_get_ntohs(parameter_tvb, offset-DLCI_TEI_LENGTH)>>1; @@ -359,7 +359,7 @@ static void dissect_draft_error_code_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree) { guint16 offset = MGMT_ERROR_MSG_HEADER_LENGTH + tvb_get_ntohs(parameter_tvb, MGMT_ERROR_MSG_LENGTH_OFFSET) + 4; - proto_tree_add_item(parameter_tree, hf_draft_error_code, parameter_tvb, offset, MGMT_ERROR_CODE_LENGTH, FALSE); + proto_tree_add_item(parameter_tree, hf_draft_error_code, parameter_tvb, offset, MGMT_ERROR_CODE_LENGTH, ENC_BIG_ENDIAN); offset += MGMT_ERROR_CODE_LENGTH ; if( tvb_length_remaining(parameter_tvb,offset) > 0 ) proto_tree_add_item(parameter_tree, hf_info_string, parameter_tvb, offset, msg_length - offset,FALSE); @@ -402,7 +402,7 @@ static const value_string error_code_values[] = { static void dissect_error_code_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { - proto_tree_add_item(parameter_tree, hf_error_code, parameter_tvb, MGMT_ERROR_CODE_OFFSET, MGMT_ERROR_CODE_LENGTH, FALSE); + proto_tree_add_item(parameter_tree, hf_error_code, parameter_tvb, MGMT_ERROR_CODE_OFFSET, MGMT_ERROR_CODE_LENGTH, ENC_BIG_ENDIAN); proto_item_append_text(parameter_item, " (%s)", val_to_str(tvb_get_ntohl(parameter_tvb, MGMT_ERROR_CODE_OFFSET), error_code_values, "Unknown error code")); } @@ -460,7 +460,7 @@ dissect_status_type_identification_parameter(tvbuff_t *parameter_tvb, proto_tree status_type = tvb_get_ntohs(parameter_tvb, NTFY_STATUS_TYPE_OFFSET); status_id = tvb_get_ntohs(parameter_tvb, NTFY_STATUS_IDENT_OFFSET); - proto_tree_add_item(parameter_tree, hf_status_type, parameter_tvb, NTFY_STATUS_TYPE_OFFSET, NTFY_STATUS_TYPE_LENGTH, FALSE); + proto_tree_add_item(parameter_tree, hf_status_type, parameter_tvb, NTFY_STATUS_TYPE_OFFSET, NTFY_STATUS_TYPE_LENGTH, ENC_BIG_ENDIAN); proto_tree_add_uint_format(parameter_tree, hf_status_id, parameter_tvb, NTFY_STATUS_IDENT_OFFSET, NTFY_STATUS_IDENT_LENGTH, status_id, "Status identification: %u (%s)", status_id, val_to_str(status_type * 256 * 256 + status_id, status_type_id_values, "unknown")); @@ -487,7 +487,7 @@ static const value_string tei_status_values[] = { static void dissect_tei_status_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { - proto_tree_add_item(parameter_tree, hf_tei_status, parameter_tvb, TEI_STATUS_OFFSET, TEI_STATUS_LENGTH, FALSE); + proto_tree_add_item(parameter_tree, hf_tei_status, parameter_tvb, TEI_STATUS_OFFSET, TEI_STATUS_LENGTH, ENC_BIG_ENDIAN); proto_item_append_text(parameter_item, " (%s)", val_to_str(tvb_get_ntohl(parameter_tvb, TEI_STATUS_OFFSET), tei_status_values, "Unknown TEI status")); } @@ -510,7 +510,7 @@ dissect_draft_tei_status_parameter(tvbuff_t *parameter_tvb, proto_tree *paramete gint offset; offset = tvb_get_ntohs(parameter_tvb, TEI_STATUS_LENGTH_OFFSET) + 8; if(tvb_length_remaining(parameter_tvb, offset) > 0 ){ - proto_tree_add_item(parameter_tree, hf_tei_draft_status, parameter_tvb, offset, TEI_STATUS_LENGTH, FALSE); + proto_tree_add_item(parameter_tree, hf_tei_draft_status, parameter_tvb, offset, TEI_STATUS_LENGTH, ENC_BIG_ENDIAN); proto_item_append_text(parameter_item, " (%s)", val_to_str(tvb_get_ntohl(parameter_tvb, offset), tei_draft_status_values, "Unknown TEI Status")); } @@ -554,7 +554,7 @@ static const value_string asp_reason_values[] = { static void dissect_asp_reason_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { - proto_tree_add_item(parameter_tree, hf_asp_reason, parameter_tvb, ASP_REASON_OFFSET, ASP_REASON_LENGTH, FALSE); + proto_tree_add_item(parameter_tree, hf_asp_reason, parameter_tvb, ASP_REASON_OFFSET, ASP_REASON_LENGTH, ENC_BIG_ENDIAN); proto_item_append_text(parameter_item, " (%s)", val_to_str(tvb_get_ntohl(parameter_tvb, ASP_REASON_OFFSET), asp_reason_values, "Unknown ASP down reason")); } @@ -594,7 +594,7 @@ static const value_string traffic_mode_type_values[] = { static void dissect_traffic_mode_type_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { - proto_tree_add_item(parameter_tree, hf_traffic_mode_type, parameter_tvb, TRAFFIC_MODE_TYPE_OFFSET, TRAFFIC_MODE_TYPE_LENGTH, FALSE); + proto_tree_add_item(parameter_tree, hf_traffic_mode_type, parameter_tvb, TRAFFIC_MODE_TYPE_OFFSET, TRAFFIC_MODE_TYPE_LENGTH, ENC_BIG_ENDIAN); proto_item_append_text(parameter_item, " (%s)", val_to_str(tvb_get_ntohl(parameter_tvb, TRAFFIC_MODE_TYPE_OFFSET), traffic_mode_type_values, "Unknown traffic mode type")); } @@ -618,8 +618,8 @@ dissect_integer_range_interface_identifier_parameter(tvbuff_t *parameter_tvb, pr number_of_ranges = (tvb_get_ntohs(parameter_tvb, INT_RANGE_LENGTH_OFFSET) - INT_RANGE_HEADER_LENGTH) / IF_ID_INTERVAL_LENGTH; offset = INT_RANGE_START_OFFSET; for(range_number = 1; range_number <= number_of_ranges; range_number++) { - proto_tree_add_item(parameter_tree, hf_if_range_start, parameter_tvb, offset + IF_ID_START_OFFSET, IF_ID_START_LENGTH, FALSE); - proto_tree_add_item(parameter_tree, hf_if_range_end, parameter_tvb, offset + IF_ID_END_OFFSET, IF_ID_END_LENGTH, FALSE); + proto_tree_add_item(parameter_tree, hf_if_range_start, parameter_tvb, offset + IF_ID_START_OFFSET, IF_ID_START_LENGTH, ENC_BIG_ENDIAN); + proto_tree_add_item(parameter_tree, hf_if_range_end, parameter_tvb, offset + IF_ID_END_OFFSET, IF_ID_END_LENGTH, ENC_BIG_ENDIAN); offset += IF_ID_INTERVAL_LENGTH; }; @@ -713,7 +713,7 @@ dissect_release_reason_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_ { gint offset = RELEASE_REASON_OFFSET; if(iua_version == DRAFT) offset = tvb_get_ntohs(parameter_tvb, RELEASE_REASON_LENGTH_OFFSET)+8; - proto_tree_add_item(parameter_tree, hf_release_reason, parameter_tvb, offset, RELEASE_REASON_LENGTH, FALSE); + proto_tree_add_item(parameter_tree, hf_release_reason, parameter_tvb, offset, RELEASE_REASON_LENGTH, ENC_BIG_ENDIAN); if(iua_version != DRAFT) proto_item_append_text(parameter_item, " (%s)", val_to_str(tvb_get_ntohl(parameter_tvb, offset), release_reason_values, "Unknown release reason")); @@ -743,7 +743,7 @@ static const value_string link_status_values[] = { static void dissect_link_status_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { - proto_tree_add_item(parameter_tree, hf_link_status, parameter_tvb, LINK_STATUS_OFFSET, LINK_STATUS_LENGTH, FALSE); + proto_tree_add_item(parameter_tree, hf_link_status, parameter_tvb, LINK_STATUS_OFFSET, LINK_STATUS_LENGTH, ENC_BIG_ENDIAN); proto_item_append_text(parameter_item, " (%s)", val_to_str(tvb_get_ntohl(parameter_tvb, LINK_STATUS_OFFSET),link_status_values, "Unknown Link status")); @@ -772,8 +772,8 @@ static const value_string sa_bit_values[] = { static void dissect_sa_bit_status_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { - proto_tree_add_item(parameter_tree, hf_sa_bit_id, parameter_tvb, SA_BIT_ID_OFFSET, SA_BIT_ID_LENGTH, FALSE); - proto_tree_add_item(parameter_tree, hf_sa_bit_value, parameter_tvb, SA_BIT_VALUE_OFFSET, SA_BIT_VALUE_LENGTH, FALSE); + proto_tree_add_item(parameter_tree, hf_sa_bit_id, parameter_tvb, SA_BIT_ID_OFFSET, SA_BIT_ID_LENGTH, ENC_BIG_ENDIAN); + proto_tree_add_item(parameter_tree, hf_sa_bit_value, parameter_tvb, SA_BIT_VALUE_OFFSET, SA_BIT_VALUE_LENGTH, ENC_BIG_ENDIAN); proto_item_append_text(parameter_item, " (%s %s)", val_to_str(tvb_get_ntohs(parameter_tvb, SA_BIT_ID_OFFSET), sa_bit_values, "unknown"), val_to_str(tvb_get_ntohs(parameter_tvb, SA_BIT_VALUE_OFFSET), sa_bit_values, "unknown Bit")); @@ -796,7 +796,7 @@ static const value_string error_reason_values[] = { static void dissect_error_indication_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { - proto_tree_add_item(parameter_tree, hf_error_reason, parameter_tvb, ERROR_REASON_OFFSET, ERROR_REASON_LENGTH, FALSE); + proto_tree_add_item(parameter_tree, hf_error_reason, parameter_tvb, ERROR_REASON_OFFSET, ERROR_REASON_LENGTH, ENC_BIG_ENDIAN); proto_item_append_text(parameter_item, " (%s)", val_to_str(tvb_get_ntohl(parameter_tvb, ERROR_REASON_OFFSET), error_reason_values, "unknown")); } @@ -809,7 +809,7 @@ dissect_error_indication_parameter(tvbuff_t *parameter_tvb, proto_tree *paramete static void dissect_asp_identifier_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { - proto_tree_add_item(parameter_tree, hf_asp_identifier, parameter_tvb, ASP_IDENTIFIER_OFFSET, ASP_IDENTIFIER_LENGTH, FALSE); + proto_tree_add_item(parameter_tree, hf_asp_identifier, parameter_tvb, ASP_IDENTIFIER_OFFSET, ASP_IDENTIFIER_LENGTH, ENC_BIG_ENDIAN); proto_item_append_text(parameter_item, " (%d) ",tvb_get_ntohl(parameter_tvb,ASP_IDENTIFIER_OFFSET)); } /*--------------------------ASP identifier-------------------------------------*/ @@ -932,7 +932,7 @@ dissect_parameter(tvbuff_t *parameter_tvb, packet_info *pinfo, proto_tree *v5ua_ val_to_str(tag, parameter_tag_values, "Unknown parameter")); parameter_tree = proto_item_add_subtree(parameter_item, ett_v5ua_parameter); /* add tag to the v5ua tree */ - proto_tree_add_item(parameter_tree, hf_parameter_tag, parameter_tvb, PARAMETER_TAG_OFFSET, PARAMETER_TAG_LENGTH, FALSE); + proto_tree_add_item(parameter_tree, hf_parameter_tag, parameter_tvb, PARAMETER_TAG_OFFSET, PARAMETER_TAG_LENGTH, ENC_BIG_ENDIAN); break; case DRAFT: default: @@ -941,12 +941,12 @@ dissect_parameter(tvbuff_t *parameter_tvb, packet_info *pinfo, proto_tree *v5ua_ parameter_tree = proto_item_add_subtree(parameter_item, ett_v5ua_parameter); /* add tag to the v5ua tree */ - proto_tree_add_item(parameter_tree, hf_parameter_tag_draft, parameter_tvb, PARAMETER_TAG_OFFSET, PARAMETER_TAG_LENGTH, FALSE); + proto_tree_add_item(parameter_tree, hf_parameter_tag_draft, parameter_tvb, PARAMETER_TAG_OFFSET, PARAMETER_TAG_LENGTH, ENC_BIG_ENDIAN); break; }; /* add length to the v5ua tree */ - proto_tree_add_item(parameter_tree, hf_parameter_length, parameter_tvb, PARAMETER_LENGTH_OFFSET, PARAMETER_LENGTH_LENGTH, FALSE); + proto_tree_add_item(parameter_tree, hf_parameter_length, parameter_tvb, PARAMETER_LENGTH_OFFSET, PARAMETER_LENGTH_LENGTH, ENC_BIG_ENDIAN); switch(tag) { case INT_INTERFACE_IDENTIFIER_PARAMETER_TAG: @@ -1341,14 +1341,14 @@ dissect_common_header(tvbuff_t *common_header_tvb, packet_info *pinfo, proto_tre common_header_tree = proto_item_add_subtree(common_header_item, ett_v5ua_common_header); /* add the components of the common header to the protocol tree */ - proto_tree_add_item(common_header_tree, hf_version, common_header_tvb, COMMON_HEADER_VERSION_OFFSET, COMMON_HEADER_VERSION_LENGTH, FALSE); - proto_tree_add_item(common_header_tree, hf_reserved, common_header_tvb, COMMON_HEADER_RESERVED_OFFSET, COMMON_HEADER_RESERVED_LENGTH, FALSE); - proto_tree_add_item(common_header_tree, hf_msg_class, common_header_tvb, COMMON_HEADER_MSG_CLASS_OFFSET, COMMON_HEADER_MSG_CLASS_LENGTH, FALSE); + proto_tree_add_item(common_header_tree, hf_version, common_header_tvb, COMMON_HEADER_VERSION_OFFSET, COMMON_HEADER_VERSION_LENGTH, ENC_BIG_ENDIAN); + proto_tree_add_item(common_header_tree, hf_reserved, common_header_tvb, COMMON_HEADER_RESERVED_OFFSET, COMMON_HEADER_RESERVED_LENGTH, ENC_BIG_ENDIAN); + proto_tree_add_item(common_header_tree, hf_msg_class, common_header_tvb, COMMON_HEADER_MSG_CLASS_OFFSET, COMMON_HEADER_MSG_CLASS_LENGTH, ENC_BIG_ENDIAN); proto_tree_add_uint_format(common_header_tree, hf_msg_type, common_header_tvb, COMMON_HEADER_MSG_TYPE_OFFSET, COMMON_HEADER_MSG_TYPE_LENGTH, message_type, "Message type: %s ( %u )", val_to_str(message_class * 256 + message_type, msg_class_type_values, "reserved"), message_type); - proto_tree_add_item(common_header_tree, hf_msg_length, common_header_tvb, COMMON_HEADER_MSG_LENGTH_OFFSET, COMMON_HEADER_MSG_LENGTH_LENGTH, FALSE); + proto_tree_add_item(common_header_tree, hf_msg_length, common_header_tvb, COMMON_HEADER_MSG_LENGTH_OFFSET, COMMON_HEADER_MSG_LENGTH_LENGTH, ENC_BIG_ENDIAN); /* Add message type to the Common Msg-Header line */ proto_item_append_text(common_header_item, " (%s)",val_to_str(message_class * 256 + message_type, msg_class_type_values, "Unknown Msg-Type")); diff --git a/epan/dissectors/packet-vcdu.c b/epan/dissectors/packet-vcdu.c index 6879c8dbb9..7a63f50641 100644 --- a/epan/dissectors/packet-vcdu.c +++ b/epan/dissectors/packet-vcdu.c @@ -277,7 +277,7 @@ dissect_vcdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) smex_header=proto_tree_add_text(tree, tvb, offset, SMEX_HEADER_LENGTH, "SMEX Header"); smex_tree=proto_item_add_subtree(smex_header, ett_smex); - proto_tree_add_item(smex_tree, hf_smex_gsc, tvb, offset, 8, FALSE); + proto_tree_add_item(smex_tree, hf_smex_gsc, tvb, offset, 8, ENC_BIG_ENDIAN); offset += 8; /* proto_tree_add_uint(smex_tree, hf_smex_unused, tvb, offset, 2, FALSE); */ offset += 2; @@ -293,12 +293,12 @@ dissect_vcdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(smex_tree, hf_smex_crc_error, tvb, offset, 1, FALSE); proto_tree_add_item(smex_tree, hf_smex_mcs_enable, tvb, offset, 1, FALSE); proto_tree_add_item(smex_tree, hf_smex_mcs_num_error, tvb, offset, 1, FALSE); - proto_tree_add_item(smex_tree, hf_smex_data_inv, tvb, offset, 1, FALSE); + proto_tree_add_item(smex_tree, hf_smex_data_inv, tvb, offset, 1, ENC_BIG_ENDIAN); ++offset; - proto_tree_add_item(smex_tree, hf_smex_frame_sync, tvb, offset, 1, FALSE); - proto_tree_add_item(smex_tree, hf_smex_data_dir, tvb, offset, 1, FALSE); - proto_tree_add_item(smex_tree, hf_smex_data_class, tvb, offset, 1, FALSE); + proto_tree_add_item(smex_tree, hf_smex_frame_sync, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(smex_tree, hf_smex_data_dir, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(smex_tree, hf_smex_data_class, tvb, offset, 1, ENC_BIG_ENDIAN); ++offset; /* extract smex ground receipt time tag */ @@ -309,14 +309,14 @@ dissect_vcdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) first_word = tvb_get_ntohs ( tvb, offset+4 ); pb5_milliseconds = ( first_word & PB5_MILLISECONDS_MASK ) >> 6; - proto_tree_add_item(smex_tree, hf_smex_pb5, tvb, offset, 2, FALSE); - proto_tree_add_item(smex_tree, hf_smex_jday, tvb, offset, 2, FALSE); + proto_tree_add_item(smex_tree, hf_smex_pb5, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(smex_tree, hf_smex_jday, tvb, offset, 2, ENC_BIG_ENDIAN); ++offset; - proto_tree_add_item(smex_tree, hf_smex_seconds, tvb, offset, 3, FALSE); + proto_tree_add_item(smex_tree, hf_smex_seconds, tvb, offset, 3, ENC_BIG_ENDIAN); offset += 3; - proto_tree_add_item(smex_tree, hf_smex_msec, tvb, offset, 2, FALSE); - /* proto_tree_add_item(smex_tree, hf_smex_spare, tvb, offset, 2, FALSE); */ + proto_tree_add_item(smex_tree, hf_smex_msec, tvb, offset, 2, ENC_BIG_ENDIAN); + /* proto_tree_add_item(smex_tree, hf_smex_spare, tvb, offset, 2, ENC_BIG_ENDIAN); */ offset += 2; /* format ground receipt time into human readable time format for display */ @@ -334,11 +334,11 @@ dissect_vcdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) first_word=tvb_get_ntohs(tvb, offset); vcid = first_word & 0x3f; - proto_tree_add_item(vcdu_tree, hf_vcdu_version, tvb, offset, 2, FALSE); - proto_tree_add_item(vcdu_tree, hf_vcdu_sp_id, tvb, offset, 2, FALSE); - proto_tree_add_item(vcdu_tree, hf_vcdu_vc_id, tvb, offset, 2, FALSE); + proto_tree_add_item(vcdu_tree, hf_vcdu_version, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(vcdu_tree, hf_vcdu_sp_id, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(vcdu_tree, hf_vcdu_vc_id, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(vcdu_tree, hf_vcdu_seq, tvb, offset, 3, FALSE); + proto_tree_add_item(vcdu_tree, hf_vcdu_seq, tvb, offset, 3, ENC_BIG_ENDIAN); offset += 3; proto_tree_add_item(vcdu_tree, hf_vcdu_replay, tvb, offset, 1, FALSE); ++offset; @@ -353,7 +353,7 @@ dissect_vcdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) new_ptr=first_word & LBP_MASK; /* add last bit pointer to display tree */ - proto_tree_add_item(vcdu_tree, hf_vcdu_lbp, tvb, offset, 2, FALSE); + proto_tree_add_item(vcdu_tree, hf_vcdu_lbp, tvb, offset, 2, ENC_BIG_ENDIAN); switch ( new_ptr ) { @@ -381,7 +381,7 @@ dissect_vcdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) new_ptr=first_word & FHP_MASK; /* add first header pointer to display tree */ - proto_tree_add_item(vcdu_tree, hf_vcdu_fhp, tvb, offset, 2, FALSE); + proto_tree_add_item(vcdu_tree, hf_vcdu_fhp, tvb, offset, 2, ENC_BIG_ENDIAN); /* process special cases of first header pointer */ if ( FHP_ALL_FILL == new_ptr ) diff --git a/epan/dissectors/packet-vlan.c b/epan/dissectors/packet-vlan.c index d62ef0fd45..1b2d7f6ba6 100644 --- a/epan/dissectors/packet-vlan.c +++ b/epan/dissectors/packet-vlan.c @@ -120,9 +120,9 @@ dissect_vlan(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) vlan_tree = proto_item_add_subtree(ti, ett_vlan); - proto_tree_add_item(vlan_tree, hf_vlan_priority, tvb, 0, 2, FALSE); - proto_tree_add_item(vlan_tree, hf_vlan_cfi, tvb, 0, 2, FALSE); - proto_tree_add_item(vlan_tree, hf_vlan_id, tvb, 0, 2, FALSE); + proto_tree_add_item(vlan_tree, hf_vlan_priority, tvb, 0, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(vlan_tree, hf_vlan_cfi, tvb, 0, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(vlan_tree, hf_vlan_id, tvb, 0, 2, ENC_BIG_ENDIAN); } encap_proto = tvb_get_ntohs(tvb, 2); diff --git a/epan/dissectors/packet-vmlab.c b/epan/dissectors/packet-vmlab.c index c53ca9259b..017b62f69c 100644 --- a/epan/dissectors/packet-vmlab.c +++ b/epan/dissectors/packet-vmlab.c @@ -95,9 +95,9 @@ dissect_vmlab(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Flags*/ attributes = tvb_get_guint8(tvb, offset); - proto_tree_add_item(vmlab_tree, hf_vmlab_flags_part1, tvb, offset, 1, FALSE); - proto_tree_add_item(vmlab_tree, hf_vmlab_flags_fragment, tvb, offset, 1, FALSE); - proto_tree_add_item(vmlab_tree, hf_vmlab_flags_part2, tvb, offset, 1, FALSE); + proto_tree_add_item(vmlab_tree, hf_vmlab_flags_part1, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(vmlab_tree, hf_vmlab_flags_fragment, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(vmlab_tree, hf_vmlab_flags_part2, tvb, offset, 1, ENC_BIG_ENDIAN); if (attributes & 0x04) { proto_item_append_text(ti, ", Fragment"); } diff --git a/epan/dissectors/packet-vnc.c b/epan/dissectors/packet-vnc.c index 29503397f2..34f0cb0668 100644 --- a/epan/dissectors/packet-vnc.c +++ b/epan/dissectors/packet-vnc.c @@ -836,7 +836,7 @@ vnc_startup_messages(tvbuff_t *tvb, packet_info *pinfo, gint offset, if (tree) { proto_tree_add_item(tree, hf_vnc_num_security_types, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); for(offset = 1; offset <= num_security_types; offset++){ proto_tree_add_item(tree, @@ -849,7 +849,7 @@ vnc_startup_messages(tvbuff_t *tvb, packet_info *pinfo, gint offset, /* Version < 3.007: The server decides the * authentication type for us to use */ proto_tree_add_item(tree, hf_vnc_server_security_type, - tvb, offset, 4, FALSE); + tvb, offset, 4, ENC_BIG_ENDIAN); /* The cast below is possible since in older versions of the protocol the only possible values are 0,1,2 */ per_conversation_info->security_type_selected = (guint8)tvb_get_ntohl(tvb, offset); switch(per_conversation_info->security_type_selected) { @@ -878,7 +878,7 @@ vnc_startup_messages(tvbuff_t *tvb, packet_info *pinfo, gint offset, case VNC_SESSION_STATE_SECURITY_TYPES : col_set_str(pinfo->cinfo, COL_INFO, "Authentication type selected by client"); - proto_tree_add_item(tree, hf_vnc_client_security_type, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_vnc_client_security_type, tvb, offset, 1, ENC_BIG_ENDIAN); per_conversation_info->security_type_selected = tvb_get_guint8(tvb, offset); @@ -918,7 +918,7 @@ vnc_startup_messages(tvbuff_t *tvb, packet_info *pinfo, gint offset, col_set_str(pinfo->cinfo, COL_INFO, "TightVNC tunneling capabilities supported"); - proto_tree_add_item(tree, hf_vnc_tight_num_tunnel_types, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_vnc_tight_num_tunnel_types, tvb, offset, 4, ENC_BIG_ENDIAN); num_tunnel_types = tvb_get_ntohl(tvb, offset); offset += 4; @@ -928,7 +928,7 @@ vnc_startup_messages(tvbuff_t *tvb, packet_info *pinfo, gint offset, * is 16 bytes, so skip them. */ - proto_tree_add_item(tree, hf_vnc_tight_tunnel_type, tvb, offset, 16, FALSE); + proto_tree_add_item(tree, hf_vnc_tight_tunnel_type, tvb, offset, 16, ENC_BIG_ENDIAN); offset += 16; } @@ -948,7 +948,7 @@ vnc_startup_messages(tvbuff_t *tvb, packet_info *pinfo, gint offset, case VNC_SESSION_STATE_TIGHT_AUTH_CAPABILITIES: col_set_str(pinfo->cinfo, COL_INFO, "TightVNC authentication capabilities supported"); - proto_tree_add_item(tree, hf_vnc_tight_num_auth_types, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_vnc_tight_num_auth_types, tvb, offset, 4, ENC_BIG_ENDIAN); num_auth_types = tvb_get_ntohl(tvb, offset); offset += 4; @@ -957,7 +957,7 @@ vnc_startup_messages(tvbuff_t *tvb, packet_info *pinfo, gint offset, guint8 *vendor, *signature; for (i = 0; i < 1; i++) { auth_code = tvb_get_ntohl(tvb, offset); - proto_tree_add_item(tree, hf_vnc_tight_auth_code, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_vnc_tight_auth_code, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; vendor = tvb_get_ephemeral_string(tvb, offset, 4); process_vendor(tree, hf_vnc_tight_server_vendor, tvb, offset); @@ -1019,7 +1019,7 @@ vnc_startup_messages(tvbuff_t *tvb, packet_info *pinfo, gint offset, case VNC_SESSION_STATE_TIGHT_AUTH_TYPE_REPLY: col_set_str(pinfo->cinfo, COL_INFO, "TightVNC authentication type selected by client"); auth_code = tvb_get_ntohl(tvb, offset); - proto_tree_add_item(tree, hf_vnc_tight_auth_code, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_vnc_tight_auth_code, tvb, offset, 4, ENC_BIG_ENDIAN); switch(auth_code) { case VNC_SECURITY_TYPE_NONE: @@ -1130,21 +1130,21 @@ vnc_startup_messages(tvbuff_t *tvb, packet_info *pinfo, gint offset, col_set_str(pinfo->cinfo, COL_INFO, "Server framebuffer parameters"); proto_tree_add_item(tree, hf_vnc_width, tvb, offset, 2, - FALSE); + ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(tree, hf_vnc_height, tvb, offset, 2, - FALSE); + ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(tree, hf_vnc_server_bits_per_pixel, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); vnc_bytes_per_pixel = tvb_get_guint8(tvb, offset)/8; vnc_set_bytes_per_pixel(pinfo, vnc_bytes_per_pixel); offset += 1; proto_tree_add_item(tree, hf_vnc_server_depth, tvb, offset, - 1, FALSE); + 1, ENC_BIG_ENDIAN); offset += 1; proto_tree_add_item(tree, hf_vnc_server_big_endian_flag, @@ -1168,15 +1168,15 @@ vnc_startup_messages(tvbuff_t *tvb, packet_info *pinfo, gint offset, offset += 2; proto_tree_add_item(tree, hf_vnc_server_red_shift, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; proto_tree_add_item(tree, hf_vnc_server_green_shift, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; proto_tree_add_item(tree, hf_vnc_server_blue_shift, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; proto_tree_add_item(tree, hf_vnc_padding, @@ -1186,7 +1186,7 @@ vnc_startup_messages(tvbuff_t *tvb, packet_info *pinfo, gint offset, if(tvb_length_remaining(tvb, offset) > 4) { /* Sometimes the desktop name & length is skipped */ proto_tree_add_item(tree, hf_vnc_desktop_name_len, - tvb, offset, 4, FALSE); + tvb, offset, 4, ENC_BIG_ENDIAN); desktop_name_len = tvb_get_ntohl(tvb, offset); offset += 4; @@ -1206,17 +1206,17 @@ vnc_startup_messages(tvbuff_t *tvb, packet_info *pinfo, gint offset, col_set_str(pinfo->cinfo, COL_INFO, "TightVNC Interaction Capabilities"); proto_tree_add_item(tree, hf_vnc_num_server_message_types, - tvb, offset, 2, FALSE); + tvb, offset, 2, ENC_BIG_ENDIAN); per_conversation_info->num_server_message_types = tvb_get_ntohs(tvb, offset); offset += 2; proto_tree_add_item(tree, hf_vnc_num_client_message_types, - tvb, offset, 2, FALSE); + tvb, offset, 2, ENC_BIG_ENDIAN); per_conversation_info->num_client_message_types = tvb_get_ntohs(tvb, offset); offset += 2; proto_tree_add_item(tree, hf_vnc_num_encoding_types, - tvb, offset, 2, FALSE); + tvb, offset, 2, ENC_BIG_ENDIAN); per_conversation_info->num_encoding_types = tvb_get_ntohs(tvb, offset); offset += 2; @@ -1263,7 +1263,7 @@ vnc_client_to_server(tvbuff_t *tvb, packet_info *pinfo, gint *offset, message_type = tvb_get_guint8(tvb, *offset); ti = proto_tree_add_item(tree, hf_vnc_client_message_type, tvb, - *offset, 1, FALSE); + *offset, 1, ENC_BIG_ENDIAN); vnc_client_message_type_tree = proto_item_add_subtree(ti, ett_vnc_client_message_type); @@ -1326,7 +1326,7 @@ vnc_server_to_client(tvbuff_t *tvb, packet_info *pinfo, gint *offset, message_type = tvb_get_guint8(tvb, *offset); ti = proto_tree_add_item(tree, hf_vnc_server_message_type, tvb, - *offset, 1, FALSE); + *offset, 1, ENC_BIG_ENDIAN); vnc_server_message_type_tree = proto_item_add_subtree(ti, ett_vnc_server_message_type); @@ -1382,13 +1382,13 @@ vnc_client_set_pixel_format(tvbuff_t *tvb, packet_info *pinfo, gint *offset, *offset += 3; /* Skip over 3 bytes of padding */ proto_tree_add_item(tree, hf_vnc_client_bits_per_pixel, tvb, *offset, - 1, FALSE); + 1, ENC_BIG_ENDIAN); vnc_bytes_per_pixel = tvb_get_guint8(tvb, *offset)/8; vnc_set_bytes_per_pixel(pinfo, vnc_bytes_per_pixel); *offset += 1; proto_tree_add_item(tree, hf_vnc_client_depth, tvb, *offset, - 1, FALSE); + 1, ENC_BIG_ENDIAN); vnc_depth = tvb_get_guint8(tvb, *offset); vnc_set_depth(pinfo, vnc_depth); *offset += 1; @@ -1414,15 +1414,15 @@ vnc_client_set_pixel_format(tvbuff_t *tvb, packet_info *pinfo, gint *offset, *offset += 2; proto_tree_add_item(tree, hf_vnc_client_red_shift, tvb, *offset, - 1, FALSE); + 1, ENC_BIG_ENDIAN); *offset += 1; proto_tree_add_item(tree, hf_vnc_client_green_shift, tvb, *offset, - 1, FALSE); + 1, ENC_BIG_ENDIAN); *offset += 1; proto_tree_add_item(tree, hf_vnc_client_blue_shift, tvb, *offset, - 1, FALSE); + 1, ENC_BIG_ENDIAN); *offset += 1; proto_tree_add_item(tree, hf_vnc_padding, tvb, *offset, 3, ENC_NA); @@ -1459,7 +1459,7 @@ vnc_client_set_encodings(tvbuff_t *tvb, packet_info *pinfo, gint *offset, for(counter = 1; counter <= number_of_encodings; counter++) { proto_tree_add_item(tree, hf_vnc_client_set_encodings_encoding_type, - tvb, *offset, 4, FALSE); + tvb, *offset, 4, ENC_BIG_ENDIAN); /* Remember the first real encoding as the preferred encoding, * per xserver/hw/vnc/rfbserver.c:rfbProcessClientNormalMessage(). @@ -1501,19 +1501,19 @@ vnc_client_framebuffer_update_request(tvbuff_t *tvb, packet_info *pinfo, *offset += 1; proto_tree_add_item(tree, hf_vnc_update_req_x_pos, - tvb, *offset, 2, FALSE); + tvb, *offset, 2, ENC_BIG_ENDIAN); *offset += 2; proto_tree_add_item(tree, hf_vnc_update_req_y_pos, - tvb, *offset, 2, FALSE); + tvb, *offset, 2, ENC_BIG_ENDIAN); *offset += 2; proto_tree_add_item(tree, hf_vnc_update_req_width, tvb, - *offset, 2, FALSE); + *offset, 2, ENC_BIG_ENDIAN); *offset += 2; proto_tree_add_item(tree, hf_vnc_update_req_height, tvb, - *offset, 2, FALSE); + *offset, 2, ENC_BIG_ENDIAN); *offset += 2; } @@ -1551,10 +1551,10 @@ vnc_client_pointer_event(tvbuff_t *tvb, packet_info *pinfo, gint *offset, proto_tree_add_item(tree, hf_vnc_button_8_pos, tvb, *offset, 1, FALSE); *offset += 1; - proto_tree_add_item(tree, hf_vnc_pointer_x_pos, tvb, *offset, 2, FALSE); + proto_tree_add_item(tree, hf_vnc_pointer_x_pos, tvb, *offset, 2, ENC_BIG_ENDIAN); *offset += 2; - proto_tree_add_item(tree, hf_vnc_pointer_y_pos, tvb, *offset, 2, FALSE); + proto_tree_add_item(tree, hf_vnc_pointer_y_pos, tvb, *offset, 2, ENC_BIG_ENDIAN); *offset += 2; } @@ -1572,7 +1572,7 @@ vnc_client_cut_text(tvbuff_t *tvb, packet_info *pinfo, gint *offset, text_len = tvb_get_ntohl(tvb, *offset); proto_tree_add_item(tree, hf_vnc_client_cut_text_len, tvb, *offset, 4, - FALSE); + ENC_BIG_ENDIAN); *offset += 4; proto_tree_add_item(tree, hf_vnc_client_cut_text, tvb, *offset, @@ -1624,26 +1624,26 @@ vnc_server_framebuffer_update(tvbuff_t *tvb, packet_info *pinfo, gint *offset, proto_item_add_subtree(ti, ett_vnc_rect); ti_x = proto_tree_add_item(vnc_rect_tree, hf_vnc_fb_update_x_pos, - tvb, *offset, 2, FALSE); + tvb, *offset, 2, ENC_BIG_ENDIAN); *offset += 2; ti_y = proto_tree_add_item(vnc_rect_tree, hf_vnc_fb_update_y_pos, - tvb, *offset, 2, FALSE); + tvb, *offset, 2, ENC_BIG_ENDIAN); *offset += 2; ti_width = proto_tree_add_item(vnc_rect_tree, hf_vnc_fb_update_width, - tvb, *offset, 2, FALSE); + tvb, *offset, 2, ENC_BIG_ENDIAN); width = tvb_get_ntohs(tvb, *offset); *offset += 2; ti_height = proto_tree_add_item(vnc_rect_tree, hf_vnc_fb_update_height, - tvb, *offset, 2, FALSE); + tvb, *offset, 2, ENC_BIG_ENDIAN); height = tvb_get_ntohs(tvb, *offset); *offset += 2; ti = proto_tree_add_item(vnc_rect_tree, hf_vnc_fb_update_encoding_type, - tvb, *offset, 4, FALSE); + tvb, *offset, 4, ENC_BIG_ENDIAN); encoding_type = tvb_get_ntohl(tvb, *offset); *offset += 4; @@ -1759,17 +1759,17 @@ vnc_extended_desktop_size(tvbuff_t *tvb, gint *offset, proto_tree *tree) ti = proto_tree_add_text(tree, tvb, *offset, 16, "Screen #%u", i); screen_tree = proto_item_add_subtree(ti, ett_vnc_desktop_screen); - proto_tree_add_item(screen_tree, hf_vnc_desktop_screen_id, tvb, *offset, 4, FALSE); + proto_tree_add_item(screen_tree, hf_vnc_desktop_screen_id, tvb, *offset, 4, ENC_BIG_ENDIAN); *offset += 4; - proto_tree_add_item(screen_tree, hf_vnc_desktop_screen_x, tvb, *offset, 2, FALSE); + proto_tree_add_item(screen_tree, hf_vnc_desktop_screen_x, tvb, *offset, 2, ENC_BIG_ENDIAN); *offset += 2; - proto_tree_add_item(screen_tree, hf_vnc_desktop_screen_y, tvb, *offset, 2, FALSE); + proto_tree_add_item(screen_tree, hf_vnc_desktop_screen_y, tvb, *offset, 2, ENC_BIG_ENDIAN); *offset += 2; - proto_tree_add_item(screen_tree, hf_vnc_desktop_screen_width, tvb, *offset, 2, FALSE); + proto_tree_add_item(screen_tree, hf_vnc_desktop_screen_width, tvb, *offset, 2, ENC_BIG_ENDIAN); *offset += 2; - proto_tree_add_item(screen_tree, hf_vnc_desktop_screen_height, tvb, *offset, 2, FALSE); + proto_tree_add_item(screen_tree, hf_vnc_desktop_screen_height, tvb, *offset, 2, ENC_BIG_ENDIAN); *offset += 2; - proto_tree_add_item(screen_tree, hf_vnc_desktop_screen_flags, tvb, *offset, 4, FALSE); + proto_tree_add_item(screen_tree, hf_vnc_desktop_screen_flags, tvb, *offset, 4, ENC_BIG_ENDIAN); *offset += 4; } @@ -1799,11 +1799,11 @@ vnc_copyrect_encoding(tvbuff_t *tvb, packet_info *pinfo _U_, gint *offset, proto_tree *tree, const guint16 width _U_, const guint16 height _U_) { proto_tree_add_item(tree, hf_vnc_copyrect_src_x_pos, tvb, *offset, - 2, FALSE); + 2, ENC_BIG_ENDIAN); *offset += 2; proto_tree_add_item(tree, hf_vnc_copyrect_src_y_pos, tvb, *offset, - 2, FALSE); + 2, ENC_BIG_ENDIAN); *offset += 2; return 0; /* bytes_needed */ @@ -1822,7 +1822,7 @@ vnc_rre_encoding(tvbuff_t *tvb, packet_info *pinfo, gint *offset, VNC_BYTES_NEEDED(4); ti = proto_tree_add_item(tree, hf_vnc_rre_num_subrects, tvb, *offset, - 4, FALSE); + 4, ENC_BIG_ENDIAN); num_subrects = tvb_get_ntohl(tvb, *offset); *offset += 4; @@ -1855,19 +1855,19 @@ vnc_rre_encoding(tvbuff_t *tvb, packet_info *pinfo, gint *offset, *offset += bytes_per_pixel; proto_tree_add_item(subrect_tree, hf_vnc_rre_subrect_x_pos, - tvb, *offset, 2, FALSE); + tvb, *offset, 2, ENC_BIG_ENDIAN); *offset += 2; proto_tree_add_item(subrect_tree, hf_vnc_rre_subrect_y_pos, - tvb, *offset, 2, FALSE); + tvb, *offset, 2, ENC_BIG_ENDIAN); *offset += 2; proto_tree_add_item(subrect_tree, hf_vnc_rre_subrect_width, - tvb, *offset, 2, FALSE); + tvb, *offset, 2, ENC_BIG_ENDIAN); *offset += 2; proto_tree_add_item(subrect_tree, hf_vnc_rre_subrect_height, - tvb, *offset, 2, FALSE); + tvb, *offset, 2, ENC_BIG_ENDIAN); *offset += 2; } @@ -1908,7 +1908,7 @@ vnc_hextile_encoding(tvbuff_t *tvb, packet_info *pinfo, gint *offset, tile_tree = proto_item_add_subtree(tile_item, ett_vnc_hextile_tile); ti = proto_tree_add_item(tile_tree, hf_vnc_hextile_subencoding_mask, tvb, - *offset, 1, FALSE); + *offset, 1, ENC_BIG_ENDIAN); subencoding_mask_tree = proto_item_add_subtree(ti, ett_vnc_hextile_subencoding_mask); @@ -1959,7 +1959,7 @@ vnc_hextile_encoding(tvbuff_t *tvb, packet_info *pinfo, gint *offset, ti = proto_tree_add_item(tile_tree, hf_vnc_hextile_num_subrects, tvb, *offset, 1, - FALSE); + ENC_BIG_ENDIAN); num_subrects = tvb_get_guint8(tvb, *offset); *offset += 1; @@ -2030,7 +2030,7 @@ vnc_zrle_encoding(tvbuff_t *tvb, packet_info *pinfo _U_, gint *offset, VNC_BYTES_NEEDED(4); proto_tree_add_item(tree, hf_vnc_zrle_len, tvb, *offset, - 4, FALSE); + 4, ENC_BIG_ENDIAN); data_len = tvb_get_ntohl(tvb, *offset); *offset += 4; @@ -2048,7 +2048,7 @@ vnc_zrle_encoding(tvbuff_t *tvb, packet_info *pinfo _U_, gint *offset, "Uncompressed ZRLE data"); ti = proto_tree_add_item(tree, hf_vnc_zrle_subencoding, - uncomp_tvb, uncomp_offset, 1, FALSE); + uncomp_tvb, uncomp_offset, 1, ENC_BIG_ENDIAN); zrle_subencoding_tree = proto_item_add_subtree(ti, ett_vnc_zrle_subencoding); @@ -2398,14 +2398,14 @@ vnc_server_set_colormap_entries(tvbuff_t *tvb, packet_info *pinfo, gint *offset, *offset += 1; /* Skip over 1 byte of padding */ proto_tree_add_item(tree, hf_vnc_colormap_first_color, - tvb, *offset, 2, FALSE); + tvb, *offset, 2, ENC_BIG_ENDIAN); *offset += 2; /* XXX - this is 3 bytes into the tvb, but number_of_colors is set off * of 4 bytes in... Bug??? */ ti = proto_tree_add_item(tree, hf_vnc_colormap_num_colors, tvb, - *offset, 2, FALSE); + *offset, 2, ENC_BIG_ENDIAN); if (number_of_colors > 10000) { expert_add_info_format(pinfo, ti, PI_MALFORMED, PI_ERROR, @@ -2435,17 +2435,17 @@ vnc_server_set_colormap_entries(tvbuff_t *tvb, packet_info *pinfo, gint *offset, proto_tree_add_item(vnc_colormap_color_group, hf_vnc_colormap_red, tvb, - *offset, 2, FALSE); + *offset, 2, ENC_BIG_ENDIAN); *offset += 2; proto_tree_add_item(vnc_colormap_color_group, hf_vnc_colormap_green, tvb, - *offset, 2, FALSE); + *offset, 2, ENC_BIG_ENDIAN); *offset += 2; proto_tree_add_item(vnc_colormap_color_group, hf_vnc_colormap_blue, tvb, - *offset, 2, FALSE); + *offset, 2, ENC_BIG_ENDIAN); *offset += 2; } return 0; @@ -2472,7 +2472,7 @@ vnc_server_cut_text(tvbuff_t *tvb, packet_info *pinfo, gint *offset, text_len = tvb_get_ntohl(tvb, *offset); pi = proto_tree_add_item(tree, hf_vnc_server_cut_text_len, tvb, *offset, 4, - FALSE); + ENC_BIG_ENDIAN); *offset += 4; if (text_len > 100000) { diff --git a/epan/dissectors/packet-vrrp.c b/epan/dissectors/packet-vrrp.c index e54eb8bdeb..c257a11e90 100644 --- a/epan/dissectors/packet-vrrp.c +++ b/epan/dissectors/packet-vrrp.c @@ -128,7 +128,7 @@ dissect_vrrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ver_type); offset++; - proto_tree_add_item(vrrp_tree, hf_vrrp_virt_rtr_id, tvb, offset, 1, FALSE); + proto_tree_add_item(vrrp_tree, hf_vrrp_virt_rtr_id, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; priority = tvb_get_guint8(tvb, offset); @@ -145,18 +145,18 @@ dissect_vrrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) switch(hi_nibble(ver_type)) { case 3: /* 4 bits reserved (mbz) + 12 bits interval */ - proto_tree_add_item(vrrp_tree, hf_vrrp_reserved_mbz, tvb, offset, 1, FALSE); - proto_tree_add_item(vrrp_tree, hf_vrrp_short_adver_int, tvb, offset, 2, FALSE); + proto_tree_add_item(vrrp_tree, hf_vrrp_reserved_mbz, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(vrrp_tree, hf_vrrp_short_adver_int, tvb, offset, 2, ENC_BIG_ENDIAN); offset+=2; break; case 2: default: /* 1 byte auth type + 1 byte interval */ auth_type = tvb_get_guint8(tvb, offset); - proto_tree_add_item(vrrp_tree, hf_vrrp_auth_type, tvb, offset, 1, FALSE); + proto_tree_add_item(vrrp_tree, hf_vrrp_auth_type, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; - proto_tree_add_item(vrrp_tree, hf_vrrp_adver_int, tvb, offset, 1, FALSE); + proto_tree_add_item(vrrp_tree, hf_vrrp_adver_int, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; break; } diff --git a/epan/dissectors/packet-vtp.c b/epan/dissectors/packet-vtp.c index 554a1b075b..668a1bed9c 100644 --- a/epan/dissectors/packet-vtp.c +++ b/epan/dissectors/packet-vtp.c @@ -148,7 +148,7 @@ dissect_vtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) vtp_tree = proto_item_add_subtree(ti, ett_vtp); proto_tree_add_item(vtp_tree, hf_vtp_version, tvb, offset, 1, - FALSE); + ENC_BIG_ENDIAN); offset += 1; code = tvb_get_guint8(tvb, offset); @@ -160,7 +160,7 @@ dissect_vtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case SUMMARY_ADVERT: proto_tree_add_item(vtp_tree, hf_vtp_followers, tvb, offset, - 1, FALSE); + 1, ENC_BIG_ENDIAN); offset += 1; md_len = tvb_get_guint8(tvb, offset); @@ -173,7 +173,7 @@ dissect_vtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset += 32; proto_tree_add_item(vtp_tree, hf_vtp_conf_rev_num, tvb, - offset, 4, FALSE); + offset, 4, ENC_BIG_ENDIAN); offset += 4; proto_tree_add_item(vtp_tree, hf_vtp_upd_id, tvb, @@ -194,7 +194,7 @@ dissect_vtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case SUBSET_ADVERT: proto_tree_add_item(vtp_tree, hf_vtp_seq_num, tvb, offset, - 1, FALSE); + 1, ENC_BIG_ENDIAN); offset += 1; md_len = tvb_get_guint8(tvb, offset); @@ -207,7 +207,7 @@ dissect_vtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset += 32; proto_tree_add_item(vtp_tree, hf_vtp_conf_rev_num, tvb, - offset, 4, FALSE); + offset, 4, ENC_BIG_ENDIAN); offset += 4; while (tvb_reported_length_remaining(tvb, offset) > 0) { @@ -232,7 +232,7 @@ dissect_vtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset += 32; proto_tree_add_item(vtp_tree, hf_vtp_start_value, tvb, - offset, 2, FALSE); + offset, 2, ENC_BIG_ENDIAN); break; case JOIN_MSG: @@ -248,12 +248,12 @@ dissect_vtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset += 32; proto_tree_add_item(vtp_tree, hf_vtp_pruning_first_vid, tvb, offset, - 2, FALSE); + 2, ENC_BIG_ENDIAN); pruning_vlan_id = tvb_get_ntohs(tvb, offset); offset += 2; proto_tree_add_item(vtp_tree, hf_vtp_pruning_last_vid, tvb, offset, - 2, FALSE); + 2, ENC_BIG_ENDIAN); offset += 2; ti = proto_tree_add_text (vtp_tree, tvb, offset, -1, @@ -360,7 +360,7 @@ dissect_vlan_info(tvbuff_t *tvb, int offset, proto_tree *tree) if (vlan_info_left < 1) return -1; proto_tree_add_item(vlan_info_tree, hf_vtp_vlan_type, tvb, offset, 1, - FALSE); + ENC_BIG_ENDIAN); offset += 1; vlan_info_left -= 1; @@ -375,21 +375,21 @@ dissect_vlan_info(tvbuff_t *tvb, int offset, proto_tree *tree) if (vlan_info_left < 2) return -1; proto_tree_add_item(vlan_info_tree, hf_vtp_isl_vlan_id, tvb, offset, 2, - FALSE); + ENC_BIG_ENDIAN); offset += 2; vlan_info_left -= 2; if (vlan_info_left < 2) return -1; proto_tree_add_item(vlan_info_tree, hf_vtp_mtu_size, tvb, offset, 2, - FALSE); + ENC_BIG_ENDIAN); offset += 2; vlan_info_left -= 2; if (vlan_info_left < 4) return -1; proto_tree_add_item(vlan_info_tree, hf_vtp_802_10_index, tvb, offset, 4, - FALSE); + ENC_BIG_ENDIAN); offset += 4; vlan_info_left -= 4; diff --git a/epan/dissectors/packet-vuze-dht.c b/epan/dissectors/packet-vuze-dht.c index c9dda7f42c..42a3645ae7 100644 --- a/epan/dissectors/packet-vuze-dht.c +++ b/epan/dissectors/packet-vuze-dht.c @@ -295,7 +295,7 @@ dissect_vuze_dht_address(tvbuff_t *tvb, packet_info _U_*pinfo, proto_tree *tree, ti = proto_tree_add_none_format(tree, hf_vuze_dht_address, tvb, offset, ip_length+3, "%s: ", addr_name ); sub_tree = proto_item_add_subtree(ti, ett_vuze_dht_address); - proto_tree_add_item(sub_tree, hf_vuze_dht_address_len, tvb, offset, TL_BYTE, FALSE); + proto_tree_add_item(sub_tree, hf_vuze_dht_address_len, tvb, offset, TL_BYTE, ENC_BIG_ENDIAN); offset += TL_BYTE; switch(ip_length) @@ -314,7 +314,7 @@ dissect_vuze_dht_address(tvbuff_t *tvb, packet_info _U_*pinfo, proto_tree *tree, } offset += ip_length; - proto_tree_add_item(sub_tree, hf_vuze_dht_address_port, tvb, offset, TL_SHORT, FALSE); + proto_tree_add_item(sub_tree, hf_vuze_dht_address_port, tvb, offset, TL_SHORT, ENC_BIG_ENDIAN); proto_item_append_text( ti, "%s:%d", ep_address_to_str( &addr ), tvb_get_ntohs(tvb,offset) ); offset += TL_SHORT; @@ -341,9 +341,9 @@ dissect_vuze_dht_contact(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, in tvb_get_guint8(tvb, offset+1) ); sub_tree = proto_item_add_subtree(ti, ett_vuze_dht_contact); - proto_tree_add_item(sub_tree, hf_vuze_dht_contact_type, tvb, offset, TL_BYTE, FALSE); + proto_tree_add_item(sub_tree, hf_vuze_dht_contact_type, tvb, offset, TL_BYTE, ENC_BIG_ENDIAN); offset += TL_BYTE; - proto_tree_add_item(sub_tree, hf_vuze_dht_proto_ver, tvb, offset, TL_BYTE, FALSE); + proto_tree_add_item(sub_tree, hf_vuze_dht_proto_ver, tvb, offset, TL_BYTE, ENC_BIG_ENDIAN); offset += TL_BYTE; offset = dissect_vuze_dht_address( tvb, pinfo, sub_tree, offset, "Contact Address" ); @@ -382,7 +382,7 @@ dissect_vuze_dht_key(tvbuff_t *tvb, packet_info _U_*pinfo, proto_tree *tree, int ti = proto_tree_add_item( tree, hf_vuze_dht_key, tvb, offset, key_len+1, ENC_NA ); sub_tree = proto_item_add_subtree(ti, ett_vuze_dht_key); - proto_tree_add_item( sub_tree, hf_vuze_dht_key_len, tvb, offset, TL_BYTE, FALSE ); + proto_tree_add_item( sub_tree, hf_vuze_dht_key_len, tvb, offset, TL_BYTE, ENC_BIG_ENDIAN ); offset += TL_BYTE; proto_tree_add_item( sub_tree, hf_vuze_dht_key_data, tvb, offset, key_len, ENC_NA ); @@ -439,7 +439,7 @@ dissect_vuze_dht_value(tvbuff_t *tvb, packet_info _U_*pinfo, proto_tree *tree, i sub_tree = proto_item_add_subtree(ti, ett_vuze_dht_value); if( ver >= PV_REMOVE_DIST_ADD_VER ) { - proto_tree_add_item(sub_tree, hf_vuze_dht_value_ver, tvb, offset, TL_INT, FALSE); + proto_tree_add_item(sub_tree, hf_vuze_dht_value_ver, tvb, offset, TL_INT, ENC_BIG_ENDIAN); value_ver = tvb_get_ntohl( tvb, offset ); offset += TL_INT; } @@ -450,13 +450,13 @@ dissect_vuze_dht_value(tvbuff_t *tvb, packet_info _U_*pinfo, proto_tree *tree, i " (reply to STATS): %d values for the key, out of %d in total...", tvb_get_ntohl(tvb, offset), tvb_get_ntohl(tvb, offset+TL_INT) ); - proto_tree_add_item(tree, hf_vuze_dht_values_num, tvb, offset, TL_INT, FALSE); + proto_tree_add_item(tree, hf_vuze_dht_values_num, tvb, offset, TL_INT, ENC_BIG_ENDIAN); offset += TL_INT; - proto_tree_add_item(tree, hf_vuze_dht_values_total, tvb, offset, TL_INT, FALSE); + proto_tree_add_item(tree, hf_vuze_dht_values_total, tvb, offset, TL_INT, ENC_BIG_ENDIAN); offset += TL_INT; - proto_tree_add_item(tree, hf_vuze_dht_reads_per_min, tvb, offset, TL_INT, FALSE); + proto_tree_add_item(tree, hf_vuze_dht_reads_per_min, tvb, offset, TL_INT, ENC_BIG_ENDIAN); offset += TL_INT; - proto_tree_add_item(tree, hf_vuze_dht_diversification_type, tvb, offset, TL_BYTE, FALSE); + proto_tree_add_item(tree, hf_vuze_dht_diversification_type, tvb, offset, TL_BYTE, ENC_BIG_ENDIAN); offset += TL_BYTE; } /* regular value */ @@ -464,10 +464,10 @@ dissect_vuze_dht_value(tvbuff_t *tvb, packet_info _U_*pinfo, proto_tree *tree, i { int value_bytes_count; - proto_tree_add_item(sub_tree, hf_vuze_dht_value_created, tvb, offset, TL_LONG, FALSE); + proto_tree_add_item(sub_tree, hf_vuze_dht_value_created, tvb, offset, TL_LONG, ENC_BIG_ENDIAN); offset += TL_LONG; - proto_tree_add_item(sub_tree, hf_vuze_dht_value_bytes_count, tvb, offset, TL_SHORT, FALSE); + proto_tree_add_item(sub_tree, hf_vuze_dht_value_bytes_count, tvb, offset, TL_SHORT, ENC_BIG_ENDIAN); value_bytes_count = tvb_get_ntohs(tvb, offset); offset += TL_SHORT; @@ -477,11 +477,11 @@ dissect_vuze_dht_value(tvbuff_t *tvb, packet_info _U_*pinfo, proto_tree *tree, i offset = dissect_vuze_dht_contact( tvb, pinfo, sub_tree, offset ); - proto_tree_add_item(sub_tree, hf_vuze_dht_value_flags, tvb, offset, TL_BYTE, FALSE); + proto_tree_add_item(sub_tree, hf_vuze_dht_value_flags, tvb, offset, TL_BYTE, ENC_BIG_ENDIAN); offset += TL_BYTE; - proto_tree_add_item(sub_tree, hf_vuze_dht_value_life_hours, tvb, offset, TL_BYTE, FALSE); + proto_tree_add_item(sub_tree, hf_vuze_dht_value_life_hours, tvb, offset, TL_BYTE, ENC_BIG_ENDIAN); offset += TL_BYTE; - proto_tree_add_item(sub_tree, hf_vuze_dht_value_replication_factor, tvb, offset, TL_BYTE, FALSE); + proto_tree_add_item(sub_tree, hf_vuze_dht_value_replication_factor, tvb, offset, TL_BYTE, ENC_BIG_ENDIAN); offset += TL_BYTE; } @@ -505,7 +505,7 @@ dissect_vuze_dht_value_group(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ti = proto_tree_add_none_format( tree, hf_vuze_dht_value_group, tvb, offset, 0, "%d values", values_count ); sub_tree = proto_item_add_subtree(ti, ett_vuze_dht_value_group); - proto_tree_add_item( sub_tree, hf_vuze_dht_values_count, tvb, offset, TL_SHORT, FALSE ); + proto_tree_add_item( sub_tree, hf_vuze_dht_values_count, tvb, offset, TL_SHORT, ENC_BIG_ENDIAN ); offset += TL_SHORT; for( i=1; i<=values_count; i++ ) @@ -553,9 +553,9 @@ dissect_vuze_dht_network_coordinate(tvbuff_t *tvb, packet_info _U_*pinfo, proto_ proto_item_append_text( ti, ": type %d, length %d ( %s )", tvb_get_guint8(tvb,offset), tvb_get_guint8(tvb,offset+TL_BYTE), tvb_bytes_to_str(tvb, offset+TL_BYTE+TL_BYTE, coordinate_size ) ); - proto_tree_add_item( sub_tree, hf_vuze_dht_network_coordinate_type, tvb, offset, TL_BYTE, FALSE ); + proto_tree_add_item( sub_tree, hf_vuze_dht_network_coordinate_type, tvb, offset, TL_BYTE, ENC_BIG_ENDIAN ); offset += TL_BYTE; - proto_tree_add_item( sub_tree, hf_vuze_dht_network_coordinate_size, tvb, offset, TL_BYTE, FALSE ); + proto_tree_add_item( sub_tree, hf_vuze_dht_network_coordinate_size, tvb, offset, TL_BYTE, ENC_BIG_ENDIAN ); offset += TL_BYTE; proto_tree_add_item( sub_tree, hf_vuze_dht_network_coordinate_data, tvb, offset, coordinate_size, ENC_NA ); offset += coordinate_size; @@ -578,7 +578,7 @@ dissect_vuze_dht_network_coordinates(tvbuff_t *tvb, packet_info *pinfo, proto_tr if( ver >= PV_GENERIC_NETPOS ) { - proto_tree_add_item(tree, hf_vuze_dht_network_coordinates_count, tvb, offset, TL_BYTE, FALSE); + proto_tree_add_item(tree, hf_vuze_dht_network_coordinates_count, tvb, offset, TL_BYTE, ENC_BIG_ENDIAN); network_coordinates_count = tvb_get_guint8( tvb, offset ); offset += TL_BYTE; @@ -610,42 +610,42 @@ TIME long always time of the local node; store static int dissect_vuze_dht_request_header(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset, int *action, int *ver ) { - proto_tree_add_item(tree, hf_vuze_dht_connection_id, tvb, offset, TL_LONG, FALSE); + proto_tree_add_item(tree, hf_vuze_dht_connection_id, tvb, offset, TL_LONG, ENC_BIG_ENDIAN); offset += TL_LONG; - proto_tree_add_item(tree, hf_vuze_dht_action, tvb, offset, TL_INT, FALSE); + proto_tree_add_item(tree, hf_vuze_dht_action, tvb, offset, TL_INT, ENC_BIG_ENDIAN); *action = tvb_get_ntohl(tvb, offset); col_append_fstr(pinfo->cinfo, COL_INFO, " Action: %s", val_to_str( *action, vuze_dht_action_type_vals, "Unknown") ); offset += TL_INT; - proto_tree_add_item(tree, hf_vuze_dht_transaction_id, tvb, offset, TL_INT, FALSE); + proto_tree_add_item(tree, hf_vuze_dht_transaction_id, tvb, offset, TL_INT, ENC_BIG_ENDIAN); offset += TL_INT; - proto_tree_add_item(tree, hf_vuze_dht_proto_ver, tvb, offset, TL_BYTE, FALSE); + proto_tree_add_item(tree, hf_vuze_dht_proto_ver, tvb, offset, TL_BYTE, ENC_BIG_ENDIAN); *ver = tvb_get_guint8( tvb, offset ); offset += TL_BYTE; if( *ver >= PV_VENDOR_ID ) { - proto_tree_add_item(tree, hf_vuze_dht_vendor_id, tvb, offset, TL_BYTE, FALSE); + proto_tree_add_item(tree, hf_vuze_dht_vendor_id, tvb, offset, TL_BYTE, ENC_BIG_ENDIAN); offset += TL_BYTE; } if( *ver > PV_NETWORKS ) { - proto_tree_add_item(tree, hf_vuze_dht_network_id, tvb, offset, TL_INT, FALSE); + proto_tree_add_item(tree, hf_vuze_dht_network_id, tvb, offset, TL_INT, ENC_BIG_ENDIAN); offset += TL_INT; } if( *ver > PV_FIX_ORIGINATOR ) { - proto_tree_add_item(tree, hf_vuze_dht_local_proto_ver, tvb, offset, TL_BYTE, FALSE); + proto_tree_add_item(tree, hf_vuze_dht_local_proto_ver, tvb, offset, TL_BYTE, ENC_BIG_ENDIAN); offset += TL_BYTE; } offset = dissect_vuze_dht_address(tvb, pinfo, tree, offset, "Local Address"); - proto_tree_add_item(tree, hf_vuze_dht_instance_id, tvb, offset, TL_INT, FALSE); + proto_tree_add_item(tree, hf_vuze_dht_instance_id, tvb, offset, TL_INT, ENC_BIG_ENDIAN); offset += TL_INT; - proto_tree_add_item(tree, hf_vuze_dht_time, tvb, offset, TL_LONG, FALSE); + proto_tree_add_item(tree, hf_vuze_dht_time, tvb, offset, TL_LONG, ENC_BIG_ENDIAN); offset += TL_LONG; return offset; @@ -666,34 +666,34 @@ INSTANCE_ID int always instance id of the node that replies static int dissect_vuze_dht_reply_header(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset, int *action, int *ver ) { - proto_tree_add_item(tree, hf_vuze_dht_action, tvb, offset, TL_INT, FALSE); + proto_tree_add_item(tree, hf_vuze_dht_action, tvb, offset, TL_INT, ENC_BIG_ENDIAN); *action = tvb_get_ntohl(tvb, offset); col_append_fstr(pinfo->cinfo, COL_INFO, " Action: %s", val_to_str( *action, vuze_dht_action_type_vals, "Unknown") ); offset += TL_INT; - proto_tree_add_item(tree, hf_vuze_dht_transaction_id, tvb, offset, TL_INT, FALSE); + proto_tree_add_item(tree, hf_vuze_dht_transaction_id, tvb, offset, TL_INT, ENC_BIG_ENDIAN); offset += TL_INT; - proto_tree_add_item(tree, hf_vuze_dht_connection_id, tvb, offset, TL_LONG, FALSE); + proto_tree_add_item(tree, hf_vuze_dht_connection_id, tvb, offset, TL_LONG, ENC_BIG_ENDIAN); offset += TL_LONG; - proto_tree_add_item(tree, hf_vuze_dht_proto_ver, tvb, offset, TL_BYTE, FALSE); + proto_tree_add_item(tree, hf_vuze_dht_proto_ver, tvb, offset, TL_BYTE, ENC_BIG_ENDIAN); *ver = tvb_get_guint8( tvb, offset ); offset += TL_BYTE; if( *ver >= PV_VENDOR_ID ) { - proto_tree_add_item(tree, hf_vuze_dht_vendor_id, tvb, offset, TL_BYTE, FALSE); + proto_tree_add_item(tree, hf_vuze_dht_vendor_id, tvb, offset, TL_BYTE, ENC_BIG_ENDIAN); offset += TL_BYTE; } if( *ver > PV_NETWORKS ) { - proto_tree_add_item(tree, hf_vuze_dht_network_id, tvb, offset, TL_INT, FALSE); + proto_tree_add_item(tree, hf_vuze_dht_network_id, tvb, offset, TL_INT, ENC_BIG_ENDIAN); offset += TL_INT; } - proto_tree_add_item(tree, hf_vuze_dht_instance_id, tvb, offset, TL_INT, FALSE); + proto_tree_add_item(tree, hf_vuze_dht_instance_id, tvb, offset, TL_INT, ENC_BIG_ENDIAN); offset += TL_INT; return offset; @@ -731,16 +731,16 @@ dissect_vuze_dht_request_store(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr guint8 keys_count, value_groups_count; if( ver >= PV_ANTI_SPOOF ) { - proto_tree_add_item(tree, hf_vuze_dht_spoof_id, tvb, offset, TL_INT, FALSE); + proto_tree_add_item(tree, hf_vuze_dht_spoof_id, tvb, offset, TL_INT, ENC_BIG_ENDIAN); offset += TL_INT; } - proto_tree_add_item(tree, hf_vuze_dht_keys_count, tvb, offset, TL_BYTE, FALSE); + proto_tree_add_item(tree, hf_vuze_dht_keys_count, tvb, offset, TL_BYTE, ENC_BIG_ENDIAN); keys_count = tvb_get_guint8( tvb, offset ); offset += TL_BYTE; offset = dissect_vuze_dht_keys( tvb, pinfo, tree, offset, keys_count ); - proto_tree_add_item(tree, hf_vuze_dht_value_groups_count, tvb, offset, TL_BYTE, FALSE); + proto_tree_add_item(tree, hf_vuze_dht_value_groups_count, tvb, offset, TL_BYTE, ENC_BIG_ENDIAN); value_groups_count = tvb_get_guint8( tvb, offset ); offset += TL_BYTE; @@ -762,7 +762,7 @@ dissect_vuze_dht_reply_store(tvbuff_t *tvb, packet_info _U_*pinfo, proto_tree *t if( ver >= PV_DIV_AND_CONT ) { guint diversifications_len; - proto_tree_add_item(tree, hf_vuze_dht_diversifications_len, tvb, offset, TL_BYTE, FALSE); + proto_tree_add_item(tree, hf_vuze_dht_diversifications_len, tvb, offset, TL_BYTE, ENC_BIG_ENDIAN); diversifications_len = tvb_get_guint8( tvb, offset ); offset += TL_BYTE; @@ -787,7 +787,7 @@ dissect_vuze_dht_request_find_node(tvbuff_t *tvb, packet_info _U_*pinfo, proto_t { guint id_len; - proto_tree_add_item(tree, hf_vuze_dht_id_len, tvb, offset, TL_BYTE, FALSE); + proto_tree_add_item(tree, hf_vuze_dht_id_len, tvb, offset, TL_BYTE, ENC_BIG_ENDIAN); id_len = tvb_get_guint8( tvb, offset ); offset += TL_BYTE; @@ -796,9 +796,9 @@ dissect_vuze_dht_request_find_node(tvbuff_t *tvb, packet_info _U_*pinfo, proto_t if( ver >= PV_MORE_NODE_STATUS ) { - proto_tree_add_item(tree, hf_vuze_dht_node_status, tvb, offset, TL_INT, FALSE); + proto_tree_add_item(tree, hf_vuze_dht_node_status, tvb, offset, TL_INT, ENC_BIG_ENDIAN); offset += TL_INT; - proto_tree_add_item(tree, hf_vuze_dht_size, tvb, offset, TL_INT, FALSE); + proto_tree_add_item(tree, hf_vuze_dht_size, tvb, offset, TL_INT, ENC_BIG_ENDIAN); offset += TL_INT; } @@ -827,17 +827,17 @@ dissect_vuze_dht_reply_find_node(tvbuff_t *tvb, packet_info *pinfo, proto_tree * if( ver >= PV_ANTI_SPOOF ) { - proto_tree_add_item(tree, hf_vuze_dht_spoof_id, tvb, offset, TL_INT, FALSE); + proto_tree_add_item(tree, hf_vuze_dht_spoof_id, tvb, offset, TL_INT, ENC_BIG_ENDIAN); offset += TL_INT; } if( ver >= PV_XFER_STATUS ) { - proto_tree_add_item(tree, hf_vuze_dht_node_type, tvb, offset, TL_INT, FALSE); + proto_tree_add_item(tree, hf_vuze_dht_node_type, tvb, offset, TL_INT, ENC_BIG_ENDIAN); offset += TL_INT; } if( ver >= PV_SIZE_ESTIMATE ) { - proto_tree_add_item(tree, hf_vuze_dht_size, tvb, offset, TL_INT, FALSE); + proto_tree_add_item(tree, hf_vuze_dht_size, tvb, offset, TL_INT, ENC_BIG_ENDIAN); offset += TL_INT; } if( ver >= PV_VIVALDI ) @@ -845,7 +845,7 @@ dissect_vuze_dht_reply_find_node(tvbuff_t *tvb, packet_info *pinfo, proto_tree * offset = dissect_vuze_dht_network_coordinates( tvb, pinfo, tree, offset, ver ); } - proto_tree_add_item(tree, hf_vuze_dht_contacts_count, tvb, offset, TL_SHORT, FALSE); + proto_tree_add_item(tree, hf_vuze_dht_contacts_count, tvb, offset, TL_SHORT, ENC_BIG_ENDIAN); contacts_count = tvb_get_ntohs( tvb, offset ); offset += TL_SHORT; @@ -870,9 +870,9 @@ static int dissect_vuze_dht_request_find_value(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset, int ver _U_ ) { offset = dissect_vuze_dht_key( tvb, pinfo, tree, offset ); - proto_tree_add_item(tree, hf_vuze_dht_flags, tvb, offset, TL_BYTE, FALSE); + proto_tree_add_item(tree, hf_vuze_dht_flags, tvb, offset, TL_BYTE, ENC_BIG_ENDIAN); offset += TL_BYTE; - proto_tree_add_item(tree, hf_vuze_dht_max_values, tvb, offset, TL_BYTE, FALSE); + proto_tree_add_item(tree, hf_vuze_dht_max_values, tvb, offset, TL_BYTE, ENC_BIG_ENDIAN); offset += TL_BYTE; return offset; @@ -899,16 +899,16 @@ dissect_vuze_dht_reply_find_value(tvbuff_t *tvb, packet_info *pinfo, proto_tree guint contacts_count; if( ver >= PV_DIV_AND_CONT ) { - proto_tree_add_item(tree, hf_vuze_dht_has_continuation, tvb, offset, TL_BOOL, FALSE); + proto_tree_add_item(tree, hf_vuze_dht_has_continuation, tvb, offset, TL_BOOL, ENC_BIG_ENDIAN); offset += TL_BOOL; } - proto_tree_add_item(tree, hf_vuze_dht_has_values, tvb, offset, TL_BOOL, FALSE); + proto_tree_add_item(tree, hf_vuze_dht_has_values, tvb, offset, TL_BOOL, ENC_BIG_ENDIAN); has_values = tvb_get_guint8( tvb, offset ); offset += TL_BOOL; if( has_values ) { - proto_tree_add_item(tree, hf_vuze_dht_contacts_count, tvb, offset, TL_SHORT, FALSE); + proto_tree_add_item(tree, hf_vuze_dht_contacts_count, tvb, offset, TL_SHORT, ENC_BIG_ENDIAN); contacts_count = tvb_get_ntohs( tvb, offset ); offset += TL_SHORT; offset = dissect_vuze_dht_contacts( tvb, pinfo, tree, offset, contacts_count ); @@ -919,7 +919,7 @@ dissect_vuze_dht_reply_find_value(tvbuff_t *tvb, packet_info *pinfo, proto_tree } if( ver >= PV_DIV_AND_CONT ) { - proto_tree_add_item(tree, hf_vuze_dht_diversification_type, tvb, offset, TL_BYTE, FALSE); + proto_tree_add_item(tree, hf_vuze_dht_diversification_type, tvb, offset, TL_BYTE, ENC_BIG_ENDIAN); offset += TL_BYTE; } offset = dissect_vuze_dht_value_group( tvb, pinfo, tree, offset, ver ); @@ -948,7 +948,7 @@ dissect_vuze_dht_reply_error(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree guint8 key_block_request_len; guint signature_len; - proto_tree_add_item(tree, hf_vuze_dht_error_type, tvb, offset, TL_INT, FALSE); + proto_tree_add_item(tree, hf_vuze_dht_error_type, tvb, offset, TL_INT, ENC_BIG_ENDIAN); error_type = tvb_get_ntohl( tvb, offset ); col_append_fstr(pinfo->cinfo, COL_INFO, " Error: %s", val_to_str( error_type, vuze_dht_error_type_vals, "Unknown") ); offset += TL_INT; @@ -959,14 +959,14 @@ dissect_vuze_dht_reply_error(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree offset = dissect_vuze_dht_address( tvb, pinfo, tree, offset, "Sender Address" ); break; case ET_KEY_BLOCKED: - proto_tree_add_item(tree, hf_vuze_dht_key_block_request_len, tvb, offset, TL_BYTE, FALSE); + proto_tree_add_item(tree, hf_vuze_dht_key_block_request_len, tvb, offset, TL_BYTE, ENC_BIG_ENDIAN); key_block_request_len = tvb_get_guint8( tvb, offset ); offset += TL_BYTE; proto_tree_add_item(tree, hf_vuze_dht_key_block_request, tvb, offset, key_block_request_len, ENC_NA); offset += key_block_request_len; - proto_tree_add_item(tree, hf_vuze_dht_signature_len, tvb, offset, TL_SHORT, FALSE); + proto_tree_add_item(tree, hf_vuze_dht_signature_len, tvb, offset, TL_SHORT, ENC_BIG_ENDIAN); signature_len = tvb_get_ntohs( tvb, offset ); offset += TL_SHORT; @@ -996,17 +996,17 @@ dissect_vuze_dht_request_key_block(tvbuff_t *tvb, packet_info _U_*pinfo, proto_t guint8 key_block_request_len; guint signature_len; - proto_tree_add_item(tree, hf_vuze_dht_spoof_id, tvb, offset, TL_INT, FALSE); + proto_tree_add_item(tree, hf_vuze_dht_spoof_id, tvb, offset, TL_INT, ENC_BIG_ENDIAN); offset += TL_INT; - proto_tree_add_item(tree, hf_vuze_dht_key_block_request_len, tvb, offset, TL_BYTE, FALSE); + proto_tree_add_item(tree, hf_vuze_dht_key_block_request_len, tvb, offset, TL_BYTE, ENC_BIG_ENDIAN); key_block_request_len = tvb_get_guint8( tvb, offset ); offset += TL_BYTE; proto_tree_add_item(tree, hf_vuze_dht_key_block_request, tvb, offset, key_block_request_len, ENC_NA); offset += key_block_request_len; - proto_tree_add_item(tree, hf_vuze_dht_signature_len, tvb, offset, TL_SHORT, FALSE); + proto_tree_add_item(tree, hf_vuze_dht_signature_len, tvb, offset, TL_SHORT, ENC_BIG_ENDIAN); signature_len = tvb_get_ntohs( tvb, offset ); offset += TL_SHORT; diff --git a/epan/dissectors/packet-vxi11.c b/epan/dissectors/packet-vxi11.c index b80efb4c94..93f4946c81 100644 --- a/epan/dissectors/packet-vxi11.c +++ b/epan/dissectors/packet-vxi11.c @@ -231,7 +231,7 @@ dissect_flags(tvbuff_t *tvb, int offset, proto_tree *tree) guint32 flags = tvb_get_ntohl(tvb, offset); proto_item *flags_item = - proto_tree_add_item(tree, hf_vxi11_core_flags, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_vxi11_core_flags, tvb, offset, 4, ENC_BIG_ENDIAN); if (flags_item) { @@ -276,7 +276,7 @@ dissect_reason(tvbuff_t *tvb, int offset, proto_tree *tree) guint32 reason = tvb_get_ntohl(tvb, offset); proto_item *reason_item = - proto_tree_add_item(tree, hf_vxi11_core_reason, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_vxi11_core_reason, tvb, offset, 4, ENC_BIG_ENDIAN); if (reason_item) { diff --git a/epan/dissectors/packet-wai.c b/epan/dissectors/packet-wai.c index 9f494281ce..613eb34e86 100644 --- a/epan/dissectors/packet-wai.c +++ b/epan/dissectors/packet-wai.c @@ -248,7 +248,7 @@ dissect_flag(tvbuff_t *tvb, guint offset, proto_tree *tree) proto_item *flag_item; proto_tree *flag_tree; - flag_item = proto_tree_add_item(tree, hf_wai_flag, tvb, offset, 1, FALSE); + flag_item = proto_tree_add_item(tree, hf_wai_flag, tvb, offset, 1, ENC_BIG_ENDIAN); flag_tree = proto_item_add_subtree (flag_item, ett_wai_flags); proto_tree_add_item (flag_tree, hf_wai_bk_rekeying_flag, tvb, offset, 1, FALSE); @@ -334,8 +334,8 @@ dissect_identity(tvbuff_t * tvb, const guint16 offset, proto_tree * tree, id_item = proto_tree_add_item(tree, hf_wai_identity, tvb, offset, length+4, ENC_NA); id_tree = proto_item_add_subtree(id_item, ett_wai_identity); proto_item_set_text(id_item, "%sIdentity", ((label==NULL)?"":label)); - proto_tree_add_item(id_tree, hf_wai_identity_id, tvb, offset, 2, FALSE); - proto_tree_add_item(id_tree, hf_wai_identity_len, tvb, offset+2, 2, FALSE); + proto_tree_add_item(id_tree, hf_wai_identity_id, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(id_tree, hf_wai_identity_len, tvb, offset+2, 2, ENC_BIG_ENDIAN); proto_tree_add_item(id_tree, hf_wai_identity_data, tvb, offset+4, length, ENC_NA); return length + 4; @@ -366,9 +366,9 @@ dissect_certificate(tvbuff_t * tvb, const gint offset, proto_tree * tree, proto_item_set_text(certificate_item, "%sCertificate", ((label==NULL)?"":label)); certificate_tree = proto_item_add_subtree(certificate_item, ett_wai_certificate); - id_item = proto_tree_add_item(certificate_tree, hf_wai_cert_id, tvb, offset, 2, FALSE); + id_item = proto_tree_add_item(certificate_tree, hf_wai_cert_id, tvb, offset, 2, ENC_BIG_ENDIAN); proto_item_set_text(id_item, "Certificate Identifier: %s (%#x)", id_name, id); - proto_tree_add_item(certificate_tree, hf_wai_cert_len, tvb, offset+2, 2, FALSE); + proto_tree_add_item(certificate_tree, hf_wai_cert_len, tvb, offset+2, 2, ENC_BIG_ENDIAN); proto_tree_add_item(certificate_tree, hf_wai_cert_data, tvb, offset+4, length, ENC_NA); return length + 4; @@ -396,9 +396,9 @@ dissect_ecdh_parameter(tvbuff_t * tvb, const gint offset, proto_tree * tree) ecdh_item = proto_tree_add_item(tree, hf_wai_ecdh, tvb, offset, ecdh_len+3, ENC_NA); ecdh_tree = proto_item_add_subtree(ecdh_item, ett_wai_ecdh_param); - ecdh_id_item = proto_tree_add_item(ecdh_tree, hf_wai_ecdh_id, tvb, offset, 1, FALSE); + ecdh_id_item = proto_tree_add_item(ecdh_tree, hf_wai_ecdh_id, tvb, offset, 1, ENC_BIG_ENDIAN); proto_item_set_text(ecdh_id_item, "ID: %s (%#x)", id_name, ecdh_id); - proto_tree_add_item(ecdh_tree, hf_wai_ecdh_len, tvb, offset+1, 2, FALSE); + proto_tree_add_item(ecdh_tree, hf_wai_ecdh_len, tvb, offset+1, 2, ENC_BIG_ENDIAN); proto_tree_add_item(ecdh_tree, hf_wai_ecdh_content, tvb, offset+3, ecdh_len, ENC_NA); return ecdh_len + 3; @@ -428,7 +428,7 @@ dissect_key_data(tvbuff_t *tvb, guint offset, proto_tree *tree, const gchar *con key_data_item = proto_tree_add_item(tree, hf_wai_key_data, tvb, offset, length+1, ENC_NA); proto_item_set_text(key_data_item, "%sKey Data", ((label==NULL)?"":label)); key_data_tree = proto_item_add_subtree(key_data_item, ett_wai_key_data); - proto_tree_add_item(key_data_tree, hf_wai_key_data_len, tvb, offset, 1, FALSE); + proto_tree_add_item(key_data_tree, hf_wai_key_data_len, tvb, offset, 1, ENC_BIG_ENDIAN); if (length > 0) { proto_tree_add_item(key_data_tree, hf_wai_key_data_content, tvb, offset+1, length, ENC_NA); @@ -449,9 +449,9 @@ dissect_multiple_certificate(tvbuff_t * tvb, guint offset, proto_tree *tree) length = tvb_get_ntohs(tvb, offset+1); multicert_item = proto_tree_add_item(tree, hf_wai_cert_ver, tvb, offset, length+3, ENC_NA); multicert_tree = proto_item_add_subtree(multicert_item, ett_wai_certificate_verification); - proto_tree_add_item(multicert_tree, hf_wai_type, tvb, offset, 1, FALSE); + proto_tree_add_item(multicert_tree, hf_wai_type, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; - proto_tree_add_item(multicert_tree, hf_wai_length, tvb, offset, 2, FALSE); + proto_tree_add_item(multicert_tree, hf_wai_length, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; nonce_1_item = proto_tree_add_item(multicert_tree, hf_wai_nonce, tvb, offset, 32, ENC_NA); offset += 32; @@ -459,10 +459,10 @@ dissect_multiple_certificate(tvbuff_t * tvb, guint offset, proto_tree *tree) nonce_2_item = proto_tree_add_item(multicert_tree, hf_wai_nonce, tvb, offset, 32, ENC_NA); offset += 32; proto_item_append_text(nonce_2_item, " 2"); - proto_tree_add_item(multicert_tree, hf_wai_ver_res, tvb, offset, 1, FALSE); + proto_tree_add_item(multicert_tree, hf_wai_ver_res, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; offset += dissect_certificate(tvb, offset, multicert_tree, "1 "); - proto_tree_add_item(multicert_tree, hf_wai_ver_res, tvb, offset, 1, FALSE); + proto_tree_add_item(multicert_tree, hf_wai_ver_res, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; offset += dissect_certificate(tvb, offset, multicert_tree, "2 "); @@ -481,13 +481,13 @@ dissect_identity_list(tvbuff_t *tvb, guint offset, proto_tree *tree) length = tvb_get_ntohs(tvb, offset+1); id_list_item = proto_tree_add_item(tree, hf_wai_identity_list, tvb, offset, length+3, ENC_NA); id_list_tree = proto_item_add_subtree(id_list_item, ett_wai_identity_list); - proto_tree_add_item(id_list_tree, hf_wai_type, tvb, offset, 1, FALSE); + proto_tree_add_item(id_list_tree, hf_wai_type, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; - proto_tree_add_item(id_list_tree, hf_wai_length, tvb, offset, 2, FALSE); + proto_tree_add_item(id_list_tree, hf_wai_length, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(id_list_tree, hf_wai_reserved_byte, tvb, offset, 1, FALSE); + proto_tree_add_item(id_list_tree, hf_wai_reserved_byte, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; - proto_tree_add_item(id_list_tree, hf_wai_no_of_ids, tvb, offset, 2, FALSE); + proto_tree_add_item(id_list_tree, hf_wai_no_of_ids, tvb, offset, 2, ENC_BIG_ENDIAN); no_of_ids = tvb_get_ntohs(tvb, offset); offset += 2; @@ -520,10 +520,10 @@ dissect_signature_algorithm(tvbuff_t *tvb, guint offset, proto_tree *tree) sa_item = proto_tree_add_item(tree, hf_wai_sign_alg, tvb, offset, length+2, ENC_NA); sa_tree = proto_item_add_subtree(sa_item, ett_wai_sign_alg); - proto_tree_add_item(sa_tree, hf_wai_length, tvb, offset, 2, FALSE); + proto_tree_add_item(sa_tree, hf_wai_length, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - alg_name_item = proto_tree_add_item(sa_tree, hf_wai_hash_alg_id, tvb, offset, 1, FALSE); + alg_name_item = proto_tree_add_item(sa_tree, hf_wai_hash_alg_id, tvb, offset, 1, ENC_BIG_ENDIAN); alg_id = tvb_get_guint8(tvb, offset); if (1 == alg_id) { @@ -531,7 +531,7 @@ dissect_signature_algorithm(tvbuff_t *tvb, guint offset, proto_tree *tree) } offset += 1; - sig_name_item = proto_tree_add_item(sa_tree, hf_wai_sign_alg_id, tvb, offset, 1, FALSE); + sig_name_item = proto_tree_add_item(sa_tree, hf_wai_sign_alg_id, tvb, offset, 1, ENC_BIG_ENDIAN); sig_id = tvb_get_guint8(tvb, offset); if (1 == sig_id) { @@ -544,7 +544,7 @@ dissect_signature_algorithm(tvbuff_t *tvb, guint offset, proto_tree *tree) param_tree = proto_item_add_subtree(param_item, ett_wai_parameter); proto_tree_add_item(param_tree, hf_wai_param_id, tvb, offset, 1, ENC_NA); offset += 1; - proto_tree_add_item(param_tree, hf_wai_length, tvb, offset, 2, FALSE); + proto_tree_add_item(param_tree, hf_wai_length, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(param_tree, hf_wai_param_content, tvb, offset, param_len, ENC_NA); @@ -563,7 +563,7 @@ dissect_signature_value(tvbuff_t *tvb, guint offset, proto_tree *tree) sv_item = proto_tree_add_item(tree, hf_wai_sign_val, tvb, offset, length+2, ENC_NA); sv_tree = proto_item_add_subtree(sv_item, ett_wai_sign_val); - proto_tree_add_item(sv_tree, hf_wai_length, tvb, offset, 2, FALSE); + proto_tree_add_item(sv_tree, hf_wai_length, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(sv_tree, hf_wai_sign_content, tvb, offset, length, ENC_NA); @@ -584,10 +584,10 @@ dissect_signature(tvbuff_t *tvb, guint offset, proto_tree *tree, const gchar *co proto_item_set_text(ss_item, "%s", (label==NULL)?"Signature":label); ss_tree = proto_item_add_subtree(ss_item, ett_wai_sign); - proto_tree_add_item(ss_tree, hf_wai_type, tvb, offset, 1, FALSE); + proto_tree_add_item(ss_tree, hf_wai_type, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; - proto_tree_add_item(ss_tree, hf_wai_length, tvb, offset, 2, FALSE); + proto_tree_add_item(ss_tree, hf_wai_length, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; offset += dissect_identity(tvb, offset, ss_tree, NULL); @@ -627,7 +627,7 @@ dissect_wai_data(tvbuff_t *tvb, proto_tree *tree, guint8 subtype, guint16 length { /* Chapter 8.1.4.5 STAKey Establishment procedure [ref: 1] */ dissect_flag(tvb, 0, data_tree); - proto_tree_add_item(data_tree, hf_wai_sta_key_id, tvb, 1, 1, FALSE); + proto_tree_add_item(data_tree, hf_wai_sta_key_id, tvb, 1, 1, ENC_BIG_ENDIAN); dissect_uskid(tvb, 2, data_tree); dissect_addid(tvb, 3, data_tree); dissect_counter(tvb, 15, data_tree); @@ -685,7 +685,7 @@ dissect_wai_data(tvbuff_t *tvb, proto_tree *tree, guint8 subtype, guint16 length offset++; offset += dissect_challenge(tvb, offset, data_tree, "ASUE "); offset += dissect_challenge(tvb, offset, data_tree, "AE "); - proto_tree_add_item(data_tree, hf_wai_access_res, tvb, offset, 1, FALSE); + proto_tree_add_item(data_tree, hf_wai_access_res, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; offset += dissect_key_data(tvb, offset, data_tree, "ASUE "); offset += dissect_key_data(tvb, offset, data_tree, "AE "); @@ -869,14 +869,14 @@ Figure 18 from [ref:1] wai_tree = proto_item_add_subtree(wai_item, ett_wai); /* Field lengths and offsets in WAI protocol described above */ - proto_tree_add_item(wai_tree, hf_wai_version, tvb, 0, 2, FALSE); - proto_tree_add_item(wai_tree, hf_wai_type, tvb, 2, 1, FALSE); - proto_tree_add_item(wai_tree, hf_wai_subtype, tvb, 3, 1, FALSE); - proto_tree_add_item(wai_tree, hf_wai_reserved, tvb, 4, 2, FALSE); - proto_tree_add_item(wai_tree, hf_wai_length, tvb, 6,2, FALSE); - proto_tree_add_item(wai_tree, hf_wai_seq, tvb, 8, 2, FALSE); - proto_tree_add_item(wai_tree, hf_wai_fragm_seq, tvb, 10, 1, FALSE); - proto_tree_add_item(wai_tree, hf_wai_flag, tvb, 11, 1, FALSE); + proto_tree_add_item(wai_tree, hf_wai_version, tvb, 0, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(wai_tree, hf_wai_type, tvb, 2, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(wai_tree, hf_wai_subtype, tvb, 3, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(wai_tree, hf_wai_reserved, tvb, 4, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(wai_tree, hf_wai_length, tvb, 6,2, ENC_BIG_ENDIAN); + proto_tree_add_item(wai_tree, hf_wai_seq, tvb, 8, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(wai_tree, hf_wai_fragm_seq, tvb, 10, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(wai_tree, hf_wai_flag, tvb, 11, 1, ENC_BIG_ENDIAN); } frag_msg = fragment_add_seq_check (tvb, WAI_DATA_OFFSET, pinfo, diff --git a/epan/dissectors/packet-wccp.c b/epan/dissectors/packet-wccp.c index a14a6c9401..a16ff73552 100644 --- a/epan/dissectors/packet-wccp.c +++ b/epan/dissectors/packet-wccp.c @@ -232,24 +232,24 @@ dissect_wccp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case WCCP_HERE_I_AM: proto_tree_add_item(wccp_tree, hf_wccp_version, tvb, - offset, 4, FALSE); + offset, 4, ENC_BIG_ENDIAN); offset += 4; dissect_hash_data(tvb, offset, wccp_tree); offset += HASH_INFO_SIZE; proto_tree_add_item(wccp_tree, hf_recvd_id, tvb, offset, - 4, FALSE); + 4, ENC_BIG_ENDIAN); offset += 4; break; case WCCP_I_SEE_YOU: proto_tree_add_item(wccp_tree, hf_wccp_version, tvb, - offset, 4, FALSE); + offset, 4, ENC_BIG_ENDIAN); offset += 4; proto_tree_add_item(wccp_tree, hf_change_num, tvb, offset, - 4, FALSE); + 4, ENC_BIG_ENDIAN); offset += 4; proto_tree_add_item(wccp_tree, hf_recvd_id, tvb, offset, - 4, FALSE); + 4, ENC_BIG_ENDIAN); offset += 4; cache_count = tvb_get_ntohl(tvb, offset); proto_tree_add_text(wccp_tree, tvb, offset, 4, @@ -272,7 +272,7 @@ dissect_wccp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) * rather than a Version field. */ proto_tree_add_item(wccp_tree, hf_recvd_id, tvb, offset, - 4, FALSE); + 4, ENC_BIG_ENDIAN); offset += 4; cache_count = tvb_get_ntohl(tvb, offset); proto_tree_add_text(wccp_tree, tvb, offset, 4, @@ -327,7 +327,7 @@ dissect_hash_data(tvbuff_t *tvb, int offset, proto_tree *wccp_tree) guint32 flags; proto_tree_add_item(wccp_tree, hf_hash_revision, tvb, offset, 4, - FALSE); + ENC_BIG_ENDIAN); offset += 4; bucket_item = proto_tree_add_text(wccp_tree, tvb, offset, 32, @@ -405,7 +405,7 @@ dissect_wccp2_header(tvbuff_t *tvb, int offset, proto_tree *wccp_tree) guint16 length; proto_tree_add_item(wccp_tree, hf_wccp_version, tvb, offset, 2, - FALSE); + ENC_BIG_ENDIAN); offset += 2; length = tvb_get_ntohs(tvb, offset); proto_tree_add_text(wccp_tree, tvb, offset, 2, "Length: %u", diff --git a/epan/dissectors/packet-wcp.c b/epan/dissectors/packet-wcp.c index 163d983d1d..e0d9117762 100644 --- a/epan/dissectors/packet-wcp.c +++ b/epan/dissectors/packet-wcp.c @@ -512,7 +512,7 @@ static tvbuff_t *wcp_uncompress( tvbuff_t *src_tvb, int offset, packet_info *pin if ((*src & 0xf0) == 0x10){ if ( tree) { ti = proto_tree_add_item( tree, hf_wcp_long_run, src_tvb, - offset-1, 3, 0); + offset-1, 3, ENC_BIG_ENDIAN); sub_tree = proto_item_add_subtree(ti, ett_wcp_field); proto_tree_add_uint(sub_tree, hf_wcp_offset, src_tvb, offset-1, 2, pntohs(src)); diff --git a/epan/dissectors/packet-who.c b/epan/dissectors/packet-who.c index 636d2bf409..a04b7a231d 100644 --- a/epan/dissectors/packet-who.c +++ b/epan/dissectors/packet-who.c @@ -111,11 +111,11 @@ dissect_who(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } if (tree) - proto_tree_add_item(who_tree, hf_who_vers, tvb, offset, 1, FALSE); + proto_tree_add_item(who_tree, hf_who_vers, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; if (tree) - proto_tree_add_item(who_tree, hf_who_type, tvb, offset, 1, FALSE); + proto_tree_add_item(who_tree, hf_who_type, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; /* 2 filler bytes */ diff --git a/epan/dissectors/packet-wifi-p2p.c b/epan/dissectors/packet-wifi-p2p.c index 48d2096a18..ff002b8dc0 100644 --- a/epan/dissectors/packet-wifi-p2p.c +++ b/epan/dissectors/packet-wifi-p2p.c @@ -371,42 +371,42 @@ static void dissect_wifi_p2p_capability(proto_item *tlv_root, tvbuff_t *tvb, int offset) { proto_tree_add_item(tlv_root, hf_p2p_attr_capab_device, tvb, - offset + 3, 1, FALSE); + offset + 3, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_root, hf_p2p_attr_capab_device_service_discovery, tvb, - offset + 3, 1, FALSE); + offset + 3, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_root, hf_p2p_attr_capab_device_client_discoverability, - tvb, offset + 3, 1, FALSE); + tvb, offset + 3, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_root, hf_p2p_attr_capab_device_concurrent_operation, - tvb, offset + 3, 1, FALSE); + tvb, offset + 3, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_root, hf_p2p_attr_capab_device_infrastructure_managed, - tvb, offset + 3, 1, FALSE); + tvb, offset + 3, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_root, hf_p2p_attr_capab_device_limit, tvb, - offset + 3, 1, FALSE); + offset + 3, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_root, hf_p2p_attr_capab_invitation_procedure, tvb, - offset + 3, 1, FALSE); + offset + 3, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_root, hf_p2p_attr_capab_group, - tvb, offset + 4, 1, FALSE); + tvb, offset + 4, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_root, hf_p2p_attr_capab_group_owner, - tvb, offset + 4, 1, FALSE); + tvb, offset + 4, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_root, hf_p2p_attr_capab_group_persistent, - tvb, offset + 4, 1, FALSE); + tvb, offset + 4, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_root, hf_p2p_attr_capab_group_limit, - tvb, offset + 4, 1, FALSE); + tvb, offset + 4, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_root, hf_p2p_attr_capab_group_intra_bss_distribution, - tvb, offset + 4, 1, FALSE); + tvb, offset + 4, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_root, hf_p2p_attr_capab_group_cross_connection, - tvb, offset + 4, 1, FALSE); + tvb, offset + 4, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_root, hf_p2p_attr_capab_group_persistent_reconnect, - tvb, offset + 4, 1, FALSE); + tvb, offset + 4, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_root, hf_p2p_attr_capab_group_group_formation, - tvb, offset + 4, 1, FALSE); + tvb, offset + 4, 1, ENC_BIG_ENDIAN); proto_item_append_text(tlv_item, ": Device 0x%x Group 0x%x", tvb_get_guint8(tvb, offset + 3), @@ -428,9 +428,9 @@ static void dissect_group_owner_intent(proto_item *tlv_root, tvbuff_t *tvb, int offset) { proto_tree_add_item(tlv_root, hf_p2p_attr_go_intent, tvb, - offset + 3, 1, FALSE); + offset + 3, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_root, hf_p2p_attr_go_intent_tie_breaker, tvb, - offset + 3, 1, FALSE); + offset + 3, 1, ENC_BIG_ENDIAN); proto_item_append_text(tlv_item, ": Intent %u Tie breaker %u", tvb_get_guint8(tvb, offset + 3) >> 1, tvb_get_guint8(tvb, offset + 3) & 0x01); @@ -440,7 +440,7 @@ static void dissect_status(proto_item *tlv_root, proto_item *tlv_item, tvbuff_t *tvb, int offset) { proto_tree_add_item(tlv_root, hf_p2p_attr_status, tvb, - offset + 3, 1, FALSE); + offset + 3, 1, ENC_BIG_ENDIAN); proto_item_append_text(tlv_item, ": %u (%s)", tvb_get_guint8(tvb, offset + 3), val_to_str(tvb_get_guint8(tvb, offset + 3), @@ -454,9 +454,9 @@ static void dissect_listen_channel(proto_item *tlv_root, proto_item *tlv_item, proto_tree_add_item(tlv_root, hf_p2p_attr_listen_channel_country, tvb, offset + 3, 3, FALSE); proto_tree_add_item(tlv_root, hf_p2p_attr_listen_channel_oper_class, tvb, - offset + 6, 1, FALSE); + offset + 6, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_root, hf_p2p_attr_listen_channel_number, tvb, - offset + 7, 1, FALSE); + offset + 7, 1, ENC_BIG_ENDIAN); proto_item_append_text(tlv_item, ": Operating Class %u " "Channel Number %u", tvb_get_guint8(tvb, offset + 6), @@ -470,9 +470,9 @@ static void dissect_operating_channel(proto_item *tlv_root, proto_tree_add_item(tlv_root, hf_p2p_attr_operating_channel_country, tvb, offset + 3, 3, FALSE); proto_tree_add_item(tlv_root, hf_p2p_attr_operating_channel_oper_class, tvb, - offset + 6, 1, FALSE); + offset + 6, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_root, hf_p2p_attr_operating_channel_number, tvb, - offset + 7, 1, FALSE); + offset + 7, 1, ENC_BIG_ENDIAN); proto_item_append_text(tlv_item, ": Operating Class %u " "Channel Number %u", tvb_get_guint8(tvb, offset + 6), @@ -491,11 +491,11 @@ static void dissect_channel_list(proto_item *tlv_root, tvbuff_t *tvb, while (offset + 3 + slen > s_offset) { proto_tree_add_item(tlv_root, hf_p2p_attr_channel_list_oper_class, tvb, - s_offset, 1, FALSE); + s_offset, 1, ENC_BIG_ENDIAN); s_offset++; proto_tree_add_item(tlv_root, hf_p2p_attr_channel_list_num_chan, tvb, - s_offset, 1, FALSE); + s_offset, 1, ENC_BIG_ENDIAN); num_chan = tvb_get_guint8(tvb, s_offset); s_offset++; @@ -521,50 +521,50 @@ static void dissect_wifi_p2p_device_info(packet_info *pinfo, s_offset += 6; proto_tree_add_item(tlv_root, hf_p2p_attr_dev_info_config_methods, - tvb, s_offset, 2, FALSE); + tvb, s_offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_root, hf_p2p_attr_dev_info_config_methods_usba, - tvb, s_offset, 2, FALSE); + tvb, s_offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_root, hf_p2p_attr_dev_info_config_methods_ethernet, - tvb, s_offset, 2, FALSE); + tvb, s_offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_root, hf_p2p_attr_dev_info_config_methods_label, - tvb, s_offset, 2, FALSE); + tvb, s_offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_root, hf_p2p_attr_dev_info_config_methods_display, - tvb, s_offset, 2, FALSE); + tvb, s_offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_root, hf_p2p_attr_dev_info_config_methods_ext_nfc_token, - tvb, s_offset, 2, FALSE); + tvb, s_offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_root, hf_p2p_attr_dev_info_config_methods_int_nfc_token, - tvb, s_offset, 2, FALSE); + tvb, s_offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_root, hf_p2p_attr_dev_info_config_methods_nfc_interface, - tvb, s_offset, 2, FALSE); + tvb, s_offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_root, hf_p2p_attr_dev_info_config_methods_pushbutton, - tvb, s_offset, 2, FALSE); + tvb, s_offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_root, hf_p2p_attr_dev_info_config_methods_keypad, - tvb, s_offset, 2, FALSE); + tvb, s_offset, 2, ENC_BIG_ENDIAN); s_offset += 2; proto_tree_add_item(tlv_root, hf_p2p_attr_dev_info_pri_dev_type, tvb, s_offset, 8, ENC_NA); proto_tree_add_item(tlv_root, hf_p2p_attr_dev_info_pri_dev_type_category, - tvb, s_offset, 2, FALSE); + tvb, s_offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_root, hf_p2p_attr_dev_info_pri_dev_type_oui, tvb, s_offset + 2, 4, ENC_NA); proto_tree_add_item(tlv_root, hf_p2p_attr_dev_info_pri_dev_type_subcategory, - tvb, s_offset + 6, 2, FALSE); + tvb, s_offset + 6, 2, ENC_BIG_ENDIAN); s_offset += 8; num_sec = tvb_get_guint8(tvb, s_offset); proto_tree_add_item(tlv_root, hf_p2p_attr_dev_info_num_sec, tvb, - s_offset, 1, FALSE); + s_offset, 1, ENC_BIG_ENDIAN); s_offset++; while (num_sec > 0) { @@ -575,7 +575,7 @@ static void dissect_wifi_p2p_device_info(packet_info *pinfo, } item = proto_tree_add_item(tlv_root, hf_p2p_attr_dev_info_dev_name_type, - tvb, s_offset, 2, FALSE); + tvb, s_offset, 2, ENC_BIG_ENDIAN); attr_type = tvb_get_ntohs(tvb, s_offset); if (attr_type != 0x1011) { expert_add_info_format(pinfo, item, PI_MALFORMED, PI_ERROR, @@ -583,7 +583,7 @@ static void dissect_wifi_p2p_device_info(packet_info *pinfo, } s_offset += 2; item = proto_tree_add_item(tlv_root, hf_p2p_attr_dev_info_dev_name_len, - tvb, s_offset, 2, FALSE); + tvb, s_offset, 2, ENC_BIG_ENDIAN); attr_len = tvb_get_ntohs(tvb, s_offset); s_offset += 2; if (attr_len > offset + 3 + slen - s_offset) { @@ -608,9 +608,9 @@ static void dissect_configuration_timeout(proto_item *tlv_root, tvbuff_t *tvb, int offset) { proto_tree_add_item(tlv_root, hf_p2p_attr_config_timeout_go, tvb, - offset + 3, 1, FALSE); + offset + 3, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_root, hf_p2p_attr_config_timeout_client, tvb, - offset + 4, 1, FALSE); + offset + 4, 1, ENC_BIG_ENDIAN); proto_item_append_text(tlv_item, ": GO %u msec, client %u msec", tvb_get_guint8(tvb, offset + 3) * 10, tvb_get_guint8(tvb, offset + 4) * 10); @@ -693,27 +693,27 @@ static void dissect_notice_of_absence(packet_info *pinfo, proto_item *tlv_root, } proto_tree_add_item(tlv_root, hf_p2p_attr_noa_index, tvb, s_offset, 1, - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item(tlv_root, hf_p2p_attr_noa_params, tvb, s_offset + 1, 1, - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item(tlv_root, hf_p2p_attr_noa_params_opp_ps, tvb, - s_offset + 1, 1, FALSE); + s_offset + 1, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_root, hf_p2p_attr_noa_params_ctwindow, tvb, - s_offset + 1, 1, FALSE); + s_offset + 1, 1, ENC_BIG_ENDIAN); s_offset += 2; while (offset + 3 + slen >= s_offset + 13) { proto_tree_add_item(tlv_root, hf_p2p_attr_noa_count_type, tvb, s_offset, 1, - FALSE); + ENC_BIG_ENDIAN); s_offset++; proto_tree_add_item(tlv_root, hf_p2p_attr_noa_duration, tvb, s_offset, 4, - TRUE); + ENC_LITTLE_ENDIAN); s_offset += 4; proto_tree_add_item(tlv_root, hf_p2p_attr_noa_interval, tvb, s_offset, 4, - TRUE); + ENC_LITTLE_ENDIAN); s_offset += 4; proto_tree_add_item(tlv_root, hf_p2p_attr_noa_start_time, tvb, s_offset, 4, - TRUE); + ENC_LITTLE_ENDIAN); s_offset += 4; } } @@ -737,7 +737,7 @@ static void dissect_wifi_p2p_group_info(packet_info *pinfo, } item = proto_tree_add_item(tlv_root, hf_p2p_attr_gi_length, tvb, s_offset, - 1, FALSE); + 1, ENC_BIG_ENDIAN); ci_len = tvb_get_guint8(tvb, s_offset); if (ci_len < 24 || s_offset + ci_len > offset + 3 + slen) { expert_add_info_format(pinfo, item, PI_MALFORMED, PI_ERROR, @@ -756,41 +756,41 @@ static void dissect_wifi_p2p_group_info(packet_info *pinfo, s_offset += 6; proto_tree_add_item(tlv_root, hf_p2p_attr_gi_dev_capab, tvb, s_offset, 1, - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item(tlv_root, hf_p2p_attr_gi_dev_capab_service_discovery, tvb, - s_offset, 1, FALSE); + s_offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_root, hf_p2p_attr_gi_dev_capab_client_discoverability, - tvb, s_offset, 1, FALSE); + tvb, s_offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_root, hf_p2p_attr_gi_dev_capab_concurrent_operation, - tvb, s_offset, 1, FALSE); + tvb, s_offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_root, hf_p2p_attr_gi_dev_capab_infrastructure_managed, - tvb, s_offset, 1, FALSE); + tvb, s_offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_root, hf_p2p_attr_gi_dev_capab_limit, tvb, - s_offset, 1, FALSE); + s_offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_root, hf_p2p_attr_capab_invitation_procedure, tvb, - s_offset, 1, FALSE); + s_offset, 1, ENC_BIG_ENDIAN); s_offset++; proto_tree_add_item(tlv_root, hf_p2p_attr_gi_config_methods, tvb, s_offset, - 2, FALSE); + 2, ENC_BIG_ENDIAN); s_offset += 2; proto_tree_add_item(tlv_root, hf_p2p_attr_gi_pri_dev_type, tvb, s_offset, 8, ENC_NA); proto_tree_add_item(tlv_root, hf_p2p_attr_gi_pri_dev_type_category, - tvb, s_offset, 2, FALSE); + tvb, s_offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_root, hf_p2p_attr_gi_pri_dev_type_oui, tvb, s_offset + 2, 4, ENC_NA); proto_tree_add_item(tlv_root, hf_p2p_attr_gi_pri_dev_type_subcategory, - tvb, s_offset + 6, 2, FALSE); + tvb, s_offset + 6, 2, ENC_BIG_ENDIAN); s_offset += 8; item = proto_tree_add_item(tlv_root, hf_p2p_attr_gi_num_sec_dev_types, tvb, - s_offset, 1, FALSE); + s_offset, 1, ENC_BIG_ENDIAN); num_sec = tvb_get_guint8(tvb, s_offset); s_offset++; left = offset + 3 + slen - s_offset; @@ -807,7 +807,7 @@ static void dissect_wifi_p2p_group_info(packet_info *pinfo, } item = proto_tree_add_item(tlv_root, hf_p2p_attr_gi_dev_name_type, - tvb, s_offset, 2, FALSE); + tvb, s_offset, 2, ENC_BIG_ENDIAN); attr_type = tvb_get_ntohs(tvb, s_offset); if (attr_type != 0x1011) { expert_add_info_format(pinfo, item, PI_MALFORMED, PI_ERROR, @@ -815,7 +815,7 @@ static void dissect_wifi_p2p_group_info(packet_info *pinfo, } s_offset += 2; item = proto_tree_add_item(tlv_root, hf_p2p_attr_gi_dev_name_len, - tvb, s_offset, 2, FALSE); + tvb, s_offset, 2, ENC_BIG_ENDIAN); attr_len = tvb_get_ntohs(tvb, s_offset); s_offset += 2; if (attr_len > offset + 3 + slen - s_offset) { @@ -843,9 +843,9 @@ static void dissect_invitation_flags(proto_item *tlv_root, tvbuff_t *tvb, int offset) { proto_tree_add_item(tlv_root, hf_p2p_attr_invitation_flags, tvb, - offset + 3, 1, FALSE); + offset + 3, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_root, hf_p2p_attr_invitation_flags_type, tvb, - offset + 3, 1, FALSE); + offset + 3, 1, ENC_BIG_ENDIAN); proto_item_append_text(tlv_item, ": Invitation Flags 0x%x", tvb_get_guint8(tvb, offset + 3)); } @@ -855,13 +855,13 @@ static void dissect_manageability(proto_item *tlv_root, tvbuff_t *tvb, int offset) { proto_tree_add_item(tlv_root, hf_p2p_attr_manageability_bitmap, tvb, - offset + 3, 1, FALSE); + offset + 3, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_root, hf_p2p_attr_manageability_bitmap_mgmt, tvb, - offset + 3, 1, FALSE); + offset + 3, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_root, hf_p2p_attr_manageability_bitmap_cross_connect, - tvb, offset + 3, 1, FALSE); + tvb, offset + 3, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_root, hf_p2p_attr_manageability_bitmap_coex_opt, tvb, - offset + 3, 1, FALSE); + offset + 3, 1, ENC_BIG_ENDIAN); proto_item_append_text(tlv_item, ": Bitmap field 0x%x", tvb_get_guint8(tvb, offset + 3)); } @@ -871,7 +871,7 @@ static void dissect_minor_reason_code(proto_item *tlv_root, tvbuff_t *tvb, int offset) { proto_tree_add_item(tlv_root, hf_p2p_attr_minor_reason_code, tvb, - offset + 3, 1, FALSE); + offset + 3, 1, ENC_BIG_ENDIAN); proto_item_append_text(tlv_item, ": %u (%s)", tvb_get_guint8(tvb, offset + 3), val_to_str(tvb_get_guint8(tvb, offset + 3), @@ -901,7 +901,7 @@ void dissect_wifi_p2p_ie(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, "Unknown attribute type (%u)")); tlv_root = proto_item_add_subtree(tlv_item, ett_p2p_tlv); - proto_tree_add_item(tlv_root, hf_p2p_attr_type, tvb, offset, 1, FALSE); + proto_tree_add_item(tlv_root, hf_p2p_attr_type, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_uint(tlv_root, hf_p2p_attr_len, tvb, offset + 1, 2, slen); @@ -971,10 +971,10 @@ void dissect_wifi_p2p_ie(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int dissect_wifi_p2p_public_action(proto_tree *tree, tvbuff_t *tvb, int offset) { proto_tree_add_item(tree, hf_p2p_public_action_subtype, tvb, offset, 1, - FALSE); + ENC_BIG_ENDIAN); offset++; proto_tree_add_item(tree, hf_p2p_public_action_dialog_token, tvb, offset, 1, - FALSE); + ENC_BIG_ENDIAN); offset++; /* Followed by variable length IEs dissected by packet-ieee80211.c */ return offset; @@ -982,9 +982,9 @@ int dissect_wifi_p2p_public_action(proto_tree *tree, tvbuff_t *tvb, int offset) int dissect_wifi_p2p_action(proto_tree *tree, tvbuff_t *tvb, int offset) { - proto_tree_add_item(tree, hf_p2p_action_subtype, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_p2p_action_subtype, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; - proto_tree_add_item(tree, hf_p2p_action_dialog_token, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_p2p_action_dialog_token, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; /* Followed by variable length IEs dissected by packet-ieee80211.c */ return offset; @@ -996,7 +996,7 @@ void dissect_wifi_p2p_anqp(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, proto_item *item; item = proto_tree_add_item(tree, hf_p2p_anqp_service_update_indicator, tvb, - offset, 2, TRUE); + offset, 2, ENC_LITTLE_ENDIAN); offset += 2; while (tvb_length_remaining(tvb, offset) >= (request ? 4 : 5)) { @@ -1024,18 +1024,18 @@ void dissect_wifi_p2p_anqp(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, "Unknown (%u)")); tlv = proto_item_add_subtree(item, ett_p2p_service_tlv); - proto_tree_add_item(tlv, hf_p2p_anqp_length, tvb, offset, 2, TRUE); + proto_tree_add_item(tlv, hf_p2p_anqp_length, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; proto_tree_add_item(tlv, hf_p2p_anqp_service_protocol_type, tvb, - offset, 1, FALSE); + offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tlv, hf_p2p_anqp_service_transaction_id, tvb, - offset + 1, 1, FALSE); + offset + 1, 1, ENC_BIG_ENDIAN); if (request) { proto_tree_add_item(tlv, hf_p2p_anqp_query_data, tvb, offset + 2, len - 2, ENC_NA); } else { proto_tree_add_item(tlv, hf_p2p_anqp_status_code, tvb, - offset + 2, 1, FALSE); + offset + 2, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tlv, hf_p2p_anqp_response_data, tvb, offset + 3, len - 3, ENC_NA); } diff --git a/epan/dissectors/packet-windows-common.c b/epan/dissectors/packet-windows-common.c index 3633bd6810..843c317cca 100644 --- a/epan/dissectors/packet-windows-common.c +++ b/epan/dissectors/packet-windows-common.c @@ -1692,8 +1692,8 @@ dissect_nt_sid(tvbuff_t *tvb, int offset, proto_tree *parent_tree, subtree = proto_item_add_subtree(item, ett_nt_sid); /* Add revision, num_auth, and authority */ - proto_tree_add_item(subtree, hf_nt_sid_revision, tvb, offset_sid_start, 1, TRUE); - proto_tree_add_item(subtree, hf_nt_sid_num_auth, tvb, offset_sid_start+1, 1, TRUE); + proto_tree_add_item(subtree, hf_nt_sid_revision, tvb, offset_sid_start, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(subtree, hf_nt_sid_num_auth, tvb, offset_sid_start+1, 1, ENC_LITTLE_ENDIAN); proto_tree_add_uint64_format_value(subtree, (sid_display_hex ? hf_nt_sid_auth_hex : hf_nt_sid_auth_dec), tvb, offset_sid_start+2, 6, authority, "%" G_GINT64_MODIFIER "u", authority); @@ -2393,7 +2393,7 @@ dissect_nt_acl(tvbuff_t *tvb, int offset, packet_info *pinfo, case ACL_REVISION_ADS: case 3: /* weirdo type */ /* size */ - proto_tree_add_item(tree, hf_nt_acl_size, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_nt_acl_size, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; /* number of ace structures */ diff --git a/epan/dissectors/packet-winsrepl.c b/epan/dissectors/packet-winsrepl.c index 48bd8560a2..9f780f2dc2 100644 --- a/epan/dissectors/packet-winsrepl.c +++ b/epan/dissectors/packet-winsrepl.c @@ -188,15 +188,15 @@ dissect_winsrepl_start(tvbuff_t *winsrepl_tvb, _U_ packet_info *pinfo, } /* ASSOC_CTX */ - proto_tree_add_item(start_tree, hf_winsrepl_assoc_ctx, winsrepl_tvb, winsrepl_offset, 4, FALSE); + proto_tree_add_item(start_tree, hf_winsrepl_assoc_ctx, winsrepl_tvb, winsrepl_offset, 4, ENC_BIG_ENDIAN); winsrepl_offset += 4; /* MINOR VERSION */ - proto_tree_add_item(start_tree, hf_winsrepl_start_minor_version, winsrepl_tvb, winsrepl_offset, 2, FALSE); + proto_tree_add_item(start_tree, hf_winsrepl_start_minor_version, winsrepl_tvb, winsrepl_offset, 2, ENC_BIG_ENDIAN); winsrepl_offset += 2; /* MAJOR VERSION */ - proto_tree_add_item(start_tree, hf_winsrepl_start_major_version, winsrepl_tvb, winsrepl_offset, 2, FALSE); + proto_tree_add_item(start_tree, hf_winsrepl_start_major_version, winsrepl_tvb, winsrepl_offset, 2, ENC_BIG_ENDIAN); winsrepl_offset += 2; return winsrepl_offset; @@ -254,15 +254,15 @@ dissect_winsrepl_wins_owner(tvbuff_t *winsrepl_tvb, _U_ packet_info *pinfo, winsrepl_offset += 4; /* MAX_VERSION */ - proto_tree_add_item(owner_tree, hf_winsrepl_owner_max_version, winsrepl_tvb, winsrepl_offset, 8, FALSE); + proto_tree_add_item(owner_tree, hf_winsrepl_owner_max_version, winsrepl_tvb, winsrepl_offset, 8, ENC_BIG_ENDIAN); winsrepl_offset += 8; /* MIN_VERSION */ - proto_tree_add_item(owner_tree, hf_winsrepl_owner_min_version, winsrepl_tvb, winsrepl_offset, 8, FALSE); + proto_tree_add_item(owner_tree, hf_winsrepl_owner_min_version, winsrepl_tvb, winsrepl_offset, 8, ENC_BIG_ENDIAN); winsrepl_offset += 8; /* TYPE */ - proto_tree_add_item(owner_tree, hf_winsrepl_owner_type, winsrepl_tvb, winsrepl_offset, 4, FALSE); + proto_tree_add_item(owner_tree, hf_winsrepl_owner_type, winsrepl_tvb, winsrepl_offset, 4, ENC_BIG_ENDIAN); winsrepl_offset += 4; return winsrepl_offset; @@ -454,11 +454,11 @@ dissect_winsrepl_wins_name(tvbuff_t *winsrepl_tvb, packet_info *pinfo, /* GROUP_FLAG */ /* XXX - is this just a Boolean? */ - proto_tree_add_item(name_tree, hf_winsrepl_name_group_flag, winsrepl_tvb, winsrepl_offset, 4, TRUE); + proto_tree_add_item(name_tree, hf_winsrepl_name_group_flag, winsrepl_tvb, winsrepl_offset, 4, ENC_LITTLE_ENDIAN); winsrepl_offset += 4; /* Version ID */ - proto_tree_add_item(name_tree, hf_winsrepl_name_version_id, winsrepl_tvb, winsrepl_offset, 8, FALSE); + proto_tree_add_item(name_tree, hf_winsrepl_name_version_id, winsrepl_tvb, winsrepl_offset, 8, ENC_BIG_ENDIAN); winsrepl_offset += 8; switch (flags & WREPL_NAME_TYPE_MASK) { @@ -651,15 +651,15 @@ dissect_winsrepl_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) } /* SIZE */ - proto_tree_add_item(winsrepl_tree, hf_winsrepl_size, tvb, offset, 4, FALSE); + proto_tree_add_item(winsrepl_tree, hf_winsrepl_size, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; /* OPCODE */ - proto_tree_add_item(winsrepl_tree, hf_winsrepl_opcode, tvb, offset, 4, FALSE); + proto_tree_add_item(winsrepl_tree, hf_winsrepl_opcode, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; /* ASSOC_CTX */ - proto_tree_add_item(winsrepl_tree, hf_winsrepl_assoc_ctx, tvb, offset, 4, FALSE); + proto_tree_add_item(winsrepl_tree, hf_winsrepl_assoc_ctx, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; /* MESSAGE_TYPE */ diff --git a/epan/dissectors/packet-wow.c b/epan/dissectors/packet-wow.c index 5d09ddc08a..9fea17baa8 100644 --- a/epan/dissectors/packet-wow.c +++ b/epan/dissectors/packet-wow.c @@ -220,7 +220,7 @@ dissect_wow_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) wow_tree = proto_item_add_subtree(ti, ett_wow); proto_tree_add_item(wow_tree, hf_wow_command, tvb, offset, 1, - TRUE); + ENC_LITTLE_ENDIAN); offset += 1; switch(cmd) { @@ -229,11 +229,11 @@ dissect_wow_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if(WOW_CLIENT_TO_SERVER) { proto_tree_add_item(wow_tree, hf_wow_error, tvb, - offset, 1, TRUE); + offset, 1, ENC_LITTLE_ENDIAN); offset += 1; proto_tree_add_item(wow_tree, hf_wow_pkt_size, - tvb, offset, 2, TRUE); + tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; string = g_strreverse(tvb_get_ephemeral_string(tvb, offset, 4)); @@ -242,19 +242,19 @@ dissect_wow_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset += 4; proto_tree_add_item(wow_tree, hf_wow_version1, - tvb, offset, 1, TRUE); + tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 1; proto_tree_add_item(wow_tree, hf_wow_version2, - tvb, offset, 1, TRUE); + tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 1; proto_tree_add_item(wow_tree, hf_wow_version3, - tvb, offset, 1, TRUE); + tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 1; proto_tree_add_item(wow_tree, hf_wow_build, tvb, - offset, 2, TRUE); + offset, 2, ENC_LITTLE_ENDIAN); offset += 2; string = g_strreverse(tvb_get_ephemeral_string(tvb, offset, 4)); @@ -274,7 +274,7 @@ dissect_wow_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(wow_tree, hf_wow_timezone_bias, - tvb, offset, 4, TRUE); + tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; proto_tree_add_item(wow_tree, hf_wow_ip, tvb, @@ -283,7 +283,7 @@ dissect_wow_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(wow_tree, hf_wow_srp_i_len, - tvb, offset, 1, TRUE); + tvb, offset, 1, ENC_LITTLE_ENDIAN); srp_i_len = tvb_get_guint8(tvb, offset); offset += 1; @@ -296,7 +296,7 @@ dissect_wow_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } else if(WOW_SERVER_TO_CLIENT) { proto_tree_add_item(wow_tree, hf_wow_error, tvb, - offset, 1, TRUE); + offset, 1, ENC_LITTLE_ENDIAN); offset += 1; offset += 1; /* Unknown field */ @@ -306,7 +306,7 @@ dissect_wow_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset += 32; proto_tree_add_item(wow_tree, hf_wow_srp_g_len, - tvb, offset, 1, TRUE); + tvb, offset, 1, ENC_LITTLE_ENDIAN); srp_g_len = tvb_get_guint8(tvb, offset); offset += 1; @@ -315,7 +315,7 @@ dissect_wow_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset += srp_g_len; proto_tree_add_item(wow_tree, hf_wow_srp_n_len, - tvb, offset, 1, TRUE); + tvb, offset, 1, ENC_LITTLE_ENDIAN); srp_n_len = tvb_get_guint8(tvb, offset); offset += 1; @@ -348,14 +348,14 @@ dissect_wow_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset += 20; proto_tree_add_item(wow_tree, hf_wow_num_keys, - tvb, offset, 1, TRUE); + tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 1; offset += 1; /* Unknown field */ } else if(WOW_SERVER_TO_CLIENT) { proto_tree_add_item(wow_tree, hf_wow_error, tvb, - offset, 1, TRUE); + offset, 1, ENC_LITTLE_ENDIAN); offset += 1; proto_tree_add_item(wow_tree, hf_wow_srp_m2, @@ -377,13 +377,13 @@ dissect_wow_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } else if(WOW_SERVER_TO_CLIENT) { proto_tree_add_item(wow_tree, hf_wow_pkt_size, - tvb, offset, 2, TRUE); + tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; offset += 4; /* Unknown field; always 0 */ proto_tree_add_item(wow_tree, hf_wow_num_realms, - tvb, offset, 2, TRUE); + tvb, offset, 2, ENC_LITTLE_ENDIAN); num_realms = tvb_get_letohs(tvb, offset); offset += 2; @@ -398,13 +398,13 @@ dissect_wow_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) realm_name); wow_realms_tree = proto_item_add_subtree(ti, ett_wow_realms); - proto_tree_add_item(wow_realms_tree, hf_wow_realm_type, tvb, offset, 1, TRUE); + proto_tree_add_item(wow_realms_tree, hf_wow_realm_type, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 1; - proto_tree_add_item(wow_realms_tree, hf_wow_realm_status, tvb, offset, 1, TRUE); + proto_tree_add_item(wow_realms_tree, hf_wow_realm_status, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 1; - proto_tree_add_item(wow_realms_tree, hf_wow_realm_color, tvb, offset, 1, TRUE); + proto_tree_add_item(wow_realms_tree, hf_wow_realm_color, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 1; proto_tree_add_string(wow_realms_tree, hf_wow_realm_name, tvb, offset, len, realm_name); @@ -415,13 +415,13 @@ dissect_wow_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_string(wow_realms_tree, hf_wow_realm_socket, tvb, offset, len, string); offset += len; - proto_tree_add_item(wow_realms_tree, hf_wow_realm_population_level, tvb, offset, 4, TRUE); + proto_tree_add_item(wow_realms_tree, hf_wow_realm_population_level, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; - proto_tree_add_item(wow_realms_tree, hf_wow_realm_num_characters, tvb, offset, 1, TRUE); + proto_tree_add_item(wow_realms_tree, hf_wow_realm_num_characters, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 1; - proto_tree_add_item(wow_realms_tree, hf_wow_realm_timezone, tvb, offset, 1, TRUE); + proto_tree_add_item(wow_realms_tree, hf_wow_realm_timezone, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 1; offset += 1; /* Unknown field */ diff --git a/epan/dissectors/packet-wps.c b/epan/dissectors/packet-wps.c index 255bd5aa8f..e2b95d8756 100644 --- a/epan/dissectors/packet-wps.c +++ b/epan/dissectors/packet-wps.c @@ -772,19 +772,19 @@ static void dissect_wps_config_methods(proto_tree *root, tvbuff_t* tvb, int offset, gint _U_ size, packet_info _U_ *pinfo) { - proto_tree_add_item(root, hf_eapwps_tlv_config_methods_usba, tvb, offset+4, 2, FALSE); - proto_tree_add_item(root, hf_eapwps_tlv_config_methods_ethernet, tvb, offset+4, 2, FALSE); - proto_tree_add_item(root, hf_eapwps_tlv_config_methods_label, tvb, offset+4, 2, FALSE); - proto_tree_add_item(root, hf_eapwps_tlv_config_methods_display, tvb, offset+4, 2, FALSE); - proto_tree_add_item(root, hf_eapwps_tlv_config_methods_virt_display, tvb, offset+4, 2, FALSE); - proto_tree_add_item(root, hf_eapwps_tlv_config_methods_phy_display, tvb, offset+4, 2, FALSE); - proto_tree_add_item(root, hf_eapwps_tlv_config_methods_nfcext, tvb, offset+4, 2, FALSE); - proto_tree_add_item(root, hf_eapwps_tlv_config_methods_nfcint, tvb, offset+4, 2, FALSE); - proto_tree_add_item(root, hf_eapwps_tlv_config_methods_nfcinf, tvb, offset+4, 2, FALSE); - proto_tree_add_item(root, hf_eapwps_tlv_config_methods_pushbutton, tvb, offset+4, 2, FALSE); - proto_tree_add_item(root, hf_eapwps_tlv_config_methods_virt_pushbutton, tvb, offset+4, 2, FALSE); - proto_tree_add_item(root, hf_eapwps_tlv_config_methods_phy_pushbutton, tvb, offset+4, 2, FALSE); - proto_tree_add_item(root, hf_eapwps_tlv_config_methods_keypad, tvb, offset+4, 2, FALSE); + proto_tree_add_item(root, hf_eapwps_tlv_config_methods_usba, tvb, offset+4, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(root, hf_eapwps_tlv_config_methods_ethernet, tvb, offset+4, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(root, hf_eapwps_tlv_config_methods_label, tvb, offset+4, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(root, hf_eapwps_tlv_config_methods_display, tvb, offset+4, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(root, hf_eapwps_tlv_config_methods_virt_display, tvb, offset+4, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(root, hf_eapwps_tlv_config_methods_phy_display, tvb, offset+4, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(root, hf_eapwps_tlv_config_methods_nfcext, tvb, offset+4, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(root, hf_eapwps_tlv_config_methods_nfcint, tvb, offset+4, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(root, hf_eapwps_tlv_config_methods_nfcinf, tvb, offset+4, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(root, hf_eapwps_tlv_config_methods_pushbutton, tvb, offset+4, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(root, hf_eapwps_tlv_config_methods_virt_pushbutton, tvb, offset+4, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(root, hf_eapwps_tlv_config_methods_phy_pushbutton, tvb, offset+4, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(root, hf_eapwps_tlv_config_methods_keypad, tvb, offset+4, 2, ENC_BIG_ENDIAN); } static void add_wps_wfa_ext(guint8 id, proto_tree *tree, tvbuff_t *tvb, @@ -798,15 +798,15 @@ static void add_wps_wfa_ext(guint8 id, proto_tree *tree, tvbuff_t *tvb, val_to_str(id, eapwps_wfa_ext_types, "Unknown (%u)")); elem = proto_item_add_subtree(item, ett_wps_wfa_ext); - proto_tree_add_item(elem, hf_eapwps_wfa_ext_id, tvb, offset - 2, 1, FALSE); - proto_tree_add_item(elem, hf_eapwps_wfa_ext_len, tvb, offset - 1, 1, FALSE); + proto_tree_add_item(elem, hf_eapwps_wfa_ext_id, tvb, offset - 2, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(elem, hf_eapwps_wfa_ext_len, tvb, offset - 1, 1, ENC_BIG_ENDIAN); switch (id) { case WPS_WFA_EXT_VERSION2: val8 = tvb_get_guint8(tvb, offset); proto_item_append_text(item, ": %d.%d", val8 >> 4, val8 & 0x0f); proto_tree_add_item(elem, hf_eapwps_wfa_ext_version2, tvb, - offset, 1, FALSE); + offset, 1, ENC_BIG_ENDIAN); break; case WPS_WFA_EXT_AUTHORIZEDMACS: proto_tree_add_item(elem, hf_eapwps_wfa_ext_authorizedmacs, @@ -816,19 +816,19 @@ static void add_wps_wfa_ext(guint8 id, proto_tree *tree, tvbuff_t *tvb, val8 = tvb_get_guint8(tvb, offset); proto_item_append_text(item, ": %s", val8 ? "TRUE" : "FALSE"); proto_tree_add_item(elem, hf_eapwps_wfa_ext_network_key_shareable, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); break; case WPS_WFA_EXT_REQUEST_TO_ENROLL: val8 = tvb_get_guint8(tvb, offset); proto_item_append_text(item, ": %s", val8 ? "TRUE" : "FALSE"); proto_tree_add_item(elem, hf_eapwps_wfa_ext_request_to_enroll, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); break; case WPS_WFA_EXT_SETTINGS_DELAY_TIME: val8 = tvb_get_guint8(tvb, offset); proto_item_append_text(item, ": %d second(s)", val8); proto_tree_add_item(elem, hf_eapwps_wfa_ext_settings_delay_time, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); break; default: break; @@ -861,7 +861,7 @@ static void dissect_wps_vendor_ext(proto_tree *tree, tvbuff_t *tvb, if (size < 3) return; vendor_id = tvb_get_ntoh24(tvb, offset); - proto_tree_add_item(tree, hf_eapwps_vendor_id, tvb, offset, 3, FALSE); + proto_tree_add_item(tree, hf_eapwps_vendor_id, tvb, offset, 3, ENC_BIG_ENDIAN); if (vendor_id == VENDOR_WIFI_ALLIANCE) dissect_wps_wfa_ext(tree, tvb, offset + 3, size - 3); } @@ -906,38 +906,38 @@ dissect_wps_tlvs(proto_tree *eap_tree, tvbuff_t *tvb, int offset, tlv_root = proto_item_add_subtree(tlv_item, ett_wps_tlv); /* analog to Tagged parameters in 802.11 */ - proto_tree_add_item(tlv_root, hf_eapwps_tlv_type, tvb, offset, 2, FALSE); - proto_tree_add_item(tlv_root, hf_eapwps_tlv_len, tvb, offset+2, 2, FALSE); + proto_tree_add_item(tlv_root, hf_eapwps_tlv_type, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_root, hf_eapwps_tlv_len, tvb, offset+2, 2, ENC_BIG_ENDIAN); switch(tlv_type) { case WPS_TLV_TYPE_AP_CHANNEL: - tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_ap_channel, tvb, offset+4, 2, FALSE); + tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_ap_channel, tvb, offset+4, 2, ENC_BIG_ENDIAN); hfindex = hf_eapwps_tlv_ap_channel; break; case WPS_TLV_TYPE_ASSOCIATION_STATE: - tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_association_state, tvb, offset+4, 2, FALSE); + tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_association_state, tvb, offset+4, 2, ENC_BIG_ENDIAN); hfindex = hf_eapwps_tlv_association_state; break; case WPS_TLV_TYPE_AUTHENTICATION_TYPE: - tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_authentication_type, tvb, offset+4, 2, FALSE); + tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_authentication_type, tvb, offset+4, 2, ENC_BIG_ENDIAN); hfindex = hf_eapwps_tlv_authentication_type; break; case WPS_TLV_TYPE_AUTHENTICATION_TYPE_FLAGS: - tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_authentication_type_flags, tvb, offset+4, 2, FALSE); + tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_authentication_type_flags, tvb, offset+4, 2, ENC_BIG_ENDIAN); hfindex = hf_eapwps_tlv_authentication_type_flags; - proto_tree_add_item(tlv_root, hf_eapwps_tlv_authentication_type_flags_open, tvb, offset+4, 2, FALSE); - proto_tree_add_item(tlv_root, hf_eapwps_tlv_authentication_type_flags_wpapsk, tvb, offset+4, 2, FALSE); - proto_tree_add_item(tlv_root, hf_eapwps_tlv_authentication_type_flags_shared, tvb, offset+4, 2, FALSE); - proto_tree_add_item(tlv_root, hf_eapwps_tlv_authentication_type_flags_wpa, tvb, offset+4, 2, FALSE); - proto_tree_add_item(tlv_root, hf_eapwps_tlv_authentication_type_flags_wpa2, tvb, offset+4, 2, FALSE); - proto_tree_add_item(tlv_root, hf_eapwps_tlv_authentication_type_flags_wpa2psk, tvb, offset+4, 2, FALSE); + proto_tree_add_item(tlv_root, hf_eapwps_tlv_authentication_type_flags_open, tvb, offset+4, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_root, hf_eapwps_tlv_authentication_type_flags_wpapsk, tvb, offset+4, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_root, hf_eapwps_tlv_authentication_type_flags_shared, tvb, offset+4, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_root, hf_eapwps_tlv_authentication_type_flags_wpa, tvb, offset+4, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_root, hf_eapwps_tlv_authentication_type_flags_wpa2, tvb, offset+4, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_root, hf_eapwps_tlv_authentication_type_flags_wpa2psk, tvb, offset+4, 2, ENC_BIG_ENDIAN); break; @@ -949,27 +949,27 @@ dissect_wps_tlvs(proto_tree *eap_tree, tvbuff_t *tvb, int offset, break; case WPS_TLV_TYPE_CONFIG_METHODS: - tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_config_methods, tvb, offset+4, 2, FALSE); + tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_config_methods, tvb, offset+4, 2, ENC_BIG_ENDIAN); hfindex = hf_eapwps_tlv_config_methods; - proto_tree_add_item(tlv_root, hf_eapwps_tlv_config_methods_usba, tvb, offset+4, 2, FALSE); - proto_tree_add_item(tlv_root, hf_eapwps_tlv_config_methods_ethernet, tvb, offset+4, 2, FALSE); - proto_tree_add_item(tlv_root, hf_eapwps_tlv_config_methods_label, tvb, offset+4, 2, FALSE); - proto_tree_add_item(tlv_root, hf_eapwps_tlv_config_methods_display, tvb, offset+4, 2, FALSE); - proto_tree_add_item(tlv_root, hf_eapwps_tlv_config_methods_virt_display, tvb, offset+4, 2, FALSE); - proto_tree_add_item(tlv_root, hf_eapwps_tlv_config_methods_phy_display, tvb, offset+4, 2, FALSE); - proto_tree_add_item(tlv_root, hf_eapwps_tlv_config_methods_nfcext, tvb, offset+4, 2, FALSE); - proto_tree_add_item(tlv_root, hf_eapwps_tlv_config_methods_nfcint, tvb, offset+4, 2, FALSE); - proto_tree_add_item(tlv_root, hf_eapwps_tlv_config_methods_nfcinf, tvb, offset+4, 2, FALSE); - proto_tree_add_item(tlv_root, hf_eapwps_tlv_config_methods_pushbutton, tvb, offset+4, 2, FALSE); - proto_tree_add_item(tlv_root, hf_eapwps_tlv_config_methods_virt_pushbutton, tvb, offset+4, 2, FALSE); - proto_tree_add_item(tlv_root, hf_eapwps_tlv_config_methods_phy_pushbutton, tvb, offset+4, 2, FALSE); - proto_tree_add_item(tlv_root, hf_eapwps_tlv_config_methods_keypad, tvb, offset+4, 2, FALSE); + proto_tree_add_item(tlv_root, hf_eapwps_tlv_config_methods_usba, tvb, offset+4, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_root, hf_eapwps_tlv_config_methods_ethernet, tvb, offset+4, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_root, hf_eapwps_tlv_config_methods_label, tvb, offset+4, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_root, hf_eapwps_tlv_config_methods_display, tvb, offset+4, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_root, hf_eapwps_tlv_config_methods_virt_display, tvb, offset+4, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_root, hf_eapwps_tlv_config_methods_phy_display, tvb, offset+4, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_root, hf_eapwps_tlv_config_methods_nfcext, tvb, offset+4, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_root, hf_eapwps_tlv_config_methods_nfcint, tvb, offset+4, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_root, hf_eapwps_tlv_config_methods_nfcinf, tvb, offset+4, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_root, hf_eapwps_tlv_config_methods_pushbutton, tvb, offset+4, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_root, hf_eapwps_tlv_config_methods_virt_pushbutton, tvb, offset+4, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_root, hf_eapwps_tlv_config_methods_phy_pushbutton, tvb, offset+4, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_root, hf_eapwps_tlv_config_methods_keypad, tvb, offset+4, 2, ENC_BIG_ENDIAN); break; case WPS_TLV_TYPE_CONFIGURATION_ERROR: - tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_configuration_error, tvb, offset+4, 2, FALSE); + tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_configuration_error, tvb, offset+4, 2, ENC_BIG_ENDIAN); hfindex = hf_eapwps_tlv_configuration_error; break; @@ -991,17 +991,17 @@ dissect_wps_tlvs(proto_tree *eap_tree, tvbuff_t *tvb, int offset, break; case WPS_TLV_TYPE_CONNECTION_TYPE: - tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_connection_type, tvb, offset+4, 1, FALSE); + tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_connection_type, tvb, offset+4, 1, ENC_BIG_ENDIAN); hfindex = hf_eapwps_tlv_connection_type; break; case WPS_TLV_TYPE_CONNECTION_TYPE_FLAGS: - tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_connection_type_flags, tvb, offset+4, 1, FALSE); + tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_connection_type_flags, tvb, offset+4, 1, ENC_BIG_ENDIAN); hfindex = hf_eapwps_tlv_connection_type_flags; - proto_tree_add_item(tlv_root, hf_eapwps_tlv_connection_type_flags_ess, tvb, offset+4, 1, FALSE); - proto_tree_add_item(tlv_root, hf_eapwps_tlv_connection_type_flags_ibss, tvb, offset+4, 1, FALSE); + proto_tree_add_item(tlv_root, hf_eapwps_tlv_connection_type_flags_ess, tvb, offset+4, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_root, hf_eapwps_tlv_connection_type_flags_ibss, tvb, offset+4, 1, ENC_BIG_ENDIAN); break; @@ -1020,7 +1020,7 @@ dissect_wps_tlvs(proto_tree *eap_tree, tvbuff_t *tvb, int offset, break; case WPS_TLV_TYPE_DEVICE_PASSWORD_ID: - tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_device_password_id, tvb, offset+4, 2, FALSE); + tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_device_password_id, tvb, offset+4, 2, ENC_BIG_ENDIAN); hfindex = hf_eapwps_tlv_device_password_id; break; @@ -1067,19 +1067,19 @@ dissect_wps_tlvs(proto_tree *eap_tree, tvbuff_t *tvb, int offset, break; case WPS_TLV_TYPE_ENCRYPTION_TYPE: - tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_encryption_type, tvb, offset+4, 2, FALSE); + tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_encryption_type, tvb, offset+4, 2, ENC_BIG_ENDIAN); hfindex = hf_eapwps_tlv_encryption_type; break; case WPS_TLV_TYPE_ENCRYPTION_TYPE_FLAGS: - tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_encryption_type_flags, tvb, offset+4, 2, FALSE); + tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_encryption_type_flags, tvb, offset+4, 2, ENC_BIG_ENDIAN); hfindex = hf_eapwps_tlv_encryption_type_flags; - proto_tree_add_item(tlv_root, hf_eapwps_tlv_encryption_type_flags_none, tvb, offset+4, 2, FALSE); - proto_tree_add_item(tlv_root, hf_eapwps_tlv_encryption_type_flags_wep, tvb, offset+4, 2, FALSE); - proto_tree_add_item(tlv_root, hf_eapwps_tlv_encryption_type_flags_tkip, tvb, offset+4, 2, FALSE); - proto_tree_add_item(tlv_root, hf_eapwps_tlv_encryption_type_flags_aes, tvb, offset+4, 2, FALSE); + proto_tree_add_item(tlv_root, hf_eapwps_tlv_encryption_type_flags_none, tvb, offset+4, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_root, hf_eapwps_tlv_encryption_type_flags_wep, tvb, offset+4, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_root, hf_eapwps_tlv_encryption_type_flags_tkip, tvb, offset+4, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_root, hf_eapwps_tlv_encryption_type_flags_aes, tvb, offset+4, 2, ENC_BIG_ENDIAN); break; @@ -1093,7 +1093,7 @@ dissect_wps_tlvs(proto_tree *eap_tree, tvbuff_t *tvb, int offset, break; case WPS_TLV_TYPE_FEATURE_ID: - tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_feature_id, tvb, offset+4, 4, FALSE); + tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_feature_id, tvb, offset+4, 4, ENC_BIG_ENDIAN); hfindex = hf_eapwps_tlv_feature_id; break; @@ -1141,7 +1141,7 @@ dissect_wps_tlvs(proto_tree *eap_tree, tvbuff_t *tvb, int offset, break; case WPS_TLV_TYPE_MESSAGE_TYPE: - tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_message_type, tvb, offset+4, 1, FALSE); + tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_message_type, tvb, offset+4, 1, ENC_BIG_ENDIAN); hfindex = hf_eapwps_tlv_message_type; if (pinfo != NULL && check_col(pinfo->cinfo, COL_INFO)) col_append_fstr(pinfo->cinfo, COL_INFO, ", %s", val_to_str(tvb_get_guint8(tvb, offset+4), @@ -1168,7 +1168,7 @@ dissect_wps_tlvs(proto_tree *eap_tree, tvbuff_t *tvb, int offset, break; case WPS_TLV_TYPE_NETWORK_INDEX: - tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_network_index, tvb, offset+4, 1, FALSE); + tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_network_index, tvb, offset+4, 1, ENC_BIG_ENDIAN); hfindex = hf_eapwps_tlv_network_index; break; @@ -1183,7 +1183,7 @@ dissect_wps_tlvs(proto_tree *eap_tree, tvbuff_t *tvb, int offset, break; case WPS_TLV_TYPE_NETWORK_KEY_INDEX: - tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_network_key_index, tvb, offset+4, 1, FALSE); + tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_network_key_index, tvb, offset+4, 1, ENC_BIG_ENDIAN); hfindex = hf_eapwps_tlv_network_key_index; break; @@ -1216,25 +1216,25 @@ dissect_wps_tlvs(proto_tree *eap_tree, tvbuff_t *tvb, int offset, break; case WPS_TLV_TYPE_OS_VERSION: - tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_os_version, tvb, offset+4, 4, FALSE); + tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_os_version, tvb, offset+4, 4, ENC_BIG_ENDIAN); hfindex = hf_eapwps_tlv_os_version; break; case WPS_TLV_TYPE_POWER_LEVEL: - tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_power_level, tvb, offset+4, 1, FALSE); + tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_power_level, tvb, offset+4, 1, ENC_BIG_ENDIAN); hfindex = hf_eapwps_tlv_power_level; break; case WPS_TLV_TYPE_PSK_CURRENT: - tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_psk_current, tvb, offset+4, 1, FALSE); + tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_psk_current, tvb, offset+4, 1, ENC_BIG_ENDIAN); hfindex = hf_eapwps_tlv_psk_current; break; case WPS_TLV_TYPE_PSK_MAX: - tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_psk_max, tvb, offset+4, 1, FALSE); + tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_psk_max, tvb, offset+4, 1, ENC_BIG_ENDIAN); hfindex = hf_eapwps_tlv_psk_max; break; @@ -1261,7 +1261,7 @@ dissect_wps_tlvs(proto_tree *eap_tree, tvbuff_t *tvb, int offset, break; case WPS_TLV_TYPE_REGISTRAR_CURRENT: - tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_registrar_current, tvb, offset+4, 1, FALSE); + tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_registrar_current, tvb, offset+4, 1, ENC_BIG_ENDIAN); hfindex = hf_eapwps_tlv_registrar_current; break; @@ -1282,7 +1282,7 @@ dissect_wps_tlvs(proto_tree *eap_tree, tvbuff_t *tvb, int offset, break; case WPS_TLV_TYPE_REGISTRAR_MAX: - tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_registrar_max, tvb, offset+4, 1, FALSE); + tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_registrar_max, tvb, offset+4, 1, ENC_BIG_ENDIAN); hfindex = hf_eapwps_tlv_registrar_max; break; @@ -1294,19 +1294,19 @@ dissect_wps_tlvs(proto_tree *eap_tree, tvbuff_t *tvb, int offset, break; case WPS_TLV_TYPE_REQUEST_TYPE: - tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_request_type, tvb, offset+4, 1, FALSE); + tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_request_type, tvb, offset+4, 1, ENC_BIG_ENDIAN); hfindex = hf_eapwps_tlv_request_type; break; case WPS_TLV_TYPE_RESPONSE_TYPE: - tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_response_type, tvb, offset+4, 1, FALSE); + tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_response_type, tvb, offset+4, 1, ENC_BIG_ENDIAN); hfindex = hf_eapwps_tlv_response_type; break; case WPS_TLV_TYPE_RF_BANDS: - tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_rf_bands, tvb, offset+4, 1, FALSE); + tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_rf_bands, tvb, offset+4, 1, ENC_BIG_ENDIAN); hfindex = hf_eapwps_tlv_rf_bands; break; @@ -1336,7 +1336,7 @@ dissect_wps_tlvs(proto_tree *eap_tree, tvbuff_t *tvb, int offset, break; case WPS_TLV_TYPE_SELECTED_REGISTRAR: - tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_selected_registrar, tvb, offset+4, 1, FALSE); + tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_selected_registrar, tvb, offset+4, 1, ENC_BIG_ENDIAN); hfindex = hf_eapwps_tlv_selected_registrar; break; @@ -1351,7 +1351,7 @@ dissect_wps_tlvs(proto_tree *eap_tree, tvbuff_t *tvb, int offset, break; case WPS_TLV_TYPE_WIFI_PROTECTED_SETUP_STATE: - tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_wifi_protected_setup_state, tvb, offset+4, 1, FALSE); + tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_wifi_protected_setup_state, tvb, offset+4, 1, ENC_BIG_ENDIAN); hfindex = hf_eapwps_tlv_wifi_protected_setup_state; break; @@ -1366,7 +1366,7 @@ dissect_wps_tlvs(proto_tree *eap_tree, tvbuff_t *tvb, int offset, break; case WPS_TLV_TYPE_TOTAL_NETWORKS: - tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_total_networks, tvb, offset+4, 1, FALSE); + tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_total_networks, tvb, offset+4, 1, ENC_BIG_ENDIAN); hfindex = hf_eapwps_tlv_total_networks; break; @@ -1394,7 +1394,7 @@ dissect_wps_tlvs(proto_tree *eap_tree, tvbuff_t *tvb, int offset, break; case WPS_TLV_TYPE_VERSION: - tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_version, tvb, offset+4, 1, FALSE); + tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_version, tvb, offset+4, 1, ENC_BIG_ENDIAN); hfindex = hf_eapwps_tlv_version; break; @@ -1421,7 +1421,7 @@ dissect_wps_tlvs(proto_tree *eap_tree, tvbuff_t *tvb, int offset, break; case WPS_TLV_TYPE_MESSAGE_COUNTER: - tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_message_counter, tvb, offset+4, 8, FALSE); + tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_message_counter, tvb, offset+4, 8, ENC_BIG_ENDIAN); hfindex = hf_eapwps_tlv_message_counter; break; @@ -1439,13 +1439,13 @@ dissect_wps_tlvs(proto_tree *eap_tree, tvbuff_t *tvb, int offset, break; case WPS_TLV_TYPE_KEY_LIFETIME: - tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_key_lifetime, tvb, offset+4, 4, FALSE); + tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_key_lifetime, tvb, offset+4, 4, ENC_BIG_ENDIAN); hfindex = hf_eapwps_tlv_key_lifetime; break; case WPS_TLV_TYPE_PERMITTED_CONFIG_METHODS: - tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_permitted_config_methods, tvb, offset+4, 2, FALSE); + tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_permitted_config_methods, tvb, offset+4, 2, ENC_BIG_ENDIAN); hfindex = hf_eapwps_tlv_permitted_config_methods; dissect_wps_config_methods(tlv_root, tvb, offset, size, pinfo); @@ -1453,7 +1453,7 @@ dissect_wps_tlvs(proto_tree *eap_tree, tvbuff_t *tvb, int offset, break; case WPS_TLV_TYPE_SELECTED_REGISTRAR_CONFIG_METHODS: - tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_selected_registrar_config_methods, tvb, offset+4, 2, FALSE); + tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_selected_registrar_config_methods, tvb, offset+4, 2, ENC_BIG_ENDIAN); hfindex = hf_eapwps_tlv_selected_registrar_config_methods; dissect_wps_config_methods(tlv_root, tvb, offset, size, pinfo); @@ -1466,7 +1466,7 @@ dissect_wps_tlvs(proto_tree *eap_tree, tvbuff_t *tvb, int offset, if (tvb_get_ntohl(tvb, offset+6) == WFA_OUI) { guint16 dev_cat = tvb_get_ntohs(tvb, offset+4); if (dev_cat > 0 && dev_cat <= WPS_DEVICE_TYPE_CATEGORY_MAX) { - proto_tree_add_item(tlv_root, hf_eapwps_tlv_primary_device_type_category, tvb, offset+4, 2, FALSE); + proto_tree_add_item(tlv_root, hf_eapwps_tlv_primary_device_type_category, tvb, offset+4, 2, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_root, hf_eapwps_tlv_primary_device_type_subcategory[dev_cat-1], tvb, offset+10, 2, FALSE); } } @@ -1540,7 +1540,7 @@ dissect_wps_tlvs(proto_tree *eap_tree, tvbuff_t *tvb, int offset, break; case WPS_TLV_TYPE_WEPTRANSMITKEY: - tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_weptransmitkey, tvb, offset+4, 1, FALSE); + tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_weptransmitkey, tvb, offset+4, 1, ENC_BIG_ENDIAN); hfindex = hf_eapwps_tlv_weptransmitkey; break; @@ -1634,7 +1634,7 @@ dissect_exteap_wps(proto_tree *eap_tree, tvbuff_t *tvb, int offset, proto_tree* pt; guint8 flags; - pi = proto_tree_add_item(eap_tree, hf_eapwps_opcode, tvb, offset, 1, FALSE); + pi = proto_tree_add_item(eap_tree, hf_eapwps_opcode, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; size -= 1; pi = proto_item_get_parent(pi); @@ -1646,7 +1646,7 @@ dissect_exteap_wps(proto_tree *eap_tree, tvbuff_t *tvb, int offset, /* Flag field, if msg-len flag set, add approriate field */ flags = tvb_get_guint8(tvb,offset); - pi = proto_tree_add_item(eap_tree, hf_eapwps_flags, tvb, offset, 1, FALSE); + pi = proto_tree_add_item(eap_tree, hf_eapwps_flags, tvb, offset, 1, ENC_BIG_ENDIAN); pt = proto_item_add_subtree(pi, ett_eap_wps_flags); proto_tree_add_item(pt, hf_eapwps_flag_mf, tvb, offset, 1, FALSE); @@ -1655,7 +1655,7 @@ dissect_exteap_wps(proto_tree *eap_tree, tvbuff_t *tvb, int offset, if (flags & MASK_WSC_FLAG_LF) { /* length field is present in first eap-packet when msg is fragmented */ - proto_tree_add_item(eap_tree, hf_eapwps_msglen, tvb, offset, 2, FALSE); + proto_tree_add_item(eap_tree, hf_eapwps_msglen, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; size -= 2; } diff --git a/epan/dissectors/packet-wsmp.c b/epan/dissectors/packet-wsmp.c index c589bd9e78..3454ddffea 100644 --- a/epan/dissectors/packet-wsmp.c +++ b/epan/dissectors/packet-wsmp.c @@ -77,32 +77,32 @@ dissect_wsmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = 0; proto_tree_add_item(wsmp_tree, - hf_wsmp_version, tvb, offset, 1, FALSE); + hf_wsmp_version, tvb, offset, 1, ENC_BIG_ENDIAN); offset ++; proto_tree_add_item(wsmp_tree, - hf_wsmp_security, tvb, offset, 1, FALSE); + hf_wsmp_security, tvb, offset, 1, ENC_BIG_ENDIAN); offset ++; proto_tree_add_item(wsmp_tree, - hf_wsmp_channel, tvb, offset, 1, FALSE); + hf_wsmp_channel, tvb, offset, 1, ENC_BIG_ENDIAN); offset ++; proto_tree_add_item(wsmp_tree, - hf_wsmp_rate, tvb, offset, 1, FALSE); + hf_wsmp_rate, tvb, offset, 1, ENC_BIG_ENDIAN); offset ++; proto_tree_add_item(wsmp_tree, - hf_wsmp_txpower, tvb, offset, 1, FALSE); + hf_wsmp_txpower, tvb, offset, 1, ENC_BIG_ENDIAN); offset ++; proto_tree_add_item(wsmp_tree, - hf_wsmp_appclass, tvb, offset, 1, FALSE); + hf_wsmp_appclass, tvb, offset, 1, ENC_BIG_ENDIAN); offset ++; acmlength = tvb_get_guint8(tvb,offset); proto_tree_add_item(wsmp_tree, - hf_wsmp_acmlength, tvb, offset, 1, FALSE); + hf_wsmp_acmlength, tvb, offset, 1, ENC_BIG_ENDIAN); offset ++; proto_tree_add_item(wsmp_tree, hf_wsmp_acm, tvb, offset, acmlength, FALSE); @@ -110,7 +110,7 @@ dissect_wsmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) wsmlength = tvb_get_letohs( tvb, offset); proto_tree_add_item(wsmp_tree, - hf_wsmp_wsmlength, tvb, offset, 2, TRUE); + hf_wsmp_wsmlength, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; wsmdata_item = proto_tree_add_text (wsmp_tree, tvb, offset, wsmlength, diff --git a/epan/dissectors/packet-x224.c b/epan/dissectors/packet-x224.c index f93031d5f5..6900cfbbcb 100644 --- a/epan/dissectors/packet-x224.c +++ b/epan/dissectors/packet-x224.c @@ -106,12 +106,12 @@ dissect_x224_cr(packet_info *pinfo _U_, proto_tree *tree, tvbuff_t *tvb, int off offset+=2; /*SRC-REF*/ - proto_tree_add_item(tree, hf_x224_src_ref, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_x224_src_ref, tvb, offset, 2, ENC_BIG_ENDIAN); offset+=2; /* class options */ /*class = tvb_get_guint8(tvb, offset);*/ - proto_tree_add_item(tree, hf_x224_class, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_x224_class, tvb, offset, 1, ENC_BIG_ENDIAN); offset+=1; if(tvb_length_remaining(tvb, offset) > 0) { @@ -130,16 +130,16 @@ dissect_x224_cc(packet_info *pinfo _U_, proto_tree *tree, tvbuff_t *tvb, int off guint8 class; /*DST-REF */ - proto_tree_add_item(tree, hf_x224_dst_ref, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_x224_dst_ref, tvb, offset, 2, ENC_BIG_ENDIAN); offset+=2; /*SRC-REF*/ - proto_tree_add_item(tree, hf_x224_src_ref, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_x224_src_ref, tvb, offset, 2, ENC_BIG_ENDIAN); offset+=2; /* class options */ class = tvb_get_guint8(tvb, offset); - proto_tree_add_item(tree, hf_x224_class, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_x224_class, tvb, offset, 1, ENC_BIG_ENDIAN); x224_info->class = class; offset+=1; @@ -157,7 +157,7 @@ dissect_x224_dt(packet_info *pinfo _U_, proto_tree *tree, tvbuff_t *tvb, int off case 3: case 4: /*DST-REF */ - proto_tree_add_item(tree, hf_x224_dst_ref, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_x224_dst_ref, tvb, offset, 2, ENC_BIG_ENDIAN); offset+=2; break; } @@ -168,7 +168,7 @@ dissect_x224_dt(packet_info *pinfo _U_, proto_tree *tree, tvbuff_t *tvb, int off /* EOT / NR */ proto_tree_add_item(tree, hf_x224_eot, tvb, offset, 1, FALSE); - proto_tree_add_item(tree, hf_x224_nr, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_x224_nr, tvb, offset, 1, ENC_BIG_ENDIAN); offset+=1; @@ -199,12 +199,12 @@ dissect_x224(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) /* length indicator */ - proto_tree_add_item(tree, hf_x224_length, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_x224_length, tvb, offset, 1, ENC_BIG_ENDIAN); offset+=1; /* code */ code = tvb_get_guint8(tvb, offset); - proto_tree_add_item(tree, hf_x224_code, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_x224_code, tvb, offset, 1, ENC_BIG_ENDIAN); offset+=1; if (check_col(pinfo->cinfo, COL_INFO)) { diff --git a/epan/dissectors/packet-x25.c b/epan/dissectors/packet-x25.c index 497c64b992..ba10494c90 100644 --- a/epan/dissectors/packet-x25.c +++ b/epan/dissectors/packet-x25.c @@ -1678,7 +1678,7 @@ dissect_x25_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (tree) { ti = proto_tree_add_item(tree, proto_x25, tvb, 0, x25_pkt_len, FALSE); x25_tree = proto_item_add_subtree(ti, ett_x25); - ti = proto_tree_add_item(x25_tree, hf_x25_gfi, tvb, 0, 2, FALSE); + ti = proto_tree_add_item(x25_tree, hf_x25_gfi, tvb, 0, 2, ENC_BIG_ENDIAN); gfi_tree = proto_item_add_subtree(ti, ett_x25_gfi); if (PACKET_IS_DATA(pkt_type)) { @@ -2392,7 +2392,7 @@ dissect_x25_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_tree_add_uint(x25_tree, hf_x25_type, tvb, localoffset, 1, X25_RR); proto_tree_add_item(x25_tree, hf_x25_p_r_mod128, tvb, - localoffset+1, 1, FALSE); + localoffset+1, 1, ENC_BIG_ENDIAN); } } break; @@ -2419,7 +2419,7 @@ dissect_x25_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_tree_add_uint(x25_tree, hf_x25_type, tvb, localoffset, 1, X25_RNR); proto_tree_add_item(x25_tree, hf_x25_p_r_mod128, tvb, - localoffset+1, 1, FALSE); + localoffset+1, 1, ENC_BIG_ENDIAN); } } break; @@ -2446,7 +2446,7 @@ dissect_x25_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_tree_add_uint(x25_tree, hf_x25_type, tvb, localoffset, 1, X25_REJ); proto_tree_add_item(x25_tree, hf_x25_p_r_mod128, tvb, - localoffset+1, 1, FALSE); + localoffset+1, 1, ENC_BIG_ENDIAN); } } } diff --git a/epan/dissectors/packet-x29.c b/epan/dissectors/packet-x29.c index ca9f91c929..f355438f67 100644 --- a/epan/dissectors/packet-x29.c +++ b/epan/dissectors/packet-x29.c @@ -142,7 +142,7 @@ dissect_x29(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset++; if (error_type != 0) { proto_tree_add_item(x29_tree, hf_inv_msg_code, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); } break; diff --git a/epan/dissectors/packet-xdmcp.c b/epan/dissectors/packet-xdmcp.c index 7b55f364e5..17f3a6e0af 100644 --- a/epan/dissectors/packet-xdmcp.c +++ b/epan/dissectors/packet-xdmcp.c @@ -251,7 +251,7 @@ static void dissect_xdmcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { proto_tree_add_item(xdmcp_tree, hf_xdmcp_length, tvb, - offset, 2, FALSE); + offset, 2, ENC_BIG_ENDIAN); offset += 2; switch (opcode) { @@ -318,7 +318,7 @@ static void dissect_xdmcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) gint ctypes_start_offset, caddrs_offset; proto_tree_add_item(xdmcp_tree, hf_xdmcp_display_number, tvb, - offset, 2, FALSE); + offset, 2, ENC_BIG_ENDIAN); offset += 2; ctypes_len = tvb_get_guint8(tvb, offset); @@ -400,7 +400,7 @@ static void dissect_xdmcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case XDMCP_ACCEPT: proto_tree_add_item(xdmcp_tree, hf_xdmcp_session_id, tvb, - offset, 4, FALSE); + offset, 4, ENC_BIG_ENDIAN); offset += 4; offset += xdmcp_add_string(xdmcp_tree, hf_xdmcp_authentication_name, tvb, offset); @@ -423,11 +423,11 @@ static void dissect_xdmcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case XDMCP_MANAGE: proto_tree_add_item(xdmcp_tree, hf_xdmcp_session_id, tvb, - offset, 4, FALSE); + offset, 4, ENC_BIG_ENDIAN); offset += 4; proto_tree_add_item(xdmcp_tree, hf_xdmcp_display_number, tvb, - offset, 2, FALSE); + offset, 2, ENC_BIG_ENDIAN); offset += 2; offset += xdmcp_add_text(xdmcp_tree, "Display class", @@ -436,13 +436,13 @@ static void dissect_xdmcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case XDMCP_REFUSE: proto_tree_add_item(xdmcp_tree, hf_xdmcp_session_id, tvb, - offset, 4, FALSE); + offset, 4, ENC_BIG_ENDIAN); offset += 4; break; case XDMCP_FAILED: proto_tree_add_item(xdmcp_tree, hf_xdmcp_session_id, tvb, - offset, 4, FALSE); + offset, 4, ENC_BIG_ENDIAN); offset += 4; offset += xdmcp_add_string(xdmcp_tree, hf_xdmcp_status, @@ -451,11 +451,11 @@ static void dissect_xdmcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case XDMCP_KEEPALIVE: proto_tree_add_item(xdmcp_tree, hf_xdmcp_display_number, tvb, - offset, 2, FALSE); + offset, 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(xdmcp_tree, hf_xdmcp_session_id, tvb, - offset, 4, FALSE); + offset, 4, ENC_BIG_ENDIAN); offset += 4; break; @@ -466,7 +466,7 @@ static void dissect_xdmcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset++; proto_tree_add_item(xdmcp_tree, hf_xdmcp_session_id, tvb, - offset, 4, FALSE); + offset, 4, ENC_BIG_ENDIAN); offset += 4; break; } diff --git a/epan/dissectors/packet-xmcp.c b/epan/dissectors/packet-xmcp.c index 4b36051d37..157453d7c6 100644 --- a/epan/dissectors/packet-xmcp.c +++ b/epan/dissectors/packet-xmcp.c @@ -448,14 +448,14 @@ decode_xmcp_attr_value (proto_tree *attr_tree, guint16 attr_type, if (attr_length < 4) break; proto_tree_add_item(attr_tree, xmcp_attr_error_reserved, tvb, offset, - 3, FALSE); + 3, ENC_BIG_ENDIAN); proto_tree_add_item(attr_tree, xmcp_attr_error_class, tvb, offset, - 3, FALSE); + 3, ENC_BIG_ENDIAN); { guint8 error_class, error_number; guint16 error_code; it = proto_tree_add_item(attr_tree, xmcp_attr_error_number, tvb, - (offset+3), 1, FALSE); + (offset+3), 1, ENC_BIG_ENDIAN); error_class = tvb_get_guint8(tvb, offset+2) & 0x07; error_number = tvb_get_guint8(tvb, offset+3); @@ -542,7 +542,7 @@ decode_xmcp_attr_value (proto_tree *attr_tree, guint16 attr_type, if (attr_length < 4) break; proto_tree_add_item(attr_tree, xmcp_attr_client_handle, tvb, offset, - 4, FALSE); + 4, ENC_BIG_ENDIAN); proto_item_append_text(attr_tree, ": %u", tvb_get_ntohl(tvb, offset)); if (check_col(pinfo->cinfo, COL_INFO)) { col_append_fstr(pinfo->cinfo, COL_INFO, ", handle %u", @@ -561,18 +561,18 @@ decode_xmcp_attr_value (proto_tree *attr_tree, guint16 attr_type, if (attr_length < 2) break; proto_tree_add_item(attr_tree, xmcp_attr_version_major, tvb, offset, - 2, FALSE); + 2, ENC_BIG_ENDIAN); if (attr_length < 4) break; proto_tree_add_item(attr_tree, xmcp_attr_version_minor, tvb, (offset+2), - 2, FALSE); + 2, ENC_BIG_ENDIAN); proto_item_append_text(attr_tree, ": %u.%u", tvb_get_ntohs(tvb, offset), tvb_get_ntohs(tvb, (offset+2))); break; case XMCP_PAGE_SIZE: if (attr_length < 4) break; - proto_tree_add_item(attr_tree, xmcp_attr_page_size, tvb, offset, 4, FALSE); + proto_tree_add_item(attr_tree, xmcp_attr_page_size, tvb, offset, 4, ENC_BIG_ENDIAN); proto_item_append_text(attr_tree, ": %u", tvb_get_ntohl(tvb, offset)); break; case XMCP_CLIENT_LABEL: @@ -588,18 +588,18 @@ decode_xmcp_attr_value (proto_tree *attr_tree, guint16 attr_type, case XMCP_KEEPALIVE: if (attr_length < 4) break; - proto_tree_add_item(attr_tree, xmcp_attr_keepalive, tvb, offset, 4, FALSE); + proto_tree_add_item(attr_tree, xmcp_attr_keepalive, tvb, offset, 4, ENC_BIG_ENDIAN); proto_item_append_text(attr_tree, ": %u", tvb_get_ntohl(tvb, offset)); break; case XMCP_SERVICE_IDENTITY: if (attr_length < 2) break; proto_tree_add_item(attr_tree, xmcp_attr_serv_service, tvb, offset, - 2, FALSE); + 2, ENC_BIG_ENDIAN); if (attr_length < 4) break; proto_tree_add_item(attr_tree, xmcp_attr_serv_subservice, tvb, (offset+2), - 2, FALSE); + 2, ENC_BIG_ENDIAN); if (attr_length < 20) break; proto_tree_add_item(attr_tree, xmcp_attr_serv_instance, tvb, (offset+4), @@ -630,13 +630,13 @@ decode_xmcp_attr_value (proto_tree *attr_tree, guint16 attr_type, if (attr_length < 2) break; proto_tree_add_item(attr_tree, xmcp_attr_servtrans_family, tvb, - (offset+1), 1, FALSE); + (offset+1), 1, ENC_BIG_ENDIAN); if (attr_length < 4) break; xmcp_service_port = tvb_get_ntohs(tvb, (offset+2)); xmcp_it_service_port = proto_tree_add_item(attr_tree, xmcp_attr_servtrans_port, - tvb, (offset+2), 2, FALSE); + tvb, (offset+2), 2, ENC_BIG_ENDIAN); /* If we now know both port and protocol number, fill in the port name */ if (xmcp_service_protocol != -1) { add_xmcp_port_name(); @@ -680,7 +680,7 @@ decode_xmcp_attr_value (proto_tree *attr_tree, guint16 attr_type, break; proto_tree_add_item(attr_tree, xmcp_attr_reserved, tvb, offset, 3, ENC_NA); proto_tree_add_item(attr_tree, xmcp_attr_service_protocol, tvb, - (offset+3), 1, FALSE); + (offset+3), 1, ENC_BIG_ENDIAN); xmcp_service_protocol = tvb_get_guint8(tvb, (offset+3)); proto_item_append_text(attr_tree, ": %u (%s)", xmcp_service_protocol, val_to_str_ext(xmcp_service_protocol, @@ -710,13 +710,13 @@ decode_xmcp_attr_value (proto_tree *attr_tree, guint16 attr_type, "Unknown")); flag_tree = proto_item_add_subtree(ti, ett_xmcp_attr_flag); proto_tree_add_item(flag_tree, xmcp_attr_flag_type, tvb, - current_offset, 2, FALSE); + current_offset, 2, ENC_BIG_ENDIAN); current_offset += 2; switch (flag_type) { case XMCP_FLAG_REMOVAL_REASON: proto_tree_add_item(flag_tree, xmcp_attr_flag_removal_reason_reserved, - tvb, current_offset, 2, FALSE); + tvb, current_offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(flag_tree, xmcp_attr_flag_removal_reason_network_withdraw, tvb, current_offset, 2, FALSE); @@ -729,14 +729,14 @@ decode_xmcp_attr_value (proto_tree *attr_tree, guint16 attr_type, break; case XMCP_FLAG_TRUST: proto_tree_add_item(flag_tree, xmcp_attr_flag_trust, tvb, - current_offset, 2, FALSE); + current_offset, 2, ENC_BIG_ENDIAN); proto_item_append_text(flag_tree, " %s", val_to_str_const(flag_value, flag_trust_values, "Unknown")); break; case XMCP_FLAG_SERVICE_VISIBILITY: proto_tree_add_item(flag_tree, xmcp_attr_flag_visibility_reserved, - tvb, current_offset, 2, FALSE); + tvb, current_offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(flag_tree, xmcp_attr_flag_visibility_unauthenticated, tvb, current_offset, 2, FALSE); @@ -750,7 +750,7 @@ decode_xmcp_attr_value (proto_tree *attr_tree, guint16 attr_type, break; default: proto_tree_add_item(flag_tree, xmcp_attr_flag_value, tvb, - current_offset, 2, FALSE); + current_offset, 2, ENC_BIG_ENDIAN); proto_item_append_text(flag_tree, " 0x%04x", flag_value); break; } @@ -762,7 +762,7 @@ decode_xmcp_attr_value (proto_tree *attr_tree, guint16 attr_type, if (attr_length < 4) break; proto_tree_add_item(attr_tree, xmcp_attr_service_version, tvb, offset, - 4, FALSE); + 4, ENC_BIG_ENDIAN); proto_item_append_text(attr_tree, ": %u", tvb_get_ntohl(tvb, offset)); break; case XMCP_SERVICE_DATA: @@ -797,7 +797,7 @@ decode_xmcp_attr_value (proto_tree *attr_tree, guint16 attr_type, if (attr_length < 4) break; proto_tree_add_item(attr_tree, xmcp_attr_subscription_id, tvb, offset, - 4, FALSE); + 4, ENC_BIG_ENDIAN); proto_item_append_text(attr_tree, ": %u", tvb_get_ntohl(tvb, offset)); if (check_col(pinfo->cinfo, COL_INFO)) { col_append_fstr(pinfo->cinfo, COL_INFO, ", subscription %u", @@ -808,7 +808,7 @@ decode_xmcp_attr_value (proto_tree *attr_tree, guint16 attr_type, if (attr_length < 4) break; proto_tree_add_item(attr_tree, xmcp_attr_service_removed_reason, tvb, - offset, 4, FALSE); + offset, 4, ENC_BIG_ENDIAN); proto_item_append_text(attr_tree, ": %s", val_to_str_const(tvb_get_ntohl(tvb, offset), service_removed_reasons, @@ -817,7 +817,7 @@ decode_xmcp_attr_value (proto_tree *attr_tree, guint16 attr_type, case XMCP_DOMAIN: if (attr_length < 4) break; - proto_tree_add_item(attr_tree, xmcp_attr_domain, tvb, offset, 4, FALSE); + proto_tree_add_item(attr_tree, xmcp_attr_domain, tvb, offset, 4, ENC_BIG_ENDIAN); proto_item_append_text(attr_tree, ": %u", tvb_get_ntohl(tvb, offset)); break; default: @@ -962,7 +962,7 @@ dissect_xmcp_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) (xmcp_msg_type_method == XMCP_METHOD_KEEPALIVE)); /* After the class/method, we have a 2 byte length...*/ - ti = proto_tree_add_item(xmcp_tree, hf_xmcp_length, tvb, 2, 2, FALSE); + ti = proto_tree_add_item(xmcp_tree, hf_xmcp_length, tvb, 2, 2, ENC_BIG_ENDIAN); msg_length = tvb_get_ntohs(tvb, 2); if ((guint)(msg_length + XMCP_HDR_LEN) > tvb_reported_length(tvb)) { expert_add_info_format(pinfo, ti, PI_PROTOCOL, PI_ERROR, @@ -973,7 +973,7 @@ dissect_xmcp_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } /* ...a 4 byte magic cookie... */ - ti = proto_tree_add_item(xmcp_tree, hf_xmcp_cookie, tvb, 4, 4, FALSE); + ti = proto_tree_add_item(xmcp_tree, hf_xmcp_cookie, tvb, 4, 4, ENC_BIG_ENDIAN); if (tvb_get_ntohl(tvb, 4) != XMCP_MAGIC_COOKIE) { expert_add_info_format(pinfo, ti, PI_PROTOCOL, PI_WARN, "Magic cookie not correct for XMCP"); @@ -1035,10 +1035,10 @@ dissect_xmcp_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) attr_tree = proto_item_add_subtree(ti, ett_xmcp_attr); proto_tree_add_item(attr_tree, xmcp_attr_type, tvb, - offset, 2, FALSE); + offset, 2, ENC_BIG_ENDIAN); offset += 2; ti = proto_tree_add_item(attr_tree, xmcp_attr_length, tvb, - offset, 2, FALSE); + offset, 2, ENC_BIG_ENDIAN); offset += 2; if ((offset + attr_length) > (XMCP_HDR_LEN + msg_length)) { diff --git a/epan/dissectors/packet-xot.c b/epan/dissectors/packet-xot.c index 812945de4a..15f053e9af 100644 --- a/epan/dissectors/packet-xot.c +++ b/epan/dissectors/packet-xot.c @@ -235,29 +235,29 @@ static void dissect_xot_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_item_set_len(ti, XOT_HEADER_LENGTH + plen); /* These fields are in overlay with packet-x25.c */ - proto_tree_add_item(xot_tree, hf_x25_gfi, tvb, hdr_offset, 2, FALSE); - proto_tree_add_item(xot_tree, hf_x25_lcn, tvb, hdr_offset, 2, FALSE); + proto_tree_add_item(xot_tree, hf_x25_gfi, tvb, hdr_offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(xot_tree, hf_x25_lcn, tvb, hdr_offset, 2, ENC_BIG_ENDIAN); hdr_offset += 2; - proto_tree_add_item(xot_tree, hf_x25_type, tvb, hdr_offset, 1, FALSE); + proto_tree_add_item(xot_tree, hf_x25_type, tvb, hdr_offset, 1, ENC_BIG_ENDIAN); hdr_offset += 1; - proto_tree_add_item(xot_tree, hf_xot_pvc_version, tvb, hdr_offset, 1, FALSE); + proto_tree_add_item(xot_tree, hf_xot_pvc_version, tvb, hdr_offset, 1, ENC_BIG_ENDIAN); hdr_offset += 1; - proto_tree_add_item(xot_tree, hf_xot_pvc_status, tvb, hdr_offset, 1, FALSE); + proto_tree_add_item(xot_tree, hf_xot_pvc_status, tvb, hdr_offset, 1, ENC_BIG_ENDIAN); hdr_offset += 1; - proto_tree_add_item(xot_tree, hf_xot_pvc_init_itf_name_len, tvb, hdr_offset, 1, FALSE); + proto_tree_add_item(xot_tree, hf_xot_pvc_init_itf_name_len, tvb, hdr_offset, 1, ENC_BIG_ENDIAN); init_itf_name_len = tvb_get_guint8(tvb, hdr_offset); hdr_offset += 1; - proto_tree_add_item(xot_tree, hf_xot_pvc_init_lcn, tvb, hdr_offset, 2, FALSE); + proto_tree_add_item(xot_tree, hf_xot_pvc_init_lcn, tvb, hdr_offset, 2, ENC_BIG_ENDIAN); hdr_offset += 2; - proto_tree_add_item(xot_tree, hf_xot_pvc_resp_itf_name_len, tvb, hdr_offset, 1, FALSE); + proto_tree_add_item(xot_tree, hf_xot_pvc_resp_itf_name_len, tvb, hdr_offset, 1, ENC_BIG_ENDIAN); resp_itf_name_len = tvb_get_guint8(tvb, hdr_offset); hdr_offset += 1; - proto_tree_add_item(xot_tree, hf_xot_pvc_resp_lcn, tvb, hdr_offset, 2, FALSE); + proto_tree_add_item(xot_tree, hf_xot_pvc_resp_lcn, tvb, hdr_offset, 2, ENC_BIG_ENDIAN); hdr_offset += 2; - proto_tree_add_item(xot_tree, hf_xot_pvc_send_inc_window, tvb, hdr_offset, 1, FALSE); + proto_tree_add_item(xot_tree, hf_xot_pvc_send_inc_window, tvb, hdr_offset, 1, ENC_BIG_ENDIAN); hdr_offset += 1; - proto_tree_add_item(xot_tree, hf_xot_pvc_send_out_window, tvb, hdr_offset, 1, FALSE); + proto_tree_add_item(xot_tree, hf_xot_pvc_send_out_window, tvb, hdr_offset, 1, ENC_BIG_ENDIAN); hdr_offset += 1; pkt_size = 1 << tvb_get_guint8(tvb, hdr_offset); proto_tree_add_uint(xot_tree, hf_xot_pvc_send_inc_pkt_size, tvb, hdr_offset, 1, pkt_size); diff --git a/epan/dissectors/packet-yhoo.c b/epan/dissectors/packet-yhoo.c index 15d2157866..096b38dc55 100644 --- a/epan/dissectors/packet-yhoo.c +++ b/epan/dissectors/packet-yhoo.c @@ -216,27 +216,27 @@ dissect_yhoo(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset += 8; proto_tree_add_item(yhoo_tree, hf_yhoo_len, tvb, - offset, 4, TRUE); + offset, 4, ENC_LITTLE_ENDIAN); offset += 4; proto_tree_add_item(yhoo_tree, hf_yhoo_service, tvb, - offset, 4, TRUE); + offset, 4, ENC_LITTLE_ENDIAN); offset += 4; proto_tree_add_item(yhoo_tree, hf_yhoo_connection_id, tvb, - offset, 4, TRUE); + offset, 4, ENC_LITTLE_ENDIAN); offset += 4; proto_tree_add_item(yhoo_tree, hf_yhoo_magic_id, tvb, - offset, 4, TRUE); + offset, 4, ENC_LITTLE_ENDIAN); offset += 4; proto_tree_add_item(yhoo_tree, hf_yhoo_unknown1, tvb, - offset, 4, TRUE); + offset, 4, ENC_LITTLE_ENDIAN); offset += 4; proto_tree_add_item(yhoo_tree, hf_yhoo_msgtype, tvb, - offset, 4, TRUE); + offset, 4, ENC_LITTLE_ENDIAN); offset += 4; proto_tree_add_item(yhoo_tree, hf_yhoo_nick1, tvb, diff --git a/epan/dissectors/packet-ymsg.c b/epan/dissectors/packet-ymsg.c index f8168528c6..40938000a3 100644 --- a/epan/dissectors/packet-ymsg.c +++ b/epan/dissectors/packet-ymsg.c @@ -404,16 +404,16 @@ dissect_ymsg_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset += 4; /* skip the YMSG string */ /* Version */ - proto_tree_add_item(ymsg_tree, hf_ymsg_version, tvb, offset, 2, FALSE); + proto_tree_add_item(ymsg_tree, hf_ymsg_version, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; /* Vendor ID */ - proto_tree_add_item(ymsg_tree, hf_ymsg_vendor, tvb, offset, 2, FALSE); + proto_tree_add_item(ymsg_tree, hf_ymsg_vendor, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; /* Length */ content_len = tvb_get_ntohs(tvb, offset); - proto_tree_add_item(ymsg_tree, hf_ymsg_len, tvb, offset, 2, FALSE); + proto_tree_add_item(ymsg_tree, hf_ymsg_len, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; /* Service */ @@ -422,15 +422,15 @@ dissect_ymsg_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ymsg_service_vals, "Unknown")); - proto_tree_add_item(ymsg_tree, hf_ymsg_service, tvb, offset, 2, FALSE); + proto_tree_add_item(ymsg_tree, hf_ymsg_service, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; /* Status */ - proto_tree_add_item(ymsg_tree, hf_ymsg_status, tvb, offset, 4, FALSE); + proto_tree_add_item(ymsg_tree, hf_ymsg_status, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; /* Session id */ - proto_tree_add_item(ymsg_tree, hf_ymsg_session_id, tvb, offset, 4, TRUE); + proto_tree_add_item(ymsg_tree, hf_ymsg_session_id, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; /* Contents */ diff --git a/epan/dissectors/packet-zbee-zcl.c b/epan/dissectors/packet-zbee-zcl.c index bcb4c999ac..2774329798 100644 --- a/epan/dissectors/packet-zbee-zcl.c +++ b/epan/dissectors/packet-zbee-zcl.c @@ -1600,7 +1600,7 @@ static void dissect_zcl_attr_data(tvbuff_t *tvb, proto_tree *tree, guint *offset proto_item_append_text(tree, ", %s: %g", val_to_str_ext_const(data_type, &zbee_zcl_short_data_type_names_ext, "Reserved"), attr_float); - proto_tree_add_item(tree, hf_zbee_zcl_attr_float, tvb, *offset, 4, TRUE); + proto_tree_add_item(tree, hf_zbee_zcl_attr_float, tvb, *offset, 4, ENC_LITTLE_ENDIAN); *offset += 4; break; @@ -1609,7 +1609,7 @@ static void dissect_zcl_attr_data(tvbuff_t *tvb, proto_tree *tree, guint *offset attr_double = tvb_get_letohieee_double(tvb, *offset); proto_item_append_text(tree, ", Double: %lg", attr_double); - proto_tree_add_item(tree, hf_zbee_zcl_attr_double, tvb, *offset, 8, TRUE); + proto_tree_add_item(tree, hf_zbee_zcl_attr_double, tvb, *offset, 8, ENC_LITTLE_ENDIAN); *offset += 8; break; diff --git a/epan/dissectors/packet-zebra.c b/epan/dissectors/packet-zebra.c index 6aa91707d8..48aaa451e8 100644 --- a/epan/dissectors/packet-zebra.c +++ b/epan/dissectors/packet-zebra.c @@ -183,23 +183,23 @@ dissect_zebra_request(proto_tree *tree, gboolean request, tvbuff_t *tvb, offset += INTERFACE_NAMSIZ; proto_tree_add_item(tree, hf_zebra_index, tvb, - offset, 4, FALSE); + offset, 4, ENC_BIG_ENDIAN); offset += 4; proto_tree_add_item(tree, hf_zebra_intflags, tvb, - offset, 4, FALSE); + offset, 4, ENC_BIG_ENDIAN); offset += 4; proto_tree_add_item(tree, hf_zebra_metric, tvb, - offset, 4, FALSE); + offset, 4, ENC_BIG_ENDIAN); offset += 4; proto_tree_add_item(tree, hf_zebra_mtu, tvb, - offset, 4, FALSE); + offset, 4, ENC_BIG_ENDIAN); offset += 4; proto_tree_add_item(tree, hf_zebra_bandwidth, tvb, - offset, 4, FALSE); + offset, 4, ENC_BIG_ENDIAN); offset += 4; break; @@ -209,17 +209,17 @@ dissect_zebra_request(proto_tree *tree, gboolean request, tvbuff_t *tvb, offset += INTERFACE_NAMSIZ; proto_tree_add_item(tree, hf_zebra_index, tvb, - offset, 4, FALSE); + offset, 4, ENC_BIG_ENDIAN); offset += 4; break; case ZEBRA_INTERFACE_ADDRESS_ADD: case ZEBRA_INTERFACE_ADDRESS_DELETE: proto_tree_add_item(tree, hf_zebra_index, tvb, - offset, 4, FALSE); + offset, 4, ENC_BIG_ENDIAN); offset += 4; proto_tree_add_item(tree, hf_zebra_family, tvb, - offset, 1, FALSE); + offset, 1, ENC_BIG_ENDIAN); offset += 1; /* XXX - switch on the address family here, instead? */ @@ -236,7 +236,7 @@ dissect_zebra_request(proto_tree *tree, gboolean request, tvbuff_t *tvb, else break; proto_tree_add_item(tree, hf_zebra_prefixlen, tvb, - offset, 1, FALSE); + offset, 1, ENC_BIG_ENDIAN); offset += 1; if (len == 17) { /* IPv4 */ @@ -254,11 +254,11 @@ dissect_zebra_request(proto_tree *tree, gboolean request, tvbuff_t *tvb, case ZEBRA_IPV4_ROUTE_ADD: case ZEBRA_IPV4_ROUTE_DELETE: proto_tree_add_item(tree, hf_zebra_type, tvb, - offset, 1, FALSE); + offset, 1, ENC_BIG_ENDIAN); offset += 1; proto_tree_add_item(tree, hf_zebra_rtflags, tvb, - offset, 1, FALSE); + offset, 1, ENC_BIG_ENDIAN); offset += 1; message = tvb_get_guint8(tvb, offset); @@ -313,29 +313,29 @@ dissect_zebra_request(proto_tree *tree, gboolean request, tvbuff_t *tvb, while (i--) { proto_tree_add_item(tree, hf_zebra_index, tvb, - offset, 4, FALSE); + offset, 4, ENC_BIG_ENDIAN); offset += 4; } } if (message & ZEBRA_ZAPI_MESSAGE_DISTANCE) { proto_tree_add_item(tree, hf_zebra_distance, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; } if (message & ZEBRA_ZAPI_MESSAGE_METRIC) { proto_tree_add_item(tree, hf_zebra_metric, - tvb, offset, 4, FALSE); + tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; } break; case ZEBRA_IPV6_ROUTE_ADD: case ZEBRA_IPV6_ROUTE_DELETE: proto_tree_add_item(tree, hf_zebra_type, tvb, - offset, 1, FALSE); + offset, 1, ENC_BIG_ENDIAN); offset += 1; proto_tree_add_item(tree, hf_zebra_rtflags, tvb, - offset, 1, FALSE); + offset, 1, ENC_BIG_ENDIAN); offset += 1; message = tvb_get_guint8(tvb, offset); @@ -390,25 +390,25 @@ dissect_zebra_request(proto_tree *tree, gboolean request, tvbuff_t *tvb, while (i--) { proto_tree_add_item(tree, hf_zebra_index, tvb, - offset, 4, FALSE); + offset, 4, ENC_BIG_ENDIAN); offset += 4; } } if (message & ZEBRA_ZAPI_MESSAGE_DISTANCE) { proto_tree_add_item(tree, hf_zebra_distance, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; } if (message & ZEBRA_ZAPI_MESSAGE_METRIC) { proto_tree_add_item(tree, hf_zebra_metric, - tvb, offset, 4, FALSE); + tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; } break; case ZEBRA_REDISTRIBUTE_ADD: case ZEBRA_REDISTRIBUTE_DELETE: proto_tree_add_item(tree, hf_zebra_type, tvb, - offset, 1, FALSE); + offset, 1, ENC_BIG_ENDIAN); offset += 1; break; case ZEBRA_REDISTRIBUTE_DEFAULT_ADD: @@ -420,7 +420,7 @@ dissect_zebra_request(proto_tree *tree, gboolean request, tvbuff_t *tvb, offset += 4; proto_tree_add_item(tree, hf_zebra_metric, - tvb, offset, 4, FALSE); + tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; break; case ZEBRA_IPV6_NEXTHOP_LOOKUP: diff --git a/epan/dissectors/packet-ziop.c b/epan/dissectors/packet-ziop.c index 2db52cfe9b..2cb40b2a4e 100644 --- a/epan/dissectors/packet-ziop.c +++ b/epan/dissectors/packet-ziop.c @@ -250,9 +250,9 @@ dissect_ziop (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) { proto_tree_add_item(ziop_tree, hf_ziop_magic, tvb, offset, 4, FALSE); offset += 4; - proto_tree_add_item(ziop_tree, hf_ziop_giop_version_major, tvb, offset, 1, FALSE); + proto_tree_add_item(ziop_tree, hf_ziop_giop_version_major, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; - proto_tree_add_item(ziop_tree, hf_ziop_giop_version_minor, tvb, offset, 1, FALSE); + proto_tree_add_item(ziop_tree, hf_ziop_giop_version_minor, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; flags = tvb_get_guint8(tvb, offset); @@ -265,7 +265,7 @@ dissect_ziop (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) { flags, "0x%02x (%s)", flags, flags_strbuf->str); offset++; - proto_tree_add_item(ziop_tree, hf_ziop_message_type, tvb, offset, 1, FALSE); + proto_tree_add_item(ziop_tree, hf_ziop_message_type, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; proto_tree_add_item(ziop_tree, hf_ziop_message_size, tvb, offset, 4, little_endian); |