add some IRemUnknown dissectors

svn path=/trunk/; revision=12782

1 files changed, 289 insertions, 29 deletions

diff --git a/epan/dissectors/packet-dcom-remunkn.c b/epan/dissectors/packet-dcom-remunkn.c
index 3b038b936a..8eb07ed37e 100644
--- a/epan/dissectors/packet-dcom-remunkn.c
+++ b/epan/dissectors/packet-dcom-remunkn.c
@@ -1,4 +1,4 @@
-/* packet-dcerpc-iremunkn.c
+/* packet-dcom-remunkn.c
  * Routines for the IRemUnknown interface
  * Copyright 2004, Jelmer Vernooij <jelmer@samba.org>
  *
@@ -23,6 +23,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
+/* see packet-dcom.c for details about DCOM */
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -32,47 +34,305 @@
 #include <glib.h>
 #include <epan/packet.h>
 #include "packet-dcerpc.h"
-#include "packet-dcerpc-dcom.h"
-#include "packet-smb-common.h"
+#include "packet-dcom.h"
+
+
+static int hf_remunk_opnum = -1;
+
+static int hf_remunk_ipid = -1;
+static int hf_remunk_refs = -1;
+static int hf_remunk_iids = -1;
+static int hf_remunk_iid = -1;
+
+static int hf_remunk_flags = -1;
+static int hf_remunk_oxid = -1;
+static int hf_remunk_oid = -1;
+static int hf_remunk_qiresult = -1;
+
+static gint ett_remunk_reminterfaceref = -1;
+static int hf_remunk_reminterfaceref = -1;
+static int hf_remunk_interface_refs = -1;
+static int hf_remunk_public_refs = -1;
+static int hf_remunk_private_refs = -1;
+
+
+static gint ett_remunk_rqi_result = -1;
+
+
+static gint ett_remunk = -1;
+static e_uuid_t uuid_remunk = { 0x00000131, 0x0000, 0x0000, { 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46 } };
+static guint16  ver_remunk = 0;
+static int proto_remunk = -1;
+
+/* There is a little bit confusion about the IRemUnknown2 interface UUIDs */
+/* DCOM documentation tells us: 0x00000142 (7 methods) */
+/* win2000 registry tells us: 0x00000142 IRemoteQI (4 methods) */
+/* win2000 registry tells us: 0x00000143 IRemUnknown2 (7 methods) */
+/* who do we want to trust? */
+
+static gint ett_remunk2 = -1;
+static e_uuid_t uuid_remunk2 = { 0x00000142, 0x0000, 0x0000, { 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46 } };
+static guint16  ver_remunk2 = 0;
+static int proto_remunk2 = -1;
+
+
+
+static int
+dissect_remunk_remqueryinterface_rqst(tvbuff_t *tvb, int offset,
+	packet_info *pinfo, proto_tree *tree, guint8 *drep)
+{
+	e_uuid_t ipid;
+	guint32	u32Refs;
+	guint16	u16IIDs;
+	guint32	u32ArraySize;
+	guint32	u32ItemIdx;
+
+
+	offset = dissect_dcom_UUID(tvb, offset, pinfo, tree, drep, 
+                        hf_remunk_ipid, &ipid);
+
+	offset = dissect_dcom_DWORD(tvb, offset, pinfo, tree, drep, 
+                        hf_remunk_refs, &u32Refs);
+
+	offset = dissect_dcom_WORD(tvb, offset, pinfo, tree, drep, 
+                        hf_remunk_iids, &u16IIDs);
+
+	offset = dissect_dcom_dcerpc_array_size(tvb, offset, pinfo, tree, drep, 
+						&u32ArraySize);
+
+	u32ItemIdx = 1;
+	while (u32ArraySize--) {
+		offset = dissect_dcom_append_UUID(tvb, offset, 	pinfo, tree, drep,
+			hf_remunk_iid, "IID", u32ItemIdx);
+	}
+
+	return offset;
+}
+
+
+static int
+dissect_remunk_remqueryinterface_resp(tvbuff_t *tvb, int offset,
+	packet_info *pinfo, proto_tree *tree, guint8 *drep)
+{
+	guint32	u32Pointer;
+	guint32	u32ArraySize;
+	guint32	u32ItemIdx;
+	proto_item *sub_item;
+	proto_tree *sub_tree;
+	guint32	u32HResult;
+	guint32	u32SubStart;
+
+
+	offset = dissect_dcom_dcerpc_pointer(tvb, offset, pinfo, tree, drep, 
+						&u32Pointer);
+	offset = dissect_dcom_dcerpc_array_size(tvb, offset, pinfo, tree, drep, 
+						&u32ArraySize);
+
+	u32ItemIdx = 1;
+	while (u32ArraySize--) {
+        /* add subtree */
+		sub_item = proto_tree_add_item(tree, hf_remunk_qiresult, tvb, offset, 0, FALSE);
+		sub_tree = proto_item_add_subtree(sub_item, ett_remunk_rqi_result);
+
+		/* REMQIRESULT */
+		offset = dissect_dcom_HRESULT(tvb, offset, pinfo, sub_tree, drep, 
+							&u32HResult);
+		u32SubStart = offset - 4;
+		offset = dissect_dcom_dcerpc_pointer(tvb, offset, pinfo, sub_tree, drep, 
+							&u32Pointer);
+		if (u32Pointer) {
+			offset = dissect_dcom_STDOBJREF(tvb, offset, pinfo, sub_tree, drep, 0 /* hfindex */);
+		}
 
-static int proto_IRemUnknown = -1;
+		/* update subtree */
+		proto_item_append_text(sub_item, "[%u]: %s", 
+			u32ItemIdx,
+			val_to_str(u32HResult, dcom_hresult_vals, "Unknown (0x%08x)") );
+		proto_item_set_len(sub_item, offset - u32SubStart);
 
-static int hf_opnum = -1;
+		/* update column info now */
+		if (check_col(pinfo->cinfo, COL_INFO)) {
+		  col_append_fstr(pinfo->cinfo, COL_INFO, " %s[%u]", 
+			  val_to_str(u32HResult, dcom_hresult_vals, "Unknown (0x%08x)"),
+			  u32ItemIdx);
+		}
 
-static gint ett_IRemUnknown = -1;
+		u32ItemIdx++;
+	}
+		
+	/* HRESULT of call */
+	offset = dissect_dcom_HRESULT(tvb, offset, pinfo, tree, drep, 
+                        &u32HResult);
 
-static e_uuid_t uuid_IRemUnknown = { 0x00000131, 0x0000, 0x0000, { 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46 } };
-static guint16  ver_IRemUnknown = 0;
+	/* update column info now */
+    if (check_col(pinfo->cinfo, COL_INFO)) {
+      col_append_fstr(pinfo->cinfo, COL_INFO, " -> %s", 
+		  val_to_str(u32HResult, dcom_hresult_vals, "Unknown (0x%08x)"));
+	}
 
-static dcerpc_sub_dissector IRemUnknown_dissectors[] = {
-	{ 0, "QueryInterface", NULL, NULL },
-	{ 1, "AddRef", NULL, NULL },
-	{ 2, "Release", NULL, NULL },
-    { 3, "RemQueryInterface", NULL, NULL },
-    { 4, "RemAddRef", NULL, NULL },
-    { 5, "RemRelease", NULL, NULL },
-    { 0, NULL, NULL, NULL },
+	return offset;
+}
+
+
+static int
+dissect_remunk_remrelease_rqst(tvbuff_t *tvb, int offset,
+	packet_info *pinfo, proto_tree *tree, guint8 *drep)
+{
+	guint32 u32Pointer;
+	guint32	u32IntRefs;
+	guint32	u32ItemIdx;
+	e_uuid_t ipid;
+	guint32	u32PublicRefs;
+	guint32	u32PrivateRefs;
+	gchar *pszFormat;
+	proto_item *sub_item;
+	proto_tree *sub_tree;
+	guint32	u32SubStart;
+
+
+	offset = dissect_dcom_dcerpc_pointer(tvb, offset, pinfo, tree, drep, 
+						&u32Pointer);
+
+	offset = dissect_dcom_DWORD(tvb, offset, pinfo, tree, drep, 
+                        hf_remunk_interface_refs, &u32IntRefs);
+
+	/* update column info now */
+    if (check_col(pinfo->cinfo, COL_INFO)) {
+		if (u32IntRefs) {
+			col_append_fstr(pinfo->cinfo, COL_INFO, " Cnt=%u Refs=", u32IntRefs);
+		} else {
+			col_append_fstr(pinfo->cinfo, COL_INFO, " Cnt=0");
+		}
+	}
+
+	u32ItemIdx = 1;
+	while (u32IntRefs--) {
+        /* add subtree */
+		sub_item = proto_tree_add_item(tree, hf_remunk_reminterfaceref, tvb, offset, 0, FALSE);
+		sub_tree = proto_item_add_subtree(sub_item, ett_remunk_reminterfaceref);
+		u32SubStart = offset;
+
+		offset = dissect_dcom_UUID(tvb, offset, pinfo, sub_tree, drep, 
+							hf_remunk_ipid, &ipid);
+
+		offset = dissect_dcom_DWORD(tvb, offset, pinfo, sub_tree, drep, 
+							hf_remunk_public_refs, &u32PublicRefs);
+
+		offset = dissect_dcom_DWORD(tvb, offset, pinfo, sub_tree, drep, 
+							hf_remunk_private_refs, &u32PrivateRefs);
+
+		/* update subtree */
+		proto_item_append_text(sub_item, "[%u]: IPID=%s, PublicRefs=%u, PrivateRefs=%u", 
+			u32ItemIdx,
+			dcom_uuid_to_str(&ipid),
+			u32PublicRefs, u32PrivateRefs);
+		proto_item_set_len(sub_item, offset - u32SubStart);
+
+		/* update column info now */
+		if (check_col(pinfo->cinfo, COL_INFO)) {
+			pszFormat = "";
+			if (u32ItemIdx == 1) {
+				pszFormat = "%u-%u";
+			} else if (u32ItemIdx < 10) {
+				pszFormat = ",%u-%u";
+			} else if (u32ItemIdx == 10) {
+				pszFormat = ",...";
+			}
+			col_append_fstr(pinfo->cinfo, COL_INFO, pszFormat, u32PublicRefs, u32PrivateRefs);
+		}
+
+		u32ItemIdx++;
+	}
+
+	return offset;
+}
+
+
+/* sub dissector table of IRemUnknown interface */
+static dcerpc_sub_dissector remunk_dissectors[] = {
+    { 0, "QueryInterface", NULL, NULL },
+    { 1, "AddRef", NULL, NULL },
+    { 2, "Release", NULL, NULL },
+
+    { 3, "RemQueryInterface", dissect_remunk_remqueryinterface_rqst, dissect_remunk_remqueryinterface_resp },
+	{ 4, "RemAddRef", NULL, NULL },
+    { 5, "RemRelease", dissect_remunk_remrelease_rqst, dissect_dcom_simple_resp },
+    { 0, NULL, NULL, NULL }
+};
+
+/* sub dissector table of IRemUnknown2 interface */
+static dcerpc_sub_dissector remunk2_dissectors[] = {
+    { 0, "QueryInterface", NULL, NULL },
+    { 1, "AddRef", NULL, NULL },
+    { 2, "Release", NULL, NULL },
+
+    { 3, "RemQueryInterface", dissect_remunk_remqueryinterface_rqst, dissect_remunk_remqueryinterface_resp },
+	{ 4, "RemAddRef", NULL, NULL },
+    { 5, "RemRelease", dissect_remunk_remrelease_rqst, dissect_dcom_simple_resp },
+
+	{ 6, "RemQueryInterface2", NULL, NULL },
+    { 0, NULL, NULL, NULL }
 };
 
+
+
 void
-proto_register_IRemUnknown (void)
+proto_register_remunk (void)
 {
-	static hf_register_info hf[] = {
-		{ &hf_opnum,
-		  { "Operation", "IRemUnknown.opnum", FT_UINT16, BASE_DEC,
-		    NULL, 0x0, "", HFILL }},
+	static hf_register_info hf_remunk_rqi_array[] = {
+        { &hf_remunk_opnum,
+	    { "Operation", "remunk_opnum", FT_UINT16, BASE_DEC, NULL, 0x0, "Operation", HFILL }},
+
+        { &hf_remunk_ipid,
+        { "IPID", "remunk_ipid", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL }},
+		{ &hf_remunk_refs,
+		{ "Refs", "remunk_refs", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }},
+		{ &hf_remunk_iids,
+		{ "IIDs", "remunk_iids", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }},
+        { &hf_remunk_iid,
+        { "IID", "remunk_iid", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL }},
+		{ &hf_remunk_qiresult,
+		{ "QIResult", "remunk_qiresult", FT_NONE, BASE_DEC, NULL, 0x0, "", HFILL }},
+		{ &hf_remunk_flags,
+		{ "Flags", "remunk_flags",  FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL }},
+		{ &hf_remunk_public_refs,
+		{ "PublicRefs", "remunk_public_refs",  FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }},
+		{ &hf_remunk_oxid,
+		{ "OXID", "remunk_oxid",  FT_UINT64, BASE_HEX, NULL, 0x0, "", HFILL }},
+		{ &hf_remunk_oid,
+		{ "OID", "remunk_oid",  FT_UINT64, BASE_HEX, NULL, 0x0, "", HFILL }},
+		{ &hf_remunk_reminterfaceref,
+		{ "RemInterfaceRef", "remunk_reminterfaceref",  FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }},
+		{ &hf_remunk_interface_refs,
+		{ "InterfaceRefs", "remunk_int_refs",  FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }},
+		{ &hf_remunk_private_refs,
+		{ "PrivateRefs", "remunk_private_refs",  FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }}
 	};
-	static gint *ett[] = {
-		&ett_IRemUnknown
+
+	static gint *ett_remunk_array[] = {
+		&ett_remunk,
+		&ett_remunk_rqi_result,
+		&ett_remunk2,
+		&ett_remunk_reminterfaceref
 	};
-	proto_IRemUnknown = proto_register_protocol ("IRemUnknown IRemUnknown Resolver", "IRemUnknown", "IRemUnknown");
-	proto_register_field_array (proto_IRemUnknown, hf, array_length (hf));
-	proto_register_subtree_array (ett, array_length (ett));
+	
+	proto_remunk = proto_register_protocol ("IRemUnknown", "IRemUnknown", "remunk");
+	proto_register_field_array (proto_remunk, hf_remunk_rqi_array, array_length (hf_remunk_rqi_array));
+
+	proto_remunk2 = proto_register_protocol ("IRemUnknown2", "IRemUnknown2", "remunk2");
+
+	proto_register_subtree_array (ett_remunk_array, array_length (ett_remunk_array));
 }
 
 void
-proto_reg_handoff_IRemUnknown (void)
+proto_reg_handoff_remunk (void)
 {
-	/* Register the protocol as dcerpc */
-	dcerpc_init_uuid (proto_IRemUnknown, ett_IRemUnknown, &uuid_IRemUnknown, ver_IRemUnknown, IRemUnknown_dissectors, hf_opnum);
+	/* Register the interfaces */
+	dcerpc_init_uuid(proto_remunk, ett_remunk, 
+		&uuid_remunk, ver_remunk, 
+		remunk_dissectors, hf_remunk_opnum);
+
+	dcerpc_init_uuid(proto_remunk2, ett_remunk2, 
+		&uuid_remunk2, ver_remunk2, 
+		remunk2_dissectors, hf_remunk_opnum);
 }