diff options
| author | jake <jake@f5534014-38df-0310-8fa8-9805f1628bb7> | 2006-02-28 18:22:46 +0000 |
|---|---|---|
| committer | jake <jake@f5534014-38df-0310-8fa8-9805f1628bb7> | 2006-02-28 18:22:46 +0000 |
| commit | a70d54a2836a36bb008d869b72a63d335bb6a477 (patch) | |
| tree | 179170ee013f49c1924440a00cce0264cd6cf350 /epan/dissectors/packet-ipmi.c | |
| parent | 184f0fad7aca941da6706c42cd6efb0b7330b15d (diff) | |
Fix for bug 762: implementing Off/On duration presentation in 10ms units
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@17430 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-ipmi.c')
| -rw-r--r-- | epan/dissectors/packet-ipmi.c | 37 |
1 files changed, 26 insertions, 11 deletions
diff --git a/epan/dissectors/packet-ipmi.c b/epan/dissectors/packet-ipmi.c index 5431084e15..8e83439246 100644 --- a/epan/dissectors/packet-ipmi.c +++ b/epan/dissectors/packet-ipmi.c @@ -2916,14 +2916,19 @@ dissect_cmd_Set_FRU_Led_State(proto_tree *tree, proto_tree *ipmi_tree, packet_in proto_tree_add_item(ipmi_tree, hf_SetFRULedState_datafield_LEDFunction, tvb, (*poffset)++, 1, TRUE); } else { - proto_tree_add_item(ipmi_tree, hf_SetFRULedState_datafield_Offduration, - tvb, (*poffset)++, 1, TRUE); + proto_tree_add_item_hidden(ipmi_tree, hf_SetFRULedState_datafield_Offduration, + tvb, *poffset, 1, TRUE); + proto_tree_add_text(ipmi_tree, tvb, (*poffset)++, 1, + "Off-duration: %u ms (0x%02x)", LEDFunction * 10, LEDFunction); } } /*On-duration */ if (tree) { - proto_tree_add_item(ipmi_tree, hf_SetFRULedState_datafield_Onduration, - tvb, (*poffset)++, 1, TRUE); + guint8 duration = tvb_get_guint8(tvb, *poffset); + proto_tree_add_item_hidden(ipmi_tree, hf_SetFRULedState_datafield_Onduration, + tvb, *poffset, 1, TRUE); + proto_tree_add_text(ipmi_tree, tvb, (*poffset)++, 1, + "On-duration: %u ms (0x%02x)", duration * 10, duration); } /* Color when illuminated */ if (tree) { @@ -2990,14 +2995,19 @@ dissect_cmd_Get_FRU_Led_State(proto_tree *tree, proto_tree *ipmi_tree, packet_in proto_tree_add_item(ipmi_tree, hf_GetFRULedState_datafield_LocalControlLEDFunction, tvb, (*poffset)++, 1, TRUE); } else { - proto_tree_add_item(ipmi_tree, hf_GetFRULedState_datafield_LocalControlOffduration, - tvb, (*poffset)++, 1, TRUE); + proto_tree_add_item_hidden(ipmi_tree, hf_GetFRULedState_datafield_LocalControlOffduration, + tvb, *poffset, 1, TRUE); + proto_tree_add_text(ipmi_tree, tvb, (*poffset)++, 1, + "Local Control Off-duration: %u ms (0x%02x)", LEDFunction * 10, LEDFunction); } } /* Local Control On-duration */ if (tree) { - proto_tree_add_item(ipmi_tree, hf_GetFRULedState_datafield_LocalControlOnduration, - tvb, (*poffset)++, 1, TRUE); + guint8 duration = tvb_get_guint8(tvb, *poffset); + proto_tree_add_item_hidden(ipmi_tree, hf_GetFRULedState_datafield_LocalControlOnduration, + tvb, *poffset, 1, TRUE); + proto_tree_add_text(ipmi_tree, tvb, (*poffset)++, 1, + "Local Control On-duration: %u ms (0x%02x)", duration * 10, duration); } /* Local Control Color */ if (tree) { @@ -3023,14 +3033,19 @@ dissect_cmd_Get_FRU_Led_State(proto_tree *tree, proto_tree *ipmi_tree, packet_in proto_tree_add_item(ipmi_tree, hf_GetFRULedState_datafield_OverrideStateLEDFunction, tvb, (*poffset)++, 1, TRUE); } else { - proto_tree_add_item(ipmi_tree, hf_GetFRULedState_datafield_OverrideStateOffduration, - tvb, (*poffset)++, 1, TRUE); + proto_tree_add_item_hidden(ipmi_tree, hf_GetFRULedState_datafield_OverrideStateOffduration, + tvb, *poffset, 1, TRUE); + proto_tree_add_text(ipmi_tree, tvb, (*poffset)++, 1, + "Override State Off-duration: %u ms (0x%02x)", LEDFunction * 10, LEDFunction); } } /* Override State On-duration */ if (tree) { - proto_tree_add_item(ipmi_tree, hf_GetFRULedState_datafield_OverrideStateOnduration, + guint8 duration = tvb_get_guint8(tvb, *poffset); + proto_tree_add_item_hidden(ipmi_tree, hf_GetFRULedState_datafield_OverrideStateOnduration, tvb, (*poffset)++, 1, TRUE); + proto_tree_add_text(ipmi_tree, tvb, (*poffset)++, 1, + "Override State On-duration: %u ms (0x%02x)", duration * 10, duration); } /* Override State Color */ if (tree) { |