git.samba.org / metze / wireshark / wip.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
proto_tree_add_subtree[_format]
[metze/wireshark/wip.git] / epan / dissectors / packet-ipmi-session.c
diff --git a/epan/dissectors/packet-ipmi-session.c b/epan/dissectors/packet-ipmi-session.c
index f471be97a234724a51afcc8edd6b27b6c20da61d..b3d24690ad30976716fa7b4707008387c72f2e85 100644 (file)
--- a/epan/dissectors/packet-ipmi-session.c
+++ b/epan/dissectors/packet-ipmi-session.c
@@ -3,8 +3,6 @@
  * Copyright 2007-2008, Alexey Neyman, Pigeon Point Systems <avn@pigeonpoint.com>
  * Copyright Duncan Laurie <duncan@sun.com>
  *
- * $Id$
- *
  * Wireshark - Network traffic analyzer
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
@@ -31,6 +29,9 @@
 #include <glib.h>
 #include <epan/packet.h>
 
+void proto_register_ipmi_session(void);
+void proto_reg_handoff_ipmi_session(void);
+
 #define RMCP_CLASS_IPMI 0x07
 
 static int proto_ipmi_session = -1;
@@ -76,43 +77,43 @@ static const value_string ipmi_authtype_vals[] = {
 #define IPMI_OEM_EXPLICIT      2
 
 static const value_string ipmi_payload_vals[] = {
-       { IPMI_IPMI_MESSAGE,    "IPMI Message" },
-       { 0x01, "SOL (serial over LAN)" },
-       { IPMI_OEM_EXPLICIT,    "OEM Explicit" },
+       { IPMI_IPMI_MESSAGE, "IPMI Message" },
+       { 0x01,              "SOL (serial over LAN)" },
+       { IPMI_OEM_EXPLICIT, "OEM Explicit" },
        /* Session Setup Payload Types */
-       { 0x10, "RMCP+ Open Session Request" },
-       { 0x11, "RMCP+ Open Session Response" },
-       { 0x12, "RAKP Message 1" },
-       { 0x13, "RAKP Message 2" },
-       { 0x14, "RAKP Message 3" },
-       { 0x15, "RAKP Message 4" },
+       { 0x10,              "RMCP+ Open Session Request" },
+       { 0x11,              "RMCP+ Open Session Response" },
+       { 0x12,              "RAKP Message 1" },
+       { 0x13,              "RAKP Message 2" },
+       { 0x14,              "RAKP Message 3" },
+       { 0x15,              "RAKP Message 4" },
        /* OEM Payload Type Handles */
-       { 0x20, "OEM0 (OEM Payload)" },
-       { 0x21, "OEM1 (OEM Payload)" },
-       { 0x22, "OEM2 (OEM Payload)" },
-       { 0x23, "OEM3 (OEM Payload)" },
-       { 0x24, "OEM4 (OEM Payload)" },
-       { 0x25, "OEM5 (OEM Payload)" },
-       { 0x26, "OEM6 (OEM Payload)" },
-       { 0x27, "OEM7 (OEM Payload)" },
+       { 0x20,              "OEM0 (OEM Payload)" },
+       { 0x21,              "OEM1 (OEM Payload)" },
+       { 0x22,              "OEM2 (OEM Payload)" },
+       { 0x23,              "OEM3 (OEM Payload)" },
+       { 0x24,              "OEM4 (OEM Payload)" },
+       { 0x25,              "OEM5 (OEM Payload)" },
+       { 0x26,              "OEM6 (OEM Payload)" },
+       { 0x27,              "OEM7 (OEM Payload)" },
        { 0x00, NULL }
 };
 
 static const true_false_string ipmi_payload_aut_val  = {
-  "Payload is authenticated",
-  "Payload is unauthenticated"
+       "Payload is authenticated",
+       "Payload is unauthenticated"
 };
 
 static const true_false_string ipmi_payload_enc_val  = {
-  "Payload is encrypted",
-  "Payload is unencrypted"
+       "Payload is encrypted",
+       "Payload is unencrypted"
 };
 
 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;
@@ -157,26 +158,22 @@ dissect_ipmi_session(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *
        }
 
        /* Later it will be overridden with sub-dissector, if any */
-       if (check_col(pinfo->cinfo, COL_PROTOCOL)) {
-               if (authtype == IPMI_AUTH_RMCPP) {
-                       col_set_str(pinfo->cinfo, COL_PROTOCOL, "RMCP+");
-               } else {
-                       col_set_str(pinfo->cinfo, COL_PROTOCOL, "IPMI");
-               }
+       if (authtype == IPMI_AUTH_RMCPP) {
+               col_set_str(pinfo->cinfo, COL_PROTOCOL, "RMCP+");
+       } else {
+               col_set_str(pinfo->cinfo, COL_PROTOCOL, "IPMI");
        }
 
-       if (check_col(pinfo->cinfo, COL_INFO)) {
-               col_add_fstr(pinfo->cinfo, COL_INFO, "Session ID 0x%x", session_id);
-               if (authtype == IPMI_AUTH_RMCPP) {
-                       col_append_fstr(pinfo->cinfo, COL_INFO, ", payload type: %s",
-                                       val_to_str_const(payloadtype, ipmi_payload_vals, "Unknown"));
-               }
+       col_add_fstr(pinfo->cinfo, COL_INFO, "Session ID 0x%x", session_id);
+       if (authtype == IPMI_AUTH_RMCPP) {
+               col_append_fstr(pinfo->cinfo, COL_INFO, ", payload type: %s",
+                               val_to_str_const(payloadtype, ipmi_payload_vals, "Unknown"));
        }
 
        if (tree) {
                offset = 0;
                ti = proto_tree_add_protocol_format(tree, proto_ipmi_session,
-                               tvb, 0, tvb_length(tvb),
+                               tvb, 0, -1,
                                "IPMI v%s Session Wrapper, session ID 0x%x",
                                authtype == IPMI_AUTH_RMCPP ? "2.0+" : "1.5",
                                session_id);
@@ -186,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);
@@ -254,12 +251,12 @@ dissect_ipmi_session(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *
                offset += msg_len;
 
                /* Show the rest of the session wrapper as binary data */
-               if (offset < tvb_length(tvb)) {
+               if (offset < tvb_captured_length(tvb)) {
                        proto_tree_add_item(sess_tree, hf_ipmi_session_trailer,
-                                       tvb, offset, tvb_length(tvb) - offset, ENC_NA);
+                                       tvb, offset, -1, ENC_NA);
                }
        }
-       return tvb_length(tvb);
+       return tvb_captured_length(tvb);
 }
 
 void
@@ -324,3 +321,16 @@ proto_reg_handoff_ipmi_session(void)
        data_handle = find_dissector("data");
        ipmi_handle = find_dissector("ipmi");
 }
+
+/*
+ * Editor modelines  -  http://www.wireshark.org/tools/modelines.html
+ *
+ * Local variables:
+ * c-basic-offset: 8
+ * tab-width: 8
+ * indent-tabs-mode: t
+ * End:
+ *
+ * vi: set shiftwidth=8 tabstop=8 noexpandtab:
+ * :indentSize=8:tabSize=8:noTabs=false:
+ */
Unnamed repository; edit this file to name it for gitweb.