Dissection of some functions and structure for dcerpc browser protocol.

svn path=/trunk/; revision=5579

1 files changed, 426 insertions, 6 deletions

diff --git a/packet-dcerpc-browser.c b/packet-dcerpc-browser.c
index c92f281bd8..32faba930e 100644
--- a/packet-dcerpc-browser.c
+++ b/packet-dcerpc-browser.c
@@ -2,7 +2,7 @@
  * Routines for DCERPC Browser packet disassembly
  * Copyright 2001, Ronnie Sahlberg
  *
- * $Id: packet-dcerpc-browser.c,v 1.1 2002/05/28 12:07:59 sahlberg Exp $
+ * $Id: packet-dcerpc-browser.c,v 1.2 2002/05/28 13:08:07 sahlberg Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -23,6 +23,10 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
+/* The IDL file for this interface can be extracted by grepping for idl 
+ * in capitals.
+ */
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -31,10 +35,42 @@
 #include <epan/packet.h>
 #include "packet-dcerpc.h"
 #include "packet-dcerpc-browser.h"
+#include "packet-dcerpc-nt.h"
+#include "smb.h"
 
 static int proto_dcerpc_browser = -1;
+static int hf_browser_rc = -1;
+static int hf_browser_unknown_long = -1;
+static int hf_browser_unknown_bytes = -1;
+static int hf_browser_unknown_string = -1;
+
+
 static gint ett_dcerpc_browser = -1;
 
