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,< |