From Jaime Fournier: updates to dcerpc conversation manager

svn path=/trunk/; revision=6339

1 files changed, 153 insertions, 11 deletions

diff --git a/packet-dcerpc-conv.c b/packet-dcerpc-conv.c
index e94dd1ee19..5dd68faacf 100644
--- a/packet-dcerpc-conv.c
+++ b/packet-dcerpc-conv.c
@@ -2,7 +2,7 @@
  * Routines for dcerpc conv dissection
  * Copyright 2001, Todd Sabin <tas@webspan.net>
  *
- * $Id: packet-dcerpc-conv.c,v 1.5 2002/08/02 23:35:48 jmayer Exp $
+ * $Id: packet-dcerpc-conv.c,v 1.6 2002/09/26 06:13:07 sahlberg Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -28,14 +28,28 @@
 #endif
 
 
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+
 #include <string.h>
 
 #include <glib.h>
 #include <epan/packet.h>
 #include "packet-dcerpc.h"
+#include "packet-dcerpc-dce122.h"
 
 
 static int proto_conv = -1;
+static int hf_conv_opnum = -1;
+static int hf_conv_rc = -1;
+static int hf_conv_who_are_you_resp_seq = -1;
+static int hf_conv_who_are_you_rqst_actuid = -1;
+static int hf_conv_who_are_you_rqst_boot_time = -1;
+static int hf_conv_who_are_you2_resp_seq = -1;
+static int hf_conv_who_are_you2_resp_casuuid = -1;
+static int hf_conv_who_are_you2_rqst_actuid = -1;
+static int hf_conv_who_are_you2_rqst_boot_time = -1;
 
 static gint ett_conv = -1;
 
@@ -44,31 +58,158 @@ static e_uuid_t uuid_conv = { 0x333a2276, 0x0000, 0x0000, { 0x0d, 0x00, 0x00, 0x
 static guint16  ver_conv = 3;
 
 
+static int
+conv_dissect_who_are_you_rqst (tvbuff_t *tvb, int offset,
+	                         packet_info *pinfo, proto_tree *tree,
+	                         char *drep)
+{
+	/*
+	 *         [in]    uuid_t          *actuid,
+	 *         [in]    unsigned32      boot_time,
+	 */
+       e_uuid_t actuid;
+
+       offset = dissect_ndr_uuid_t (tvb, offset, pinfo, tree, drep, hf_conv_who_are_you_rqst_actuid, &actuid);
+       offset = dissect_ndr_time_t (tvb, offset, pinfo, tree, drep, hf_conv_who_are_you_rqst_boot_time, NULL);
+
+       if (check_col(pinfo->cinfo, COL_INFO)) {
+         col_add_fstr(pinfo->cinfo, COL_INFO,
+             "conv_who_are_you request actuid: %08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x",
+              actuid.Data1, actuid.Data2, actuid.Data3, actuid.Data4[0], actuid.Data4[1],
+              actuid.Data4[2], actuid.Data4[3], actuid.Data4[4], actuid.Data4[5], actuid.Data4[6], actuid.Data4[7]);
+        }
+	        
+	return offset;
+}
+
+static int
+conv_dissect_who_are_you_resp (tvbuff_t *tvb, int offset,
+	                         packet_info *pinfo, proto_tree *tree,
+	                         char *drep)
+{
+	/*
+	 *         [out]   unsigned32      *seq,
+	 *         [out]   unsigned32      *st
+	 */
+       guint32 seq, st;
+
+       offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, hf_conv_who_are_you_resp_seq, &seq);
+       offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, hf_conv_rc, &st);
+	
+
+       if (check_col(pinfo->cinfo, COL_INFO)) {
+         col_add_fstr(pinfo->cinfo, COL_INFO, "conv_who_are_you reply seq:%u st:%s", 
+               seq, val_to_str(st, dce_error_vals, "%u")); 
+       }
+
+       return offset;
+}
+
+
+
+static int
+conv_dissect_who_are_you2_rqst (tvbuff_t *tvb, int offset,
+	                         packet_info *pinfo, proto_tree *tree,
+	                         char *drep)
+{
+	/*
+	 *         [in]    uuid_t          *actuid,
+	 *         [in]    unsigned32      boot_time,
+	 */
+        e_uuid_t actuid;
+
+        offset = dissect_ndr_uuid_t (tvb, offset, pinfo, tree, drep, hf_conv_who_are_you2_rqst_actuid, &actuid);
+        offset = dissect_ndr_time_t (tvb, offset, pinfo, tree, drep, hf_conv_who_are_you2_rqst_boot_time, NULL);
+
+        if (check_col(pinfo->cinfo, COL_INFO)) {
+           col_add_fstr(pinfo->cinfo, COL_INFO,
+                "conv_who_are_you request actuid: %08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x",
+                 actuid.Data1, actuid.Data2, actuid.Data3, actuid.Data4[0], actuid.Data4[1],
+                 actuid.Data4[2], actuid.Data4[3], actuid.Data4[4], actuid.Data4[5], actuid.Data4[6], actuid.Data4[7]);
+        }
+	        
+	return offset;
+}
+static int
+conv_dissect_who_are_you2_resp (tvbuff_t *tvb, int offset,
+	                         packet_info *pinfo, proto_tree *tree,
+	                         char *drep)
+{
+	/*
+	 *         [out]   unsigned32      *seq,
+	 *         [out]   uuid_t          *cas_uuid,
+	 *                  
+	 *         [out]   unsigned32      *st
+	 */
+       guint32 seq, st;
+       e_uuid_t cas_uuid;
+
+       offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, hf_conv_who_are_you2_resp_seq, &seq);
+       offset = dissect_ndr_uuid_t (tvb, offset, pinfo, tree, drep, hf_conv_who_are_you2_resp_casuuid, &cas_uuid);
+       offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, hf_conv_rc, &st);
+
+       if (check_col(pinfo->cinfo, COL_INFO)) {
+         col_add_fstr(pinfo->cinfo, COL_INFO, 
+               "conv_who_are_you2 reply seq:%u st:%s cas:%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x", 
+                seq, val_to_str(st, dce_error_vals, "%u"), 
+                cas_uuid.Data1, cas_uuid.Data2, cas_uuid.Data3, cas_uuid.Data4[0], cas_uuid.Data4[1],
+                cas_uuid.Data4[2], cas_uuid.Data4[3], cas_uuid.Data4[4], cas_uuid.Data4[5], cas_uuid.Data4[6], cas_uuid.Data4[7]); 
+        }
+
+	return offset;
+}
+
+
 static dcerpc_sub_dissector conv_dissectors[] = {
-    { 0, "conv_who_are_you", NULL, NULL },
-    { 1, "conv_who_are_you2", NULL, NULL },
-    { 2, "conv_are_you_there", NULL, NULL },
-    { 3, "conv_who_are_you_auth", NULL, NULL },
-    { 4, "conv_who_are_you_auth_more", NULL, NULL },
+    { 0, "who_are_you", 
+          conv_dissect_who_are_you_rqst, conv_dissect_who_are_you_resp },
+    { 1, "who_are_you2", 
+          conv_dissect_who_are_you2_rqst, conv_dissect_who_are_you2_resp },
+    { 2, "are_you_there", NULL, NULL },
+    { 3, "who_are_you_auth", NULL, NULL },
+    { 4, "who_are_you_auth_more", NULL, NULL },
     { 0, NULL, NULL, NULL }
 };
 