+
+static int
+dissect_browser_long_pointer(tvbuff_t *tvb, int offset, 
+                             packet_info *pinfo, proto_tree *tree, 
+                             char *drep)
+{
+	dcerpc_info *di;
+
+	di=pinfo->private_data;
+        offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep,
+                                     di->hf_index, NULL);
+	return offset;
+}
+
+
+
+/*
+ IDL [ uuid(6bffd098-a112-3610-9833-012892020162),
+ IDL   version(0.0),
+ IDL   implicit_handle(handle_t rpc_binding)
+ IDL ] interface browser
+ IDL {
+*/
+
 static e_uuid_t uuid_dcerpc_browser = {
         0x6bffd098, 0xa112, 0x3610,
         { 0x98, 0x33, 0x01, 0x28, 0x92, 0x02, 0x01, 0x62 }
@@ -42,12 +78,376 @@ static e_uuid_t uuid_dcerpc_browser = {
 
 static guint16 ver_dcerpc_browser = 0;
 
+
+/*
+  IDL typedef struct {
+  IDL   long element_7;
+  IDL   [size_is(element_7)] [unique] byte *element_8;
+  IDL } TYPE_4;
+*/
+static int
+dissect_browser_TYPE_4_data(tvbuff_t *tvb, int offset,
+			packet_info *pinfo, proto_tree *tree,
+			char *drep)
+{
+	guint32 len;
+	dcerpc_info *di;
+
+	di=pinfo->private_data;
+	if(di->conformant_run){
+		/*just a run to handle conformant arrays, nothing to dissect */
+		return offset;
+	}
+
+	/* this is really the length of the encoded data */
+	offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep,
+		hf_browser_unknown_long, &len);
+	proto_tree_add_item(tree, hf_browser_unknown_bytes, tvb, offset, len,
+		FALSE);
+	offset += len;
+
+	return len;
+}
+static int
+dissect_browser_TYPE_4(tvbuff_t *tvb, int offset,
+			packet_info *pinfo, proto_tree *tree,
+			char *drep)
+{
+	offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep,
+		hf_browser_unknown_long, NULL);
+
+	offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep,
+		dissect_browser_TYPE_4_data, NDR_POINTER_UNIQUE,
+		"unknown TYPE_4", -1, -1);
+
+	return offset;
+}
+
+
+/*
+  IDL typedef struct {
+  IDL   long element_5;
+  IDL   [size_is(element_5)] [unique] byte *element_6;
+  IDL } TYPE_3;
+*/
+static int
+dissect_browser_TYPE_3_data(tvbuff_t *tvb, int offset,
+			packet_info *pinfo, proto_tree *tree,
+			char *drep)
+{
+	guint32 len;
+	dcerpc_info *di;
+
+	di=pinfo->private_data;
+	if(di->conformant_run){
+		/*just a run to handle conformant arrays, nothing to dissect */
+		return offset;
+	}
+
+	/* this is really the length of the encoded data */
+	offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep,
+		hf_browser_unknown_long, &len);
+	proto_tree_add_item(tree, hf_browser_unknown_bytes, tvb, offset, len,
+		FALSE);
+	offset += len;
+
+	return len;
+}
+static int
+dissect_browser_TYPE_3(tvbuff_t *tvb, int offset,
+			packet_info *pinfo, proto_tree *tree,
+			char *drep)
+{
+	offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep,
+		hf_browser_unknown_long, NULL);
+
+	offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep,
+		dissect_browser_TYPE_3_data, NDR_POINTER_UNIQUE,
+		"unknown TYPE_3", -1, -1);
+
+	return offset;
+}
+
+
+
+/*
+  IDL typedef [switch_type(long)] union {
+  IDL   [case(100)] [unique] TYPE_3 *element_3;
+  IDL   [case(101)] [unique] TYPE_4 *element_4;
+  IDL } TYPE_2;
+*/
+static int
+dissect_browser_TYPE_2(tvbuff_t *tvb, int offset,
+			packet_info *pinfo, proto_tree *tree,
+			char *drep)
+{
+	guint32 level;
+
+	/* this is really the union switch arm */
+	offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep,
+		hf_browser_unknown_long, &level);
+	ALIGN_TO_4_BYTES;
+
+	switch(level){
+	case 100:	
+		offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep,
+			dissect_browser_TYPE_3, NDR_POINTER_UNIQUE,
+			"unknown TYPE_3", -1, -1);
+		break;
+	case 101:	
+		offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep,
+			dissect_browser_TYPE_4, NDR_POINTER_UNIQUE,
+			"unknown TYPE_4", -1, -1);
+		break;
+	}
+
+	return offset;
+}
+
+
+/*
+  IDL typedef struct {
+  IDL   long element_1;
+  IDL   TYPE_2 element_2;
+  IDL } TYPE_1;
+*/
+static int
+dissect_browser_TYPE_1(tvbuff_t *tvb, int offset,
+			packet_info *pinfo, proto_tree *tree,
+			char *drep)
+{
+	offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep,
+		hf_browser_unknown_long, NULL);
+
+	offset = dissect_browser_TYPE_2(tvb, offset, pinfo, tree, drep);
+
+	return offset;
+}
+
+
+
+/*
+ IDL  long Function_00(
+ IDL        [in] [unique] [string] wchar_t *element_9,
+ IDL        [in] [unique] [string] wchar_t *element_10,
+ IDL        [in] [unique] [string] wchar_t *element_11,
+ IDL        [in,out] [ref] TYPE_1 element_12,
+ IDL        [in] long element_13,
+ IDL        [out] long element_14,
+ IDL        [in] long element_15,
+ IDL        [in] [unique] [string] wchar_t *element_16,
+ IDL        [in,out] [unique] long *element_17
+ IDL  );
+*/
+static int
+dissect_browser_UNKNOWN_00_rqst(tvbuff_t *tvb, int offset,
+			packet_info *pinfo, proto_tree *tree,
+			char *drep)
+{
+	offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep,
+			dissect_ndr_nt_UNICODE_STRING_str, NDR_POINTER_UNIQUE,
+			"unknown string", hf_browser_unknown_string, 0);
+
+	offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep,
+			dissect_ndr_nt_UNICODE_STRING_str, NDR_POINTER_UNIQUE,
+			"unknown string", hf_browser_unknown_string, 0);
+
+	offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep,
+			dissect_ndr_nt_UNICODE_STRING_str, NDR_POINTER_UNIQUE,
+			"unknown string", hf_browser_unknown_string, 0);
+
+	offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep,
+			dissect_browser_TYPE_1, NDR_POINTER_REF,
+			"unknown TYPE_1", -1, 0);
+
+	offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep,
+		hf_browser_unknown_long, NULL);
+
+	offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep,
+		hf_browser_unknown_long, NULL);
+
+	offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep,
+			dissect_ndr_nt_UNICODE_STRING_str, NDR_POINTER_UNIQUE,
+			"unknown string", hf_browser_unknown_string, 0);
+
+	offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep,
+			dissect_browser_long_pointer, NDR_POINTER_UNIQUE,
+			"unknown long", hf_browser_unknown_long, 0);
+
+	return offset;
+}
+static int
+dissect_browser_UNKNOWN_00_reply(tvbuff_t *tvb, int offset,
+			packet_info *pinfo, proto_tree *tree,
+			char *drep)
+{
+	offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep,
+			dissect_browser_TYPE_1, NDR_POINTER_REF,
+			"unknown TYPE_1", -1, 0);
+
+	offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep,
+		hf_browser_unknown_long, NULL);
+
+	offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep,
+			dissect_browser_long_pointer, NDR_POINTER_UNIQUE,
+			"unknown long", hf_browser_unknown_long, 0);
+
+	offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep,
+		hf_browser_rc, NULL);
+
+	return offset;
+}
+
+/*
+  IDL long Function_01(
+  IDL       [in] [unique] [string] wchar_t *element_18,
+  IDL       [in] long element_19,
+  IDL       [in] long element_20
+  IDL );
+*/
+static int
+dissect_browser_UNKNOWN_01_rqst(tvbuff_t *tvb, int offset,
+			packet_info *pinfo, proto_tree *tree,
+			char *drep)
+{
+	offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep,
+			dissect_ndr_nt_UNICODE_STRING_str, NDR_POINTER_UNIQUE,
+			"unknown string", hf_browser_unknown_string, 0);
+
+	offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep,
+		hf_browser_unknown_long, NULL);
+
+	offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep,
+		hf_browser_unknown_long, NULL);
+
+	return offset;
+}
+static int
+dissect_browser_UNKNOWN_01_reply(tvbuff_t *tvb, int offset,
+			packet_info *pinfo, proto_tree *tree,
+			char *drep)
+{
+	offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep,
+		hf_browser_rc, NULL);
+
+	return offset;
+}
+
+
+/*
+  IDL long Function_02(
+  IDL       [in] [unique] [string] wchar_t *element_21,
+  IDL       [in,out] [ref] TYPE_1 element_22,
+  IDL       [out] long element_23
+  IDL );
+*/
+static int
+dissect_browser_UNKNOWN_02_rqst(tvbuff_t *tvb, int offset,
+			packet_info *pinfo, proto_tree *tree,
+			char *drep)
+{
+	offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep,
+			dissect_ndr_nt_UNICODE_STRING_str, NDR_POINTER_UNIQUE,
+			"unknown string", hf_browser_unknown_string, 0);
+
+	offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep,
+			dissect_browser_TYPE_1, NDR_POINTER_REF,
+			"unknown TYPE_1", -1, 0);
+
+	return offset;
+}
+static int
+dissect_browser_UNKNOWN_02_reply(tvbuff_t *tvb, int offset,
+			packet_info *pinfo, proto_tree *tree,
+			char *drep)
+{
+	offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep,
+		hf_browser_unknown_long, NULL);
+
+	offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep,
+		hf_browser_rc, NULL);
+
+	return offset;
+}
+
+
+/*
+  IDL long Function_03(
+  IDL       [in] [unique] [string] wchar_t *element_24
+  IDL );
+*/
+static int
+dissect_browser_UNKNOWN_03_rqst(tvbuff_t *tvb, int offset,
+			packet_info *pinfo, proto_tree *tree,
+			char *drep)
+{
+	offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep,
+			dissect_ndr_nt_UNICODE_STRING_str, NDR_POINTER_UNIQUE,
+			"unknown string", hf_browser_unknown_string, 0);
+
+	return offset;
+}
+static int
+dissect_browser_UNKNOWN_03_reply(tvbuff_t *tvb, int offset,
+			packet_info *pinfo, proto_tree *tree,
+			char *drep)
+{
+	offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep,
+		hf_browser_rc, NULL);
+
+	return offset;
+}
+
+
+/*
+  IDL long Function_04(
+  IDL       [in] [unique] [string] wchar_t *element_25,
+  IDL       [in] [string] char element_26
+  IDL );
+*/
+static int
+dissect_browser_UNKNOWN_04_rqst(tvbuff_t *tvb, int offset,
+			packet_info *pinfo, proto_tree *tree,
+			char *drep)
+{
+	offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep,
+			dissect_ndr_nt_UNICODE_STRING_str, NDR_POINTER_UNIQUE,
+			"unknown string", hf_browser_unknown_string, 0);
+
+	offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep,
+			dissect_ndr_nt_UNICODE_STRING_str, NDR_POINTER_REF,
+			"unknown string", hf_browser_unknown_string, 0);
+
+	return offset;
+}
+static int
+dissect_browser_UNKNOWN_04_reply(tvbuff_t *tvb, int offset,
+			packet_info *pinfo, proto_tree *tree,
+			char *drep)
+{
+	offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep,
+		hf_browser_rc, NULL);
+
+	return offset;
+}
+
+
 static dcerpc_sub_dissector dcerpc_browser_dissectors[] = {
-        { BROWSER_UNKNOWN_00, "BROWSER_UNKNOWN_00", NULL, NULL },
-        { BROWSER_UNKNOWN_01, "BROWSER_UNKNOWN_01", NULL, NULL },
-        { BROWSER_UNKNOWN_02, "BROWSER_UNKNOWN_02", NULL, NULL },
-        { BROWSER_UNKNOWN_03, "BROWSER_UNKNOWN_03", NULL, NULL },
-        { BROWSER_UNKNOWN_04, "BROWSER_UNKNOWN_04", NULL, NULL },
+        { BROWSER_UNKNOWN_00, "BROWSER_UNKNOWN_00", 
+		dissect_browser_UNKNOWN_00_rqst,
+		dissect_browser_UNKNOWN_00_reply },
+        { BROWSER_UNKNOWN_01, "BROWSER_UNKNOWN_01",
+		dissect_browser_UNKNOWN_01_rqst,
+		dissect_browser_UNKNOWN_01_reply },
+        { BROWSER_UNKNOWN_02, "BROWSER_UNKNOWN_02",
+		dissect_browser_UNKNOWN_02_rqst,
+		dissect_browser_UNKNOWN_02_reply },
+        { BROWSER_UNKNOWN_03, "BROWSER_UNKNOWN_03",
+		dissect_browser_UNKNOWN_03_rqst,
+		dissect_browser_UNKNOWN_03_reply },
+        { BROWSER_UNKNOWN_04, "BROWSER_UNKNOWN_04",
+		dissect_browser_UNKNOWN_04_rqst,
+		dissect_browser_UNKNOWN_04_reply },
         { BROWSER_UNKNOWN_05, "BROWSER_UNKNOWN_05", NULL, NULL },
         { BROWSER_UNKNOWN_06, "BROWSER_UNKNOWN_06", NULL, NULL },
         { BROWSER_UNKNOWN_07, "BROWSER_UNKNOWN_07", NULL, NULL },
@@ -62,6 +462,24 @@ static dcerpc_sub_dissector dcerpc_browser_dissectors[] = {
 void 
 proto_register_dcerpc_browser(void)
 {
+static hf_register_info hf[] = {
+	{ &hf_browser_rc, { 
+		"Return code", "rpc_browser.rc", FT_UINT32, BASE_HEX, 
+		VALS(NT_errors), 0x0, "Browser return code", HFILL }},
+
+	{ &hf_browser_unknown_long, { 
+		"Unknown long", "rpc_browser.unknown.long", FT_UINT32, BASE_HEX, 
+		NULL, 0x0, "Unknown long. If you know what this is, contact ethereal developers.", HFILL }},
+	
+	{ &hf_browser_unknown_bytes, { 
+		"Unknown bytes", "rpc_browser.unknown.bytes", FT_BYTES, BASE_HEX, 
+		NULL, 0x0, "Unknown bytes. If you know what this is, contact ethereal developers.", HFILL }},
+
+	{ &hf_browser_unknown_string, { 
+		"Unknown string", "rpc_browser.unknown.string", FT_STRING, BASE_HEX, 
+		NULL, 0x0, "Unknown string. If you know what this is, contact ethereal developers.", HFILL }},
+
+	};
         static gint *ett[] = {
                 &ett_dcerpc_browser,
         };
@@ -69,6 +487,8 @@ proto_register_dcerpc_browser(void)
         proto_dcerpc_browser = proto_register_protocol(
                 "RPC Browser", "RPC_BROWSER", "rpc_browser");
 
+        proto_register_field_array(proto_dcerpc_browser, hf, 
+				   array_length(hf));
         proto_register_subtree_array(ett, array_length(ett));
 }