From c4f4087a9a1e8d9795839945d26157c93c8b05f1 Mon Sep 17 00:00:00 2001 From: Chris Maynard Date: Thu, 22 Dec 2011 02:17:11 +0000 Subject: Use ENC_LITTLE_ENDIAN instead of TRUE as endian argument to proto_tree_add_bitmask_text(). svn path=/trunk/; revision=40271 --- epan/dissectors/packet-ipmi-app.c | 72 ++++++------ epan/dissectors/packet-ipmi-chassis.c | 42 +++---- epan/dissectors/packet-ipmi-se.c | 54 ++++----- epan/dissectors/packet-ipmi-storage.c | 22 ++-- epan/dissectors/packet-ipmi-transport.c | 192 ++++++++++++++++---------------- 5 files changed, 191 insertions(+), 191 deletions(-) diff --git a/epan/dissectors/packet-ipmi-app.c b/epan/dissectors/packet-ipmi-app.c index a34da3ebca..f955d480b7 100644 --- a/epan/dissectors/packet-ipmi-app.c +++ b/epan/dissectors/packet-ipmi-app.c @@ -432,14 +432,14 @@ rs01(tvbuff_t *tvb, proto_tree *tree) len = tvb_length(tvb); proto_tree_add_item(tree, hf_ipmi_app_01_dev_id, tvb, 0, 1, ENC_LITTLE_ENDIAN); - proto_tree_add_bitmask_text(tree, tvb, 1, 1, NULL, NULL, ett_ipmi_app_01_byte2, byte2, TRUE, 0); - proto_tree_add_bitmask_text(tree, tvb, 2, 1, NULL, NULL, ett_ipmi_app_01_byte3, byte3, TRUE, 0); + proto_tree_add_bitmask_text(tree, tvb, 1, 1, NULL, NULL, ett_ipmi_app_01_byte2, byte2, ENC_LITTLE_ENDIAN, 0); + proto_tree_add_bitmask_text(tree, tvb, 2, 1, NULL, NULL, ett_ipmi_app_01_byte3, byte3, ENC_LITTLE_ENDIAN, 0); proto_tree_add_item(tree, hf_ipmi_app_01_fw_rev_min, tvb, 3, 1, ENC_LITTLE_ENDIAN); proto_tree_add_item(tree, hf_ipmi_app_01_ipmi_version, tvb, 4, 1, ENC_LITTLE_ENDIAN); proto_tree_add_bitmask_text(tree, tvb, 5, 1, "Additional device support: ", "None", - ett_ipmi_app_01_byte6, byte6, TRUE, 0); + ett_ipmi_app_01_byte6, byte6, ENC_LITTLE_ENDIAN, 0); proto_tree_add_item(tree, hf_ipmi_app_01_manufacturer, tvb, 6, 3, ENC_LITTLE_ENDIAN); proto_tree_add_item(tree, hf_ipmi_app_01_product, tvb, 9, 2, ENC_LITTLE_ENDIAN); if (len > 11) { @@ -500,9 +500,9 @@ rq06(tvbuff_t *tvb, proto_tree *tree) static const gint *byte2[] = { &hf_ipmi_app_06_devpwr_set, &hf_ipmi_app_06_devpwr_enum, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, "ACPI System Power State: ", NULL, - ett_ipmi_app_06_syspwr, byte1, TRUE, 0); + ett_ipmi_app_06_syspwr, byte1, ENC_LITTLE_ENDIAN, 0); proto_tree_add_bitmask_text(tree, tvb, 1, 1, "ACPI Device Power State: ", NULL, - ett_ipmi_app_06_devpwr, byte2, TRUE, 0); + ett_ipmi_app_06_devpwr, byte2, ENC_LITTLE_ENDIAN, 0); } /* Get ACPI Power State. @@ -514,9 +514,9 @@ rs07(tvbuff_t *tvb, proto_tree *tree) static const gint *byte2[] = { &hf_ipmi_app_07_devpwr_enum, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, "ACPI System Power State: ", NULL, - ett_ipmi_app_07_syspwr, byte1, TRUE, 0); + ett_ipmi_app_07_syspwr, byte1, ENC_LITTLE_ENDIAN, 0); proto_tree_add_bitmask_text(tree, tvb, 1, 1, "ACPI Device Power State: ", NULL, - ett_ipmi_app_07_devpwr, byte2, TRUE, 0); + ett_ipmi_app_07_devpwr, byte2, ENC_LITTLE_ENDIAN, 0); } /* Get Device GUID. @@ -548,12 +548,12 @@ rq24(tvbuff_t *tvb, proto_tree *tree) &hf_ipmi_app_24_expiration_flags_biospost, &hf_ipmi_app_24_expiration_flags_biosfrb2, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, "Timer Use: ", NULL, ett_ipmi_app_24_timer_use, - byte1, TRUE, 0); + byte1, ENC_LITTLE_ENDIAN, 0); proto_tree_add_bitmask_text(tree, tvb, 1, 1, NULL, NULL, ett_ipmi_app_24_timer_action, - byte2, TRUE, 0); + byte2, ENC_LITTLE_ENDIAN, 0); proto_tree_add_item(tree, hf_ipmi_app_24_pretimeout, tvb, 2, 1, ENC_LITTLE_ENDIAN); proto_tree_add_bitmask_text(tree, tvb, 3, 1, "Timer Use Expiration flags clear: ", "None", - ett_ipmi_app_24_expiration_flags, byte4, TRUE, BMT_NO_TFS); + ett_ipmi_app_24_expiration_flags, byte4, ENC_LITTLE_ENDIAN, BMT_NO_TFS); proto_tree_add_item(tree, hf_ipmi_app_24_initial_countdown, tvb, 4, 2, ENC_LITTLE_ENDIAN); } @@ -562,7 +562,7 @@ rq24(tvbuff_t *tvb, proto_tree *tree) static void rs25(tvbuff_t *tvb, proto_tree *tree) { - static const gint *byte1[] = { &hf_ipmi_app_25_timer_use_dont_log, + static const gint *byte1[] = { &hf_ipmi_app_25_timer_use_dont_log, &hf_ipmi_app_25_timer_use_started, &hf_ipmi_app_25_timer_use_timer_use, NULL }; static const gint *byte2[] = { &hf_ipmi_app_25_timer_action_interrupt, &hf_ipmi_app_25_timer_action_timeout_action, NULL }; @@ -571,12 +571,12 @@ rs25(tvbuff_t *tvb, proto_tree *tree) &hf_ipmi_app_25_expiration_flags_biosfrb2, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, "Timer Use: ", NULL, ett_ipmi_app_25_timer_use, - byte1, TRUE, 0); + byte1, ENC_LITTLE_ENDIAN, 0); proto_tree_add_bitmask_text(tree, tvb, 1, 1, NULL, NULL, ett_ipmi_app_25_timer_action, - byte2, TRUE, 0); + byte2, ENC_LITTLE_ENDIAN, 0); proto_tree_add_item(tree, hf_ipmi_app_25_pretimeout, tvb, 2, 1, ENC_LITTLE_ENDIAN); proto_tree_add_bitmask_text(tree, tvb, 3, 1, "Timer Use Expiration flags: ", "None", - ett_ipmi_app_25_expiration_flags, byte4, TRUE, BMT_NO_TFS); + ett_ipmi_app_25_expiration_flags, byte4, ENC_LITTLE_ENDIAN, BMT_NO_TFS); proto_tree_add_item(tree, hf_ipmi_app_25_initial_countdown, tvb, 4, 2, ENC_LITTLE_ENDIAN); proto_tree_add_item(tree, hf_ipmi_app_25_present_countdown, tvb, 6, 2, ENC_LITTLE_ENDIAN); } @@ -591,7 +591,7 @@ rq2e(tvbuff_t *tvb, proto_tree *tree) &hf_ipmi_app_2e_byte1_emb_full_intr, &hf_ipmi_app_2e_byte1_rmq_intr, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, "Enables: ", "None", ett_ipmi_app_2e_byte1, - byte1, TRUE, BMT_NO_TFS); + byte1, ENC_LITTLE_ENDIAN, BMT_NO_TFS); } /* Get BMC Global Enables. @@ -604,7 +604,7 @@ rs2f(tvbuff_t *tvb, proto_tree *tree) &hf_ipmi_app_2f_byte1_emb_full_intr, &hf_ipmi_app_2f_byte1_rmq_intr, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, "Enables: ", "None", ett_ipmi_app_2f_byte1, - byte1, TRUE, BMT_NO_TFS); + byte1, ENC_LITTLE_ENDIAN, BMT_NO_TFS); } /* Clear Message Flags. @@ -617,7 +617,7 @@ rq30(tvbuff_t *tvb, proto_tree *tree) &hf_ipmi_app_30_byte1_emb, &hf_ipmi_app_30_byte1_rmq, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, "Clear Message Flags: ", "None", - ett_ipmi_app_30_byte1, byte1, TRUE, BMT_NO_TFS); + ett_ipmi_app_30_byte1, byte1, ENC_LITTLE_ENDIAN, BMT_NO_TFS); } /* Get Message Flags. @@ -630,7 +630,7 @@ rs31(tvbuff_t *tvb, proto_tree *tree) &hf_ipmi_app_31_byte1_emb, &hf_ipmi_app_31_byte1_rmq, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, "Flags: ", "None", - ett_ipmi_app_31_byte1, byte1, TRUE, BMT_NO_TFS); + ett_ipmi_app_31_byte1, byte1, ENC_LITTLE_ENDIAN, BMT_NO_TFS); } /* Enable Message Channel Receive. @@ -642,9 +642,9 @@ rq32(tvbuff_t *tvb, proto_tree *tree) static const gint *byte2[] = { &hf_ipmi_app_32_rq_state, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_app_32_rq_byte1, - byte1, TRUE, 0); + byte1, ENC_LITTLE_ENDIAN, 0); proto_tree_add_bitmask_text(tree, tvb, 1, 1, NULL, NULL, ett_ipmi_app_32_rq_byte2, - byte2, TRUE, 0); + byte2, ENC_LITTLE_ENDIAN, 0); } static void @@ -654,9 +654,9 @@ rs32(tvbuff_t *tvb, proto_tree *tree) static const gint *byte2[] = { &hf_ipmi_app_32_rs_state, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_app_32_rs_byte1, - byte1, TRUE, 0); + byte1, ENC_LITTLE_ENDIAN, 0); proto_tree_add_bitmask_text(tree, tvb, 1, 1, NULL, NULL, ett_ipmi_app_32_rs_byte2, - byte2, TRUE, 0); + byte2, ENC_LITTLE_ENDIAN, 0); } /* Get Message @@ -679,7 +679,7 @@ rq34(tvbuff_t *tvb, proto_tree *tree) tvbuff_t *next; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, - ett_ipmi_app_34_byte1, byte1, TRUE, 0); + ett_ipmi_app_34_byte1, byte1, ENC_LITTLE_ENDIAN, 0); next = tvb_new_subset(tvb, 1, tvb_length(tvb) - 1, tvb_length(tvb) - 1); ti = proto_tree_add_text(tree, next, 0, tvb_length(next), "Message"); @@ -736,8 +736,8 @@ rq38(tvbuff_t *tvb, proto_tree *tree) static const gint *byte1[] = { &hf_ipmi_app_38_rq_ipmi20, &hf_ipmi_app_38_rq_chan, NULL }; static const gint *byte2[] = { &hf_ipmi_app_38_rq_priv, NULL }; - proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_app_38_rq_byte1, byte1, TRUE, 0); - proto_tree_add_bitmask_text(tree, tvb, 1, 1, NULL, NULL, ett_ipmi_app_38_rq_byte2, byte2, TRUE, 0); + proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_app_38_rq_byte1, byte1, ENC_LITTLE_ENDIAN, 0); + proto_tree_add_bitmask_text(tree, tvb, 1, 1, NULL, NULL, ett_ipmi_app_38_rq_byte2, byte2, ENC_LITTLE_ENDIAN, 0); } static void @@ -751,11 +751,11 @@ rs38(tvbuff_t *tvb, proto_tree *tree) &hf_ipmi_app_38_rs_user_nonnull, &hf_ipmi_app_38_rs_user_null, &hf_ipmi_app_38_rs_user_anon, NULL }; static const gint *byte4[] = { &hf_ipmi_app_38_rs_ipmi20_conn, &hf_ipmi_app_38_rs_ipmi15_conn, NULL }; - proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_app_38_rs_byte1, byte1, TRUE, 0); - proto_tree_add_bitmask_text(tree, tvb, 1, 1, NULL, NULL, ett_ipmi_app_38_rs_byte2, byte2, TRUE, BMT_NO_FALSE); - proto_tree_add_bitmask_text(tree, tvb, 2, 1, NULL, NULL, ett_ipmi_app_38_rs_byte3, byte3, TRUE, BMT_NO_FALSE); + proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_app_38_rs_byte1, byte1, ENC_LITTLE_ENDIAN, 0); + proto_tree_add_bitmask_text(tree, tvb, 1, 1, NULL, NULL, ett_ipmi_app_38_rs_byte2, byte2, ENC_LITTLE_ENDIAN, BMT_NO_FALSE); + proto_tree_add_bitmask_text(tree, tvb, 2, 1, NULL, NULL, ett_ipmi_app_38_rs_byte3, byte3, ENC_LITTLE_ENDIAN, BMT_NO_FALSE); proto_tree_add_bitmask_text(tree, tvb, 3, 1, "Supported connections: ", "None", - ett_ipmi_app_38_rs_byte4, byte4, TRUE, 0); + ett_ipmi_app_38_rs_byte4, byte4, ENC_LITTLE_ENDIAN, 0); proto_tree_add_item(tree, hf_ipmi_app_38_rs_oem_iana, tvb, 4, 3, ENC_LITTLE_ENDIAN); proto_tree_add_item(tree, hf_ipmi_app_38_rs_oem_aux, tvb, 7, 1, ENC_LITTLE_ENDIAN); } @@ -768,7 +768,7 @@ rq39(tvbuff_t *tvb, proto_tree *tree) static const gint *byte1[] = { &hf_ipmi_app_39_authtype, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, - ett_ipmi_app_39_byte1, byte1, TRUE, 0); + ett_ipmi_app_39_byte1, byte1, ENC_LITTLE_ENDIAN, 0); proto_tree_add_item(tree, hf_ipmi_app_39_user, tvb, 1, 16, ENC_ASCII|ENC_NA); } @@ -794,9 +794,9 @@ rq3a(tvbuff_t *tvb, proto_tree *tree) static const gint *byte2[] = { &hf_ipmi_app_3a_privlevel, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, - ett_ipmi_app_3a_rq_byte1, byte1, TRUE, 0); + ett_ipmi_app_3a_rq_byte1, byte1, ENC_LITTLE_ENDIAN, 0); proto_tree_add_bitmask_text(tree, tvb, 1, 1, NULL, NULL, - ett_ipmi_app_3a_rq_byte2, byte2, TRUE, 0); + ett_ipmi_app_3a_rq_byte2, byte2, ENC_LITTLE_ENDIAN, 0); proto_tree_add_item(tree, hf_ipmi_app_3a_authcode, tvb, 2, 16, ENC_NA); proto_tree_add_item(tree, hf_ipmi_app_3a_outbound_seq, tvb, 18, 4, ENC_LITTLE_ENDIAN); } @@ -808,11 +808,11 @@ rs3a(tvbuff_t *tvb, proto_tree *tree) static const gint *byte10[] = { &hf_ipmi_app_3a_maxpriv_session, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, - ett_ipmi_app_3a_rs_byte1, byte1, TRUE, 0); + ett_ipmi_app_3a_rs_byte1, byte1, ENC_LITTLE_ENDIAN, 0); proto_tree_add_item(tree, hf_ipmi_app_3a_session_id, tvb, 1, 4, ENC_LITTLE_ENDIAN); proto_tree_add_item(tree, hf_ipmi_app_3a_inbound_seq, tvb, 5, 4, ENC_LITTLE_ENDIAN); proto_tree_add_bitmask_text(tree, tvb, 9, 1, NULL, NULL, - ett_ipmi_app_3a_rs_byte10, byte10, TRUE, 0); + ett_ipmi_app_3a_rs_byte10, byte10, ENC_LITTLE_ENDIAN, 0); } static const value_string cc3a[] = { @@ -833,7 +833,7 @@ rq3b(tvbuff_t *tvb, proto_tree *tree) static const gint *byte1[] = { &hf_ipmi_app_3b_req_priv, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, - ett_ipmi_app_3b_rq_byte1, byte1, TRUE, 0); + ett_ipmi_app_3b_rq_byte1, byte1, ENC_LITTLE_ENDIAN, 0); } static void @@ -842,7 +842,7 @@ rs3b(tvbuff_t *tvb, proto_tree *tree) static const gint *byte1[] = { &hf_ipmi_app_3b_new_priv, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, - ett_ipmi_app_3b_rs_byte1, byte1, TRUE, 0); + ett_ipmi_app_3b_rs_byte1, byte1, ENC_LITTLE_ENDIAN, 0); } static const value_string cc3b[] = { diff --git a/epan/dissectors/packet-ipmi-chassis.c b/epan/dissectors/packet-ipmi-chassis.c index 280c7d821e..c473e0fdc2 100644 --- a/epan/dissectors/packet-ipmi-chassis.c +++ b/epan/dissectors/packet-ipmi-chassis.c @@ -333,7 +333,7 @@ bootopt_00(tvbuff_t *tvb, proto_tree *tree) static const int *byte1[] = { &hf_ipmi_chs_bo00_sip, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_chs_bo00_byte1, byte1, - TRUE, 0); + ENC_LITTLE_ENDIAN, 0); } static void @@ -348,7 +348,7 @@ bootopt_02(tvbuff_t *tvb, proto_tree *tree) static const int *byte1[] = { &hf_ipmi_chs_bo02_request, &hf_ipmi_chs_bo02_discovered, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, "Service partition scan: ", - "Not discovered", ett_ipmi_chs_bo02_byte1, byte1, TRUE, 0); + "Not discovered", ett_ipmi_chs_bo02_byte1, byte1, ENC_LITTLE_ENDIAN, 0); } static void @@ -358,7 +358,7 @@ bootopt_03(tvbuff_t *tvb, proto_tree *tree) &hf_ipmi_chs_bo03_wd_timeout, &hf_ipmi_chs_bo03_softreset, &hf_ipmi_chs_bo03_powerup, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, "BMC boot flag valid, don't clear on: ", - "None", ett_ipmi_chs_bo03_byte1, byte1, TRUE, BMT_NO_TFS); + "None", ett_ipmi_chs_bo03_byte1, byte1, ENC_LITTLE_ENDIAN, BMT_NO_TFS); } static void @@ -370,7 +370,7 @@ bootopt_04(tvbuff_t *tvb, proto_tree *tree) proto_tree_add_item(tree, hf_ipmi_chs_bo04_write_mask, tvb, 0, 1, ENC_LITTLE_ENDIAN); proto_tree_add_bitmask_text(tree, tvb, 1, 1, "Boot Initiator Acknowledge data: ", - "None", ett_ipmi_chs_bo04_byte2, byte2, TRUE, BMT_NO_TFS); + "None", ett_ipmi_chs_bo04_byte2, byte2, ENC_LITTLE_ENDIAN, BMT_NO_TFS); } static void @@ -387,13 +387,13 @@ bootopt_05(tvbuff_t *tvb, proto_tree *tree) &hf_ipmi_chs_bo05_bios_muxctl_override, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_chs_bo05_byte1, - byte1, TRUE, 0); + byte1, ENC_LITTLE_ENDIAN, 0); proto_tree_add_bitmask_text(tree, tvb, 1, 1, NULL, NULL, ett_ipmi_chs_bo05_byte2, - byte2, TRUE, 0); + byte2, ENC_LITTLE_ENDIAN, 0); proto_tree_add_bitmask_text(tree, tvb, 2, 1, NULL, NULL, ett_ipmi_chs_bo05_byte3, - byte3, TRUE, 0); + byte3, ENC_LITTLE_ENDIAN, 0); proto_tree_add_bitmask_text(tree, tvb, 3, 1, NULL, NULL, ett_ipmi_chs_bo05_byte4, - byte4, TRUE, 0); + byte4, ENC_LITTLE_ENDIAN, 0); proto_tree_add_item(tree, hf_ipmi_chs_bo05_byte5, tvb, 4, 1, ENC_LITTLE_ENDIAN); } @@ -403,7 +403,7 @@ bootopt_06(tvbuff_t *tvb, proto_tree *tree) static const int *byte1[] = { &hf_ipmi_chs_bo06_chan_num, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, - ett_ipmi_chs_bo06_byte1, byte1, TRUE, 0); + ett_ipmi_chs_bo06_byte1, byte1, ENC_LITTLE_ENDIAN, 0); proto_tree_add_item(tree, hf_ipmi_chs_bo06_session_id, tvb, 1, 4, ENC_LITTLE_ENDIAN); ipmi_add_timestamp(tree, hf_ipmi_chs_bo06_bootinfo_timestamp, tvb, 5); } @@ -440,7 +440,7 @@ rs00(tvbuff_t *tvb, proto_tree *tree) &hf_ipmi_chs_00_capflags_fpl, &hf_ipmi_chs_00_capflags_is, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, "Capabilities: ", "None", - ett_ipmi_chs_00_capflags, byte1, TRUE, BMT_NO_TFS); + ett_ipmi_chs_00_capflags, byte1, ENC_LITTLE_ENDIAN, BMT_NO_TFS); proto_tree_add_item(tree, hf_ipmi_chs_00_fru_dev_addr, tvb, 1, 1, ENC_LITTLE_ENDIAN); proto_tree_add_item(tree, hf_ipmi_chs_00_sdr_dev_addr, tvb, 2, 1, ENC_LITTLE_ENDIAN); proto_tree_add_item(tree, hf_ipmi_chs_00_sel_dev_addr, tvb, 3, 1, ENC_LITTLE_ENDIAN); @@ -473,14 +473,14 @@ rs01(tvbuff_t *tvb, proto_tree *tree) &hf_ipmi_chs_01_fpb_poweroff_disabled, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, "Current Power State: ", NULL, - ett_ipmi_chs_01_pwr_state, byte1, TRUE, 0); + ett_ipmi_chs_01_pwr_state, byte1, ENC_LITTLE_ENDIAN, 0); proto_tree_add_bitmask_text(tree, tvb, 1, 1, "Last Power Event: ", NULL, - ett_ipmi_chs_01_last_event, byte2, TRUE, 0); + ett_ipmi_chs_01_last_event, byte2, ENC_LITTLE_ENDIAN, 0); proto_tree_add_bitmask_text(tree, tvb, 2, 1, "Misc. State: ", NULL, - ett_ipmi_chs_01_misc, byte3, TRUE, 0); + ett_ipmi_chs_01_misc, byte3, ENC_LITTLE_ENDIAN, 0); if (tvb_length(tvb) > 3) { proto_tree_add_bitmask_text(tree, tvb, 3, 1, "Front panel buttons capabilities: ", - NULL, ett_ipmi_chs_01_fpb, byte4, TRUE, BMT_NO_TFS); + NULL, ett_ipmi_chs_01_fpb, byte4, ENC_LITTLE_ENDIAN, BMT_NO_TFS); }; } @@ -492,7 +492,7 @@ rq02(tvbuff_t *tvb, proto_tree *tree) static const int *byte1[] = { &hf_ipmi_chs_02_cctrl, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, - ett_ipmi_chs_02_byte1, byte1, TRUE, 0); + ett_ipmi_chs_02_byte1, byte1, ENC_LITTLE_ENDIAN, 0); } /* Chassis Identify @@ -508,7 +508,7 @@ rq04(tvbuff_t *tvb, proto_tree *tree) if (tvb_length(tvb) > 1) { proto_tree_add_bitmask_text(tree, tvb, 1, 1, "Flags: ", "None", - ett_ipmi_chs_04_byte2, byte2, TRUE, 0); + ett_ipmi_chs_04_byte2, byte2, ENC_LITTLE_ENDIAN, 0); } } @@ -520,7 +520,7 @@ rq05(tvbuff_t *tvb, proto_tree *tree) static const int *byte1[] = { &hf_ipmi_chs_05_flags_fpl, &hf_ipmi_chs_05_flags_intrusion, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, "Capabilities: ", "None", - ett_ipmi_chs_05_flags, byte1, TRUE, 0); + ett_ipmi_chs_05_flags, byte1, ENC_LITTLE_ENDIAN, 0); proto_tree_add_item(tree, hf_ipmi_chs_05_fru_dev_addr, tvb, 1, 1, ENC_LITTLE_ENDIAN); proto_tree_add_item(tree, hf_ipmi_chs_05_sdr_dev_addr, tvb, 2, 1, ENC_LITTLE_ENDIAN); proto_tree_add_item(tree, hf_ipmi_chs_05_sel_dev_addr, tvb, 3, 1, ENC_LITTLE_ENDIAN); @@ -539,7 +539,7 @@ rq06(tvbuff_t *tvb, proto_tree *tree) static const int *byte1[] = { &hf_ipmi_chs_06_rq_policy, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, - ett_ipmi_chs_06_byte1, byte1, TRUE, 0); + ett_ipmi_chs_06_byte1, byte1, ENC_LITTLE_ENDIAN, 0); } /* Get Power Restore Policy @@ -551,7 +551,7 @@ rs06(tvbuff_t *tvb, proto_tree *tree) &hf_ipmi_chs_06_rs_policy_support_restore, &hf_ipmi_chs_06_rs_policy_support_poweroff, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, "Power Restore Policy support: ", "None", - ett_ipmi_chs_06_policy_support, byte1, TRUE, BMT_NO_TFS); + ett_ipmi_chs_06_policy_support, byte1, ENC_LITTLE_ENDIAN, BMT_NO_TFS); } /* Get System Restart Cause @@ -562,7 +562,7 @@ rs07(tvbuff_t *tvb, proto_tree *tree) static const int *byte1[] = { &hf_ipmi_chs_07_cause, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, - ett_ipmi_chs_07_byte1, byte1, TRUE, 0); + ett_ipmi_chs_07_byte1, byte1, ENC_LITTLE_ENDIAN, 0); proto_tree_add_item(tree, hf_ipmi_chs_07_chan, tvb, 1, 1, ENC_LITTLE_ENDIAN); } @@ -666,7 +666,7 @@ rs09(tvbuff_t *tvb, proto_tree *tree) } proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, - ett_ipmi_chs_09_rs_byte1, byte1, TRUE, 0); + ett_ipmi_chs_09_rs_byte1, byte1, ENC_LITTLE_ENDIAN, 0); ti = proto_tree_add_text(tree, tvb, 1, 1, "Boot option parameter selector: %s (0x%02x)", diff --git a/epan/dissectors/packet-ipmi-se.c b/epan/dissectors/packet-ipmi-se.c index f5cde5e95e..5b4216a9ed 100644 --- a/epan/dissectors/packet-ipmi-se.c +++ b/epan/dissectors/packet-ipmi-se.c @@ -1963,7 +1963,7 @@ cfgparam_06(tvbuff_t *tvb, proto_tree *tree) { static const int *byte1[] = { &hf_ipmi_se_cp06_filter, NULL }; - proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_se_cp06_byte1, byte1, TRUE, 0); + proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_se_cp06_byte1, byte1, ENC_LITTLE_ENDIAN, 0); proto_tree_add_item(tree, hf_ipmi_se_cp06_data, tvb, 1, 20, ENC_NA); } @@ -1972,7 +1972,7 @@ cfgparam_07(tvbuff_t *tvb, proto_tree *tree) { static const int *byte1[] = { &hf_ipmi_se_cp07_filter, NULL }; - proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_se_cp07_byte1, byte1, TRUE, 0); + proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_se_cp07_byte1, byte1, ENC_LITTLE_ENDIAN, 0); proto_tree_add_item(tree, hf_ipmi_se_cp06_data, tvb, 1, 1, ENC_NA); } @@ -1987,7 +1987,7 @@ cfgparam_09(tvbuff_t *tvb, proto_tree *tree) { static const int *byte1[] = { &hf_ipmi_se_cp09_entry, NULL }; - proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_se_cp09_byte1, byte1, TRUE, 0); + proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_se_cp09_byte1, byte1, ENC_LITTLE_ENDIAN, 0); proto_tree_add_item(tree, hf_ipmi_se_cp09_data, tvb, 1, 3, ENC_NA); } @@ -1996,7 +1996,7 @@ cfgparam_10(tvbuff_t *tvb, proto_tree *tree) { static const int *byte1[] = { &hf_ipmi_se_cp10_useval, NULL }; - proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_se_cp10_byte1, byte1, TRUE, 0); + proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_se_cp10_byte1, byte1, ENC_LITTLE_ENDIAN, 0); ipmi_add_guid(tree, hf_ipmi_se_cp10_guid, tvb, 1); } @@ -2025,8 +2025,8 @@ cfgparam_12(tvbuff_t *tvb, proto_tree *tree) tmp, "%sSelects volatile string parameters", ipmi_dcd8(tmp, 0x7f)); } - proto_tree_add_bitmask_text(tree, tvb, 1, 1, NULL, NULL, ett_ipmi_se_cp12_byte2, byte2, TRUE, 0); - proto_tree_add_bitmask_text(tree, tvb, 2, 1, NULL, NULL, ett_ipmi_se_cp12_byte3, byte3, TRUE, 0); + proto_tree_add_bitmask_text(tree, tvb, 1, 1, NULL, NULL, ett_ipmi_se_cp12_byte2, byte2, ENC_LITTLE_ENDIAN, 0); + proto_tree_add_bitmask_text(tree, tvb, 2, 1, NULL, NULL, ett_ipmi_se_cp12_byte3, byte3, ENC_LITTLE_ENDIAN, 0); } static void @@ -2034,7 +2034,7 @@ cfgparam_13(tvbuff_t *tvb, proto_tree *tree) { static const int *byte1[] = { &hf_ipmi_se_cp13_stringsel, NULL }; - proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_se_cp13_byte1, byte1, TRUE, 0); + proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_se_cp13_byte1, byte1, ENC_LITTLE_ENDIAN, 0); proto_tree_add_item(tree, hf_ipmi_se_cp13_blocksel, tvb, 1, 1, ENC_LITTLE_ENDIAN); proto_tree_add_item(tree, hf_ipmi_se_cp13_string, tvb, 2, tvb_length(tvb) - 2, ENC_ASCII|ENC_NA); } @@ -2063,7 +2063,7 @@ cp15_add_group_and_member(proto_tree *tree, tvbuff_t *tvb, guint offs, guint num proto_tree_add_uint_format(tree, hf_ipmi_se_cp15_group, tvb, offs, 1, tmp, "Group ID %d: %d%s", num, tmp, gdesc); - proto_tree_add_bitmask_text(tree, tvb, offs + 1, 1, NULL, NULL, ett_ipmi_se_cp15_member, byte2, TRUE, 0); + proto_tree_add_bitmask_text(tree, tvb, offs + 1, 1, NULL, NULL, ett_ipmi_se_cp15_member, byte2, ENC_LITTLE_ENDIAN, 0); } static void @@ -2073,13 +2073,13 @@ cfgparam_15(tvbuff_t *tvb, proto_tree *tree) static const int *byte2[] = { &hf_ipmi_se_cp15_force, &hf_ipmi_se_cp15_delayed, &hf_ipmi_se_cp15_channel, NULL }; static const int *byte11[] = { &hf_ipmi_se_cp15_retries, &hf_ipmi_se_cp15_operation, NULL }; - proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_se_cp15_byte1, byte1, TRUE, 0); - proto_tree_add_bitmask_text(tree, tvb, 1, 1, NULL, NULL, ett_ipmi_se_cp15_byte2, byte2, TRUE, 0); + proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_se_cp15_byte1, byte1, ENC_LITTLE_ENDIAN, 0); + proto_tree_add_bitmask_text(tree, tvb, 1, 1, NULL, NULL, ett_ipmi_se_cp15_byte2, byte2, ENC_LITTLE_ENDIAN, 0); cp15_add_group_and_member(tree, tvb, 2, 0); cp15_add_group_and_member(tree, tvb, 4, 1); cp15_add_group_and_member(tree, tvb, 6, 2); cp15_add_group_and_member(tree, tvb, 8, 3); - proto_tree_add_bitmask_text(tree, tvb, 10, 1, NULL, NULL, ett_ipmi_se_cp15_byte11, byte11, TRUE, 0); + proto_tree_add_bitmask_text(tree, tvb, 10, 1, NULL, NULL, ett_ipmi_se_cp15_byte11, byte11, ENC_LITTLE_ENDIAN, 0); } static struct { @@ -2181,7 +2181,7 @@ rq00(tvbuff_t *tvb, proto_tree *tree) proto_tree_add_item(tree, hf_ipmi_se_00_addr, tvb, 0, 1, ENC_LITTLE_ENDIAN); } - proto_tree_add_bitmask_text(tree, tvb, 1, 1, NULL, NULL, ett_ipmi_se_00_byte2, byte2, TRUE, 0); + proto_tree_add_bitmask_text(tree, tvb, 1, 1, NULL, NULL, ett_ipmi_se_00_byte2, byte2, ENC_LITTLE_ENDIAN, 0); } /* Get event receiver. @@ -2200,7 +2200,7 @@ rs01(tvbuff_t *tvb, proto_tree *tree) proto_tree_add_item(tree, hf_ipmi_se_01_addr, tvb, 0, 1, ENC_LITTLE_ENDIAN); } - proto_tree_add_bitmask_text(tree, tvb, 1, 1, NULL, NULL, ett_ipmi_se_01_byte2, byte2, TRUE, 0); + proto_tree_add_bitmask_text(tree, tvb, 1, 1, NULL, NULL, ett_ipmi_se_01_byte2, byte2, ENC_LITTLE_ENDIAN, 0); } /* Platform event. @@ -2222,7 +2222,7 @@ rs10(tvbuff_t *tvb, proto_tree *tree) proto_tree_add_item(tree, hf_ipmi_se_10_pef_version, tvb, 0, 1, ENC_LITTLE_ENDIAN); proto_tree_add_bitmask_text(tree, tvb, 1, 1, "Action support: ", "None", ett_ipmi_se_10_action, - byte2, TRUE, 0); + byte2, ENC_LITTLE_ENDIAN, 0); proto_tree_add_item(tree, hf_ipmi_se_10_entries, tvb, 2, 1, ENC_LITTLE_ENDIAN); } @@ -2340,7 +2340,7 @@ rs13(tvbuff_t *tvb, proto_tree *tree) const char *desc; proto_tree_add_bitmask_text(tree, tvb, 0, 1, "Parameter revision", NULL, - ett_ipmi_se_13_rev, byte1, TRUE, 0); + ett_ipmi_se_13_rev, byte1, ENC_LITTLE_ENDIAN, 0); if (!ipmi_getsaveddata(0, &pno)) { /* No request found - cannot parse further */ @@ -2392,7 +2392,7 @@ rq14(tvbuff_t *tvb, proto_tree *tree) { static const gint *byte1[] = { &hf_ipmi_se_14_processed_by, NULL }; - proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_se_14_byte1, byte1, TRUE, 0); + proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_se_14_byte1, byte1, ENC_LITTLE_ENDIAN, 0); proto_tree_add_item(tree, hf_ipmi_se_14_rid, tvb, 1, 2, ENC_LITTLE_ENDIAN); } @@ -2447,9 +2447,9 @@ rq16(tvbuff_t *tvb, proto_tree *tree) return; } - proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_se_16_byte1, byte1, TRUE, 0); - proto_tree_add_bitmask_text(tree, tvb, 1, 1, NULL, NULL, ett_ipmi_se_16_byte2, byte2, TRUE, 0); - proto_tree_add_bitmask_text(tree, tvb, 2, 1, NULL, NULL, ett_ipmi_se_16_byte3, byte3, TRUE, 0); + proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_se_16_byte1, byte1, ENC_LITTLE_ENDIAN, 0); + proto_tree_add_bitmask_text(tree, tvb, 1, 1, NULL, NULL, ett_ipmi_se_16_byte2, byte2, ENC_LITTLE_ENDIAN, 0); + proto_tree_add_bitmask_text(tree, tvb, 2, 1, NULL, NULL, ett_ipmi_se_16_byte3, byte3, ENC_LITTLE_ENDIAN, 0); if (tvb_length(tvb) > 3) { proto_tree_add_item(tree, hf_ipmi_se_16_gen, tvb, 3, 1, ENC_LITTLE_ENDIAN); sub = tvb_new_subset(tvb, 4, tvb_length(tvb) - 4, tvb_length(tvb) - 4); @@ -2499,7 +2499,7 @@ rq20(tvbuff_t *tvb, proto_tree *tree) if (tvb_length(tvb) > 0) { proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, - ett_ipmi_se_20_rq_byte1, byte1, TRUE, 0); + ett_ipmi_se_20_rq_byte1, byte1, ENC_LITTLE_ENDIAN, 0); ipmi_setsaveddata(0, tvb_get_guint8(tvb, 0) & 0x01); } } @@ -2517,7 +2517,7 @@ rs20(tvbuff_t *tvb, proto_tree *tree) proto_tree_add_item(tree, hf_ipmi_se_20_rs_num, tvb, 0, 1, ENC_LITTLE_ENDIAN); } proto_tree_add_bitmask_text(tree, tvb, 1, 1, NULL, NULL, ett_ipmi_se_20_rs_byte2, - byte2, TRUE, 0); + byte2, ENC_LITTLE_ENDIAN, 0); if (tvb_get_guint8(tvb, 1) & 0x80) { /* Dynamic sensor population */ proto_tree_add_item(tree, hf_ipmi_se_20_rs_change, tvb, 2, 4, ENC_LITTLE_ENDIAN); @@ -2684,7 +2684,7 @@ add_thresholds(tvbuff_t *tvb, int offs, proto_tree *tree, const char *desc) &hf_ipmi_se_XX_m_lnr, &hf_ipmi_se_XX_m_lc, &hf_ipmi_se_XX_m_lnc, NULL }; proto_tree_add_bitmask_text(tree, tvb, offs, 1, desc, "None", - ett_ipmi_se_XX_mask, threshold_mask, TRUE, 0); + ett_ipmi_se_XX_mask, threshold_mask, ENC_LITTLE_ENDIAN, 0); proto_tree_add_item(tree, hf_ipmi_se_XX_thr_lnc, tvb, offs + 1, 1, ENC_LITTLE_ENDIAN); proto_tree_add_item(tree, hf_ipmi_se_XX_thr_lc, tvb, offs + 2, 1, ENC_LITTLE_ENDIAN); proto_tree_add_item(tree, hf_ipmi_se_XX_thr_lnr, tvb, offs + 3, 1, ENC_LITTLE_ENDIAN); @@ -2763,7 +2763,7 @@ rq28(tvbuff_t *tvb, proto_tree *tree) static const struct true_false_string tfs_lect = { "Select", "Do not select" }; proto_tree_add_item(tree, hf_ipmi_se_28_sensor, tvb, 0, 1, ENC_LITTLE_ENDIAN); - proto_tree_add_bitmask_text(tree, tvb, 1, 1, NULL, NULL, ett_ipmi_se_28_byte2, byte2, TRUE, 0); + proto_tree_add_bitmask_text(tree, tvb, 1, 1, NULL, NULL, ett_ipmi_se_28_byte2, byte2, ENC_LITTLE_ENDIAN, 0); add_events(tvb, 2, tree, &tfs_lect, "Selected events"); } @@ -2780,7 +2780,7 @@ rs29(tvbuff_t *tvb, proto_tree *tree) { static const int *byte1[] = { &hf_ipmi_se_29_fl_evm, &hf_ipmi_se_29_fl_scan, NULL }; - proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_se_29_byte1, byte1, TRUE, 0); + proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_se_29_byte1, byte1, ENC_LITTLE_ENDIAN, 0); add_events(tvb, 1, tree, &tfs_29_enabled, "Enabled events"); } @@ -2793,7 +2793,7 @@ rq2a(tvbuff_t *tvb, proto_tree *tree) static const struct true_false_string rearm_tfs = { "Re-arm", "Do not re-arm" }; proto_tree_add_item(tree, hf_ipmi_se_2a_sensor, tvb, 0, 1, ENC_LITTLE_ENDIAN); - proto_tree_add_bitmask_text(tree, tvb, 1, 1, NULL, NULL, ett_ipmi_se_2a_byte2, byte2, TRUE, 0); + proto_tree_add_bitmask_text(tree, tvb, 1, 1, NULL, NULL, ett_ipmi_se_2a_byte2, byte2, ENC_LITTLE_ENDIAN, 0); add_events(tvb, 2, tree, &rearm_tfs, "Re-arm Events"); } @@ -2811,7 +2811,7 @@ rs2b(tvbuff_t *tvb, proto_tree *tree) static const int *byte1[] = { &hf_ipmi_se_2b_fl_evm, &hf_ipmi_se_2b_fl_scan, &hf_ipmi_se_2b_fl_unavail, NULL }; static const struct true_false_string occur_tfs = { "Occurred", "Did not occur" }; - proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_se_2b_byte1, byte1, TRUE, 0); + proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_se_2b_byte1, byte1, ENC_LITTLE_ENDIAN, 0); add_events(tvb, 1, tree, &occur_tfs, "Event Status"); } @@ -2840,7 +2840,7 @@ rs2d(tvbuff_t *tvb, proto_tree *tree) int i, j, len; proto_tree_add_item(tree, hf_ipmi_se_2d_reading, tvb, 0, 1, ENC_LITTLE_ENDIAN); - proto_tree_add_bitmask_text(tree, tvb, 1, 1, NULL, NULL, ett_ipmi_se_2d_byte2, byte2, TRUE, 0); + proto_tree_add_bitmask_text(tree, tvb, 1, 1, NULL, NULL, ett_ipmi_se_2d_byte2, byte2, ENC_LITTLE_ENDIAN, 0); len = tvb_length(tvb); for (i = 0; i < 2 && i < len - 2; i++) { ti = proto_tree_add_text(tree, tvb, i + 2, 1, "Threshold comparisons/assertions (byte %d)", i); diff --git a/epan/dissectors/packet-ipmi-storage.c b/epan/dissectors/packet-ipmi-storage.c index c480b976c2..48c9330175 100644 --- a/epan/dissectors/packet-ipmi-storage.c +++ b/epan/dissectors/packet-ipmi-storage.c @@ -255,7 +255,7 @@ rs10(tvbuff_t *tvb, proto_tree *tree) static const int *flags[] = { &hf_ipmi_stor_10_access, NULL }; proto_tree_add_item(tree, hf_ipmi_stor_10_size, tvb, 0, 2, ENC_LITTLE_ENDIAN); - proto_tree_add_bitmask_text(tree, tvb, 2, 1, NULL, NULL, ett_ipmi_stor_10_flags, flags, TRUE, 0); + proto_tree_add_bitmask_text(tree, tvb, 2, 1, NULL, NULL, ett_ipmi_stor_10_flags, flags, ENC_LITTLE_ENDIAN, 0); } /* Read FRU Data @@ -317,7 +317,7 @@ rs20(tvbuff_t *tvb, proto_tree *tree) ipmi_add_timestamp(tree, hf_ipmi_stor_20_ts_add, tvb, 5); ipmi_add_timestamp(tree, hf_ipmi_stor_20_ts_erase, tvb, 9); proto_tree_add_bitmask_text(tree, tvb, 13, 1, "Operation Support: ", NULL, - ett_ipmi_stor_20_ops, ops, TRUE, 0); + ett_ipmi_stor_20_ops, ops, ENC_LITTLE_ENDIAN, 0); } /* Get SDR Repository Allocation Info @@ -386,7 +386,7 @@ rq25(tvbuff_t *tvb, proto_tree *tree) proto_tree_add_item(tree, hf_ipmi_stor_25_rec_id, tvb, 2, 2, ENC_LITTLE_ENDIAN); proto_tree_add_item(tree, hf_ipmi_stor_25_offset, tvb, 4, 1, ENC_LITTLE_ENDIAN); proto_tree_add_bitmask_text(tree, tvb, 5, 1, NULL, NULL, - ett_ipmi_stor_25_byte6, byte6, TRUE, 0); + ett_ipmi_stor_25_byte6, byte6, ENC_LITTLE_ENDIAN, 0); proto_tree_add_item(tree, hf_ipmi_stor_25_data, tvb, 6, tvb_length(tvb) - 6, ENC_NA); } @@ -432,7 +432,7 @@ rs27(tvbuff_t *tvb, proto_tree *tree) static const int *status[] = { &hf_ipmi_stor_27_status, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, - ett_ipmi_stor_27_status, status, TRUE, 0); + ett_ipmi_stor_27_status, status, ENC_LITTLE_ENDIAN, 0); } /* Get SDR Repository Time @@ -459,7 +459,7 @@ rq2c(tvbuff_t *tvb, proto_tree *tree) static const int *byte1[] = { &hf_ipmi_stor_2c_init_agent, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, - ett_ipmi_stor_2c_rq_byte1, byte1, TRUE, 0); + ett_ipmi_stor_2c_rq_byte1, byte1, ENC_LITTLE_ENDIAN, 0); } static void @@ -468,7 +468,7 @@ rs2c(tvbuff_t *tvb, proto_tree *tree) static const int *byte1[] = { &hf_ipmi_stor_2c_init_state, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, - ett_ipmi_stor_2c_rs_byte1, byte1, TRUE, 0); + ett_ipmi_stor_2c_rs_byte1, byte1, ENC_LITTLE_ENDIAN, 0); } /* Get SEL Info @@ -485,7 +485,7 @@ rs40(tvbuff_t *tvb, proto_tree *tree) ipmi_add_timestamp(tree, hf_ipmi_stor_40_ts_add, tvb, 5); ipmi_add_timestamp(tree, hf_ipmi_stor_40_ts_erase, tvb, 9); proto_tree_add_bitmask_text(tree, tvb, 13, 1, "Operation Support: ", NULL, - ett_ipmi_stor_40_ops, ops, TRUE, 0); + ett_ipmi_stor_40_ops, ops, ENC_LITTLE_ENDIAN, 0); } static const value_string cc40[] = { @@ -576,7 +576,7 @@ rq45(tvbuff_t *tvb, proto_tree *tree) proto_tree_add_item(tree, hf_ipmi_stor_45_rec_id, tvb, 2, 2, ENC_LITTLE_ENDIAN); proto_tree_add_item(tree, hf_ipmi_stor_45_offset, tvb, 4, 1, ENC_LITTLE_ENDIAN); proto_tree_add_bitmask_text(tree, tvb, 5, 1, NULL, NULL, - ett_ipmi_stor_45_byte6, byte6, TRUE, 0); + ett_ipmi_stor_45_byte6, byte6, ENC_LITTLE_ENDIAN, 0); proto_tree_add_item(tree, hf_ipmi_stor_45_data, tvb, 6, tvb_length(tvb) - 6, ENC_NA); } @@ -629,7 +629,7 @@ rs47(tvbuff_t *tvb, proto_tree *tree) static const int *status[] = { &hf_ipmi_stor_47_status, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, - ett_ipmi_stor_47_status, status, TRUE, 0); + ett_ipmi_stor_47_status, status, ENC_LITTLE_ENDIAN, 0); } /* Get SEL Time @@ -661,7 +661,7 @@ rq5a(tvbuff_t *tvb, proto_tree *tree) } proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, - ett_ipmi_stor_5a_byte1, byte1, TRUE, 0); + ett_ipmi_stor_5a_byte1, byte1, ENC_LITTLE_ENDIAN, 0); } static void @@ -692,7 +692,7 @@ rq5b(tvbuff_t *tvb, proto_tree *tree) guint8 v = tvb_get_guint8(tvb, 0); proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, - ett_ipmi_stor_5b_byte1, byte1, TRUE, 0); + ett_ipmi_stor_5b_byte1, byte1, ENC_LITTLE_ENDIAN, 0); if (v > 2) { proto_tree_add_item(tree, hf_ipmi_stor_5b_unknown, tvb, 1, tvb_length(tvb) - 1, ENC_NA); diff --git a/epan/dissectors/packet-ipmi-transport.c b/epan/dissectors/packet-ipmi-transport.c index 0dbf15b8cc..c3349dcae1 100644 --- a/epan/dissectors/packet-ipmi-transport.c +++ b/epan/dissectors/packet-ipmi-transport.c @@ -711,7 +711,7 @@ lan_serial_00(tvbuff_t *tvb, proto_tree *tree) static const int *byte1[] = { &hf_ipmi_trn_lan00_sip, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_trn_lan00_byte1, - byte1, TRUE, 0); + byte1, ENC_LITTLE_ENDIAN, 0); } static void @@ -719,7 +719,7 @@ lan_serial_01(tvbuff_t *tvb, proto_tree *tree) { proto_tree_add_bitmask_text(tree, tvb, 0, 1, "Authentication types supported: ", "No authentication types supported for this channel", ett_ipmi_trn_lan01_byte1, - lanXX_authtypes_byte, TRUE, 0); + lanXX_authtypes_byte, ENC_LITTLE_ENDIAN, 0); } static void @@ -727,19 +727,19 @@ lan_serial_02(tvbuff_t *tvb, proto_tree *tree) { proto_tree_add_bitmask_text(tree, tvb, 0, 1, "Authentication types for Callback level: ", "No authentication types enabled", ett_ipmi_trn_lan02_byte1, - lanXX_authtypes_byte, TRUE, 0); + lanXX_authtypes_byte, ENC_LITTLE_ENDIAN, 0); proto_tree_add_bitmask_text(tree, tvb, 1, 1, "Authentication types for User level: ", "No authentication types enabled", ett_ipmi_trn_lan02_byte2, - lanXX_authtypes_byte, TRUE, 0); + lanXX_authtypes_byte, ENC_LITTLE_ENDIAN, 0); proto_tree_add_bitmask_text(tree, tvb, 2, 1, "Authentication types for Operator level: ", "No authentication types enabled", ett_ipmi_trn_lan02_byte3, - lanXX_authtypes_byte, TRUE, 0); + lanXX_authtypes_byte, ENC_LITTLE_ENDIAN, 0); proto_tree_add_bitmask_text(tree, tvb, 3, 1, "Authentication types for Administrator level: ", "No authentication types enabled", ett_ipmi_trn_lan02_byte4, - lanXX_authtypes_byte, TRUE, 0); + lanXX_authtypes_byte, ENC_LITTLE_ENDIAN, 0); proto_tree_add_bitmask_text(tree, tvb, 4, 1, "Authentication types for OEM level: ", "No authentication types enabled", ett_ipmi_trn_lan02_byte5, - lanXX_authtypes_byte, TRUE, 0); + lanXX_authtypes_byte, ENC_LITTLE_ENDIAN, 0); } static void @@ -754,7 +754,7 @@ lan_04(tvbuff_t *tvb, proto_tree *tree) static const int *byte1[] = { &hf_ipmi_trn_lan04_ipsrc, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_trn_lan04_byte1, - byte1, TRUE, 0); + byte1, ENC_LITTLE_ENDIAN, 0); } static void @@ -776,8 +776,8 @@ lan_07(tvbuff_t *tvb, proto_tree *tree) static const int *byte3[] = { &hf_ipmi_trn_lan07_precedence, &hf_ipmi_trn_lan07_tos, NULL }; proto_tree_add_item(tree, hf_ipmi_trn_lan07_ttl, tvb, 0, 1, ENC_LITTLE_ENDIAN); - proto_tree_add_bitmask_text(tree, tvb, 1, 1, NULL, NULL, ett_ipmi_trn_lan07_byte2, byte2, TRUE, 0); - proto_tree_add_bitmask_text(tree, tvb, 2, 1, NULL, NULL, ett_ipmi_trn_lan07_byte3, byte3, TRUE, 0); + proto_tree_add_bitmask_text(tree, tvb, 1, 1, NULL, NULL, ett_ipmi_trn_lan07_byte2, byte2, ENC_LITTLE_ENDIAN, 0); + proto_tree_add_bitmask_text(tree, tvb, 2, 1, NULL, NULL, ett_ipmi_trn_lan07_byte3, byte3, ENC_LITTLE_ENDIAN, 0); } static void @@ -797,7 +797,7 @@ lan_10(tvbuff_t *tvb, proto_tree *tree) { static const int *byte1[] = { &hf_ipmi_trn_lan10_responses, &hf_ipmi_trn_lan10_gratuitous, NULL }; - proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_trn_lan10_byte1, byte1, TRUE, 0); + proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_trn_lan10_byte1, byte1, ENC_LITTLE_ENDIAN, 0); } static void @@ -841,7 +841,7 @@ lan_17(tvbuff_t *tvb, proto_tree *tree) { static const int *byte1[] = { &hf_ipmi_trn_lan17_num_dst, NULL }; - proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_trn_lan17_byte1, byte1, TRUE, 0); + proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_trn_lan17_byte1, byte1, ENC_LITTLE_ENDIAN, 0); } static void @@ -851,10 +851,10 @@ lan_18(tvbuff_t *tvb, proto_tree *tree) static const int *byte2[] = { &hf_ipmi_trn_lan18_ack, &hf_ipmi_trn_lan18_dst_type, NULL }; static const int *byte4[] = { &hf_ipmi_trn_lan18_retries, NULL }; - proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_trn_lan18_byte1, byte1, TRUE, 0); - proto_tree_add_bitmask_text(tree, tvb, 1, 1, NULL, NULL, ett_ipmi_trn_lan18_byte2, byte2, TRUE, 0); + proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_trn_lan18_byte1, byte1, ENC_LITTLE_ENDIAN, 0); + proto_tree_add_bitmask_text(tree, tvb, 1, 1, NULL, NULL, ett_ipmi_trn_lan18_byte2, byte2, ENC_LITTLE_ENDIAN, 0); proto_tree_add_item(tree, hf_ipmi_trn_lan18_tout, tvb, 2, 1, ENC_LITTLE_ENDIAN); - proto_tree_add_bitmask_text(tree, tvb, 1, 1, NULL, NULL, ett_ipmi_trn_lan18_byte4, byte4, TRUE, 0); + proto_tree_add_bitmask_text(tree, tvb, 1, 1, NULL, NULL, ett_ipmi_trn_lan18_byte4, byte4, ENC_LITTLE_ENDIAN, 0); } static void @@ -866,11 +866,11 @@ lan_19(tvbuff_t *tvb, proto_tree *tree) guint8 v; v = tvb_get_guint8(tvb, 1) >> 4; - proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_trn_lan19_byte1, byte1, TRUE, 0); - proto_tree_add_bitmask_text(tree, tvb, 1, 1, NULL, NULL, ett_ipmi_trn_lan19_byte2, byte2, TRUE, 0); + proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_trn_lan19_byte1, byte1, ENC_LITTLE_ENDIAN, 0); + proto_tree_add_bitmask_text(tree, tvb, 1, 1, NULL, NULL, ett_ipmi_trn_lan19_byte2, byte2, ENC_LITTLE_ENDIAN, 0); if (v == 0) { - proto_tree_add_bitmask_text(tree, tvb, 2, 1, NULL, NULL, ett_ipmi_trn_lan19_byte3, byte3, TRUE, 0); + proto_tree_add_bitmask_text(tree, tvb, 2, 1, NULL, NULL, ett_ipmi_trn_lan19_byte3, byte3, ENC_LITTLE_ENDIAN, 0); proto_tree_add_item(tree, hf_ipmi_trn_lan19_ip, tvb, 3, 4, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_ipmi_trn_lan19_mac, tvb, 7, 6, ENC_NA); return; @@ -884,7 +884,7 @@ lan_20(tvbuff_t *tvb, proto_tree *tree) { static const int *byte12[] = { &hf_ipmi_trn_lan20_vlan_id_enable, &hf_ipmi_trn_lan20_vlan_id, NULL }; - proto_tree_add_bitmask_text(tree, tvb, 0, 2, NULL, NULL, ett_ipmi_trn_lan20_byte12, byte12, TRUE, 0); + proto_tree_add_bitmask_text(tree, tvb, 0, 2, NULL, NULL, ett_ipmi_trn_lan20_byte12, byte12, ENC_LITTLE_ENDIAN, 0); } static void @@ -892,7 +892,7 @@ lan_21(tvbuff_t *tvb, proto_tree *tree) { static const int *byte1[] = { &hf_ipmi_trn_lan21_vlan_prio, NULL }; - proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_trn_lan21_byte1, byte1, TRUE, 0); + proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_trn_lan21_byte1, byte1, ENC_LITTLE_ENDIAN, 0); } static void @@ -900,7 +900,7 @@ lan_22(tvbuff_t *tvb, proto_tree *tree) { static const int *byte1[] = { &hf_ipmi_trn_lan22_num_cs_entries, NULL }; - proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_trn_lan22_byte1, byte1, TRUE, 0); + proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_trn_lan22_byte1, byte1, ENC_LITTLE_ENDIAN, 0); } static void @@ -954,14 +954,14 @@ lan_25(tvbuff_t *tvb, proto_tree *tree) guint8 v; v = tvb_get_guint8(tvb, 1) >> 4; - proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_trn_lan25_byte1, byte1, TRUE, 0); - proto_tree_add_bitmask_text(tree, tvb, 1, 1, NULL, NULL, ett_ipmi_trn_lan25_byte2, byte2, TRUE, 0); + proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_trn_lan25_byte1, byte1, ENC_LITTLE_ENDIAN, 0); + proto_tree_add_bitmask_text(tree, tvb, 1, 1, NULL, NULL, ett_ipmi_trn_lan25_byte2, byte2, ENC_LITTLE_ENDIAN, 0); switch (v) { case 0: break; case 1: proto_tree_add_bitmask_text(tree, tvb, 2, 2, NULL, NULL, ett_ipmi_trn_lan25_byte34, - byte34, TRUE, 0); + byte34, ENC_LITTLE_ENDIAN, 0); break; default: proto_tree_add_item(tree, hf_ipmi_trn_lan25_address, tvb, 2, tvb_length(tvb) - 2, ENC_LITTLE_ENDIAN); @@ -1021,7 +1021,7 @@ rq01(tvbuff_t *tvb, proto_tree *tree) } proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_trn_01_byte1, - byte1, TRUE, 0); + byte1, ENC_LITTLE_ENDIAN, 0); proto_tree_add_uint_format_value(tree, hf_ipmi_trn_01_param, tvb, 1, 1, pno, "%s (0x%02x)", desc, pno); if (pno < array_length(lan_options)) { @@ -1067,7 +1067,7 @@ rq02(tvbuff_t *tvb, proto_tree *tree) } proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, - ett_ipmi_trn_02_byte1, byte1, TRUE, 0); + ett_ipmi_trn_02_byte1, byte1, ENC_LITTLE_ENDIAN, 0); proto_tree_add_uint_format_value(tree, hf_ipmi_trn_02_param, tvb, 1, 1, pno, "%s (0x%02x)", desc, pno); proto_tree_add_item(tree, hf_ipmi_trn_02_set, tvb, 2, 1, ENC_LITTLE_ENDIAN); @@ -1084,7 +1084,7 @@ rs02(tvbuff_t *tvb, proto_tree *tree) guint32 pno, req; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, - ett_ipmi_trn_02_rev, byte1, TRUE, 0); + ett_ipmi_trn_02_rev, byte1, ENC_LITTLE_ENDIAN, 0); if (!ipmi_getsaveddata(0, &pno) || !ipmi_getsaveddata(1, &req)) { /* No request found - cannot parse further */ @@ -1136,9 +1136,9 @@ rq03(tvbuff_t *tvb, proto_tree *tree) static const int *byte2[] = { &hf_ipmi_trn_03_arp_resp, &hf_ipmi_trn_03_gratuitous_arp, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, - ett_ipmi_trn_03_rq_byte1, byte1, TRUE, 0); + ett_ipmi_trn_03_rq_byte1, byte1, ENC_LITTLE_ENDIAN, 0); proto_tree_add_bitmask_text(tree, tvb, 1, 1, NULL, NULL, - ett_ipmi_trn_03_rq_byte2, byte2, TRUE, 0); + ett_ipmi_trn_03_rq_byte2, byte2, ENC_LITTLE_ENDIAN, 0); } static void @@ -1148,7 +1148,7 @@ rs03(tvbuff_t *tvb, proto_tree *tree) &hf_ipmi_trn_03_status_gratuitous_arp, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, - ett_ipmi_trn_03_rs_byte1, byte1, TRUE, 0); + ett_ipmi_trn_03_rs_byte1, byte1, ENC_LITTLE_ENDIAN, 0); } static void @@ -1158,9 +1158,9 @@ rq04(tvbuff_t *tvb, proto_tree *tree) static const int *byte2[] = { &hf_ipmi_trn_04_clear, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, - ett_ipmi_trn_04_byte1, byte1, TRUE, 0); + ett_ipmi_trn_04_byte1, byte1, ENC_LITTLE_ENDIAN, 0); proto_tree_add_bitmask_text(tree, tvb, 1, 1, NULL, NULL, - ett_ipmi_trn_04_byte2, byte2, TRUE, 0); + ett_ipmi_trn_04_byte2, byte2, ENC_LITTLE_ENDIAN, 0); } static void @@ -1184,7 +1184,7 @@ serial_03(tvbuff_t *tvb, proto_tree *tree) &hf_ipmi_trn_serial03_ppp, &hf_ipmi_trn_serial03_basic, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, - ett_ipmi_trn_serial03_byte1, byte1, TRUE, 0); + ett_ipmi_trn_serial03_byte1, byte1, ENC_LITTLE_ENDIAN, 0); } static void @@ -1204,7 +1204,7 @@ serial_04(tvbuff_t *tvb, proto_tree *tree) static const gint *byte1[] = { &hf_ipmi_trn_serial04_timeout, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, - ett_ipmi_trn_serial04_byte1, byte1, TRUE, 0); + ett_ipmi_trn_serial04_byte1, byte1, ENC_LITTLE_ENDIAN, 0); } static void @@ -1216,9 +1216,9 @@ serial_05(tvbuff_t *tvb, proto_tree *tree) &hf_ipmi_trn_serial05_cb_prespec, &hf_ipmi_trn_serial05_no_cb, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, "Callback capabilities: ", "None", - ett_ipmi_trn_serial05_byte1, byte1, TRUE, BMT_NO_TFS); + ett_ipmi_trn_serial05_byte1, byte1, ENC_LITTLE_ENDIAN, BMT_NO_TFS); proto_tree_add_bitmask_text(tree, tvb, 1, 1, "CBCP negotiation options: ", "None", - ett_ipmi_trn_serial05_byte2, byte2, TRUE, BMT_NO_TFS); + ett_ipmi_trn_serial05_byte2, byte2, ENC_LITTLE_ENDIAN, BMT_NO_TFS); proto_tree_add_item(tree, hf_ipmi_trn_serial05_cb_dest1, tvb, 2, 1, ENC_LITTLE_ENDIAN); proto_tree_add_item(tree, hf_ipmi_trn_serial05_cb_dest2, tvb, 3, 1, ENC_LITTLE_ENDIAN); proto_tree_add_item(tree, hf_ipmi_trn_serial05_cb_dest3, tvb, 4, 1, ENC_LITTLE_ENDIAN); @@ -1231,7 +1231,7 @@ serial_06(tvbuff_t *tvb, proto_tree *tree) &hf_ipmi_trn_serial06_dcd, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, - ett_ipmi_trn_serial06_byte1, byte1, TRUE, 0); + ett_ipmi_trn_serial06_byte1, byte1, ENC_LITTLE_ENDIAN, 0); } static void @@ -1241,9 +1241,9 @@ serial_07(tvbuff_t *tvb, proto_tree *tree) static const gint *byte2[] = { &hf_ipmi_trn_serial07_bitrate, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, - ett_ipmi_trn_serial07_byte1, byte1, TRUE, 0); + ett_ipmi_trn_serial07_byte1, byte1, ENC_LITTLE_ENDIAN, 0); proto_tree_add_bitmask_text(tree, tvb, 1, 1, NULL, NULL, - ett_ipmi_trn_serial07_byte2, byte2, TRUE, 0); + ett_ipmi_trn_serial07_byte2, byte2, ENC_LITTLE_ENDIAN, 0); } static void @@ -1258,9 +1258,9 @@ serial_08(tvbuff_t *tvb, proto_tree *tree) &hf_ipmi_trn_serial08_ping_retry, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, "Switch/escape settings", NULL, - ett_ipmi_trn_serial08_byte1, byte1, TRUE, BMT_NO_APPEND); + ett_ipmi_trn_serial08_byte1, byte1, ENC_LITTLE_ENDIAN, BMT_NO_APPEND); proto_tree_add_bitmask_text(tree, tvb, 1, 1, "Sharing/ping settings", NULL, - ett_ipmi_trn_serial08_byte2, byte2, TRUE, BMT_NO_APPEND); + ett_ipmi_trn_serial08_byte2, byte2, ENC_LITTLE_ENDIAN, BMT_NO_APPEND); } static void @@ -1270,9 +1270,9 @@ serial_09(tvbuff_t *tvb, proto_tree *tree) static const gint *byte2[] = { &hf_ipmi_trn_serial09_ring_dead, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, - ett_ipmi_trn_serial09_byte1, byte1, TRUE, 0); + ett_ipmi_trn_serial09_byte1, byte1, ENC_LITTLE_ENDIAN, 0); proto_tree_add_bitmask_text(tree, tvb, 1, 1, NULL, NULL, - ett_ipmi_trn_serial09_byte2, byte2, TRUE, 0); + ett_ipmi_trn_serial09_byte2, byte2, ENC_LITTLE_ENDIAN, 0); } static void @@ -1318,7 +1318,7 @@ serial_16(tvbuff_t *tvb, proto_tree *tree) static const gint *byte1[] = { &hf_ipmi_trn_serial16_ndest, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, - ett_ipmi_trn_serial16_byte1, byte1, TRUE, 0); + ett_ipmi_trn_serial16_byte1, byte1, ENC_LITTLE_ENDIAN, 0); } static void @@ -1331,12 +1331,12 @@ serial_17(tvbuff_t *tvb, proto_tree *tree) guint8 v; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, - ett_ipmi_trn_serial17_byte1, byte1, TRUE, 0); + ett_ipmi_trn_serial17_byte1, byte1, ENC_LITTLE_ENDIAN, 0); proto_tree_add_bitmask_text(tree, tvb, 1, 1, NULL, NULL, - ett_ipmi_trn_serial17_byte2, byte2, TRUE, 0); + ett_ipmi_trn_serial17_byte2, byte2, ENC_LITTLE_ENDIAN, 0); proto_tree_add_item(tree, hf_ipmi_trn_serial17_alert_ack_timeout, tvb, 2, 1, ENC_LITTLE_ENDIAN); proto_tree_add_bitmask_text(tree, tvb, 3, 1, NULL, NULL, - ett_ipmi_trn_serial17_byte4, byte4, TRUE, 0); + ett_ipmi_trn_serial17_byte4, byte4, ENC_LITTLE_ENDIAN, 0); v = tvb_get_guint8(tvb, 1) & 0x0f; switch (v) { @@ -1357,7 +1357,7 @@ serial_17(tvbuff_t *tvb, proto_tree *tree) return; } proto_tree_add_bitmask_text(tree, tvb, 4, 1, NULL, NULL, - ett_ipmi_trn_serial17_byte5, byte5, TRUE, 0); + ett_ipmi_trn_serial17_byte5, byte5, ENC_LITTLE_ENDIAN, 0); } static void @@ -1375,11 +1375,11 @@ serial_19(tvbuff_t *tvb, proto_tree *tree) static const gint *byte3[] = { &hf_ipmi_trn_serial19_bitrate, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, - ett_ipmi_trn_serial19_byte1, byte1, TRUE, 0); + ett_ipmi_trn_serial19_byte1, byte1, ENC_LITTLE_ENDIAN, 0); proto_tree_add_bitmask_text(tree, tvb, 1, 1, NULL, NULL, - ett_ipmi_trn_serial19_byte2, byte2, TRUE, 0); + ett_ipmi_trn_serial19_byte2, byte2, ENC_LITTLE_ENDIAN, 0); proto_tree_add_bitmask_text(tree, tvb, 2, 1, NULL, NULL, - ett_ipmi_trn_serial19_byte3, byte3, TRUE, 0); + ett_ipmi_trn_serial19_byte3, byte3, ENC_LITTLE_ENDIAN, 0); } static void @@ -1388,7 +1388,7 @@ serial_20(tvbuff_t *tvb, proto_tree *tree) static const gint *byte1[] = { &hf_ipmi_trn_serial20_num_dial_strings, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, - ett_ipmi_trn_serial20_byte1, byte1, TRUE, 0); + ett_ipmi_trn_serial20_byte1, byte1, ENC_LITTLE_ENDIAN, 0); } static void @@ -1397,7 +1397,7 @@ serial_21(tvbuff_t *tvb, proto_tree *tree) static const gint *byte1[] = { &hf_ipmi_trn_serial21_dialsel, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, - ett_ipmi_trn_serial21_byte1, byte1, TRUE, 0); + ett_ipmi_trn_serial21_byte1, byte1, ENC_LITTLE_ENDIAN, 0); proto_tree_add_item(tree, hf_ipmi_trn_serial21_blockno, tvb, 1, 1, ENC_LITTLE_ENDIAN); proto_tree_add_item(tree, hf_ipmi_trn_serial21_dialstr, tvb, 2, 1, ENC_ASCII|ENC_NA); } @@ -1408,7 +1408,7 @@ serial_22(tvbuff_t *tvb, proto_tree *tree) static const gint *byte1[] = { &hf_ipmi_trn_serial22_num_ipaddrs, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, - ett_ipmi_trn_serial22_byte1, byte1, TRUE, 0); + ett_ipmi_trn_serial22_byte1, byte1, ENC_LITTLE_ENDIAN, 0); } static void @@ -1417,7 +1417,7 @@ serial_23(tvbuff_t *tvb, proto_tree *tree) static const gint *byte1[] = { &hf_ipmi_trn_serial23_destsel, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, - ett_ipmi_trn_serial23_byte1, byte1, TRUE, 0); + ett_ipmi_trn_serial23_byte1, byte1, ENC_LITTLE_ENDIAN, 0); proto_tree_add_item(tree, hf_ipmi_trn_serial23_ipaddr, tvb, 1, 4, ENC_BIG_ENDIAN); } @@ -1427,7 +1427,7 @@ serial_24(tvbuff_t *tvb, proto_tree *tree) static const gint *byte1[] = { &hf_ipmi_trn_serial24_num_tap_accounts, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, - ett_ipmi_trn_serial24_byte1, byte1, TRUE, 0); + ett_ipmi_trn_serial24_byte1, byte1, ENC_LITTLE_ENDIAN, 0); } static void @@ -1437,7 +1437,7 @@ serial_25(tvbuff_t *tvb, proto_tree *tree) proto_tree_add_item(tree, hf_ipmi_trn_serial25_tap_acct, tvb, 0, 1, ENC_LITTLE_ENDIAN); proto_tree_add_bitmask_text(tree, tvb, 1, 1, NULL, NULL, - ett_ipmi_trn_serial25_byte2, byte2, TRUE, 0); + ett_ipmi_trn_serial25_byte2, byte2, ENC_LITTLE_ENDIAN, 0); } static void @@ -1466,21 +1466,21 @@ serial_28(tvbuff_t *tvb, proto_tree *tree) static const gint *byte14[] = { &hf_ipmi_trn_serial28_n4, &hf_ipmi_trn_serial28_n3, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, - ett_ipmi_trn_serial28_byte1, byte1, TRUE, 0); + ett_ipmi_trn_serial28_byte1, byte1, ENC_LITTLE_ENDIAN, 0); proto_tree_add_bitmask_text(tree, tvb, 1, 1, NULL, NULL, - ett_ipmi_trn_serial28_byte2, byte2, TRUE, 0); + ett_ipmi_trn_serial28_byte2, byte2, ENC_LITTLE_ENDIAN, 0); proto_tree_add_item(tree, hf_ipmi_trn_serial28_srvtype, tvb, 2, 3, ENC_ASCII|ENC_NA); proto_tree_add_item(tree, hf_ipmi_trn_serial28_ctrl_esc, tvb, 5, 4, ENC_LITTLE_ENDIAN); proto_tree_add_bitmask_text(tree, tvb, 9, 1, NULL, NULL, - ett_ipmi_trn_serial28_byte10, byte10, TRUE, 0); + ett_ipmi_trn_serial28_byte10, byte10, ENC_LITTLE_ENDIAN, 0); proto_tree_add_bitmask_text(tree, tvb, 10, 1, NULL, NULL, - ett_ipmi_trn_serial28_byte11, byte11, TRUE, 0); + ett_ipmi_trn_serial28_byte11, byte11, ENC_LITTLE_ENDIAN, 0); proto_tree_add_bitmask_text(tree, tvb, 11, 1, NULL, NULL, - ett_ipmi_trn_serial28_byte12, byte12, TRUE, 0); + ett_ipmi_trn_serial28_byte12, byte12, ENC_LITTLE_ENDIAN, 0); proto_tree_add_bitmask_text(tree, tvb, 12, 1, NULL, NULL, - ett_ipmi_trn_serial28_byte13, byte13, TRUE, 0); + ett_ipmi_trn_serial28_byte13, byte13, ENC_LITTLE_ENDIAN, 0); proto_tree_add_bitmask_text(tree, tvb, 13, 1, NULL, NULL, - ett_ipmi_trn_serial28_byte14, byte14, TRUE, 0); + ett_ipmi_trn_serial28_byte14, byte14, ENC_LITTLE_ENDIAN, 0); } static void @@ -1491,9 +1491,9 @@ serial_29(tvbuff_t *tvb, proto_tree *tree) static const gint *byte2[] = { &hf_ipmi_trn_serial29_o_newline, &hf_ipmi_trn_serial29_i_newline, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, - ett_ipmi_trn_serial29_byte1, byte1, TRUE, 0); + ett_ipmi_trn_serial29_byte1, byte1, ENC_LITTLE_ENDIAN, 0); proto_tree_add_bitmask_text(tree, tvb, 1, 1, NULL, NULL, - ett_ipmi_trn_serial29_byte2, byte2, TRUE, 0); + ett_ipmi_trn_serial29_byte2, byte2, ENC_LITTLE_ENDIAN, 0); } static void @@ -1506,11 +1506,11 @@ serial_30(tvbuff_t *tvb, proto_tree *tree) &hf_ipmi_trn_serial30_addr_comp, &hf_ipmi_trn_serial30_proto_comp, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, - ett_ipmi_trn_serial30_byte1, byte1, TRUE, 0); + ett_ipmi_trn_serial30_byte1, byte1, ENC_LITTLE_ENDIAN, 0); proto_tree_add_bitmask_text(tree, tvb, 1, 1, NULL, NULL, - ett_ipmi_trn_serial30_byte2, byte2, TRUE, 0); + ett_ipmi_trn_serial30_byte2, byte2, ENC_LITTLE_ENDIAN, 0); proto_tree_add_bitmask_text(tree, tvb, 2, 1, NULL, NULL, - ett_ipmi_trn_serial30_byte3, byte3, TRUE, 0); + ett_ipmi_trn_serial30_byte3, byte3, ENC_LITTLE_ENDIAN, 0); } static void @@ -1531,7 +1531,7 @@ serial_33(tvbuff_t *tvb, proto_tree *tree) static const gint *byte1[] = { &hf_ipmi_trn_serial33_auth_proto, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, - ett_ipmi_trn_serial33_byte1, byte1, TRUE, 0); + ett_ipmi_trn_serial33_byte1, byte1, ENC_LITTLE_ENDIAN, 0); } static void @@ -1559,7 +1559,7 @@ serial_37(tvbuff_t *tvb, proto_tree *tree) static const gint *byte1[] = { &hf_ipmi_trn_serial37_num_ppp, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, - ett_ipmi_trn_serial37_byte1, byte1, TRUE, 0); + ett_ipmi_trn_serial37_byte1, byte1, ENC_LITTLE_ENDIAN, 0); } static void @@ -1622,7 +1622,7 @@ serial_43(tvbuff_t *tvb, proto_tree *tree) proto_tree_add_item(tree, hf_ipmi_trn_serial43_acct_sel, tvb, 0, 1, ENC_LITTLE_ENDIAN); proto_tree_add_bitmask_text(tree, tvb, 1, 1, NULL, NULL, - ett_ipmi_trn_serial43_byte1, byte1, TRUE, 0); + ett_ipmi_trn_serial43_byte1, byte1, ENC_LITTLE_ENDIAN, 0); } static void @@ -1677,7 +1677,7 @@ serial_50(tvbuff_t *tvb, proto_tree *tree) &hf_ipmi_trn_serial50_38400, &hf_ipmi_trn_serial50_19200, &hf_ipmi_trn_serial50_9600, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, "Bit rate support: ", "None", - ett_ipmi_trn_serial50_byte1, byte1, TRUE, 0); + ett_ipmi_trn_serial50_byte1, byte1, ENC_LITTLE_ENDIAN, 0); } static void @@ -1689,9 +1689,9 @@ serial_51(tvbuff_t *tvb, proto_tree *tree) proto_tree_add_item(tree, hf_ipmi_trn_serial51_port_assoc_sel, tvb, 0, 1, ENC_LITTLE_ENDIAN); proto_tree_add_bitmask_text(tree, tvb, 1, 1, NULL, NULL, - ett_ipmi_trn_serial51_byte2, byte2, TRUE, 0); + ett_ipmi_trn_serial51_byte2, byte2, ENC_LITTLE_ENDIAN, 0); proto_tree_add_bitmask_text(tree, tvb, 2, 1, NULL, NULL, - ett_ipmi_trn_serial51_byte3, byte3, TRUE, 0); + ett_ipmi_trn_serial51_byte3, byte3, ENC_LITTLE_ENDIAN, 0); } static void @@ -1788,7 +1788,7 @@ rq10(tvbuff_t *tvb, proto_tree *tree) } proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_trn_10_byte1, - byte1, TRUE, 0); + byte1, ENC_LITTLE_ENDIAN, 0); proto_tree_add_uint_format_value(tree, hf_ipmi_trn_10_param, tvb, 1, 1, pno, "%s (0x%02x)", desc, pno); if (pno < array_length(serial_options)) { @@ -1834,7 +1834,7 @@ rq11(tvbuff_t *tvb, proto_tree *tree) } proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, - ett_ipmi_trn_11_byte1, byte1, TRUE, 0); + ett_ipmi_trn_11_byte1, byte1, ENC_LITTLE_ENDIAN, 0); proto_tree_add_uint_format_value(tree, hf_ipmi_trn_11_param, tvb, 1, 1, pno, "%s (0x%02x)", desc, pno); proto_tree_add_item(tree, hf_ipmi_trn_11_set, tvb, 2, 1, ENC_LITTLE_ENDIAN); @@ -1851,7 +1851,7 @@ rs11(tvbuff_t *tvb, proto_tree *tree) guint32 pno, req; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, - ett_ipmi_trn_11_rev, byte1, TRUE, 0); + ett_ipmi_trn_11_rev, byte1, ENC_LITTLE_ENDIAN, 0); if (!ipmi_getsaveddata(0, &pno) || !ipmi_getsaveddata(1, &req)) { /* No request found - cannot parse further */ @@ -1905,9 +1905,9 @@ rq12(tvbuff_t *tvb, proto_tree *tree) static const gint *byte2[] = { &hf_ipmi_trn_12_mux_setting, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, - ett_ipmi_trn_12_rq_byte1, byte1, TRUE, 0); + ett_ipmi_trn_12_rq_byte1, byte1, ENC_LITTLE_ENDIAN, 0); proto_tree_add_bitmask_text(tree, tvb, 1, 1, NULL, NULL, - ett_ipmi_trn_12_rq_byte2, byte2, TRUE, 0); + ett_ipmi_trn_12_rq_byte2, byte2, ENC_LITTLE_ENDIAN, 0); } static void @@ -1917,7 +1917,7 @@ rs12(tvbuff_t *tvb, proto_tree *tree) &hf_ipmi_trn_12_alert, &hf_ipmi_trn_12_msg, &hf_ipmi_trn_12_req, &hf_ipmi_trn_12_mux_state, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, - ett_ipmi_trn_12_rs_byte1, byte1, TRUE, 0); + ett_ipmi_trn_12_rs_byte1, byte1, ENC_LITTLE_ENDIAN, 0); } /* Get TAP Response Codes @@ -1928,7 +1928,7 @@ rq13(tvbuff_t *tvb, proto_tree *tree) static const gint *byte1[] = { &hf_ipmi_trn_13_chan, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, - ett_ipmi_trn_13_byte1, byte1, TRUE, 0); + ett_ipmi_trn_13_byte1, byte1, ENC_LITTLE_ENDIAN, 0); } static void @@ -1949,7 +1949,7 @@ rq14(tvbuff_t *tvb, proto_tree *tree) static const gint *byte1[] = { &hf_ipmi_trn_14_chan, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, - ett_ipmi_trn_14_byte1, byte1, TRUE, 0); + ett_ipmi_trn_14_byte1, byte1, ENC_LITTLE_ENDIAN, 0); proto_tree_add_item(tree, hf_ipmi_trn_14_block, tvb, 1, 1, ENC_LITTLE_ENDIAN); proto_tree_add_item(tree, hf_ipmi_trn_14_data, tvb, 2, 16, ENC_NA); } @@ -1962,7 +1962,7 @@ rq15(tvbuff_t *tvb, proto_tree *tree) static const gint *byte1[] = { &hf_ipmi_trn_15_chan, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, - ett_ipmi_trn_15_byte1, byte1, TRUE, 0); + ett_ipmi_trn_15_byte1, byte1, ENC_LITTLE_ENDIAN, 0); proto_tree_add_item(tree, hf_ipmi_trn_15_block, tvb, 1, 1, ENC_LITTLE_ENDIAN); } @@ -1980,7 +1980,7 @@ rq16(tvbuff_t *tvb, proto_tree *tree) static const gint *byte1[] = { &hf_ipmi_trn_16_chan, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, - ett_ipmi_trn_16_byte1, byte1, TRUE, 0); + ett_ipmi_trn_16_byte1, byte1, ENC_LITTLE_ENDIAN, 0); proto_tree_add_item(tree, hf_ipmi_trn_16_src_port, tvb, 1, 2, ENC_LITTLE_ENDIAN); proto_tree_add_item(tree, hf_ipmi_trn_16_dst_port, tvb, 3, 2, ENC_LITTLE_ENDIAN); proto_tree_add_item(tree, hf_ipmi_trn_16_src_addr, tvb, 5, 4, ENC_BIG_ENDIAN); @@ -2016,9 +2016,9 @@ rq17(tvbuff_t *tvb, proto_tree *tree) } proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, - ett_ipmi_trn_17_byte1, byte1, TRUE, 0); + ett_ipmi_trn_17_byte1, byte1, ENC_LITTLE_ENDIAN, 0); proto_tree_add_bitmask_text(tree, tvb, 1, 1, NULL, NULL, - ett_ipmi_trn_17_byte2, byte2, TRUE, 0); + ett_ipmi_trn_17_byte2, byte2, ENC_LITTLE_ENDIAN, 0); } static void @@ -2048,7 +2048,7 @@ rq18(tvbuff_t *tvb, proto_tree *tree) static const gint *byte1[] = { &hf_ipmi_trn_18_state, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, - ett_ipmi_trn_18_byte1, byte1, TRUE, 0); + ett_ipmi_trn_18_byte1, byte1, ENC_LITTLE_ENDIAN, 0); proto_tree_add_item(tree, hf_ipmi_trn_18_ipmi_ver, tvb, 1, 1, ENC_LITTLE_ENDIAN); } @@ -2061,9 +2061,9 @@ rq19(tvbuff_t *tvb, proto_tree *tree) static const gint *byte2[] = { &hf_ipmi_trn_19_dest_sel, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, - ett_ipmi_trn_19_byte1, byte1, TRUE, 0); + ett_ipmi_trn_19_byte1, byte1, ENC_LITTLE_ENDIAN, 0); proto_tree_add_bitmask_text(tree, tvb, 1, 1, NULL, NULL, - ett_ipmi_trn_19_byte2, byte2, TRUE, 0); + ett_ipmi_trn_19_byte2, byte2, ENC_LITTLE_ENDIAN, 0); } static const value_string cc19[] = { @@ -2083,10 +2083,10 @@ parse_callback_options(tvbuff_t *tvb, guint offs, proto_tree *tree) proto_tree_add_bitmask_text(tree, tvb, offs, 1, "User callback capabilities: ", "None", - ett_ipmi_trn_XX_usercap, usercap, TRUE, BMT_NO_TFS); + ett_ipmi_trn_XX_usercap, usercap, ENC_LITTLE_ENDIAN, BMT_NO_TFS); proto_tree_add_bitmask_text(tree, tvb, offs + 1, 1, "CBCP negotiation options: ", "None", - ett_ipmi_trn_XX_cbcp, cbcp, TRUE, BMT_NO_TFS); + ett_ipmi_trn_XX_cbcp, cbcp, ENC_LITTLE_ENDIAN, BMT_NO_TFS); proto_tree_add_item(tree, hf_ipmi_trn_XX_dst1, tvb, offs + 2, 1, ENC_LITTLE_ENDIAN); proto_tree_add_item(tree, hf_ipmi_trn_XX_dst2, tvb, offs + 3, 1, ENC_LITTLE_ENDIAN); proto_tree_add_item(tree, hf_ipmi_trn_XX_dst3, tvb, offs + 4, 1, ENC_LITTLE_ENDIAN); @@ -2101,9 +2101,9 @@ rq1a(tvbuff_t *tvb, proto_tree *tree) static const gint *byte2[] = { &hf_ipmi_trn_1a_chan, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, - ett_ipmi_trn_1a_byte1, byte1, TRUE, 0); + ett_ipmi_trn_1a_byte1, byte1, ENC_LITTLE_ENDIAN, 0); proto_tree_add_bitmask_text(tree, tvb, 1, 1, NULL, NULL, - ett_ipmi_trn_1a_byte2, byte2, TRUE, 0); + ett_ipmi_trn_1a_byte2, byte2, ENC_LITTLE_ENDIAN, 0); parse_callback_options(tvb, 2, tree); } @@ -2116,9 +2116,9 @@ rq1b(tvbuff_t *tvb, proto_tree *tree) static const gint *byte2[] = { &hf_ipmi_trn_1b_chan, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, - ett_ipmi_trn_1b_byte1, byte1, TRUE, 0); + ett_ipmi_trn_1b_byte1, byte1, ENC_LITTLE_ENDIAN, 0); proto_tree_add_bitmask_text(tree, tvb, 1, 1, NULL, NULL, - ett_ipmi_trn_1b_byte2, byte2, TRUE, 0); + ett_ipmi_trn_1b_byte2, byte2, ENC_LITTLE_ENDIAN, 0); } static void -- cgit v1.2.3