1 files changed, 15 insertions, 22 deletions

diff --git a/epan/dissectors/packet-dcerpc.h b/epan/dissectors/packet-dcerpc.h
index a01bc74b25..2bde221123 100644
--- a/epan/dissectors/packet-dcerpc.h
+++ b/epan/dissectors/packet-dcerpc.h
@@ -57,13 +57,6 @@ extern "C" {
 #undef PT_R4
 #endif
 
-typedef struct _e_uuid_t {
-    guint32 Data1;
-    guint16 Data2;
-    guint16 Data3;
-    guint8 Data4[8];
-} e_uuid_t;
-
 #define DCERPC_UUID_NULL { 0,0,0, {0,0,0,0,0,0,0,0} }
 
 /* %08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x */
@@ -71,7 +64,7 @@ typedef struct _e_uuid_t {
 
 typedef struct _e_ctx_hnd {
     guint32 attributes;
-    e_uuid_t uuid;
+    e_guid_t uuid;
 } e_ctx_hnd;
 
 typedef struct _e_dce_cn_common_hdr_t {
@@ -92,9 +85,9 @@ typedef struct _e_dce_dg_common_hdr_t {
     guint8 flags2;
     guint8 drep[3];
     guint8 serial_hi;
-    e_uuid_t obj_id;
-    e_uuid_t if_id;
-    e_uuid_t act_id;
+    e_guid_t obj_id;
+    e_guid_t if_id;
+    e_guid_t act_id;
     guint32 server_boot;
     guint32 if_ver;
     guint32 seqnum;
@@ -128,9 +121,9 @@ typedef struct _dcerpc_auth_info {
  * and can not be used to keep data hanging around.
  */
 typedef struct _dcerpc_call_value {
-    e_uuid_t uuid;          /* interface UUID */
+    e_guid_t uuid;          /* interface UUID */
     guint16 ver;            /* interface version */
-    e_uuid_t object_uuid;   /* optional object UUID (or DCERPC_UUID_NULL) */
+    e_guid_t object_uuid;   /* optional object UUID (or DCERPC_UUID_NULL) */
     guint16 opnum;
     guint32 req_frame;
     nstime_t req_time;
@@ -202,7 +195,7 @@ typedef struct _dcerpc_info {
  */
 guint16 dcerpc_tvb_get_ntohs (tvbuff_t *tvb, gint offset, guint8 *drep);
 guint32 dcerpc_tvb_get_ntohl (tvbuff_t *tvb, gint offset, guint8 *drep);
-void dcerpc_tvb_get_uuid (tvbuff_t *tvb, gint offset, guint8 *drep, e_uuid_t *uuid);
+void dcerpc_tvb_get_uuid (tvbuff_t *tvb, gint offset, guint8 *drep, e_guid_t *uuid);
 WS_DLL_PUBLIC
 int dissect_dcerpc_uint8 (tvbuff_t *tvb, gint offset, packet_info *pinfo,
                           proto_tree *tree, guint8 *drep,
@@ -231,7 +224,7 @@ int dissect_dcerpc_time_t (tvbuff_t *tvb, gint offset, packet_info *pinfo,
 WS_DLL_PUBLIC
 int dissect_dcerpc_uuid_t (tvbuff_t *tvb, gint offset, packet_info *pinfo,
                            proto_tree *tree, guint8 *drep,
-                           int hfindex, e_uuid_t *pdata);
+                           int hfindex, e_guid_t *pdata);
 
 /*
  * NDR routines for subdissectors.
@@ -276,7 +269,7 @@ int dissect_ndr_time_t (tvbuff_t *tvb, gint offset, packet_info *pinfo,
 WS_DLL_PUBLIC
 int dissect_ndr_uuid_t (tvbuff_t *tvb, gint offset, packet_info *pinfo,
                         proto_tree *tree, dcerpc_info *di, guint8 *drep,
-                        int hfindex, e_uuid_t *pdata);
+                        int hfindex, e_guid_t *pdata);
 int dissect_ndr_ctx_hnd (tvbuff_t *tvb, gint offset, packet_info *pinfo,
                         proto_tree *tree, dcerpc_info *di, guint8 *drep,
                         int hfindex, e_ctx_hnd *pdata);
@@ -380,13 +373,13 @@ typedef struct _dcerpc_sub_dissector {
 
 /* registration function for subdissectors */
 WS_DLL_PUBLIC
-void dcerpc_init_uuid (int proto, int ett, e_uuid_t *uuid, guint16 ver, dcerpc_sub_dissector *procs, int opnum_hf);
+void dcerpc_init_uuid (int proto, int ett, e_guid_t *uuid, guint16 ver, dcerpc_sub_dissector *procs, int opnum_hf);
 WS_DLL_PUBLIC
-const char *dcerpc_get_proto_name(e_uuid_t *uuid, guint16 ver);
+const char *dcerpc_get_proto_name(e_guid_t *uuid, guint16 ver);
 WS_DLL_PUBLIC
-int dcerpc_get_proto_hf_opnum(e_uuid_t *uuid, guint16 ver);
+int dcerpc_get_proto_hf_opnum(e_guid_t *uuid, guint16 ver);
 WS_DLL_PUBLIC
-dcerpc_sub_dissector *dcerpc_get_proto_sub_dissector(e_uuid_t *uuid, guint16 ver);
+dcerpc_sub_dissector *dcerpc_get_proto_sub_dissector(e_guid_t *uuid, guint16 ver);
 
 /* Create a opnum, name value_string from a subdissector list */
 
@@ -405,7 +398,7 @@ WS_DLL_PUBLIC void decode_dcerpc_add_show_list(decode_add_show_list_func func, g
 WS_DLL_PUBLIC GHashTable *dcerpc_uuids;
 
 typedef struct _dcerpc_uuid_key {
-    e_uuid_t uuid;
+    e_guid_t uuid;
     guint16 ver;
 } dcerpc_uuid_key;
 
@@ -459,7 +452,7 @@ typedef struct decode_dcerpc_bind_values_s {
     guint64 transport_salt;
     /* corresponding "interface" */
     GString *ifname;
-    e_uuid_t uuid;
+    e_guid_t uuid;
     guint16 ver;
 } decode_dcerpc_bind_values_t;