Use the full name of the "hf_dcerpc_obj_id" field when formatting the

protocol tree item for it.

Fix a typo.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6555 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/packet-dcerpc.c b/packet-dcerpc.c
index 7eef0897b1072a95cea25d1932911883f8c90120..ad9676502c10585d8ca5d4eecd1de394c64ce301 100644 (file)
--- a/packet-dcerpc.c
+++ b/packet-dcerpc.c
@@ -2,7 +2,7 @@
  * Routines for DCERPC packet disassembly
  * Copyright 2001, Todd Sabin <tas@webspan.net>
  *
- * $Id: packet-dcerpc.c,v 1.84 2002/11/02 22:14:21 sahlberg Exp $
+ * $Id: packet-dcerpc.c,v 1.85 2002/11/03 20:34:54 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -1587,6 +1587,7 @@ dissect_dcerpc_cn_bind (tvbuff_t *tvb, packet_info *pinfo, proto_tree *dcerpc_tr
       offset = dissect_dcerpc_uint16 (tvb, offset, pinfo, dcerpc_tree, hdr->drep,
                                       hf_dcerpc_cn_num_trans_items, &num_trans_items);
 
+      /* XXX - use "dissect_ndr_uuid_t()"? */
       dcerpc_tvb_get_uuid (tvb, offset, hdr->drep, &if_id);
       if (dcerpc_tree) {
          uuid_str_len = snprintf(uuid_str, DCERPC_UUID_STR_LEN, 
@@ -1672,6 +1673,7 @@ dissect_dcerpc_cn_bind (tvbuff_t *tvb, packet_info *pinfo, proto_tree *dcerpc_tr
       }
 
       for (j = 0; j < num_trans_items; j++) {
+        /* XXX - use "dissect_ndr_uuid_t()"? */
         dcerpc_tvb_get_uuid (tvb, offset, hdr->drep, &trans_id);
         if (dcerpc_tree) {
            uuid_str_len = snprintf(uuid_str, DCERPC_UUID_STR_LEN, 
@@ -1681,8 +1683,8 @@ dissect_dcerpc_cn_bind (tvbuff_t *tvb, packet_info *pinfo, proto_tree *dcerpc_tr
                                   trans_id.Data4[2], trans_id.Data4[3],
                                   trans_id.Data4[4], trans_id.Data4[5],
                                   trans_id.Data4[6], trans_id.Data4[7]);
-         if (uuid_str_len >= DCERPC_UUID_STR_LEN)
-                 memset(uuid_str, 0, DCERPC_UUID_STR_LEN);
+            if (uuid_str_len >= DCERPC_UUID_STR_LEN)
+                memset(uuid_str, 0, DCERPC_UUID_STR_LEN);
             proto_tree_add_string_format (dcerpc_tree, hf_dcerpc_cn_bind_trans_id, tvb,
                                           offset, 16, uuid_str, "Transfer Syntax: %s", uuid_str);
         }
@@ -1761,6 +1763,7 @@ dissect_dcerpc_cn_bind_ack (tvbuff_t *tvb, packet_info *pinfo, proto_tree *dcerp
             offset += 2;
         }
 
+        /* XXX - use "dissect_ndr_uuid_t()"? */
         dcerpc_tvb_get_uuid (tvb, offset, hdr->drep, &trans_id);
         if (dcerpc_tree) {
            uuid_str_len = snprintf(uuid_str, DCERPC_UUID_STR_LEN, 
@@ -2000,6 +2003,7 @@ dissect_dcerpc_cn_rqst (tvbuff_t *tvb, packet_info *pinfo, proto_tree *dcerpc_tr
     }
 
     if (hdr->flags & PFC_OBJECT_UUID) {
+        /* XXX - use "dissect_ndr_uuid_t()"? */
         dcerpc_tvb_get_uuid (tvb, offset, hdr->drep, &obj_id);
         if (dcerpc_tree) {
            uuid_str_len = snprintf(uuid_str, DCERPC_UUID_STR_LEN, 
@@ -3217,6 +3221,7 @@ dissect_dcerpc_dg (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     offset++;
 
     if (tree) {
+        /* XXX - use "dissect_ndr_uuid_t()"? */
        uuid_str_len = snprintf(uuid_str, DCERPC_UUID_STR_LEN, 
                                 "%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x",
                                 hdr.obj_id.Data1, hdr.obj_id.Data2, hdr.obj_id.Data3,
@@ -3231,11 +3236,12 @@ dissect_dcerpc_dg (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
         if (uuid_str_len >= DCERPC_UUID_STR_LEN)
                memset(uuid_str, 0, DCERPC_UUID_STR_LEN);
         proto_tree_add_string_format (dcerpc_tree, hf_dcerpc_obj_id, tvb,
-                                      offset, 16, uuid_str, "Object: %s", uuid_str);
+                                      offset, 16, uuid_str, "Object UUID: %s", uuid_str);
     }
     offset += 16;
 
     if (tree) {
+        /* XXX - use "dissect_ndr_uuid_t()"? */
        uuid_str_len = snprintf(uuid_str, DCERPC_UUID_STR_LEN, 
                                 "%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x",
                                 hdr.if_id.Data1, hdr.if_id.Data2, hdr.if_id.Data3,
@@ -3255,6 +3261,7 @@ dissect_dcerpc_dg (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     offset += 16;
 
     if (tree) {
+        /* XXX - use "dissect_ndr_uuid_t()"? */
        uuid_str_len = snprintf(uuid_str, DCERPC_UUID_STR_LEN, 
                                 "%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x",
                                 hdr.act_id.Data1, hdr.act_id.Data2, hdr.act_id.Data3,
@@ -3646,7 +3653,7 @@ proto_register_dcerpc (void)
         { &hf_dcerpc_dg_if_id,
           { "Interface", "dcerpc.dg_if_id", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL }},
         { &hf_dcerpc_dg_act_id,
-          { "Activitiy", "dcerpc.dg_act_id", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL }},
+          { "Activity", "dcerpc.dg_act_id", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL }},
         { &hf_dcerpc_opnum,
           { "Opnum", "dcerpc.opnum", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }},