diff options
| author | Michael Mann <mmann78@netscape.net> | 2014-06-29 09:13:51 -0400 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2014-06-29 14:52:33 +0000 |
| commit | e8a8d62dc33099ee2e0d9d405b48e74097f7688d (patch) | |
| tree | 0d79d9841b29f735cdf0005da3a6c747591586ea /epan/dissectors/packet-ipmi-session.c | |
| parent | fe4b7ee625c046bc09a7d8ae55afb0e16cb17fc3 (diff) | |
proto_tree_add_subtree[_format]
Change-Id: I7e016f10fcfdc0523bf2fe8c11295c0334f7c332
Reviewed-on: https://code.wireshark.org/review/2694
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-ipmi-session.c')
| -rw-r--r-- | epan/dissectors/packet-ipmi-session.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-ipmi-session.c b/epan/dissectors/packet-ipmi-session.c index c04db04a9f..b3d24690ad 100644 --- a/epan/dissectors/packet-ipmi-session.c +++ b/epan/dissectors/packet-ipmi-session.c @@ -113,7 +113,7 @@ static int dissect_ipmi_session(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { proto_tree *sess_tree = NULL, *s_tree; - proto_item *ti = NULL; + proto_item *ti; tvbuff_t *next_tvb; guint32 session_id; guint8 authtype, payloadtype = 0; @@ -183,13 +183,13 @@ dissect_ipmi_session(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void * if (authtype == IPMI_AUTH_RMCPP) { /* IPMI v2.0+ */ - ti = proto_tree_add_text(sess_tree, tvb, offset, 1, + s_tree = proto_tree_add_subtree_format(sess_tree, tvb, offset, 1, + ett_ipmi_session_payloadtype, NULL, "Payload type: %s (0x%02x), %sencrypted, %sauthenticated", val_to_str_const(payloadtype, ipmi_payload_vals, "Unknown"), payloadtype, payloadtype_enc ? "" : "not ", payloadtype_auth ? "" : "not "); - s_tree = proto_item_add_subtree(ti, ett_ipmi_session_payloadtype); proto_tree_add_item(s_tree, hf_ipmi_session_payloadtype_enc, tvb, offset, 1, ENC_LITTLE_ENDIAN); proto_tree_add_item(s_tree, hf_ipmi_session_payloadtype_auth, tvb, offset, 1, ENC_LITTLE_ENDIAN); proto_tree_add_item(s_tree, hf_ipmi_session_payloadtype, tvb, offset, 1, ENC_LITTLE_ENDIAN); |