+static const value_string conv_opnum_vals[] = {
+    { 0, "who_are_you" }, 
+    { 1, "who_are_you2" }, 
+    { 2, "are_you_there" },
+    { 3, "who_are_you_auth" },
+    { 4, "who_are_you_auth_more" },
+    { 0, NULL }
+};
+
 
 void
 proto_register_conv (void)
 {
-#if 0
 	static hf_register_info hf[] = {
+        { &hf_conv_opnum,
+            { "Operation", "conv.opnum", FT_UINT16, BASE_DEC, VALS(conv_opnum_vals), 0x0, "Operation", HFILL }},
+        { &hf_conv_who_are_you_resp_seq,
+            {"hf_conv_who_are_you_resp_seq", "conv.who_are_you_resp_seq", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }},
+        { &hf_conv_rc,
+            {"Status", "conv.status", FT_UINT32, BASE_DEC, VALS(dce_error_vals), 0x0, "", HFILL }},
+        { &hf_conv_who_are_you_rqst_actuid,
+            {"hf_conv_who_are_you_rqst_actuid", "conv.who_are_you_rqst_actuid", FT_STRING, BASE_NONE, NULL, 0x0, "UUID", HFILL }},
+        { &hf_conv_who_are_you_rqst_boot_time,
+            {"hf_conv_who_are_you_rqst_boot_time", "conv.who_are_you_rqst_boot_time", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0, "", HFILL }},
+        { &hf_conv_who_are_you2_rqst_actuid,
+            {"hf_conv_who_are_you2_rqst_actuid", "conv.who_are_you2_rqst_actuid", FT_STRING, BASE_NONE, NULL, 0x0, "UUID", HFILL }},
+        { &hf_conv_who_are_you2_rqst_boot_time,
+            {"hf_conv_who_are_you2_rqst_boot_time", "conv.who_are_you2_rqst_boot_time", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0, "", HFILL }},
+        { &hf_conv_who_are_you2_resp_seq,
+            {"hf_conv_who_are_you2_resp_seq", "conv.who_are_you2_resp_seq", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }},
+        { &hf_conv_who_are_you2_resp_casuuid,
+            {"hf_conv_who_are_you2_resp_casuuid", "conv.who_are_you2_resp_casuuid", FT_STRING, BASE_NONE, NULL, 0x0, "UUID", HFILL }}
 	};
-#endif
 
 	static gint *ett[] = {
 		&ett_conv
 	};
 	proto_conv = proto_register_protocol ("DCE/RPC Conversation Manager", "CONV", "conv");
-#if 0
 	proto_register_field_array (proto_conv, hf, array_length (hf));
-#endif
 	proto_register_subtree_array (ett, array_length (ett));
 }
 
@@ -76,5 +217,6 @@ void
 proto_reg_handoff_conv (void)
 {
 	/* Register the protocol as dcerpc */
-	dcerpc_init_uuid (proto_conv, ett_conv, &uuid_conv, ver_conv, conv_dissectors, -1);
+	dcerpc_init_uuid (proto_conv, ett_conv, &uuid_conv, ver_conv, conv_dissectors, hf_conv_opnum);
 }
+