diff options
| author | Guy Harris <guy@alum.mit.edu> | 2015-03-03 02:47:53 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2015-03-03 10:55:29 +0000 |
| commit | 499d95964d0d19bbec7f78d6fe4461eb26c552ca (patch) | |
| tree | bf926f264babd15bcbc12456a6985f5fc5969bdb /epan/dissectors | |
| parent | a0ce286d8d3aaa5a63f69bb03d15d2d225941169 (diff) | |
Eliminate e_uuid_t in favor of e_guid_t.
That eliminates a redundant and confusing data type, and avoids issues
with one piece of code using e_uuid_t but wanting to use routines
expecting an e_guid_t.
Change-Id: I95e172d46d342ab40f6254300ecbd2a0530cde60
Reviewed-on: https://code.wireshark.org/review/7506
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/dissectors')
91 files changed, 388 insertions, 398 deletions
diff --git a/epan/dissectors/dcerpc/idl2wrs.c b/epan/dissectors/dcerpc/idl2wrs.c index 3991490ba8..6c7a4291e6 100644 --- a/epan/dissectors/dcerpc/idl2wrs.c +++ b/epan/dissectors/dcerpc/idl2wrs.c @@ -881,7 +881,7 @@ static void parseheader(void) fprintf(stderr, "ERROR: no uuid found\n"); Exit(10); } - FPRINTF(eth_code,"static e_uuid_t uuid_dcerpc_%s = {\n", ifname); + FPRINTF(eth_code,"static e_guid_t uuid_dcerpc_%s = {\n", ifname); FPRINTF(eth_code," 0x%c%c%c%c%c%c%c%c, 0x%c%c%c%c, 0x%c%c%c%c,\n",uuid[1],uuid[2],uuid[3],uuid[4],uuid[5],uuid[6],uuid[7],uuid[8],uuid[10],uuid[11],uuid[12],uuid[13],uuid[15],uuid[16],uuid[17],uuid[18]); FPRINTF(eth_code," { 0x%c%c, 0x%c%c, 0x%c%c, 0x%c%c, 0x%c%c, 0x%c%c, 0x%c%c, 0x%c%c}\n",uuid[20],uuid[21],uuid[22],uuid[23],uuid[25],uuid[26],uuid[27],uuid[28],uuid[29],uuid[30],uuid[31],uuid[32],uuid[33],uuid[34],uuid[35],uuid[36]); FPRINTF(eth_code,"};\n"); diff --git a/epan/dissectors/packet-aim-messaging.c b/epan/dissectors/packet-aim-messaging.c index 8b24bcbf2e..42572653be 100644 --- a/epan/dissectors/packet-aim-messaging.c +++ b/epan/dissectors/packet-aim-messaging.c @@ -419,7 +419,7 @@ dissect_aim_msg_minityping(tvbuff_t *tvb, packet_info *pinfo, proto_tree *msg_tr typedef struct _aim_client_plugin { const char *name; - e_uuid_t uuid; + e_guid_t uuid; } aim_client_plugin; static const aim_client_plugin known_client_plugins[] = { @@ -435,7 +435,7 @@ static const aim_client_plugin known_client_plugins[] = { }; static const -aim_client_plugin *aim_find_plugin ( e_uuid_t uuid) +aim_client_plugin *aim_find_plugin ( e_guid_t uuid) { int i; @@ -443,7 +443,7 @@ aim_client_plugin *aim_find_plugin ( e_uuid_t uuid) { const aim_client_plugin *plugin = &(known_client_plugins[i]); - if(memcmp(&(plugin->uuid), &uuid, sizeof(e_uuid_t)) == 0) + if(memcmp(&(plugin->uuid), &uuid, sizeof(e_guid_t)) == 0) return plugin; } @@ -451,15 +451,15 @@ aim_client_plugin *aim_find_plugin ( e_uuid_t uuid) } static int -dissect_aim_plugin(proto_tree *entry, tvbuff_t *tvb, int offset, e_uuid_t* out_plugin_uuid) +dissect_aim_plugin(proto_tree *entry, tvbuff_t *tvb, int offset, e_guid_t* out_plugin_uuid) { const aim_client_plugin *plugin = NULL; - e_uuid_t uuid; + e_guid_t uuid; - uuid.Data1 = tvb_get_ntohl(tvb, offset); - uuid.Data2 = tvb_get_ntohs(tvb, offset+4); - uuid.Data3 = tvb_get_ntohs(tvb, offset+6); - tvb_memcpy(tvb, uuid.Data4, offset+8, 8); + uuid.data1 = tvb_get_ntohl(tvb, offset); + uuid.data2 = tvb_get_ntohs(tvb, offset+4); + uuid.data3 = tvb_get_ntohs(tvb, offset+6); + tvb_memcpy(tvb, uuid.data4, offset+8, 8); if (out_plugin_uuid) *out_plugin_uuid = uuid; @@ -467,10 +467,10 @@ dissect_aim_plugin(proto_tree *entry, tvbuff_t *tvb, int offset, e_uuid_t* out_p proto_tree_add_text(entry, tvb, offset, 16, "Plugin: %s {%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", - plugin ? plugin->name:"Unknown", uuid.Data1, uuid.Data2, - uuid.Data3, uuid.Data4[0], uuid.Data4[1], uuid.Data4[2], - uuid.Data4[3], uuid.Data4[4], uuid.Data4[5], uuid.Data4[6], - uuid.Data4[7] + plugin ? plugin->name:"Unknown", uuid.data1, uuid.data2, + uuid.data3, uuid.data4[0], uuid.data4[1], uuid.data4[2], + uuid.data4[3], uuid.data4[4], uuid.data4[5], uuid.data4[6], + uuid.data4[7] ); return offset+16; @@ -506,19 +506,19 @@ dissect_aim_rendezvous_extended_message(tvbuff_t *tvb, proto_tree *msg_tree) } static int -is_uuid_null(e_uuid_t uuid) +is_uuid_null(e_guid_t uuid) { - return (uuid.Data1 == 0) && - (uuid.Data2 == 0) && - (uuid.Data3 == 0) && - (uuid.Data4[0] == 0) && - (uuid.Data4[1] == 0) && - (uuid.Data4[2] == 0) && - (uuid.Data4[3] == 0) && - (uuid.Data4[4] == 0) && - (uuid.Data4[5] == 0) && - (uuid.Data4[6] == 0) && - (uuid.Data4[7] == 0); + return (uuid.data1 == 0) && + (uuid.data2 == 0) && + (uuid.data3 == 0) && + (uuid.data4[0] == 0) && + (uuid.data4[1] == 0) && + (uuid.data4[2] == 0) && + (uuid.data4[3] == 0) && + (uuid.data4[4] == 0) && + (uuid.data4[5] == 0) && + (uuid.data4[6] == 0) && + (uuid.data4[7] == 0); } static int @@ -527,7 +527,7 @@ dissect_aim_tlv_value_extended_data(proto_tree *entry, guint16 valueid _U_, tvbu int offset = 0; guint16 length/*, protocol_version*/; int start_offset; - e_uuid_t plugin_uuid; + e_guid_t plugin_uuid; length = tvb_get_letohs(tvb, offset); proto_tree_add_text(entry, tvb, offset, 2, "Length: %d", length); offset+=2; diff --git a/epan/dissectors/packet-aim.h b/epan/dissectors/packet-aim.h index a03a157d5d..db739a22c9 100644 --- a/epan/dissectors/packet-aim.h +++ b/epan/dissectors/packet-aim.h @@ -23,9 +23,6 @@ #ifndef __PACKET_AIM_H__ #define __PACKET_AIM_H__ -/* For e_uuid_t */ -#include "packet-dcerpc.h" - typedef struct _aim_tlv { guint16 valueid; const char *desc; diff --git a/epan/dissectors/packet-dcerpc-atsvc.c b/epan/dissectors/packet-dcerpc-atsvc.c index ba20161990..9bdda4543f 100644 --- a/epan/dissectors/packet-dcerpc-atsvc.c +++ b/epan/dissectors/packet-dcerpc-atsvc.c @@ -103,7 +103,7 @@ static gint proto_dcerpc_atsvc = -1; /* Version information */ -static e_uuid_t uuid_dcerpc_atsvc = { +static e_guid_t uuid_dcerpc_atsvc = { 0x1ff70682, 0x0a51, 0x30e8, { 0x07, 0x6d, 0x74, 0x0b, 0xe8, 0xce, 0xe9, 0x8b } }; diff --git a/epan/dissectors/packet-dcerpc-bossvr.c b/epan/dissectors/packet-dcerpc-bossvr.c index 9ffc0ee18e..ca19bea50f 100644 --- a/epan/dissectors/packet-dcerpc-bossvr.c +++ b/epan/dissectors/packet-dcerpc-bossvr.c @@ -41,7 +41,7 @@ static int hf_bossvr_opnum = -1; static gint ett_bossvr = -1; -static e_uuid_t uuid_bossvr = { 0x4d37f2dd, 0xed43, 0x0000, { 0x02, 0xc0, 0x37, 0xcf, 0x1e, 0x00, 0x00, 0x01 } }; +static e_guid_t uuid_bossvr = { 0x4d37f2dd, 0xed43, 0x0000, { 0x02, 0xc0, 0x37, 0xcf, 0x1e, 0x00, 0x00, 0x01 } }; static guint16 ver_bossvr = 0; diff --git a/epan/dissectors/packet-dcerpc-browser.c b/epan/dissectors/packet-dcerpc-browser.c index cc05113d4d..4938dfd764 100644 --- a/epan/dissectors/packet-dcerpc-browser.c +++ b/epan/dissectors/packet-dcerpc-browser.c @@ -70,7 +70,7 @@ dissect_browser_long_pointer(tvbuff_t *tvb, int offset, IDL { */ -static e_uuid_t uuid_dcerpc_browser = { +static e_guid_t uuid_dcerpc_browser = { 0x6bffd098, 0xa112, 0x3610, { 0x98, 0x33, 0x01, 0x28, 0x92, 0x02, 0x01, 0x62 } }; diff --git a/epan/dissectors/packet-dcerpc-budb.c b/epan/dissectors/packet-dcerpc-budb.c index f9bf4a29b9..4fd53f476b 100644 --- a/epan/dissectors/packet-dcerpc-budb.c +++ b/epan/dissectors/packet-dcerpc-budb.c @@ -293,7 +293,7 @@ budb_dissect_NameString_t(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_t /* INCLUDED FILE : ETH_CODE */ -static e_uuid_t uuid_dcerpc_budb = { +static e_guid_t uuid_dcerpc_budb = { 0xeb814e2a, 0x0099, 0x11ca, { 0x86, 0x78, 0x02, 0x60, 0x8c, 0x2e, 0xa9, 0x6e} }; diff --git a/epan/dissectors/packet-dcerpc-butc.c b/epan/dissectors/packet-dcerpc-butc.c index f6e1ecf349..87a3940606 100644 --- a/epan/dissectors/packet-dcerpc-butc.c +++ b/epan/dissectors/packet-dcerpc-butc.c @@ -203,7 +203,7 @@ butc_dissect_NameString_t(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_t /* INCLUDED FILE : ETH_CODE */ -static e_uuid_t uuid_dcerpc_butc = { +static e_guid_t uuid_dcerpc_butc = { 0x1d193c08, 0x000b, 0x11ca, { 0xba, 0x1d, 0x02, 0x60, 0x8c, 0x2e, 0xa9, 0x6e} }; diff --git a/epan/dissectors/packet-dcerpc-cds_clerkserver.c b/epan/dissectors/packet-dcerpc-cds_clerkserver.c index 48792a9e38..51a4c1322a 100644 --- a/epan/dissectors/packet-dcerpc-cds_clerkserver.c +++ b/epan/dissectors/packet-dcerpc-cds_clerkserver.c @@ -41,7 +41,7 @@ static int hf_cds_clerkserver_opnum = -1; static gint ett_cds_clerkserver = -1; -static e_uuid_t uuid_cds_clerkserver = { 0x257df1c9, 0xc6d3, 0x11ca, { 0x85, 0x54, 0x08, 0x00, 0x2b, 0x1c, 0x8f, 0x1f } }; +static e_guid_t uuid_cds_clerkserver = { 0x257df1c9, 0xc6d3, 0x11ca, { 0x85, 0x54, 0x08, 0x00, 0x2b, 0x1c, 0x8f, 0x1f } }; static guint16 ver_cds_clerkserver = 1; diff --git a/epan/dissectors/packet-dcerpc-cds_solicit.c b/epan/dissectors/packet-dcerpc-cds_solicit.c index 45e7255a65..b0e601612c 100644 --- a/epan/dissectors/packet-dcerpc-cds_solicit.c +++ b/epan/dissectors/packet-dcerpc-cds_solicit.c @@ -39,7 +39,7 @@ static int hf_cds_solicit_opnum = -1; static gint ett_cds_solicit = -1; -static e_uuid_t uuid_cds_solicit = { 0xd5579459, 0x8bca, 0x11ca, { 0xb7, 0x71, 0x08, 0x00, 0x2b, 0x1c, 0x8f, 0x1f } }; +static e_guid_t uuid_cds_solicit = { 0xd5579459, 0x8bca, 0x11ca, { 0xb7, 0x71, 0x08, 0x00, 0x2b, 0x1c, 0x8f, 0x1f } }; static guint16 ver_cds_solicit = 1; diff --git a/epan/dissectors/packet-dcerpc-conv.c b/epan/dissectors/packet-dcerpc-conv.c index bb206b2df3..d437a82029 100644 --- a/epan/dissectors/packet-dcerpc-conv.c +++ b/epan/dissectors/packet-dcerpc-conv.c @@ -45,7 +45,7 @@ static int hf_conv_who_are_you2_resp_casuuid = -1; static gint ett_conv = -1; -static e_uuid_t uuid_conv = { 0x333a2276, 0x0000, 0x0000, { 0x0d, 0x00, 0x00, 0x80, 0x9c, 0x00, 0x00, 0x00 } }; +static e_guid_t uuid_conv = { 0x333a2276, 0x0000, 0x0000, { 0x0d, 0x00, 0x00, 0x80, 0x9c, 0x00, 0x00, 0x00 } }; static guint16 ver_conv = 3; @@ -58,16 +58,16 @@ conv_dissect_who_are_you_rqst (tvbuff_t *tvb, int offset, * [in] uuid_t *actuid, * [in] unsigned32 boot_time, */ - e_uuid_t actuid; + e_guid_t actuid; offset = dissect_ndr_uuid_t(tvb, offset, pinfo, tree, di, drep, hf_conv_who_are_you_rqst_actuid, &actuid); offset = dissect_ndr_time_t(tvb, offset, pinfo, tree, di, drep, hf_conv_who_are_you_rqst_boot_time, NULL); 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]); + 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; } @@ -104,16 +104,16 @@ conv_dissect_who_are_you2_rqst (tvbuff_t *tvb, int offset, * [in] uuid_t *actuid, * [in] unsigned32 boot_time, */ - e_uuid_t actuid; + e_guid_t actuid; offset = dissect_ndr_uuid_t(tvb, offset, pinfo, tree, di, drep, hf_conv_who_are_you2_rqst_actuid, &actuid); offset = dissect_ndr_time_t(tvb, offset, pinfo, tree, di, drep, hf_conv_who_are_you2_rqst_boot_time, NULL); col_add_fstr(pinfo->cinfo, COL_INFO, "conv_who_are_you2 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]); + 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; } @@ -129,7 +129,7 @@ conv_dissect_who_are_you2_resp (tvbuff_t *tvb, int offset, * [out] unsigned32 *st */ guint32 seq, st; - e_uuid_t cas_uuid; + e_guid_t cas_uuid; offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, di, drep, hf_conv_who_are_you2_resp_seq, &seq); offset = dissect_ndr_uuid_t (tvb, offset, pinfo, tree, di, drep, hf_conv_who_are_you2_resp_casuuid, &cas_uuid); @@ -138,9 +138,9 @@ conv_dissect_who_are_you2_resp (tvbuff_t *tvb, int offset, col_add_fstr(pinfo->cinfo, COL_INFO, "conv_who_are_you2 response seq:%u st:%s cas:%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x", seq, val_to_str_ext(st, &dce_error_vals_ext, "%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]); + 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; } diff --git a/epan/dissectors/packet-dcerpc-cprpc_server.c b/epan/dissectors/packet-dcerpc-cprpc_server.c index 94b45a0403..4a576d3e7c 100644 --- a/epan/dissectors/packet-dcerpc-cprpc_server.c +++ b/epan/dissectors/packet-dcerpc-cprpc_server.c @@ -39,7 +39,7 @@ static int hf_cprpc_server_opnum = -1; static gint ett_cprpc_server = -1; -static e_uuid_t uuid_cprpc_server = { 0x4885772c, 0xc6d3, 0x11ca, { 0x84, 0xc6, 0x08, 0x00, 0x2b, 0x1c, 0x8f, 0x1f } }; +static e_guid_t uuid_cprpc_server = { 0x4885772c, 0xc6d3, 0x11ca, { 0x84, 0xc6, 0x08, 0x00, 0x2b, 0x1c, 0x8f, 0x1f } }; static guint16 ver_cprpc_server = 1; diff --git a/epan/dissectors/packet-dcerpc-dcom.h b/epan/dissectors/packet-dcerpc-dcom.h index 22a4d8f3c6..f184305dbc 100644 --- a/epan/dissectors/packet-dcerpc-dcom.h +++ b/epan/dissectors/packet-dcerpc-dcom.h @@ -30,7 +30,7 @@ typedef struct tagCOMVERSION typedef struct tagORPC_EXTENT { - e_uuid_t id; + e_guid_t id; guint32 size; /* guint8 data[]; */ } ORPC_EXTENT; @@ -46,7 +46,7 @@ typedef struct tagORPCTHIS { COMVERSION version; guint32 flags; guint32 reserved1; - e_uuid_t cid; + e_guid_t cid; ORPC_EXTENT_ARRAY *extensions; } ORPCTHIS; diff --git a/epan/dissectors/packet-dcerpc-dfs.c b/epan/dissectors/packet-dcerpc-dfs.c index 612a617fb1..a237a3a788 100644 --- a/epan/dissectors/packet-dcerpc-dfs.c +++ b/epan/dissectors/packet-dcerpc-dfs.c @@ -233,7 +233,7 @@ static gint proto_dcerpc_netdfs = -1; /* Version information */ -static e_uuid_t uuid_dcerpc_netdfs = { +static e_guid_t uuid_dcerpc_netdfs = { 0x4fc742e0, 0x4a10, 0x11cf, { 0x82, 0x73, 0x00, 0xaa, 0x00, 0x4a, 0xe6, 0x73 } }; diff --git a/epan/dissectors/packet-dcerpc-dnsserver.c b/epan/dissectors/packet-dcerpc-dnsserver.c index f6dd39c19e..576db7e8d1 100644 --- a/epan/dissectors/packet-dcerpc-dnsserver.c +++ b/epan/dissectors/packet-dcerpc-dnsserver.c @@ -187,7 +187,7 @@ static gint proto_dcerpc_dnsserver = -1; /* Version information */ -static e_uuid_t uuid_dcerpc_dnsserver = { +static e_guid_t uuid_dcerpc_dnsserver = { 0x50abc2a4, 0x574d, 0x40b3, { 0x9d, 0x66, 0xee, 0x4f, 0xd5, 0xfb, 0xa0, 0x76 } }; diff --git a/epan/dissectors/packet-dcerpc-drsuapi.c b/epan/dissectors/packet-dcerpc-drsuapi.c index 5581719771..7882dea879 100644 --- a/epan/dissectors/packet-dcerpc-drsuapi.c +++ b/epan/dissectors/packet-dcerpc-drsuapi.c @@ -587,7 +587,7 @@ drsuapi_dissect_a_string(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tr /* INCLUDED FILE : ETH_CODE */ -static e_uuid_t uuid_dcerpc_drsuapi = { +static e_guid_t uuid_dcerpc_drsuapi = { 0xe3514235, 0x4b06, 0x11d1, { 0xab, 0x04, 0x00, 0xc0, 0x4f, 0xc2, 0xdc, 0xd2} }; diff --git a/epan/dissectors/packet-dcerpc-dssetup.c b/epan/dissectors/packet-dcerpc-dssetup.c index e509f7b1fd..a1c40bf16b 100644 --- a/epan/dissectors/packet-dcerpc-dssetup.c +++ b/epan/dissectors/packet-dcerpc-dssetup.c @@ -56,7 +56,7 @@ static gint proto_dcerpc_dssetup = -1; /* Version information */ -static e_uuid_t uuid_dcerpc_dssetup = { +static e_guid_t uuid_dcerpc_dssetup = { 0x3919286a, 0xb10c, 0x11d0, { 0x9b, 0xa8, 0x00, 0xc0, 0x4f, 0xd9, 0x2e, 0xf5 } }; diff --git a/epan/dissectors/packet-dcerpc-dtsprovider.c b/epan/dissectors/packet-dcerpc-dtsprovider.c index d15d37bfe4..ba42532137 100644 --- a/epan/dissectors/packet-dcerpc-dtsprovider.c +++ b/epan/dissectors/packet-dcerpc-dtsprovider.c @@ -40,7 +40,7 @@ static int hf_dtsprovider_opnum = -1; static gint ett_dtsprovider = -1; -static e_uuid_t uuid_dtsprovider = { 0xbfca1238, 0x628a, 0x11c9, { 0xa0, 0x73, 0x08, 0x00, 0x2b, 0x0d, 0xea, 0x7a } }; +static e_guid_t uuid_dtsprovider = { 0xbfca1238, 0x628a, 0x11c9, { 0xa0, 0x73, 0x08, 0x00, 0x2b, 0x0d, 0xea, 0x7a } }; static guint16 ver_dtsprovider = 1; diff --git a/epan/dissectors/packet-dcerpc-dtsstime_req.c b/epan/dissectors/packet-dcerpc-dtsstime_req.c index 2f21aff3ca..af34672615 100644 --- a/epan/dissectors/packet-dcerpc-dtsstime_req.c +++ b/epan/dissectors/packet-dcerpc-dtsstime_req.c @@ -39,7 +39,7 @@ static int hf_dtsstime_req_opnum = -1; static gint ett_dtsstime_req = -1; -static e_uuid_t uuid_dtsstime_req = { 0x019ee420, 0x682d, 0x11c9, { 0xa6, 0x07, 0x08, 0x00, 0x2b, 0x0d, 0xea, 0x7a } }; +static e_guid_t uuid_dtsstime_req = { 0x019ee420, 0x682d, 0x11c9, { 0xa6, 0x07, 0x08, 0x00, 0x2b, 0x0d, 0xea, 0x7a } }; static guint16 ver_dtsstime_req = 1; diff --git a/epan/dissectors/packet-dcerpc-efs.c b/epan/dissectors/packet-dcerpc-efs.c index 7fecc0596b..477f84665f 100644 --- a/epan/dissectors/packet-dcerpc-efs.c +++ b/epan/dissectors/packet-dcerpc-efs.c @@ -68,7 +68,7 @@ static gint proto_dcerpc_efs = -1; /* Version information */ -static e_uuid_t uuid_dcerpc_efs = { +static e_guid_t uuid_dcerpc_efs = { 0xc681d488, 0xd850, 0x11d0, { 0x8c, 0x52, 0x00, 0xc0, 0x4f, 0xd9, 0x0f, 0x7e } }; diff --git a/epan/dissectors/packet-dcerpc-epm.c b/epan/dissectors/packet-dcerpc-epm.c index d422213737..bc90418cce 100644 --- a/epan/dissectors/packet-dcerpc-epm.c +++ b/epan/dissectors/packet-dcerpc-epm.c @@ -74,7 +74,7 @@ static expert_field ei_epm_proto_undecoded = EI_INIT; /* the UUID is identical for interface versions 3 and 4 */ -static e_uuid_t uuid_epm = { 0xe1af8308, 0x5d1f, 0x11c9, { 0x91, 0xa4, 0x08, 0x00, 0x2b, 0x14, 0xa0, 0xfa } }; +static e_guid_t uuid_epm = { 0xe1af8308, 0x5d1f, 0x11c9, { 0x91, 0xa4, 0x08, 0x00, 0x2b, 0x14, 0xa0, 0xfa } }; static guint16 ver_epm3 = 3; static guint16 ver_epm4 = 4; @@ -330,7 +330,7 @@ epm_dissect_tower_data (tvbuff_t *tvb, int offset, int old_offset = offset; guint16 len; guint8 proto_id; - e_uuid_t uuid; + e_guid_t uuid; proto_item *pi; tr = proto_tree_add_subtree_format(tree, tvb, offset, 0, ett_epm_tower_floor, &it, "Floor %d ", ii+1); @@ -352,19 +352,19 @@ epm_dissect_tower_data (tvbuff_t *tvb, int offset, proto_tree_add_guid_format (tr, hf_epm_uuid, tvb, offset+1, 16, (e_guid_t *) &uuid, "UUID: %s (%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x)", uuid_name, - uuid.Data1, uuid.Data2, uuid.Data3, - uuid.Data4[0], uuid.Data4[1], - uuid.Data4[2], uuid.Data4[3], - uuid.Data4[4], uuid.Data4[5], - uuid.Data4[6], uuid.Data4[7]); + uuid.data1, uuid.data2, uuid.data3, + uuid.data4[0], uuid.data4[1], + uuid.data4[2], uuid.data4[3], + uuid.data4[4], uuid.data4[5], + uuid.data4[6], uuid.data4[7]); } else { proto_tree_add_guid_format (tr, hf_epm_uuid, tvb, offset+1, 16, (e_guid_t *) &uuid, "UUID: %08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x", - uuid.Data1, uuid.Data2, uuid.Data3, - uuid.Data4[0], uuid.Data4[1], - uuid.Data4[2], uuid.Data4[3], - uuid.Data4[4], uuid.Data4[5], - uuid.Data4[6], uuid.Data4[7]); + uuid.data1, uuid.data2, uuid.data3, + uuid.data4[0], uuid.data4[1], + uuid.data4[2], uuid.data4[3], + uuid.data4[4], uuid.data4[5], + uuid.data4[6], uuid.data4[7]); } proto_tree_add_item(tr, hf_epm_uuid_version, tvb, offset+17, 2, ENC_BIG_ENDIAN); /* Major/minor bytes treated as big endian */ @@ -376,11 +376,11 @@ epm_dissect_tower_data (tvbuff_t *tvb, int offset, proto_item_append_text(tr, "UUID: %s", s); col_append_fstr(pinfo->cinfo, COL_INFO, ", %s", s); } else { - proto_item_append_text(tr, "UUID: %08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x Version %d.%d", uuid.Data1, uuid.Data2, uuid.Data3, - uuid.Data4[0], uuid.Data4[1], - uuid.Data4[2], uuid.Data4[3], - uuid.Data4[4], uuid.Data4[5], - uuid.Data4[6], uuid.Data4[7], + proto_item_append_text(tr, "UUID: %08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x Version %d.%d", uuid.data1, uuid.data2, uuid.data3, + uuid.data4[0], uuid.data4[1], + uuid.data4[2], uuid.data4[3], + uuid.data4[4], uuid.data4[5], + uuid.data4[6], uuid.data4[7], tvb_get_guint8(tvb, offset+17), tvb_get_guint8(tvb, offset+18)); } diff --git a/epan/dissectors/packet-dcerpc-eventlog.c b/epan/dissectors/packet-dcerpc-eventlog.c index 0efaa625a0..bead8119e5 100644 --- a/epan/dissectors/packet-dcerpc-eventlog.c +++ b/epan/dissectors/packet-dcerpc-eventlog.c @@ -128,7 +128,7 @@ static gint proto_dcerpc_eventlog = -1; /* Version information */ -static e_uuid_t uuid_dcerpc_eventlog = { +static e_guid_t uuid_dcerpc_eventlog = { 0x82273fdc, 0xe32a, 0x18c3, { 0x3f, 0x78, 0x82, 0x79, 0x29, 0xdc, 0x23, 0xea } }; diff --git a/epan/dissectors/packet-dcerpc-fileexp.c b/epan/dissectors/packet-dcerpc-fileexp.c index e045b508a9..11e21a3f5f 100644 --- a/epan/dissectors/packet-dcerpc-fileexp.c +++ b/epan/dissectors/packet-dcerpc-fileexp.c @@ -290,7 +290,7 @@ static gint ett_fileexp_afsbundled_stat = -1; /* vars for our macro(s) */ static int hf_error_st = -1; -static e_uuid_t uuid_fileexp = +static e_guid_t uuid_fileexp = { 0x4d37f2dd, 0xed93, 0x0000, {0x02, 0xc0, 0x37, 0xcf, 0x1e, 0x00, 0x00, 0x00} }; static guint16 ver_fileexp = 4; @@ -757,7 +757,7 @@ dissect_afsAcl (tvbuff_t *tvb, int offset, proto_tree *tree = NULL; int old_offset = offset; guint32 acl_len; - e_uuid_t uuid1, defaultcell; + e_guid_t uuid1, defaultcell; if (di->conformant_run) { @@ -778,21 +778,21 @@ dissect_afsAcl (tvbuff_t *tvb, int offset, hf_fileexp_afsacl_uuid1, &uuid1); col_append_fstr (pinfo->cinfo, COL_INFO, " - %08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x", - uuid1.Data1, uuid1.Data2, uuid1.Data3, uuid1.Data4[0], - uuid1.Data4[1], uuid1.Data4[2], uuid1.Data4[3], - uuid1.Data4[4], uuid1.Data4[5], uuid1.Data4[6], - uuid1.Data4[7]); + uuid1.data1, uuid1.data2, uuid1.data3, uuid1.data4[0], + uuid1.data4[1], uuid1.data4[2], uuid1.data4[3], + uuid1.data4[4], uuid1.data4[5], uuid1.data4[6], + uuid1.data4[7]); offset = dissect_ndr_uuid_t (tvb, offset, pinfo, tree, di, drep, hf_fileexp_afsacl_defaultcell_uuid, &defaultcell); col_append_fstr (pinfo->cinfo, COL_INFO, " %08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x", - defaultcell.Data1, defaultcell.Data2, defaultcell.Data3, - defaultcell.Data4[0], defaultcell.Data4[1], - defaultcell.Data4[2], defaultcell.Data4[3], - defaultcell.Data4[4], defaultcell.Data4[5], - defaultcell.Data4[6], defaultcell.Data4[7]); + defaultcell.data1, defaultcell.data2, defaultcell.data3, + defaultcell.data4[0], defaultcell.data4[1], + defaultcell.data4[2], defaultcell.data4[3], + defaultcell.data4[4], defaultcell.data4[5], + defaultcell.data4[6], defaultcell.data4[7]); offset += (acl_len - 38); @@ -941,7 +941,7 @@ dissect_afsstorestatus (tvbuff_t *tvb, int offset, guint32 spare5, spare6, accesstime_usec, changetime_usec, owner, group, mode; guint32 trunc_high, trunc_low, length_high, length_low, devicetype; guint32 cmask, modtime_usec; - e_uuid_t typeuuid; + e_guid_t typeuuid; if (di->conformant_run) { @@ -1371,7 +1371,7 @@ dissect_afsuuid (tvbuff_t *tvb, int offset, */ /*HEREN*/ - e_uuid_t uuid1; + e_guid_t uuid1; proto_item *item = NULL; proto_tree *tree = NULL; @@ -1389,7 +1389,7 @@ dissect_afsuuid (tvbuff_t *tvb, int offset, offset = dissect_ndr_uuid_t (tvb, offset, pinfo, tree, di, drep, hf_fileexp_afsuuid_uuid, &uuid1); - col_append_fstr (pinfo->cinfo, COL_INFO, ":%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x", uuid1.Data1, uuid1.Data2, uuid1.Data3, uuid1.Data4[0], uuid1.Data4[1], uuid1.Data4[2], uuid1.Data4[3], uuid1.Data4[4], uuid1.Data4[5], uuid1.Data4[6], uuid1.Data4[7]); + col_append_fstr (pinfo->cinfo, COL_INFO, ":%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x", uuid1.data1, uuid1.data2, uuid1.data3, uuid1.data4[0], uuid1.data4[1], uuid1.data4[2], uuid1.data4[3], uuid1.data4[4], uuid1.data4[5], uuid1.data4[6], uuid1.data4[7]); proto_item_set_len (item, offset - old_offset); return offset; @@ -1706,7 +1706,7 @@ dissect_fetchstatus (tvbuff_t *tvb, int offset, guint32 devicenumber, blocksused, clientspare1, devicenumberhighbits; guint32 agtypeunique, himaxspare, lomaxspare, pathconfspare, spare4; guint32 spare5, spare6; - e_uuid_t typeuuid, objectuuid; + e_guid_t typeuuid, objectuuid; if (di->conformant_run) { diff --git a/epan/dissectors/packet-dcerpc-fldb.c b/epan/dissectors/packet-dcerpc-fldb.c index ecc9296f86..d56f60d9e9 100644 --- a/epan/dissectors/packet-dcerpc-fldb.c +++ b/epan/dissectors/packet-dcerpc-fldb.c @@ -46,7 +46,7 @@ static gint ett_fldb_vlconf_cell = -1; static gint ett_fldb_afsNameString_t = -1; -static e_uuid_t uuid_fldb = +static e_guid_t uuid_fldb = { 0x4d37f2dd, 0xed43, 0x0000, {0x02, 0xc0, 0x37, 0xcf, 0x2e, 0x00, 0x00, 0x01} }; static guint16 ver_fldb = 4; @@ -641,7 +641,7 @@ dissect_vldbentry (tvbuff_t *tvb, int offset, guint32 maxtotallatency, hardmaxtotallatency, minimumpouncedally; guint32 defaultmaxreplicalatency, reclaimdally, whenlocked; guint32 spare1, spare2, spare3, spare4; - e_uuid_t siteowner, siteobjid; + e_guid_t siteowner, siteobjid; gint i; #define MAXNSERVERS 16 #define MAXVOLTYPES 8 @@ -731,11 +731,11 @@ dissect_vldbentry (tvbuff_t *tvb, int offset, hf_fldb_vldbentry_siteowner, &siteowner); col_append_fstr (pinfo->cinfo, COL_INFO, " SiteOwner - %08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x", - siteowner.Data1, siteowner.Data2, siteowner.Data3, - siteowner.Data4[0], siteowner.Data4[1], - siteowner.Data4[2], siteowner.Data4[3], - siteowner.Data4[4], siteowner.Data4[5], - siteowner.Data4[6], siteowner.Data4[7]); + siteowner.data1, siteowner.data2, siteowner.data3, + siteowner.data4[0], siteowner.data4[1], + siteowner.data4[2], siteowner.data4[3], + siteowner.data4[4], siteowner.data4[5], + siteowner.data4[6], siteowner.data4[7]); } /* afsUUID siteObjID[MAXNSERVERS]; */ @@ -746,11 +746,11 @@ dissect_vldbentry (tvbuff_t *tvb, int offset, hf_fldb_vldbentry_siteobjid, &siteobjid); col_append_fstr (pinfo->cinfo, COL_INFO, " SiteObjID - %08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x", - siteobjid.Data1, siteobjid.Data2, siteobjid.Data3, - siteobjid.Data4[0], siteobjid.Data4[1], - siteobjid.Data4[2], siteobjid.Data4[3], - siteobjid.Data4[4], siteobjid.Data4[5], - siteobjid.Data4[6], siteobjid.Data4[7]); + siteobjid.data1, siteobjid.data2, siteobjid.data3, + siteobjid.data4[0], siteobjid.data4[1], + siteobjid.data4[2], siteobjid.data4[3], + siteobjid.data4[4], siteobjid.data4[5], + siteobjid.data4[6], siteobjid.data4[7]); } /* afsHyper VolIDs[MAXVOLTYPES]; */ @@ -977,7 +977,7 @@ fldb_dissect_getsiteinfo_resp (tvbuff_t *tvb, int offset, dcerpc_info *di, guint8 *drep) { const guint8 *namestring; - e_uuid_t owner, objid; + e_guid_t owner, objid; guint32 creationquota, creationuses, deletedflag; guint32 spare2, spare3, spare4, spare5; @@ -1015,20 +1015,20 @@ fldb_dissect_getsiteinfo_resp (tvbuff_t *tvb, int offset, offset = dissect_ndr_uuid_t (tvb, offset, pinfo, tree, di, drep, hf_fldb_uuid_owner, &owner); col_append_fstr (pinfo->cinfo, COL_INFO, " Owner - %08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x", - owner.Data1, owner.Data2, owner.Data3, owner.Data4[0], - owner.Data4[1], owner.Data4[2], owner.Data4[3], - owner.Data4[4], owner.Data4[5], owner.Data4[6], - owner.Data4[7]); + owner.data1, owner.data2, owner.data3, owner.data4[0], + owner.data4[1], owner.data4[2], owner.data4[3], + owner.data4[4], owner.data4[5], owner.data4[6], + owner.data4[7]); offset = dissect_ndr_uuid_t (tvb, offset, pinfo, tree, di, drep, hf_fldb_uuid_objid, &objid); col_append_fstr (pinfo->cinfo, COL_INFO, " ObjID - %08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x", - objid.Data1, objid.Data2, objid.Data3, objid.Data4[0], - objid.Data4[1], objid.Data4[2], objid.Data4[3], - objid.Data4[4], objid.Data4[5], objid.Data4[6], - objid.Data4[7]); + objid.data1, objid.data2, objid.data3, objid.data4[0], + objid.data4[1], objid.data4[2], objid.data4[3], + objid.data4[4], objid.data4[5], objid.data4[6], + objid.data4[7]); offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, di, drep, hf_fldb_creationquota, diff --git a/epan/dissectors/packet-dcerpc-frsapi.c b/epan/dissectors/packet-dcerpc-frsapi.c index 649a1345c9..034ee972a8 100644 --- a/epan/dissectors/packet-dcerpc-frsapi.c +++ b/epan/dissectors/packet-dcerpc-frsapi.c @@ -44,7 +44,7 @@ IDL implicit_handle(handle_t rpc_binding) IDL ] interface frsapi */ -static e_uuid_t uuid_dcerpc_frsapi = { +static e_guid_t uuid_dcerpc_frsapi = { 0xd049b186, 0x814f, 0x11d1, { 0x9a, 0x3c, 0x00, 0xc0, 0x4f, 0xc9, 0xb2, 0x32 } }; diff --git a/epan/dissectors/packet-dcerpc-frsrpc.c b/epan/dissectors/packet-dcerpc-frsrpc.c index 822c1d45a5..e264f770e6 100644 --- a/epan/dissectors/packet-dcerpc-frsrpc.c +++ b/epan/dissectors/packet-dcerpc-frsrpc.c @@ -221,7 +221,7 @@ static gint proto_dcerpc_frsrpc = -1; /* Version information */ -static e_uuid_t uuid_dcerpc_frsrpc = { +static e_guid_t uuid_dcerpc_frsrpc = { 0xf5cc59b4, 0x4264, 0x101a, { 0x8c, 0x59, 0x08, 0x00, 0x2b, 0x2f, 0x84, 0x26 } }; diff --git a/epan/dissectors/packet-dcerpc-frstrans.c b/epan/dissectors/packet-dcerpc-frstrans.c index 044cfac77c..373c645b50 100644 --- a/epan/dissectors/packet-dcerpc-frstrans.c +++ b/epan/dissectors/packet-dcerpc-frstrans.c @@ -141,7 +141,7 @@ static gint proto_dcerpc_frstrans = -1; /* Version information */ -static e_uuid_t uuid_dcerpc_frstrans = { +static e_guid_t uuid_dcerpc_frstrans = { 0x897e2e5f, 0x93f3, 0x4376, { 0x9c, 0x9c, 0xfd, 0x22, 0x77, 0x49, 0x5c, 0x27 } }; diff --git a/epan/dissectors/packet-dcerpc-ftserver.c b/epan/dissectors/packet-dcerpc-ftserver.c index 5862816e28..24408dbb09 100644 --- a/epan/dissectors/packet-dcerpc-ftserver.c +++ b/epan/dissectors/packet-dcerpc-ftserver.c @@ -41,7 +41,7 @@ static int hf_ftserver_opnum = -1; static gint ett_ftserver = -1; -static e_uuid_t uuid_ftserver = { 0x4d37f2dd, 0xed43, 0x0004, { 0x02, 0xc0, 0x37, 0xcf, 0x1e, 0x00, 0x00, 0x00 } }; +static e_guid_t uuid_ftserver = { 0x4d37f2dd, 0xed43, 0x0004, { 0x02, 0xc0, 0x37, 0xcf, 0x1e, 0x00, 0x00, 0x00 } }; static guint16 ver_ftserver = 4; diff --git a/epan/dissectors/packet-dcerpc-icl_rpc.c b/epan/dissectors/packet-dcerpc-icl_rpc.c index 4857282e95..53573a4eb5 100644 --- a/epan/dissectors/packet-dcerpc-icl_rpc.c +++ b/epan/dissectors/packet-dcerpc-icl_rpc.c @@ -38,7 +38,7 @@ static int hf_icl_rpc_opnum = -1; static gint ett_icl_rpc = -1; -static e_uuid_t uuid_icl_rpc = { 0x003fd39c, 0x7feb, 0x1bbc, { 0xbe, 0xbe, 0x02, 0x60, 0x8c, 0x2e, 0xf4, 0xd2 } }; +static e_guid_t uuid_icl_rpc = { 0x003fd39c, 0x7feb, 0x1bbc, { 0xbe, 0xbe, 0x02, 0x60, 0x8c, 0x2e, 0xf4, 0xd2 } }; static guint16 ver_icl_rpc = 1; diff --git a/epan/dissectors/packet-dcerpc-initshutdown.c b/epan/dissectors/packet-dcerpc-initshutdown.c index 824c0ffd3d..618b994587 100644 --- a/epan/dissectors/packet-dcerpc-initshutdown.c +++ b/epan/dissectors/packet-dcerpc-initshutdown.c @@ -48,7 +48,7 @@ static gint proto_dcerpc_initshutdown = -1; /* Version information */ -static e_uuid_t uuid_dcerpc_initshutdown = { +static e_guid_t uuid_dcerpc_initshutdown = { 0x894de0c0, 0x0d55, 0x11d3, { 0xa3, 0x22, 0x00, 0xc0, 0x4f, 0xa3, 0x21, 0xa1 } }; diff --git a/epan/dissectors/packet-dcerpc-krb5rpc.c b/epan/dissectors/packet-dcerpc-krb5rpc.c index b092aceb83..bb518d71e1 100644 --- a/epan/dissectors/packet-dcerpc-krb5rpc.c +++ b/epan/dissectors/packet-dcerpc-krb5rpc.c @@ -40,7 +40,7 @@ static int proto_krb5rpc = -1; static gint ett_krb5rpc = -1; -static e_uuid_t uuid_krb5rpc = +static e_guid_t uuid_krb5rpc = { 0x8f73de50, 0x768c, 0x11ca, {0xbf, 0xfc, 0x08, 0x00, 0x1e, 0x03, 0x94, 0x31} }; diff --git a/epan/dissectors/packet-dcerpc-llb.c b/epan/dissectors/packet-dcerpc-llb.c index cbe2ab3942..e639bd038a 100644 --- a/epan/dissectors/packet-dcerpc-llb.c +++ b/epan/dissectors/packet-dcerpc-llb.c @@ -39,7 +39,7 @@ static int hf_llb_opnum = -1; static gint ett_llb = -1; -static e_uuid_t uuid_llb = +static e_guid_t uuid_llb = { 0x333b33c3, 0x0000, 0x0000, {0x0d, 0x00, 0x00, 0x87, 0x84, 0x00, 0x00, 0x00} }; static guint16 ver_llb = 4; diff --git a/epan/dissectors/packet-dcerpc-lsa.c b/epan/dissectors/packet-dcerpc-lsa.c index 56833a151f..3d50c6fa80 100644 --- a/epan/dissectors/packet-dcerpc-lsa.c +++ b/epan/dissectors/packet-dcerpc-lsa.c @@ -522,7 +522,7 @@ static gint proto_dcerpc_lsarpc = -1; /* Version information */ -static e_uuid_t uuid_dcerpc_lsarpc = { +static e_guid_t uuid_dcerpc_lsarpc = { 0x12345778, 0x1234, 0xabcd, { 0xef, 0x00, 0x01, 0x23, 0x45, 0x67, 0x89, 0xab } }; diff --git a/epan/dissectors/packet-dcerpc-mapi.c b/epan/dissectors/packet-dcerpc-mapi.c index a9f547eaab..1d0af2a8c1 100644 --- a/epan/dissectors/packet-dcerpc-mapi.c +++ b/epan/dissectors/packet-dcerpc-mapi.c @@ -171,7 +171,7 @@ static gint proto_dcerpc_mapi = -1; /* Version information */ -static e_uuid_t uuid_dcerpc_mapi = { +static e_guid_t uuid_dcerpc_mapi = { 0xa4f1db00, 0xca47, 0x1067, { 0xb3, 0x1f, 0x00, 0xdd, 0x01, 0x06, 0x62, 0xda } }; diff --git a/epan/dissectors/packet-dcerpc-mdssvc.c b/epan/dissectors/packet-dcerpc-mdssvc.c index a64e46e9e8..503d6de2ca 100644 --- a/epan/dissectors/packet-dcerpc-mdssvc.c +++ b/epan/dissectors/packet-dcerpc-mdssvc.c @@ -69,7 +69,7 @@ static gint proto_dcerpc_mdssvc = -1; /* Version information */ -static e_uuid_t uuid_dcerpc_mdssvc = { +static e_guid_t uuid_dcerpc_mdssvc = { 0x885d85fb, 0xc754, 0x4062, { 0xa0, 0xe7, 0x68, 0x72, 0xce, 0x00, 0x64, 0xf4 } }; diff --git a/epan/dissectors/packet-dcerpc-messenger.c b/epan/dissectors/packet-dcerpc-messenger.c index 64d6506e81..00877928b6 100644 --- a/epan/dissectors/packet-dcerpc-messenger.c +++ b/epan/dissectors/packet-dcerpc-messenger.c @@ -46,7 +46,7 @@ static gint ett_dcerpc_messenger = -1; * a dynamic UDP port */ -static e_uuid_t uuid_dcerpc_messenger = { +static e_guid_t uuid_dcerpc_messenger = { 0x5a7b91f8, 0xff00, 0x11d0, { 0xa9, 0xb2, 0x00, 0xc0, 0x4f, 0xb6, 0xe6, 0xfc} }; diff --git a/epan/dissectors/packet-dcerpc-mgmt.c b/epan/dissectors/packet-dcerpc-mgmt.c index a2674ac47a..bb6638349c 100644 --- a/epan/dissectors/packet-dcerpc-mgmt.c +++ b/epan/dissectors/packet-dcerpc-mgmt.c @@ -39,7 +39,7 @@ static int hf_mgmt_princ_name = -1; static gint ett_mgmt = -1; -static e_uuid_t uuid_mgmt = { 0xafa8bd80, 0x7d8a, 0x11c9, { 0xbe, 0xf4, 0x08, 0x00, 0x2b, 0x10, 0x29, 0x89 } }; +static e_guid_t uuid_mgmt = { 0xafa8bd80, 0x7d8a, 0x11c9, { 0xbe, 0xf4, 0x08, 0x00, 0x2b, 0x10, 0x29, 0x89 } }; static guint16 ver_mgmt = 1; static int diff --git a/epan/dissectors/packet-dcerpc-misc.c b/epan/dissectors/packet-dcerpc-misc.c index ae32830bab..552163424a 100644 --- a/epan/dissectors/packet-dcerpc-misc.c +++ b/epan/dissectors/packet-dcerpc-misc.c @@ -48,7 +48,7 @@ static gint proto_dcerpc_misc = -1; /* Version information */ -static e_uuid_t uuid_dcerpc_misc = { +static e_guid_t uuid_dcerpc_misc = { 0x12345678, 0x1234, 0x1234, { 0x12, 0x34, 0xab, 0xcd, 0xef, 0x12, 0x34, 0x56 } }; diff --git a/epan/dissectors/packet-dcerpc-ndr.c b/epan/dissectors/packet-dcerpc-ndr.c index 6f6645fdb5..bbc37e1ac4 100644 --- a/epan/dissectors/packet-dcerpc-ndr.c +++ b/epan/dissectors/packet-dcerpc-ndr.c @@ -519,7 +519,7 @@ dissect_ndr_time_t(tvbuff_t *tvb, gint offset, packet_info *pinfo, 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) { /* Some callers expect us to initialize pdata, even in error conditions, so * do it right away in case we forget later */ diff --git a/epan/dissectors/packet-dcerpc-netlogon.c b/epan/dissectors/packet-dcerpc-netlogon.c index bcb15f98bf..bfc11c92fe 100644 --- a/epan/dissectors/packet-dcerpc-netlogon.c +++ b/epan/dissectors/packet-dcerpc-netlogon.c @@ -470,7 +470,7 @@ typedef struct _seen_packet { static seen_packet seen; -static e_uuid_t uuid_dcerpc_netlogon = { +static e_guid_t uuid_dcerpc_netlogon = { 0x12345678, 0x1234, 0xabcd, { 0xef, 0x00, 0x01, 0x23, 0x45, 0x67, 0xcf, 0xfb } }; diff --git a/epan/dissectors/packet-dcerpc-nspi.c b/epan/dissectors/packet-dcerpc-nspi.c index 297f792a08..51ef4a3af2 100644 --- a/epan/dissectors/packet-dcerpc-nspi.c +++ b/epan/dissectors/packet-dcerpc-nspi.c @@ -175,7 +175,7 @@ static gint proto_dcerpc_nspi = -1; /* Version information */ -static e_uuid_t uuid_dcerpc_nspi = { +static e_guid_t uuid_dcerpc_nspi = { 0xf5cc5a18, 0x4264, 0x101a, { 0x8c, 0x59, 0x08, 0x00, 0x2b, 0x2f, 0x84, 0x26 } }; diff --git a/epan/dissectors/packet-dcerpc-pnp.c b/epan/dissectors/packet-dcerpc-pnp.c index 6e7f276bad..44cb321808 100644 --- a/epan/dissectors/packet-dcerpc-pnp.c +++ b/epan/dissectors/packet-dcerpc-pnp.c @@ -42,7 +42,7 @@ static gint ett_dcerpc_pnp = -1; * and \pipe\ntsvcs or \pipe\plugplay named pipes as endpoint. */ -static e_uuid_t uuid_dcerpc_pnp = { +static e_guid_t uuid_dcerpc_pnp = { 0x8d9f4e40, 0xa03d, 0x11ce, { 0x8f, 0x69, 0x08, 0x00, 0x3e, 0x30, 0x05, 0x1b } }; diff --git a/epan/dissectors/packet-dcerpc-rdaclif.c b/epan/dissectors/packet-dcerpc-rdaclif.c index fcd7eed228..70ed8b4e57 100644 --- a/epan/dissectors/packet-dcerpc-rdaclif.c +++ b/epan/dissectors/packet-dcerpc-rdaclif.c @@ -38,7 +38,7 @@ static int hf_rdaclif_opnum = -1; static gint ett_rdaclif = -1; -static e_uuid_t uuid_rdaclif = +static e_guid_t uuid_rdaclif = { 0x47b33331, 0x8000, 0x0000, {0x0d, 0x00, 0x01, 0xdc, 0x6c, 0x00, 0x00, 0x00} }; diff --git a/epan/dissectors/packet-dcerpc-rep_proc.c b/epan/dissectors/packet-dcerpc-rep_proc.c index 87671f0795..e61297d34d 100644 --- a/epan/dissectors/packet-dcerpc-rep_proc.c +++ b/epan/dissectors/packet-dcerpc-rep_proc.c @@ -40,7 +40,7 @@ static int hf_rep_proc_opnum = -1; static gint ett_rep_proc = -1; -static e_uuid_t uuid_rep_proc = { 0x4d37f2dd, 0xed43, 0x0005, { 0x02, 0xc0, 0x37, 0xcf, 0x1e, 0x00, 0x00, 0x00 } }; +static e_guid_t uuid_rep_proc = { 0x4d37f2dd, 0xed43, 0x0005, { 0x02, 0xc0, 0x37, 0xcf, 0x1e, 0x00, 0x00, 0x00 } }; static guint16 ver_rep_proc = 4; diff --git a/epan/dissectors/packet-dcerpc-rfr.c b/epan/dissectors/packet-dcerpc-rfr.c index d49587d238..a3a104441f 100644 --- a/epan/dissectors/packet-dcerpc-rfr.c +++ b/epan/dissectors/packet-dcerpc-rfr.c @@ -41,7 +41,7 @@ static gint proto_dcerpc_rfr = -1; /* Version information */ -static e_uuid_t uuid_dcerpc_rfr = { +static e_guid_t uuid_dcerpc_rfr = { 0x1544f5e0, 0x613c, 0x11d1, { 0x93, 0xdf, 0x00, 0xc0, 0x4f, 0xd7, 0xbd, 0x09 } }; diff --git a/epan/dissectors/packet-dcerpc-roverride.c b/epan/dissectors/packet-dcerpc-roverride.c index e14bb6ff7a..7c3bb399f5 100644 --- a/epan/dissectors/packet-dcerpc-roverride.c +++ b/epan/dissectors/packet-dcerpc-roverride.c @@ -40,7 +40,7 @@ static int hf_roverride_opnum = -1; static gint ett_roverride = -1; -static e_uuid_t uuid_roverride = { 0x5d978990, 0x4851, 0x11ca, { 0x99, 0x37, 0x08, 0x00, 0x1e, 0x03, 0x94, 0x48 } }; +static e_guid_t uuid_roverride = { 0x5d978990, 0x4851, 0x11ca, { 0x99, 0x37, 0x08, 0x00, 0x1e, 0x03, 0x94, 0x48 } }; static guint16 ver_roverride = 1; diff --git a/epan/dissectors/packet-dcerpc-rpriv.c b/epan/dissectors/packet-dcerpc-rpriv.c index 7bad7ec452..6c7f0d9e27 100644 --- a/epan/dissectors/packet-dcerpc-rpriv.c +++ b/epan/dissectors/packet-dcerpc-rpriv.c @@ -46,7 +46,7 @@ static int hf_rpriv_get_eptgt_rqst_key_t2 = -1; static gint ett_rpriv = -1; -static e_uuid_t uuid_rpriv = { 0xb1e338f8, 0x9533, 0x11c9, { 0xa3, 0x4a, 0x08, 0x00, 0x1e, 0x01, 0x9c, 0x1e } }; +static e_guid_t uuid_rpriv = { 0xb1e338f8, 0x9533, 0x11c9, { 0xa3, 0x4a, 0x08, 0x00, 0x1e, 0x01, 0x9c, 0x1e } }; static guint16 ver_rpriv = 1; diff --git a/epan/dissectors/packet-dcerpc-rras.c b/epan/dissectors/packet-dcerpc-rras.c index d0e1638d97..15c0af478c 100644 --- a/epan/dissectors/packet-dcerpc-rras.c +++ b/epan/dissectors/packet-dcerpc-rras.c @@ -42,7 +42,7 @@ static gint ett_dcerpc_rras = -1; * and the \pipe\ROUTER named pipe as endpoint. */ -static e_uuid_t uuid_dcerpc_rras = { +static e_guid_t uuid_dcerpc_rras = { 0x8f09f000, 0xb7ed, 0x11ce, { 0xbb, 0xd2, 0x00, 0x00, 0x1a, 0x18, 0x1c, 0xad } }; diff --git a/epan/dissectors/packet-dcerpc-rs_acct.c b/epan/dissectors/packet-dcerpc-rs_acct.c index bc241836d4..24d1f92688 100644 --- a/epan/dissectors/packet-dcerpc-rs_acct.c +++ b/epan/dissectors/packet-dcerpc-rs_acct.c @@ -47,7 +47,7 @@ static gint ett_rs_acct = -1; -static e_uuid_t uuid_rs_acct = { 0x4c878280, 0x2000, 0x0000, { 0x0d, 0x00, 0x02, 0x87, 0x14, 0x00, 0x00, 0x00 } }; +static e_guid_t uuid_rs_acct = { 0x4c878280, 0x2000, 0x0000, { 0x0d, 0x00, 0x02, 0x87, 0x14, 0x00, 0x00, 0x00 } }; static guint16 ver_rs_acct = 1; diff --git a/epan/dissectors/packet-dcerpc-rs_attr.c b/epan/dissectors/packet-dcerpc-rs_attr.c index 379a2a6096..6f1accaa0c 100644 --- a/epan/dissectors/packet-dcerpc-rs_attr.c +++ b/epan/dissectors/packet-dcerpc-rs_attr.c @@ -40,7 +40,7 @@ static int hf_rs_attr_opnum = -1; static gint ett_rs_attr = -1; -static e_uuid_t uuid_rs_attr = { 0xa71fc1e8, 0x567f, 0x11cb, { 0x98, 0xa0, 0x08, 0x00, 0x1e, 0x04, 0xde, 0x8c } }; +static e_guid_t uuid_rs_attr = { 0xa71fc1e8, 0x567f, 0x11cb, { 0x98, 0xa0, 0x08, 0x00, 0x1e, 0x04, 0xde, 0x8c } }; static guint16 ver_rs_attr = 0; diff --git a/epan/dissectors/packet-dcerpc-rs_attr_schema.c b/epan/dissectors/packet-dcerpc-rs_attr_schema.c index fc268a8a7d..4752a3b676 100644 --- a/epan/dissectors/packet-dcerpc-rs_attr_schema.c +++ b/epan/dissectors/packet-dcerpc-rs_attr_schema.c @@ -38,7 +38,7 @@ static int hf_rs_attr_schema_opnum = -1; static gint ett_rs_attr_schema = -1; -static e_uuid_t uuid_rs_attr_schema = +static e_guid_t uuid_rs_attr_schema = { 0xb47c9460, 0x567f, 0x11cb, {0x8c, 0x09, 0x08, 0x00, 0x1e, 0x04, 0xde, 0x8c} }; static guint16 ver_rs_attr_schema = 0; diff --git a/epan/dissectors/packet-dcerpc-rs_bind.c b/epan/dissectors/packet-dcerpc-rs_bind.c index be854950b4..7e7b6d0f51 100644 --- a/epan/dissectors/packet-dcerpc-rs_bind.c +++ b/epan/dissectors/packet-dcerpc-rs_bind.c @@ -39,7 +39,7 @@ static int hf_rs_bind_opnum = -1; static gint ett_rs_bind = -1; -static e_uuid_t uuid_rs_bind = +static e_guid_t uuid_rs_bind = { 0xd46113d0, 0xa848, 0x11cb, {0xb8, 0x63, 0x08, 0x00, 0x1e, 0x04, 0x6a, 0xa5} diff --git a/epan/dissectors/packet-dcerpc-rs_misc.c b/epan/dissectors/packet-dcerpc-rs_misc.c index 7490013868..de5952d946 100644 --- a/epan/dissectors/packet-dcerpc-rs_misc.c +++ b/epan/dissectors/packet-dcerpc-rs_misc.c @@ -43,7 +43,7 @@ static int hf_rs_misc_login_get_info_rqst_key_t = -1; static gint ett_rs_misc = -1; -static e_uuid_t uuid_rs_misc = { 0x4c878280, 0x5000, 0x0000, { 0x0d, 0x00, 0x02, 0x87, 0x14, 0x00, 0x00, 0x00 } }; +static e_guid_t uuid_rs_misc = { 0x4c878280, 0x5000, 0x0000, { 0x0d, 0x00, 0x02, 0x87, 0x14, 0x00, 0x00, 0x00 } }; static guint16 ver_rs_misc = 1; diff --git a/epan/dissectors/packet-dcerpc-rs_pgo.c b/epan/dissectors/packet-dcerpc-rs_pgo.c index 63692afd8a..d4962c8d2f 100644 --- a/epan/dissectors/packet-dcerpc-rs_pgo.c +++ b/epan/dissectors/packet-dcerpc-rs_pgo.c @@ -117,7 +117,7 @@ static gint ett_rs_pgo_result_t = -1; static gint ett_rs_pgo = -1; -static e_uuid_t uuid_rs_pgo = +static e_guid_t uuid_rs_pgo = { 0x4c878280, 0x3000, 0x0000, {0x0d, 0x00, 0x02, 0x87, 0x14, 0x00, 0x00, 0x00} }; @@ -324,7 +324,7 @@ dissect_rs_cache_data_t (tvbuff_t * tvb, int offset, proto_tree *tree = NULL; int old_offset = offset; guint32 person_dtm, group_dtm, org_dtm; - e_uuid_t uuid1; + e_guid_t uuid1; if (di->conformant_run) @@ -354,10 +354,10 @@ dissect_rs_cache_data_t (tvbuff_t * tvb, int offset, col_append_fstr (pinfo->cinfo, COL_INFO, " siteid %08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x person_dtm:%u group_dtm:%u org_dtm:%u", - uuid1.Data1, uuid1.Data2, uuid1.Data3, uuid1.Data4[0], - uuid1.Data4[1], uuid1.Data4[2], uuid1.Data4[3], - uuid1.Data4[4], uuid1.Data4[5], uuid1.Data4[6], - uuid1.Data4[7], person_dtm, group_dtm, org_dtm); + uuid1.data1, uuid1.data2, uuid1.data3, uuid1.data4[0], + uuid1.data4[1], uuid1.data4[2], uuid1.data4[3], + uuid1.data4[4], uuid1.data4[5], uuid1.data4[6], + uuid1.data4[7], person_dtm, group_dtm, org_dtm); proto_item_set_len (item, offset - old_offset); return offset; @@ -480,7 +480,7 @@ dissect_sec_rgy_pgo_item_t (tvbuff_t * tvb, int offset, proto_item *item = NULL; proto_tree *tree = NULL; int old_offset = offset; - e_uuid_t id; + e_guid_t id; guint32 unix_num, quota; if (di->conformant_run) @@ -510,10 +510,10 @@ dissect_sec_rgy_pgo_item_t (tvbuff_t * tvb, int offset, col_append_fstr (pinfo->cinfo, COL_INFO, " sec_rgy_pgo_item_t - id %08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x unix_num:%u quota:%u", - id.Data1, id.Data2, id.Data3, id.Data4[0], - id.Data4[1], id.Data4[2], id.Data4[3], - id.Data4[4], id.Data4[5], id.Data4[6], - id.Data4[7], unix_num, quota); + id.data1, id.data2, id.data3, id.data4[0], + id.data4[1], id.data4[2], id.data4[3], + id.data4[4], id.data4[5], id.data4[6], + id.data4[7], unix_num, quota); proto_item_set_len (item, offset - old_offset); return offset; @@ -541,7 +541,7 @@ dissect_sec_rgy_cursor_t (tvbuff_t * tvb, int offset, proto_item *item = NULL; proto_tree *tree = NULL; int old_offset = offset; - e_uuid_t source; + e_guid_t source; guint32 handle, valid; if (di->conformant_run) @@ -568,10 +568,10 @@ dissect_sec_rgy_cursor_t (tvbuff_t * tvb, int offset, col_append_fstr (pinfo->cinfo, COL_INFO, " sec_rgy_cursor_t - source %08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x handle:%u valid:%u", - source.Data1, source.Data2, source.Data3, - source.Data4[0], source.Data4[1], source.Data4[2], - source.Data4[3], source.Data4[4], source.Data4[5], - source.Data4[6], source.Data4[7], handle, valid); + source.data1, source.data2, source.data3, + source.data4[0], source.data4[1], source.data4[2], + source.data4[3], source.data4[4], source.data4[5], + source.data4[6], source.data4[7], handle, valid); proto_item_set_len (item, offset - old_offset); return offset; @@ -658,7 +658,7 @@ dissect_rs_pgo_id_key_t (tvbuff_t * tvb, int offset, proto_item *item = NULL; proto_tree *tree = NULL; int old_offset = offset; - e_uuid_t id; + e_guid_t id; if (di->conformant_run) { @@ -679,9 +679,9 @@ dissect_rs_pgo_id_key_t (tvbuff_t * tvb, int offset, col_append_fstr (pinfo->cinfo, COL_INFO, " rs_pgo_id_key_t - id %08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x", - id.Data1, id.Data2, id.Data3, id.Data4[0], - id.Data4[1], id.Data4[2], id.Data4[3], - id.Data4[4], id.Data4[5], id.Data4[6], id.Data4[7]); + id.data1, id.data2, id.data3, id.data4[0], + id.data4[1], id.data4[2], id.data4[3], + id.data4[4], id.data4[5], id.data4[6], id.data4[7]); proto_item_set_len (item, offset - old_offset); return offset; diff --git a/epan/dissectors/packet-dcerpc-rs_plcy.c b/epan/dissectors/packet-dcerpc-rs_plcy.c index 0e0dcdfd8c..f574d472bf 100644 --- a/epan/dissectors/packet-dcerpc-rs_plcy.c +++ b/epan/dissectors/packet-dcerpc-rs_plcy.c @@ -38,7 +38,7 @@ static int proto_dcerpc_rs_plcy = -1; static int hf_rs_plcy_opnum = -1; static gint ett_dcerpc_rs_plcy = -1; -static e_uuid_t uuid_dcerpc_rs_plcy = { +static e_guid_t uuid_dcerpc_rs_plcy = { 0x4c878280, 0x4000, 0x0000, { 0x0D, 0x00, 0x02, 0x87, 0x14, 0x00, 0x00, 0x00 } }; diff --git a/epan/dissectors/packet-dcerpc-rs_prop_acct.c b/epan/dissectors/packet-dcerpc-rs_prop_acct.c index 57f60a9aa0..26f1a74228 100644 --- a/epan/dissectors/packet-dcerpc-rs_prop_acct.c +++ b/epan/dissectors/packet-dcerpc-rs_prop_acct.c @@ -37,7 +37,7 @@ static int hf_rs_prop_acct_opnum = -1; static gint ett_rs_prop_acct = -1; -static e_uuid_t uuid_rs_prop_acct = { 0x68097130, 0xde43, 0x11ca, { 0xa5, 0x54, 0x08, 0x00, 0x1e, 0x03, 0x94, 0xc7 } }; +static e_guid_t uuid_rs_prop_acct = { 0x68097130, 0xde43, 0x11ca, { 0xa5, 0x54, 0x08, 0x00, 0x1e, 0x03, 0x94, 0xc7 } }; static guint16 ver_rs_prop_acct = 1; diff --git a/epan/dissectors/packet-dcerpc-rs_prop_acl.c b/epan/dissectors/packet-dcerpc-rs_prop_acl.c index da50bcab73..c1c1052fc5 100644 --- a/epan/dissectors/packet-dcerpc-rs_prop_acl.c +++ b/epan/dissectors/packet-dcerpc-rs_prop_acl.c @@ -38,7 +38,7 @@ static int hf_rs_prop_acl_opnum = -1; static gint ett_rs_prop_acl = -1; -static e_uuid_t uuid_rs_prop_acl = +static e_guid_t uuid_rs_prop_acl = { 0x591d87d0, 0xde64, 0x11ca, {0xa1, 0x1c, 0x08, 0x00, 0x1e, 0x03, 0x94, 0xc7} }; diff --git a/epan/dissectors/packet-dcerpc-rs_prop_attr.c b/epan/dissectors/packet-dcerpc-rs_prop_attr.c index 0b5b1f05e3..505c8a712f 100644 --- a/epan/dissectors/packet-dcerpc-rs_prop_attr.c +++ b/epan/dissectors/packet-dcerpc-rs_prop_attr.c @@ -38,7 +38,7 @@ static int hf_rs_prop_attr_opnum = -1; static gint ett_rs_prop_attr = -1; -static e_uuid_t uuid_rs_prop_attr = +static e_guid_t uuid_rs_prop_attr = { 0x0eff23e6, 0x555a, 0x11cd, {0x95, 0xbf, 0x08, 0x00, 0x09, 0x27, 0x84, 0xc3} }; diff --git a/epan/dissectors/packet-dcerpc-rs_prop_pgo.c b/epan/dissectors/packet-dcerpc-rs_prop_pgo.c index e0a4201e73..adee926e3c 100644 --- a/epan/dissectors/packet-dcerpc-rs_prop_pgo.c +++ b/epan/dissectors/packet-dcerpc-rs_prop_pgo.c @@ -38,7 +38,7 @@ static int hf_rs_prop_pgo_opnum = -1; static gint ett_rs_prop_pgo = -1; -static e_uuid_t uuid_rs_prop_pgo = +static e_guid_t uuid_rs_prop_pgo = { 0xc23626e8, 0xde34, 0x11ca, {0x8c, 0xbc, 0x08, 0x00, 0x1e, 0x03, 0x94, 0xc7} }; diff --git a/epan/dissectors/packet-dcerpc-rs_prop_plcy.c b/epan/dissectors/packet-dcerpc-rs_prop_plcy.c index a992295b99..fef817c51d 100644 --- a/epan/dissectors/packet-dcerpc-rs_prop_plcy.c +++ b/epan/dissectors/packet-dcerpc-rs_prop_plcy.c @@ -38,7 +38,7 @@ static int hf_rs_prop_plcy_opnum = -1; static gint ett_rs_prop_plcy = -1; -static e_uuid_t uuid_rs_prop_plcy = +static e_guid_t uuid_rs_prop_plcy = { 0xe6ac5cb8, 0xde3e, 0x11ca, {0x93, 0x76, 0x08, 0x00, 0x1e, 0x03, 0x94, 0xc7} }; diff --git a/epan/dissectors/packet-dcerpc-rs_pwd_mgmt.c b/epan/dissectors/packet-dcerpc-rs_pwd_mgmt.c index a520335e44..c986c8517b 100644 --- a/epan/dissectors/packet-dcerpc-rs_pwd_mgmt.c +++ b/epan/dissectors/packet-dcerpc-rs_pwd_mgmt.c @@ -38,7 +38,7 @@ static int hf_rs_pwd_mgmt_opnum = -1; static gint ett_rs_pwd_mgmt = -1; -static e_uuid_t uuid_rs_pwd_mgmt = +static e_guid_t uuid_rs_pwd_mgmt = { 0x3139a0e2, 0x68da, 0x11cd, {0x91, 0xc7, 0x08, 0x00, 0x09, 0x24, 0x24, 0x44} }; diff --git a/epan/dissectors/packet-dcerpc-rs_repadm.c b/epan/dissectors/packet-dcerpc-rs_repadm.c index 1bbb11c3f9..adaf14218b 100644 --- a/epan/dissectors/packet-dcerpc-rs_repadm.c +++ b/epan/dissectors/packet-dcerpc-rs_repadm.c @@ -40,7 +40,7 @@ static int hf_rs_repadm_opnum = -1; static gint ett_rs_repadm = -1; -static e_uuid_t uuid_rs_repadm = { 0x5b8c2fa8, 0xb60b, 0x11c9, { 0xbe, 0x0f, 0x08, 0x00, 0x1e, 0x01, 0x8f, 0xa0 } }; +static e_guid_t uuid_rs_repadm = { 0x5b8c2fa8, 0xb60b, 0x11c9, { 0xbe, 0x0f, 0x08, 0x00, 0x1e, 0x01, 0x8f, 0xa0 } }; static guint16 ver_rs_repadm = 1; diff --git a/epan/dissectors/packet-dcerpc-rs_replist.c b/epan/dissectors/packet-dcerpc-rs_replist.c index 2d88098832..6036004257 100644 --- a/epan/dissectors/packet-dcerpc-rs_replist.c +++ b/epan/dissectors/packet-dcerpc-rs_replist.c @@ -40,7 +40,7 @@ static int hf_rs_replist_opnum = -1; static gint ett_rs_replist = -1; -static e_uuid_t uuid_rs_replist = { 0x850446b0, 0xe95b, 0x11CA, { 0xad, 0x90, 0x08, 0x00, 0x1e, 0x01, 0x45, 0xb1 } }; +static e_guid_t uuid_rs_replist = { 0x850446b0, 0xe95b, 0x11CA, { 0xad, 0x90, 0x08, 0x00, 0x1e, 0x01, 0x45, 0xb1 } }; static guint16 ver_rs_replist = 2; diff --git a/epan/dissectors/packet-dcerpc-rs_repmgr.c b/epan/dissectors/packet-dcerpc-rs_repmgr.c index 100ccc259e..c66d0b2313 100644 --- a/epan/dissectors/packet-dcerpc-rs_repmgr.c +++ b/epan/dissectors/packet-dcerpc-rs_repmgr.c @@ -38,7 +38,7 @@ static int hf_rs_repmgr_opnum = -1; static gint ett_rs_repmgr = -1; -static e_uuid_t uuid_rs_repmgr = +static e_guid_t uuid_rs_repmgr = { 0xb62dc198, 0xdfd4, 0x11ca, {0x94, 0x8f, 0x08, 0x00, 0x1e, 0x02, 0x59, 0x4c} }; diff --git a/epan/dissectors/packet-dcerpc-rs_unix.c b/epan/dissectors/packet-dcerpc-rs_unix.c index 7378445e70..b6617f471d 100644 --- a/epan/dissectors/packet-dcerpc-rs_unix.c +++ b/epan/dissectors/packet-dcerpc-rs_unix.c @@ -39,7 +39,7 @@ static int hf_rs_unix_opnum = -1; static gint ett_rs_unix = -1; -static e_uuid_t uuid_rs_unix = { 0x361993c0, 0xb000, 0x0000, { 0x0d, 0x00, 0x00, 0x87, 0x84, 0x00, 0x00, 0x00 } }; +static e_guid_t uuid_rs_unix = { 0x361993c0, 0xb000, 0x0000, { 0x0d, 0x00, 0x00, 0x87, 0x84, 0x00, 0x00, 0x00 } }; static guint16 ver_rs_unix = 1; diff --git a/epan/dissectors/packet-dcerpc-rsec_login.c b/epan/dissectors/packet-dcerpc-rsec_login.c index 68c7d99090..4e98d7162f 100644 --- a/epan/dissectors/packet-dcerpc-rsec_login.c +++ b/epan/dissectors/packet-dcerpc-rsec_login.c @@ -39,7 +39,7 @@ static int hf_rsec_login_opnum = -1; static gint ett_rsec_login = -1; -static e_uuid_t uuid_rsec_login = { 0xa76e832a, 0x10df, 0x11cd, { 0x90, 0x56, 0x08, 0x00, 0x09, 0x24, 0x24, 0x44 } }; +static e_guid_t uuid_rsec_login = { 0xa76e832a, 0x10df, 0x11cd, { 0x90, 0x56, 0x08, 0x00, 0x09, 0x24, 0x24, 0x44 } }; static guint16 ver_rsec_login = 2; diff --git a/epan/dissectors/packet-dcerpc-samr.c b/epan/dissectors/packet-dcerpc-samr.c index 843b443aee..926c9d8c61 100644 --- a/epan/dissectors/packet-dcerpc-samr.c +++ b/epan/dissectors/packet-dcerpc-samr.c @@ -669,7 +669,7 @@ static gint proto_dcerpc_samr = -1; /* Version information */ -static e_uuid_t uuid_dcerpc_samr = { +static e_guid_t uuid_dcerpc_samr = { 0x12345778, 0x1234, 0xabcd, { 0xef, 0x00, 0x01, 0x23, 0x45, 0x67, 0x89, 0xac } }; diff --git a/epan/dissectors/packet-dcerpc-secidmap.c b/epan/dissectors/packet-dcerpc-secidmap.c index 23fe3176fb..0264b2fac4 100644 --- a/epan/dissectors/packet-dcerpc-secidmap.c +++ b/epan/dissectors/packet-dcerpc-secidmap.c @@ -39,7 +39,7 @@ static int hf_secidmap_opnum = -1; static gint ett_secidmap = -1; -static e_uuid_t uuid_secidmap = { 0x0d7c1e50, 0x113a, 0x11ca, { 0xb7, 0x1f, 0x08, 0x00, 0x1e, 0x01, 0xdc, 0x6c } }; +static e_guid_t uuid_secidmap = { 0x0d7c1e50, 0x113a, 0x11ca, { 0xb7, 0x1f, 0x08, 0x00, 0x1e, 0x01, 0xdc, 0x6c } }; static guint16 ver_secidmap = 1; diff --git a/epan/dissectors/packet-dcerpc-spoolss.c b/epan/dissectors/packet-dcerpc-spoolss.c index 9daa4eb7f0..87fa1d7fde 100644 --- a/epan/dissectors/packet-dcerpc-spoolss.c +++ b/epan/dissectors/packet-dcerpc-spoolss.c @@ -7246,7 +7246,7 @@ proto_register_dcerpc_spoolss(void) NULL, 0, NULL, HFILL }}, { &hf_datatype, - { "Datatype", "spoolss.Datatype", FT_STRING, BASE_NONE, + { "Datatype", "spoolss.datatype", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_textstatus, @@ -8547,7 +8547,7 @@ proto_register_dcerpc_spoolss(void) /* Protocol handoff */ -static e_uuid_t uuid_dcerpc_spoolss = { +static e_guid_t uuid_dcerpc_spoolss = { 0x12345678, 0x1234, 0xabcd, { 0xef, 0x00, 0x01, 0x23, 0x45, 0x67, 0x89, 0xab } }; diff --git a/epan/dissectors/packet-dcerpc-srvsvc.c b/epan/dissectors/packet-dcerpc-srvsvc.c index ae9928f0a8..1e571f09a8 100644 --- a/epan/dissectors/packet-dcerpc-srvsvc.c +++ b/epan/dissectors/packet-dcerpc-srvsvc.c @@ -923,7 +923,7 @@ static gint proto_dcerpc_srvsvc = -1; /* Version information */ -static e_uuid_t uuid_dcerpc_srvsvc = { +static e_guid_t uuid_dcerpc_srvsvc = { 0x4b324fc8, 0x1670, 0x01d3, { 0x12, 0x78, 0x5a, 0x47, 0xbf, 0x6e, 0xe1, 0x88 } }; diff --git a/epan/dissectors/packet-dcerpc-svcctl.c b/epan/dissectors/packet-dcerpc-svcctl.c index 005e51d47d..3c518354d3 100644 --- a/epan/dissectors/packet-dcerpc-svcctl.c +++ b/epan/dissectors/packet-dcerpc-svcctl.c @@ -80,7 +80,7 @@ static int hf_svcctl_password_size = -1; static gint ett_dcerpc_svcctl = -1; static gint ett_dcerpc_svcctl_service_type_bits = -1; -static e_uuid_t uuid_dcerpc_svcctl = { +static e_guid_t uuid_dcerpc_svcctl = { 0x367abb81, 0x9844, 0x35f1, { 0xad, 0x32, 0x98, 0xf0, 0x38, 0x00, 0x10, 0x03 } }; diff --git a/epan/dissectors/packet-dcerpc-tapi.c b/epan/dissectors/packet-dcerpc-tapi.c index 0f00bd98c8..ad1485ce63 100644 --- a/epan/dissectors/packet-dcerpc-tapi.c +++ b/epan/dissectors/packet-dcerpc-tapi.c @@ -52,7 +52,7 @@ static gint ett_dcerpc_tapi = -1; IDL ] interface tapi IDL { */ -static e_uuid_t uuid_dcerpc_tapi = { +static e_guid_t uuid_dcerpc_tapi = { 0x2f5f6520, 0xca46, 0x1067, { 0xb3, 0x19, 0x00, 0xdd, 0x01, 0x06, 0x62, 0xda } }; diff --git a/epan/dissectors/packet-dcerpc-tkn4int.c b/epan/dissectors/packet-dcerpc-tkn4int.c index 7e08da71ff..f7604d7139 100644 --- a/epan/dissectors/packet-dcerpc-tkn4int.c +++ b/epan/dissectors/packet-dcerpc-tkn4int.c @@ -40,7 +40,7 @@ static int hf_tkn4int_opnum = -1; static gint ett_tkn4int = -1; -static e_uuid_t uuid_tkn4int = { 0x4d37f2dd, 0xed96, 0x0000, { 0x02, 0xc0, 0x37, 0xcf, 0x1e, 0x00, 0x00, 0x00 } }; +static e_guid_t uuid_tkn4int = { 0x4d37f2dd, 0xed96, 0x0000, { 0x02, 0xc0, 0x37, 0xcf, 0x1e, 0x00, 0x00, 0x00 } }; static guint16 ver_tkn4int = 4; diff --git a/epan/dissectors/packet-dcerpc-trksvr.c b/epan/dissectors/packet-dcerpc-trksvr.c index 508b1cb406..759fafdd50 100644 --- a/epan/dissectors/packet-dcerpc-trksvr.c +++ b/epan/dissectors/packet-dcerpc-trksvr.c @@ -45,7 +45,7 @@ static gint ett_dcerpc_trksvr = -1; IDL ] interface trksvr IDL { */ -static e_uuid_t uuid_dcerpc_trksvr = { +static e_guid_t uuid_dcerpc_trksvr = { 0x4da1c422, 0x943d, 0x11d1, { 0xac, 0xae, 0x00, 0xc0, 0x4f, 0xc2, 0xaa, 0x3f } }; diff --git a/epan/dissectors/packet-dcerpc-ubikdisk.c b/epan/dissectors/packet-dcerpc-ubikdisk.c index 2fc47faa22..3a6d5a54c9 100644 --- a/epan/dissectors/packet-dcerpc-ubikdisk.c +++ b/epan/dissectors/packet-dcerpc-ubikdisk.c @@ -40,7 +40,7 @@ static int hf_ubikdisk_opnum = -1; static gint ett_ubikdisk = -1; -static e_uuid_t uuid_ubikdisk = { 0x4d37f2dd, 0xed43, 0x0002, { 0x02, 0xc0, 0x37, 0xcf, 0x1e, 0x00, 0x00, 0x00 } }; +static e_guid_t uuid_ubikdisk = { 0x4d37f2dd, 0xed43, 0x0002, { 0x02, 0xc0, 0x37, 0xcf, 0x1e, 0x00, 0x00, 0x00 } }; static guint16 ver_ubikdisk = 4; diff --git a/epan/dissectors/packet-dcerpc-ubikvote.c b/epan/dissectors/packet-dcerpc-ubikvote.c index 4de3e13e60..644d0bce2b 100644 --- a/epan/dissectors/packet-dcerpc-ubikvote.c +++ b/epan/dissectors/packet-dcerpc-ubikvote.c @@ -40,7 +40,7 @@ static int hf_ubikvote_opnum = -1; static gint ett_ubikvote = -1; -static e_uuid_t uuid_ubikvote = { 0x4d37f2dd, 0xed43, 0x0003, { 0x02, 0xc0, 0x37, 0xcf, 0x1e, 0x00, 0x00, 0x00 } }; +static e_guid_t uuid_ubikvote = { 0x4d37f2dd, 0xed43, 0x0003, { 0x02, 0xc0, 0x37, 0xcf, 0x1e, 0x00, 0x00, 0x00 } }; static guint16 ver_ubikvote = 4; diff --git a/epan/dissectors/packet-dcerpc-update.c b/epan/dissectors/packet-dcerpc-update.c index 570f2a8f6d..c1ae339189 100644 --- a/epan/dissectors/packet-dcerpc-update.c +++ b/epan/dissectors/packet-dcerpc-update.c @@ -38,7 +38,7 @@ static int hf_dce_update_opnum = -1; static gint ett_dce_update = -1; -static e_uuid_t uuid_dce_update = +static e_guid_t uuid_dce_update = { 0x4d37f2dd, 0xed43, 0x0000, {0x02, 0xc0, 0x37, 0xcf, 0x1e, 0x00, 0x10, 0x00} }; diff --git a/epan/dissectors/packet-dcerpc-winreg.c b/epan/dissectors/packet-dcerpc-winreg.c index f68122ac56..575d2dd9e4 100644 --- a/epan/dissectors/packet-dcerpc-winreg.c +++ b/epan/dissectors/packet-dcerpc-winreg.c @@ -192,7 +192,7 @@ static gint proto_dcerpc_winreg = -1; /* Version information */ -static e_uuid_t uuid_dcerpc_winreg = { +static e_guid_t uuid_dcerpc_winreg = { 0x338cd001, 0x2244, 0x31f1, { 0xaa, 0xaa, 0x90, 0x00, 0x38, 0x00, 0x10, 0x03 } }; diff --git a/epan/dissectors/packet-dcerpc-wkssvc.c b/epan/dissectors/packet-dcerpc-wkssvc.c index 0ae6af917a..6c0bb54f0a 100644 --- a/epan/dissectors/packet-dcerpc-wkssvc.c +++ b/epan/dissectors/packet-dcerpc-wkssvc.c @@ -481,7 +481,7 @@ static gint proto_dcerpc_wkssvc = -1; /* Version information */ -static e_uuid_t uuid_dcerpc_wkssvc = { +static e_guid_t uuid_dcerpc_wkssvc = { 0x6bffd098, 0xa112, 0x3610, { 0x98, 0x33, 0x46, 0xc3, 0xf8, 0x7e, 0x34, 0x5a } }; diff --git a/epan/dissectors/packet-dcerpc-wzcsvc.c b/epan/dissectors/packet-dcerpc-wzcsvc.c index a87b2776ee..e1e123e52b 100644 --- a/epan/dissectors/packet-dcerpc-wzcsvc.c +++ b/epan/dissectors/packet-dcerpc-wzcsvc.c @@ -32,7 +32,7 @@ static gint proto_dcerpc_wzcsvc = -1; /* Version information */ -static e_uuid_t uuid_dcerpc_wzcsvc = { +static e_guid_t uuid_dcerpc_wzcsvc = { 0x621dff68, 0x3c39, 0x4c6c, { 0xaa, 0xe3, 0xe6, 0x8e, 0x2c, 0x65, 0x03, 0xad } }; diff --git a/epan/dissectors/packet-dcerpc.c b/epan/dissectors/packet-dcerpc.c index 154cac76f4..2ae8a55a40 100644 --- a/epan/dissectors/packet-dcerpc.c +++ b/epan/dissectors/packet-dcerpc.c @@ -49,21 +49,21 @@ void proto_reg_handoff_dcerpc(void); static int dcerpc_tap = -1; /* 32bit Network Data Representation, see DCE/RPC Appendix I */ -static e_uuid_t uuid_data_repr_proto = { 0x8a885d04, 0x1ceb, 0x11c9, +static e_guid_t uuid_data_repr_proto = { 0x8a885d04, 0x1ceb, 0x11c9, { 0x9f, 0xe8, 0x08, 0x00, 0x2b, 0x10, 0x48, 0x60 } }; /* 64bit Network Data Representation, introduced in Windows Server 2008 */ -static e_uuid_t uuid_ndr64 = { 0x71710533, 0xbeba, 0x4937, +static e_guid_t uuid_ndr64 = { 0x71710533, 0xbeba, 0x4937, { 0x83, 0x19, 0xb5, 0xdb, 0xef, 0x9c, 0xcc, 0x36 } }; /* Bind Time Feature Negotiation, see [MS-RPCE] 3.3.1.5.3 */ -static e_uuid_t uuid_bind_time_feature_nego_00 = { 0x6cb71c2c, 0x9812, 0x4540, { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } }; -static e_uuid_t uuid_bind_time_feature_nego_01 = { 0x6cb71c2c, 0x9812, 0x4540, { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } }; -static e_uuid_t uuid_bind_time_feature_nego_02 = { 0x6cb71c2c, 0x9812, 0x4540, { 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } }; -static e_uuid_t uuid_bind_time_feature_nego_03 = { 0x6cb71c2c, 0x9812, 0x4540, { 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } }; +static e_guid_t uuid_bind_time_feature_nego_00 = { 0x6cb71c2c, 0x9812, 0x4540, { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } }; +static e_guid_t uuid_bind_time_feature_nego_01 = { 0x6cb71c2c, 0x9812, 0x4540, { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } }; +static e_guid_t uuid_bind_time_feature_nego_02 = { 0x6cb71c2c, 0x9812, 0x4540, { 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } }; +static e_guid_t uuid_bind_time_feature_nego_03 = { 0x6cb71c2c, 0x9812, 0x4540, { 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } }; /* see [MS-OXRPC] Appendix A: Full IDL, http://msdn.microsoft.com/en-us/library/ee217991%28v=exchg.80%29.aspx */ -static e_uuid_t uuid_asyncemsmdb = { 0x5261574a, 0x4572, 0x206e, +static e_guid_t uuid_asyncemsmdb = { 0x5261574a, 0x4572, 0x206e, { 0xb2, 0x68, 0x6b, 0x19, 0x92, 0x13, 0xb4, 0xe4 } }; static const value_string pckt_vals[] = { @@ -626,9 +626,9 @@ typedef struct _dcerpc_bind_key { } dcerpc_bind_key; typedef struct _dcerpc_bind_value { - e_uuid_t uuid; + e_guid_t uuid; guint16 ver; - e_uuid_t transport; + e_guid_t transport; } dcerpc_bind_value; /* Extra data for DCERPC handling and tracking of context ids */ @@ -971,7 +971,7 @@ typedef struct _dcerpc_fragment_key { address src; address dst; guint32 id; - e_uuid_t act_id; + e_guid_t act_id; } dcerpc_fragment_key; static guint @@ -983,9 +983,9 @@ dcerpc_fragment_hash(gconstpointer k) hash_val = 0; hash_val += key->id; - hash_val += key->act_id.Data1; - hash_val += key->act_id.Data2 << 16; - hash_val += key->act_id.Data3; + hash_val += key->act_id.data1; + hash_val += key->act_id.data2 << 16; + hash_val += key->act_id.data3; return hash_val; } @@ -1003,7 +1003,7 @@ dcerpc_fragment_equal(gconstpointer k1, gconstpointer k2) return (((key1->id == key2->id) && (ADDRESSES_EQUAL(&key1->src, &key2->src)) && (ADDRESSES_EQUAL(&key1->dst, &key2->dst)) - && (memcmp (&key1->act_id, &key2->act_id, sizeof (e_uuid_t)) == 0)) + && (memcmp (&key1->act_id, &key2->act_id, sizeof (e_guid_t)) == 0)) ? TRUE : FALSE); } @@ -1225,7 +1225,7 @@ dcerpc_uuid_equal(gconstpointer k1, gconstpointer k2) { const dcerpc_uuid_key *key1 = (const dcerpc_uuid_key *)k1; const dcerpc_uuid_key *key2 = (const dcerpc_uuid_key *)k2; - return ((memcmp(&key1->uuid, &key2->uuid, sizeof (e_uuid_t)) == 0) + return ((memcmp(&key1->uuid, &key2->uuid, sizeof (e_guid_t)) == 0) && (key1->ver == key2->ver)); } @@ -1235,11 +1235,11 @@ dcerpc_uuid_hash(gconstpointer k) const dcerpc_uuid_key *key = (const dcerpc_uuid_key *)k; /* This isn't perfect, but the Data1 part of these is almost always unique. */ - return key->uuid.Data1; + return key->uuid.data1; } void -dcerpc_init_uuid(int proto, int ett, e_uuid_t *uuid, guint16 ver, +dcerpc_init_uuid(int proto, int ett, e_guid_t *uuid, guint16 ver, dcerpc_sub_dissector *procs, int opnum_hf) { dcerpc_uuid_key *key = (dcerpc_uuid_key *)g_malloc(sizeof (*key)); @@ -1278,7 +1278,7 @@ dcerpc_init_uuid(int proto, int ett, e_uuid_t *uuid, guint16 ver, * or NULL if the protocol/version is not known to wireshark. */ const char * -dcerpc_get_proto_name(e_uuid_t *uuid, guint16 ver) +dcerpc_get_proto_name(e_guid_t *uuid, guint16 ver) { dcerpc_uuid_key key; dcerpc_uuid_value *sub_proto; @@ -1295,7 +1295,7 @@ dcerpc_get_proto_name(e_uuid_t *uuid, guint16 ver) * or -1 if the protocol/version is not known to wireshark. */ int -dcerpc_get_proto_hf_opnum(e_uuid_t *uuid, guint16 ver) +dcerpc_get_proto_hf_opnum(e_guid_t *uuid, guint16 ver) { dcerpc_uuid_key key; dcerpc_uuid_value *sub_proto; @@ -1341,7 +1341,7 @@ again: * or NULL if the protocol/version is not known to wireshark. */ dcerpc_sub_dissector * -dcerpc_get_proto_sub_dissector(e_uuid_t *uuid, guint16 ver) +dcerpc_get_proto_sub_dissector(e_guid_t *uuid, guint16 ver) { dcerpc_uuid_key key; dcerpc_uuid_value *sub_proto; @@ -1397,7 +1397,7 @@ typedef struct _dcerpc_cn_call_key { typedef struct _dcerpc_dg_call_key { conversation_t *conv; guint32 seqnum; - e_uuid_t act_id ; + e_guid_t act_id ; } dcerpc_dg_call_key; @@ -1418,7 +1418,7 @@ dcerpc_dg_call_equal(gconstpointer k1, gconstpointer k2) const dcerpc_dg_call_key *key2 = (const dcerpc_dg_call_key *)k2; return ((key1->conv == key2->conv) && (key1->seqnum == key2->seqnum) - && ((memcmp(&key1->act_id, &key2->act_id, sizeof (e_uuid_t)) == 0))); + && ((memcmp(&key1->act_id, &key2->act_id, sizeof (e_guid_t)) == 0))); } static guint @@ -1440,12 +1440,12 @@ static guint dcerpc_dg_call_hash(gconstpointer k) { const dcerpc_dg_call_key *key = (const dcerpc_dg_call_key *)k; - return (GPOINTER_TO_UINT(key->conv) + key->seqnum + key->act_id.Data1 - + (key->act_id.Data2 << 16) + key->act_id.Data3 - + (key->act_id.Data4[0] << 24) + (key->act_id.Data4[1] << 16) - + (key->act_id.Data4[2] << 8) + (key->act_id.Data4[3] << 0) - + (key->act_id.Data4[4] << 24) + (key->act_id.Data4[5] << 16) - + (key->act_id.Data4[6] << 8) + (key->act_id.Data4[7] << 0)); + return (GPOINTER_TO_UINT(key->conv) + key->seqnum + key->act_id.data1 + + (key->act_id.data2 << 16) + key->act_id.data3 + + (key->act_id.data4[0] << 24) + (key->act_id.data4[1] << 16) + + (key->act_id.data4[2] << 8) + (key->act_id.data4[3] << 0) + + (key->act_id.data4[4] << 24) + (key->act_id.data4[5] << 16) + + (key->act_id.data4[6] << 8) + (key->act_id.data4[7] << 0)); } /* to keep track of matched calls/responses @@ -1678,9 +1678,9 @@ dissect_dcerpc_double(tvbuff_t *tvb, gint offset, packet_info *pinfo _U_, int dissect_dcerpc_uuid_t(tvbuff_t *tvb, gint offset, packet_info *pinfo _U_, proto_tree *tree, guint8 *drep, - int hfindex, e_uuid_t *pdata) + int hfindex, e_guid_t *pdata) { - e_uuid_t uuid; + e_guid_t uuid; if (drep[0] & DREP_LITTLE_ENDIAN) { @@ -1722,7 +1722,7 @@ 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) +dcerpc_tvb_get_uuid(tvbuff_t *tvb, gint offset, guint8 *drep, e_guid_t *uuid) { if (drep[0] & DREP_LITTLE_ENDIAN) { tvb_get_letohguid(tvb, offset, (e_guid_t *) uuid); @@ -2843,7 +2843,7 @@ dcerpc_try_handoff(packet_info *pinfo, proto_tree *tree, tvb, offset, 0, TRUE); PROTO_ITEM_SET_HIDDEN(hidden_item); col_append_fstr(pinfo->cinfo, COL_INFO, " %s V%u", - guids_resolve_uuid_to_str(&info->call_data->uuid), info->call_data->ver); + guids_resolve_guid_to_str(&info->call_data->uuid), info->call_data->ver); if (decrypted_tvb != NULL) { show_stub_data(decrypted_tvb, 0, dcerpc_tree, auth_info, @@ -3235,8 +3235,8 @@ dissect_dcerpc_cn_bind(tvbuff_t *tvb, gint offset, packet_info *pinfo, guint16 ctx_id; guint8 num_trans_items; guint j; - e_uuid_t if_id; - e_uuid_t trans_id; + e_guid_t if_id; + e_guid_t trans_id; guint32 trans_ver; guint16 if_ver, if_ver_minor; dcerpc_auth_info auth_info; @@ -3359,10 +3359,10 @@ dissect_dcerpc_cn_bind(tvbuff_t *tvb, gint offset, packet_info *pinfo, } /* check for [MS-RPCE] 3.3.1.5.3 Bind Time Feature Negotiation */ - if (trans_id.Data1 == 0x6cb71c2c && trans_id.Data2 == 0x9812 && trans_id.Data3 == 0x4540) { + if (trans_id.data1 == 0x6cb71c2c && trans_id.data2 == 0x9812 && trans_id.data3 == 0x4540) { proto_tree *uuid_tree = proto_item_add_subtree(uuid_item, ett_dcerpc_cn_trans_btfn); - proto_tree_add_boolean(uuid_tree, hf_dcerpc_cn_bind_trans_btfn_01, tvb, offset+8, 1, trans_id.Data4[0]); - proto_tree_add_boolean(uuid_tree, hf_dcerpc_cn_bind_trans_btfn_02, tvb, offset+8, 1, trans_id.Data4[0]); + proto_tree_add_boolean(uuid_tree, hf_dcerpc_cn_bind_trans_btfn_01, tvb, offset+8, 1, trans_id.data4[0]); + proto_tree_add_boolean(uuid_tree, hf_dcerpc_cn_bind_trans_btfn_02, tvb, offset+8, 1, trans_id.data4[0]); } } offset += 16; @@ -3401,8 +3401,8 @@ dissect_dcerpc_cn_bind(tvbuff_t *tvb, gint offset, packet_info *pinfo, if (i > 0) col_append_fstr(pinfo->cinfo, COL_INFO, ","); col_append_fstr(pinfo->cinfo, COL_INFO, " %s V%u.%u (%s)", - guids_resolve_uuid_to_str(&if_id), if_ver, if_ver_minor, - guids_resolve_uuid_to_str(&trans_id)); + guids_resolve_guid_to_str(&if_id), if_ver, if_ver_minor, + guids_resolve_guid_to_str(&trans_id)); if (ctx_tree) { proto_item_set_len(ctx_item, offset - ctx_offset); @@ -3427,7 +3427,7 @@ dissect_dcerpc_cn_bind_ack(tvbuff_t *tvb, gint offset, packet_info *pinfo, guint i; guint16 result = 0; guint16 reason = 0; - e_uuid_t trans_id; + e_guid_t trans_id; guint32 trans_ver; dcerpc_auth_info auth_info; const char *uuid_name = NULL; @@ -3818,7 +3818,7 @@ dissect_dcerpc_cn_rqst(tvbuff_t *tvb, gint offset, packet_info *pinfo, conversation_t *conv; guint16 ctx_id; guint16 opnum; - e_uuid_t obj_id = DCERPC_UUID_NULL; + e_guid_t obj_id = DCERPC_UUID_NULL; dcerpc_auth_info auth_info; guint32 alloc_hint; proto_item *pi; @@ -3994,7 +3994,7 @@ dissect_dcerpc_cn_resp(tvbuff_t *tvb, gint offset, packet_info *pinfo, guint32 alloc_hint; proto_item *pi; proto_item *parent_pi; - e_uuid_t obj_id_null = DCERPC_UUID_NULL; + e_guid_t obj_id_null = DCERPC_UUID_NULL; dcerpc_decode_as_data* decode_data = dcerpc_get_decode_data(pinfo); offset = dissect_dcerpc_uint32(tvb, offset, pinfo, dcerpc_tree, hdr->drep, 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; diff --git a/epan/dissectors/packet-dcom-dispatch.c b/epan/dissectors/packet-dcom-dispatch.c index c8beb198d4..49b1091a62 100644 --- a/epan/dissectors/packet-dcom-dispatch.c +++ b/epan/dissectors/packet-dcom-dispatch.c @@ -81,7 +81,7 @@ static gint ett_dispatch_flags = -1; static gint ett_dispatch_params = -1; static gint ett_dispatch_excepinfo = -1; -static e_uuid_t uuid_dispatch = { 0x00020400, 0x0000, 0x0000, { 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46 } }; +static e_guid_t uuid_dispatch = { 0x00020400, 0x0000, 0x0000, { 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46 } }; static guint16 ver_dispatch = 0; static gint ett_dispatch = -1; static int proto_dispatch = -1; @@ -173,7 +173,7 @@ int dissect_IDispatch_GetIDsOfNames_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, dcerpc_info *di, guint8 *drep) { - e_uuid_t riid; + e_guid_t riid; guint32 u32Lcid; gchar szName[1000] = { 0 }; guint32 u32Names; @@ -256,7 +256,7 @@ dissect_IDispatch_Invoke_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, dcerpc_info *di, guint8 *drep) { guint32 u32DispIdMember; - e_uuid_t riid; + e_guid_t riid; guint32 u32Lcid; guint32 u32Flags; guint32 u32Args; diff --git a/epan/dissectors/packet-dcom-oxid.c b/epan/dissectors/packet-dcom-oxid.c index ceb943acd7..a3417e4390 100644 --- a/epan/dissectors/packet-dcom-oxid.c +++ b/epan/dissectors/packet-dcom-oxid.c @@ -55,7 +55,7 @@ static int hf_oxid_ds_array = -1; static gint ett_oxid = -1; -static e_uuid_t uuid_oxid = { 0x99fcfec4, 0x5260, 0x101b, { 0xbb, 0xcb, 0x00, 0xaa, 0x00, 0x21, 0x34, 0x7a } }; +static e_guid_t uuid_oxid = { 0x99fcfec4, 0x5260, 0x101b, { 0xbb, 0xcb, 0x00, 0xaa, 0x00, 0x21, 0x34, 0x7a } }; static guint16 ver_oxid = 0; @@ -213,7 +213,7 @@ dissect_oxid_resolve_oxid2_resp(tvbuff_t *tvb, int offset, { guint32 u32Pointer; guint32 u32ArraySize; - e_uuid_t ipid; + e_guid_t ipid; guint32 u32AuthnHint; guint16 u16VersionMajor; guint16 u16VersionMinor; diff --git a/epan/dissectors/packet-dcom-remact.c b/epan/dissectors/packet-dcom-remact.c index d546d4b582..0fcb98c1ce 100644 --- a/epan/dissectors/packet-dcom-remact.c +++ b/epan/dissectors/packet-dcom-remact.c @@ -50,7 +50,7 @@ static int hf_remact_authn_hint = -1; static int proto_remact = -1; static gint ett_remact = -1; -static e_uuid_t uuid_remact = { 0x4d9f4ab8, 0x7d1c, 0x11cf, { 0x86, 0x1e, 0x00, 0x20, 0xaf, 0x6e, 0x7c, 0x57 } }; +static e_guid_t uuid_remact = { 0x4d9f4ab8, 0x7d1c, 0x11cf, { 0x86, 0x1e, 0x00, 0x20, 0xaf, 0x6e, 0x7c, 0x57 } }; static guint16 ver_remact = 0; @@ -65,8 +65,8 @@ dissect_remact_remote_activation_rqst(tvbuff_t *tvb, int offset, guint32 u32ArraySize; guint32 u32ItemIdx; guint16 u16ProtSeqs; - e_uuid_t clsid; - e_uuid_t iid; + e_guid_t clsid; + e_guid_t iid; gchar szObjName[1000] = { 0 }; guint32 u32ObjNameLen = sizeof(szObjName); @@ -129,7 +129,7 @@ dissect_remact_remote_activation_resp(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, dcerpc_info *di, guint8 *drep) { guint32 u32Pointer; - e_uuid_t ipid; + e_guid_t ipid; guint32 u32AuthnHint; guint16 u16VersionMajor; guint16 u16VersionMinor; diff --git a/epan/dissectors/packet-dcom-remunkn.c b/epan/dissectors/packet-dcom-remunkn.c index efaa246c58..0e35b2d643 100644 --- a/epan/dissectors/packet-dcom-remunkn.c +++ b/epan/dissectors/packet-dcom-remunkn.c @@ -52,11 +52,11 @@ 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 e_guid_t uuid_remunk = { 0x00000131, 0x0000, 0x0000, { 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46 } }; static guint16 ver_remunk = 0; static int proto_remunk = -1; -static e_uuid_t ipid_remunk = { 0x00000131, 0x1234, 0x5678, { 0xCA, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46 } }; +static e_guid_t ipid_remunk = { 0x00000131, 0x1234, 0x5678, { 0xCA, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46 } }; /* There is a little bit confusion about the IRemUnknown2 interface UUIDs */ /* DCOM documentation tells us: 0x00000142 (7 methods) */ @@ -65,14 +65,14 @@ static e_uuid_t ipid_remunk = { 0x00000131, 0x1234, 0x5678, { 0xCA, 0xFE, 0x00, /* There is some evidence, that the DCOM documentation is wrong, so using 143 for IRemUnknown2 now. */ static gint ett_remunk2 = -1; -static e_uuid_t uuid_remunk2 = { 0x00000143, 0x0000, 0x0000, { 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46 } }; +static e_guid_t uuid_remunk2 = { 0x00000143, 0x0000, 0x0000, { 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46 } }; static guint16 ver_remunk2 = 0; static int proto_remunk2 = -1; typedef struct remunk_remqueryinterface_call_s { guint iid_count; - e_uuid_t *iids; + e_guid_t *iids; } remunk_remqueryinterface_call_t; @@ -80,12 +80,12 @@ static int dissect_remunk_remqueryinterface_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, dcerpc_info *di, guint8 *drep) { - e_uuid_t ipid; + e_guid_t ipid; guint32 u32Refs; guint16 u16IIDs; guint32 u32ArraySize; guint32 u32ItemIdx; - e_uuid_t iid; + e_guid_t iid; remunk_remqueryinterface_call_t *call; @@ -105,9 +105,9 @@ dissect_remunk_remqueryinterface_rqst(tvbuff_t *tvb, int offset, /* limit the allocation to a reasonable size */ if(u32ArraySize < 100) { - call = (remunk_remqueryinterface_call_t *)wmem_alloc(wmem_file_scope(), sizeof(remunk_remqueryinterface_call_t) + u32ArraySize * sizeof(e_uuid_t)); + call = (remunk_remqueryinterface_call_t *)wmem_alloc(wmem_file_scope(), sizeof(remunk_remqueryinterface_call_t) + u32ArraySize * sizeof(e_guid_t)); call->iid_count = u32ArraySize; - call->iids = (e_uuid_t *) (call+1); + call->iids = (e_guid_t *) (call+1); di->call_data->private_data = call; } else { call = NULL; @@ -136,12 +136,12 @@ dissect_remunk_remqueryinterface_resp(tvbuff_t *tvb, int offset, proto_tree *sub_tree; guint32 u32HResult; guint32 u32SubStart; - e_uuid_t iid; - e_uuid_t iid_null = DCERPC_UUID_NULL; + e_guid_t iid; + e_guid_t iid_null = DCERPC_UUID_NULL; remunk_remqueryinterface_call_t *call = (remunk_remqueryinterface_call_t *)di->call_data->private_data; guint64 oxid; guint64 oid; - e_uuid_t ipid; + e_guid_t ipid; offset = dissect_dcom_that(tvb, offset, pinfo, tree, di, drep); @@ -216,7 +216,7 @@ dissect_remunk_remrelease_rqst(tvbuff_t *tvb, int offset, guint32 u32Pointer; guint32 u32IntRefs; guint32 u32ItemIdx; - e_uuid_t ipid; + e_guid_t ipid; guint32 u32PublicRefs; guint32 u32PrivateRefs; const gchar *pszFormat; @@ -260,7 +260,7 @@ dissect_remunk_remrelease_rqst(tvbuff_t *tvb, int offset, /* update subtree */ proto_item_append_text(sub_item, "[%u]: IPID=%s, PublicRefs=%u, PrivateRefs=%u", u32ItemIdx, - guids_resolve_uuid_to_str(&ipid), + guids_resolve_guid_to_str(&ipid), u32PublicRefs, u32PrivateRefs); proto_item_set_len(sub_item, offset - u32SubStart); diff --git a/epan/dissectors/packet-dcom-sysact.c b/epan/dissectors/packet-dcom-sysact.c index 444908d875..48158d0e91 100644 --- a/epan/dissectors/packet-dcom-sysact.c +++ b/epan/dissectors/packet-dcom-sysact.c @@ -137,24 +137,24 @@ static int hf_typesz_commhdrlen = -1; static int hf_typesz_filler = -1; static int hf_typesz_buflen = -1; -static e_uuid_t uuid_ISystemActivator = { 0x000001a0, 0x0000, 0x0000, { 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46 } }; +static e_guid_t uuid_ISystemActivator = { 0x000001a0, 0x0000, 0x0000, { 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46 } }; static guint16 ver_ISystemActivator = 0; -/*static e_uuid_t clsid_ActivationPropertiesIn = { 0x00000338, 0x0000, 0x0000, { 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46} };*/ -/*static e_uuid_t clsid_ActivationPropertiesOut = { 0x00000339, 0x0000, 0x0000, { 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46} };*/ -static e_uuid_t iid_ActivationPropertiesIn = { 0x000001a2, 0x0000, 0x0000, { 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46} }; -static e_uuid_t iid_ActivationPropertiesOut = { 0x000001a3, 0x0000, 0x0000, { 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46} }; +/*static e_guid_t clsid_ActivationPropertiesIn = { 0x00000338, 0x0000, 0x0000, { 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46} };*/ +/*static e_guid_t clsid_ActivationPropertiesOut = { 0x00000339, 0x0000, 0x0000, { 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46} };*/ +static e_guid_t iid_ActivationPropertiesIn = { 0x000001a2, 0x0000, 0x0000, { 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46} }; +static e_guid_t iid_ActivationPropertiesOut = { 0x000001a3, 0x0000, 0x0000, { 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46} }; -static e_uuid_t clsid_SpecialSystemProperties = { 0x000001b9, 0x0000, 0x0000, { 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46} }; -static e_uuid_t clsid_InstantiationInfo = { 0x000001ab, 0x0000, 0x0000, { 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46} }; -static e_uuid_t clsid_ActivationContextInfo = { 0x000001a5, 0x0000, 0x0000, { 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46} }; -static e_uuid_t clsid_ContextMarshaler = { 0x0000033b, 0x0000, 0x0000, { 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46} }; -static e_uuid_t clsid_SecurityInfo = { 0x000001a6, 0x0000, 0x0000, { 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46} }; -static e_uuid_t clsid_ServerLocationInfo = { 0x000001a4, 0x0000, 0x0000, { 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46} }; -static e_uuid_t clsid_ScmRequestInfo = { 0x000001aa, 0x0000, 0x0000, { 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46} }; -static e_uuid_t clsid_PropsOutInfo = { 0x00000339, 0x0000, 0x0000, { 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46} }; -static e_uuid_t clsid_ScmReplyInfo = { 0x000001b6, 0x0000, 0x0000, { 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46} }; -/*static e_uuid_t clsid_InstanceInfo = { 0x000001ad, 0x0000, 0x0000, { 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46} };*/ +static e_guid_t clsid_SpecialSystemProperties = { 0x000001b9, 0x0000, 0x0000, { 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46} }; +static e_guid_t clsid_InstantiationInfo = { 0x000001ab, 0x0000, 0x0000, { 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46} }; +static e_guid_t clsid_ActivationContextInfo = { 0x000001a5, 0x0000, 0x0000, { 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46} }; +static e_guid_t clsid_ContextMarshaler = { 0x0000033b, 0x0000, 0x0000, { 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46} }; +static e_guid_t clsid_SecurityInfo = { 0x000001a6, 0x0000, 0x0000, { 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46} }; +static e_guid_t clsid_ServerLocationInfo = { 0x000001a4, 0x0000, 0x0000, { 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46} }; +static e_guid_t clsid_ScmRequestInfo = { 0x000001aa, 0x0000, 0x0000, { 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46} }; +static e_guid_t clsid_PropsOutInfo = { 0x00000339, 0x0000, 0x0000, { 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46} }; +static e_guid_t clsid_ScmReplyInfo = { 0x000001b6, 0x0000, 0x0000, { 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46} }; +/*static e_guid_t clsid_InstanceInfo = { 0x000001ad, 0x0000, 0x0000, { 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46} };*/ static const value_string instninfo_actflags[] = { @@ -187,7 +187,7 @@ static const value_string ts_endian_vals[] = { #define MAX_ACTPROP_LIMIT 10 typedef struct property_guids { - e_uuid_t guid[MAX_ACTPROP_LIMIT]; + e_guid_t guid[MAX_ACTPROP_LIMIT]; guint32 size[MAX_ACTPROP_LIMIT]; guint32 id_idx; guint32 size_idx; @@ -348,7 +348,7 @@ dissect_dcom_ActivationPropertiesCustomerHdr(tvbuff_t *tvb, gint offset, packet_ static int dissect_dcom_ActivationProperty(tvbuff_t *tvb, gint offset, packet_info *pinfo, - proto_tree *tree, dcerpc_info *di, guint8 *drep, e_uuid_t *clsid, gint size) + proto_tree *tree, dcerpc_info *di, guint8 *drep, e_guid_t *clsid, gint size) { dcom_dissect_fn_t routine = NULL; diff --git a/epan/dissectors/packet-dcom.c b/epan/dissectors/packet-dcom.c index 6cb9c9b2b5..8b7952250b 100644 --- a/epan/dissectors/packet-dcom.c +++ b/epan/dissectors/packet-dcom.c @@ -220,17 +220,17 @@ static expert_field ei_dcom_hresult_expert = EI_INIT; static expert_field ei_dcom_dualstringarray_mult_ip = EI_INIT; /* this/that extension UUIDs */ -static e_uuid_t uuid_debug_ext = { 0xf1f19680, 0x4d2a, 0x11ce, { 0xa6, 0x6a, 0x00, 0x20, 0xaf, 0x6e, 0x72, 0xf4} }; -static e_uuid_t uuid_ext_error_ext ={ 0xf1f19681, 0x4d2a, 0x11ce, { 0xa6, 0x6a, 0x00, 0x20, 0xaf, 0x6e, 0x72, 0xf4} }; +static e_guid_t uuid_debug_ext = { 0xf1f19680, 0x4d2a, 0x11ce, { 0xa6, 0x6a, 0x00, 0x20, 0xaf, 0x6e, 0x72, 0xf4} }; +static e_guid_t uuid_ext_error_ext ={ 0xf1f19681, 0x4d2a, 0x11ce, { 0xa6, 0x6a, 0x00, 0x20, 0xaf, 0x6e, 0x72, 0xf4} }; /* general DCOM UUIDs */ -static const e_uuid_t ipid_rem_unknown = { 0x00000131, 0x1234, 0x5678, { 0xCA, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46} }; -static const e_uuid_t iid_unknown = { 0x00000000, 0x0000, 0x0000, { 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46} }; -static const e_uuid_t uuid_null = { 0x00000000, 0x0000, 0x0000, { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }; -static const e_uuid_t iid_class_factory = { 0x00000001, 0x0000, 0x0000, { 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46} }; +static const e_guid_t ipid_rem_unknown = { 0x00000131, 0x1234, 0x5678, { 0xCA, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46} }; +static const e_guid_t iid_unknown = { 0x00000000, 0x0000, 0x0000, { 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46} }; +static const e_guid_t uuid_null = { 0x00000000, 0x0000, 0x0000, { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }; +static const e_guid_t iid_class_factory = { 0x00000001, 0x0000, 0x0000, { 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46} }; #if 0 -static const e_uuid_t iid_act_prop_in = { 0x000001A2, 0x0000, 0x0000, { 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46} }; -static const e_uuid_t iid_act_prop_out = { 0x000001A3, 0x0000, 0x0000, { 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46} }; +static const e_guid_t iid_act_prop_in = { 0x000001A2, 0x0000, 0x0000, { 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46} }; +static const e_guid_t iid_act_prop_out = { 0x000001A3, 0x0000, 0x0000, { 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46} }; #endif static GList *dcom_machines = NULL; @@ -272,15 +272,15 @@ void dcom_interface_dump(void) { for(interfaces = object->interfaces; interfaces != NULL; interfaces = g_list_next(interfaces)) { interf = (dcom_interface_t *)interfaces->data; g_warning(" Interface(#%4u): iid:%s", - interf->first_packet, guids_resolve_uuid_to_str(&interf->iid)); - g_warning(" ipid:%s", guids_resolve_uuid_to_str(&interf->ipid)); + interf->first_packet, guids_resolve_guid_to_str(&interf->iid)); + g_warning(" ipid:%s", guids_resolve_guid_to_str(&interf->ipid)); } } } } #endif -dcom_interface_t *dcom_interface_find(packet_info *pinfo _U_, const address *addr _U_, e_uuid_t *ipid) +dcom_interface_t *dcom_interface_find(packet_info *pinfo _U_, const address *addr _U_, e_guid_t *ipid) { dcom_interface_t *interf; GList *interfaces; @@ -294,7 +294,7 @@ dcom_interface_t *dcom_interface_find(packet_info *pinfo _U_, const address *add for(interfaces = dcom_interfaces; interfaces != NULL; interfaces = g_list_next(interfaces)) { interf = (dcom_interface_t *)interfaces->data; - if(memcmp(&interf->ipid, ipid, sizeof(e_uuid_t)) == 0) { + if(memcmp(&interf->ipid, ipid, sizeof(e_guid_t)) == 0) { return interf; } } @@ -303,7 +303,7 @@ dcom_interface_t *dcom_interface_find(packet_info *pinfo _U_, const address *add } -dcom_interface_t *dcom_interface_new(packet_info *pinfo, const address *addr, e_uuid_t *iid, guint64 oxid, guint64 oid, e_uuid_t *ipid) +dcom_interface_t *dcom_interface_new(packet_info *pinfo, const address *addr, e_guid_t *iid, guint64 oxid, guint64 oid, e_guid_t *ipid) { GList *dcom_iter; dcom_machine_t *machine; @@ -377,7 +377,7 @@ dcom_interface_t *dcom_interface_new(packet_info *pinfo, const address *addr, e_ dcom_iter = object->interfaces; while(dcom_iter != NULL) { interf = (dcom_interface_t *)dcom_iter->data; - if(memcmp(&interf->ipid, ipid, sizeof(e_uuid_t)) == 0) { + if(memcmp(&interf->ipid, ipid, sizeof(e_guid_t)) == 0) { break; } dcom_iter = g_list_next(dcom_iter); @@ -701,7 +701,7 @@ dissect_dcom_extent(tvbuff_t *tvb, int offset, guint32 u32ArrayRes; guint32 u32ExtentSize; - e_uuid_t uuidExtend; + e_guid_t uuidExtend; const char *uuid_name; @@ -745,14 +745,14 @@ dissect_dcom_extent(tvbuff_t *tvb, int offset, /* look for a registered uuid name */ if((uuid_name = guids_get_uuid_name(&uuidExtend)) != NULL) { proto_tree_add_guid_format_value(sub_tree, hf_dcom_extent_id, tvb, - offset, sizeof(e_uuid_t), (e_guid_t *) &uuidExtend, + offset, sizeof(e_guid_t), (e_guid_t *) &uuidExtend, "%s (%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x)", uuid_name, - uuidExtend.Data1, uuidExtend.Data2, uuidExtend.Data3, - uuidExtend.Data4[0], uuidExtend.Data4[1], - uuidExtend.Data4[2], uuidExtend.Data4[3], - uuidExtend.Data4[4], uuidExtend.Data4[5], - uuidExtend.Data4[6], uuidExtend.Data4[7]); + uuidExtend.data1, uuidExtend.data2, uuidExtend.data3, + uuidExtend.data4[0], uuidExtend.data4[1], + uuidExtend.data4[2], uuidExtend.data4[3], + uuidExtend.data4[4], uuidExtend.data4[5], + uuidExtend.data4[6], uuidExtend.data4[7]); u32VariableOffset += 16; } else { u32VariableOffset = dissect_dcom_UUID(tvb, u32VariableOffset, pinfo, sub_tree, di, drep, @@ -795,7 +795,7 @@ dissect_dcom_this(tvbuff_t *tvb, int offset, guint16 u16VersionMinor; guint32 u32Flags; guint32 u32Res; - e_uuid_t uuidCausality; + e_guid_t uuidCausality; proto_item *sub_item; proto_tree *sub_tree; guint32 u32SubStart; @@ -821,13 +821,13 @@ dissect_dcom_this(tvbuff_t *tvb, int offset, /* update subtree header */ proto_item_append_text(sub_item, ", V%u.%u, Causality ID: %s", - u16VersionMajor, u16VersionMinor, guids_resolve_uuid_to_str(&uuidCausality)); + u16VersionMajor, u16VersionMinor, guids_resolve_guid_to_str(&uuidCausality)); proto_item_set_len(sub_item, offset - u32SubStart); if(memcmp(&di->call_data->object_uuid, &uuid_null, sizeof(uuid_null)) != 0) { pi = proto_tree_add_guid_format(tree, hf_dcom_ipid, tvb, offset, 0, (e_guid_t *) &di->call_data->object_uuid, - "Object UUID/IPID: %s", guids_resolve_uuid_to_str(&di->call_data->object_uuid)); + "Object UUID/IPID: %s", guids_resolve_guid_to_str(&di->call_data->object_uuid)); PROTO_ITEM_SET_GENERATED(pi); } @@ -861,7 +861,7 @@ dissect_dcom_that(tvbuff_t *tvb, int offset, if(memcmp(&di->call_data->object_uuid, &uuid_null, sizeof(uuid_null)) != 0) { pi = proto_tree_add_guid_format(tree, hf_dcom_ipid, tvb, offset, 0, (e_guid_t *) &di->call_data->object_uuid, - "Object UUID/IPID: %s", guids_resolve_uuid_to_str(&di->call_data->object_uuid)); + "Object UUID/IPID: %s", guids_resolve_guid_to_str(&di->call_data->object_uuid)); PROTO_ITEM_SET_GENERATED(pi); } @@ -1459,11 +1459,11 @@ dissect_dcom_VARIANT(tvbuff_t *tvb, int offset, packet_info *pinfo, int dissect_dcom_UUID(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, dcerpc_info *di, guint8 *drep, - int hfindex, e_uuid_t *pdata) + int hfindex, e_guid_t *pdata) { const gchar *uuid_name; header_field_info *hfi; - e_uuid_t uuid; + e_guid_t uuid; /* get the UUID, but don't put it into the tree */ @@ -1477,20 +1477,20 @@ dissect_dcom_UUID(tvbuff_t *tvb, int offset, proto_tree_add_guid_format(tree, hfindex, tvb, offset-16, 16, (e_guid_t *) &uuid, "%s: %s (%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x)", hfi->name, uuid_name, - uuid.Data1, uuid.Data2, uuid.Data3, - uuid.Data4[0], uuid.Data4[1], - uuid.Data4[2], uuid.Data4[3], - uuid.Data4[4], uuid.Data4[5], - uuid.Data4[6], uuid.Data4[7]); + uuid.data1, uuid.data2, uuid.data3, + uuid.data4[0], uuid.data4[1], + uuid.data4[2], uuid.data4[3], + uuid.data4[4], uuid.data4[5], + uuid.data4[6], uuid.data4[7]); } else { proto_tree_add_guid_format(tree, hfindex, tvb, offset-16, 16, (e_guid_t *) &uuid, "%s: %08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x", hfi->name, - uuid.Data1, uuid.Data2, uuid.Data3, - uuid.Data4[0], uuid.Data4[1], - uuid.Data4[2], uuid.Data4[3], - uuid.Data4[4], uuid.Data4[5], - uuid.Data4[6], uuid.Data4[7]); + uuid.data1, uuid.data2, uuid.data3, + uuid.data4[0], uuid.data4[1], + uuid.data4[2], uuid.data4[3], + uuid.data4[4], uuid.data4[5], + uuid.data4[6], uuid.data4[7]); } if(pdata != NULL) { @@ -1504,7 +1504,7 @@ dissect_dcom_UUID(tvbuff_t *tvb, int offset, int dissect_dcom_append_UUID(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, dcerpc_info *di, guint8 *drep, - int hfindex, int field_index, e_uuid_t *uuid) + int hfindex, int field_index, e_guid_t *uuid) { const gchar *uuid_name; proto_item *pi; @@ -1535,11 +1535,11 @@ dissect_dcom_append_UUID(tvbuff_t *tvb, int offset, } proto_item_append_text(pi, "%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x", - uuid->Data1, uuid->Data2, uuid->Data3, - uuid->Data4[0], uuid->Data4[1], - uuid->Data4[2], uuid->Data4[3], - uuid->Data4[4], uuid->Data4[5], - uuid->Data4[6], uuid->Data4[7]); + uuid->data1, uuid->data2, uuid->data3, + uuid->data4[0], uuid->data4[1], + uuid->data4[2], uuid->data4[3], + uuid->data4[4], uuid->data4[5], + uuid->data4[6], uuid->data4[7]); if(uuid_name) { proto_item_append_text(pi, ")"); @@ -1876,7 +1876,7 @@ dissect_dcom_DUALSTRINGARRAY(tvbuff_t *tvb, gint offset, packet_info *pinfo, int dissect_dcom_STDOBJREF(tvbuff_t *tvb, gint offset, packet_info *pinfo, proto_tree *tree, dcerpc_info *di, guint8 *drep, int hfindex _U_, - guint64 *oxid, guint64 *oid, e_uuid_t *ipid) + guint64 *oxid, guint64 *oid, e_guid_t *ipid) { guint32 u32Flags; guint32 u32PublicRefs; @@ -1904,7 +1904,7 @@ dissect_dcom_STDOBJREF(tvbuff_t *tvb, gint offset, packet_info *pinfo, /* append info to subtree header */ proto_item_append_text(sub_item, ": PublicRefs=%u IPID=%s", - u32PublicRefs, guids_resolve_uuid_to_str(ipid)); + u32PublicRefs, guids_resolve_guid_to_str(ipid)); proto_item_set_len(sub_item, offset - u32SubStart); return offset; @@ -1915,14 +1915,14 @@ dissect_dcom_STDOBJREF(tvbuff_t *tvb, gint offset, packet_info *pinfo, /* * *static void - *print_uuid(const e_uuid_t* uuid) + *print_uuid(const e_guid_t* uuid) *{ * proto_tree_add_debug_text(NULL, "UUID:(%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x)\n", - * uuid->Data1, uuid->Data2, uuid->Data3, - * uuid->Data4[0], uuid->Data4[1], - * uuid->Data4[2], uuid->Data4[3], - * uuid->Data4[4], uuid->Data4[5], - * uuid->Data4[6], uuid->Data4[7]); + * uuid->data1, uuid->data2, uuid->data3, + * uuid->data4[0], uuid->data4[1], + * uuid->data4[2], uuid->data4[3], + * uuid->data4[4], uuid->data4[5], + * uuid->data4[6], uuid->data4[7]); * * return; *} @@ -1930,7 +1930,7 @@ dissect_dcom_STDOBJREF(tvbuff_t *tvb, gint offset, packet_info *pinfo, */ int -dcom_register_rountine(dcom_dissect_fn_t routine, e_uuid_t* uuid) +dcom_register_rountine(dcom_dissect_fn_t routine, e_guid_t* uuid) { dcom_marshaler_t *marshaler; @@ -1957,7 +1957,7 @@ dcom_register_rountine(dcom_dissect_fn_t routine, e_uuid_t* uuid) dcom_dissect_fn_t -dcom_get_rountine_by_uuid(const e_uuid_t* uuid) +dcom_get_rountine_by_uuid(const e_guid_t* uuid) { dcom_marshaler_t *marsh; GList *marshalers; @@ -1971,7 +1971,7 @@ dcom_get_rountine_by_uuid(const e_uuid_t* uuid) marsh = (dcom_marshaler_t *)marshalers->data; /*print_uuid(&marsh->uuid);*/ /*print_uuid(uuid);*/ - if(memcmp(&marsh->uuid, uuid, sizeof(e_uuid_t)) == 0) { + if(memcmp(&marsh->uuid, uuid, sizeof(e_guid_t)) == 0) { return marsh->routine; } } @@ -1983,7 +1983,7 @@ dcom_get_rountine_by_uuid(const e_uuid_t* uuid) static int dissect_dcom_CUSTOBJREF(tvbuff_t *tvb, gint offset, packet_info *pinfo, proto_tree *tree, dcerpc_info *di, guint8 *drep, int hfindex, - e_uuid_t *clsid, e_uuid_t *iid) + e_guid_t *clsid, e_guid_t *iid) { guint32 u32CBExtension; guint32 u32Size; @@ -2026,14 +2026,14 @@ dissect_dcom_OBJREF(tvbuff_t *tvb, gint offset, packet_info *pinfo, { guint32 u32Signature; guint32 u32Flags; - e_uuid_t iid; - e_uuid_t clsid; + e_guid_t iid; + e_guid_t clsid; proto_item *sub_item; proto_tree *sub_tree; guint32 u32SubStart; guint64 oxid = 0; guint64 oid = 0; - e_uuid_t ipid; + e_guid_t ipid; dcom_interface_t *dcom_if = NULL; gchar ip[4]; diff --git a/epan/dissectors/packet-dcom.h b/epan/dissectors/packet-dcom.h index 20865fc990..f4826acdba 100644 --- a/epan/dissectors/packet-dcom.h +++ b/epan/dissectors/packet-dcom.h @@ -63,8 +63,8 @@ typedef struct dcom_interface_s { void *private_data; gint first_packet; - e_uuid_t iid; - e_uuid_t ipid; /* the DCE/RPC Object UUID */ + e_guid_t iid; + e_guid_t ipid; /* the DCE/RPC Object UUID */ } dcom_interface_t; typedef int (*dcom_dissect_fn_t) (tvbuff_t *tvb, gint offset, packet_info *pinfo, @@ -74,19 +74,19 @@ typedef struct dcom_marshaler_s { dcom_object_t *parent; void *private_data; - e_uuid_t uuid; + e_guid_t uuid; dcom_dissect_fn_t routine; } dcom_marshaler_t; -WS_DLL_PUBLIC dcom_interface_t *dcom_interface_new(packet_info *pinfo, const address *addr, e_uuid_t *iid, guint64 oxid, guint64 oid, e_uuid_t *ipid); -WS_DLL_PUBLIC dcom_interface_t *dcom_interface_find(packet_info *pinfo, const address *addr, e_uuid_t *ipid); +WS_DLL_PUBLIC dcom_interface_t *dcom_interface_new(packet_info *pinfo, const address *addr, e_guid_t *iid, guint64 oxid, guint64 oid, e_guid_t *ipid); +WS_DLL_PUBLIC dcom_interface_t *dcom_interface_find(packet_info *pinfo, const address *addr, e_guid_t *ipid); #ifdef DEBUG extern void dcom_interface_dump(void); #endif -extern int dcom_register_rountine(dcom_dissect_fn_t routine, e_uuid_t* uuid); +extern int dcom_register_rountine(dcom_dissect_fn_t routine, e_guid_t* uuid); extern void dcom_register_common_routines_(void); -extern dcom_dissect_fn_t dcom_get_rountine_by_uuid(const e_uuid_t* uuid); +extern dcom_dissect_fn_t dcom_get_rountine_by_uuid(const e_guid_t* uuid); /* the essential DCOM this and that, starting every call */ WS_DLL_PUBLIC int @@ -113,12 +113,12 @@ dissect_dcom_that(tvbuff_t *tvb, int offset, extern int dissect_dcom_UUID(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, dcerpc_info *di, guint8 *drep, - int hfindex, e_uuid_t *uuid); + int hfindex, e_guid_t *uuid); extern int dissect_dcom_append_UUID(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, dcerpc_info *di, guint8 *drep, - int hfindex, int field_index, e_uuid_t *uuid); + int hfindex, int field_index, e_guid_t *uuid); extern int dissect_dcom_indexed_WORD(tvbuff_t *tvb, int offset, packet_info *pinfo, @@ -179,7 +179,7 @@ dissect_dcom_DUALSTRINGARRAY(tvbuff_t *tvb, gint offset, packet_info *pinfo, extern int dissect_dcom_STDOBJREF(tvbuff_t *tvb, gint offset, packet_info *pinfo, proto_tree *tree, dcerpc_info *di, guint8 *drep, int hfindex, - guint64 *oxid, guint64 *oid, e_uuid_t *ipid); + guint64 *oxid, guint64 *oid, e_guid_t *ipid); extern int dissect_dcom_OBJREF(tvbuff_t *tvb, gint offset, packet_info *pinfo, proto_tree *tree, dcerpc_info *di, guint8 *drep, int hfindex, dcom_interface_t **interf); diff --git a/epan/dissectors/packet-ldap.c b/epan/dissectors/packet-ldap.c index cac8af7414..9077578904 100644 --- a/epan/dissectors/packet-ldap.c +++ b/epan/dissectors/packet-ldap.c @@ -845,18 +845,18 @@ dissect_ldap_AssertionValue(gboolean implicit_tag, tvbuff_t *tvb, int offset, as } else if ( (len==16) /* GUIDs are always 16 bytes */ && (attributedesc_string && !strncmp("DomainGuid", attributedesc_string, 10))) { guint8 drep[4] = { 0x10, 0x00, 0x00, 0x00}; /* fake DREP struct */ - e_uuid_t uuid; + e_guid_t uuid; /* This octet string contained a GUID */ dissect_dcerpc_uuid_t(tvb, offset, actx->pinfo, tree, drep, hf_ldap_guid, &uuid); ldapvalue_string=(char*)wmem_alloc(wmem_packet_scope(), 1024); g_snprintf(ldapvalue_string, 1023, "%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x", - uuid.Data1, uuid.Data2, uuid.Data3, - uuid.Data4[0], uuid.Data4[1], - uuid.Data4[2], uuid.Data4[3], - uuid.Data4[4], uuid.Data4[5], - uuid.Data4[6], uuid.Data4[7]); + uuid.data1, uuid.data2, uuid.data3, + uuid.data4[0], uuid.data4[1], + uuid.data4[2], uuid.data4[3], + uuid.data4[4], uuid.data4[5], + uuid.data4[6], uuid.data4[7]); goto finished; } else if (attributedesc_string && !strncmp("NtVer", attributedesc_string, 5)){ @@ -4669,18 +4669,18 @@ static void dissect_ldap_guid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { guint8 drep[4] = { 0x10, 0x00, 0x00, 0x00}; /* fake DREP struct */ - e_uuid_t uuid; + e_guid_t uuid; /* This octet string contained a GUID */ dissect_dcerpc_uuid_t(tvb, 0, pinfo, tree, drep, hf_ldap_guid, &uuid); ldapvalue_string=(char*)wmem_alloc(wmem_packet_scope(), 1024); g_snprintf(ldapvalue_string, 1023, "%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x", - uuid.Data1, uuid.Data2, uuid.Data3, - uuid.Data4[0], uuid.Data4[1], - uuid.Data4[2], uuid.Data4[3], - uuid.Data4[4], uuid.Data4[5], - uuid.Data4[6], uuid.Data4[7]); + uuid.data1, uuid.data2, uuid.data3, + uuid.data4[0], uuid.data4[1], + uuid.data4[2], uuid.data4[3], + uuid.data4[4], uuid.data4[5], + uuid.data4[6], uuid.data4[7]); } static int diff --git a/epan/dissectors/packet-smb2.c b/epan/dissectors/packet-smb2.c index ff04894449..5e141b1026 100644 --- a/epan/dissectors/packet-smb2.c +++ b/epan/dissectors/packet-smb2.c @@ -717,17 +717,17 @@ static gchar *policy_hnd_to_file_id(const e_ctx_hnd *hnd) { gchar *file_id; file_id = wmem_strdup_printf(wmem_packet_scope(), "%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x", - hnd->uuid.Data1, - hnd->uuid.Data2, - hnd->uuid.Data3, - hnd->uuid.Data4[0], - hnd->uuid.Data4[1], - hnd->uuid.Data4[2], - hnd->uuid.Data4[3], - hnd->uuid.Data4[4], - hnd->uuid.Data4[5], - hnd->uuid.Data4[6], - hnd->uuid.Data4[7]); + hnd->uuid.data1, + hnd->uuid.data2, + hnd->uuid.data3, + hnd->uuid.data4[0], + hnd->uuid.data4[1], + hnd->uuid.data4[2], + hnd->uuid.data4[3], + hnd->uuid.data4[4], + hnd->uuid.data4[5], + hnd->uuid.data4[6], + hnd->uuid.data4[7]); return file_id; } static guint smb2_eo_files_hash(gconstpointer k) { @@ -738,17 +738,17 @@ int are_equal; const e_ctx_hnd *key1 = (const e_ctx_hnd *)k1; const e_ctx_hnd *key2 = (const e_ctx_hnd *)k2; - are_equal = (key1->uuid.Data1==key2->uuid.Data1 && - key1->uuid.Data2==key2->uuid.Data2 && - key1->uuid.Data3==key2->uuid.Data3 && - key1->uuid.Data4[0]==key2->uuid.Data4[0] && - key1->uuid.Data4[1]==key2->uuid.Data4[1] && - key1->uuid.Data4[2]==key2->uuid.Data4[2] && - key1->uuid.Data4[3]==key2->uuid.Data4[3] && - key1->uuid.Data4[4]==key2->uuid.Data4[4] && - key1->uuid.Data4[5]==key2->uuid.Data4[5] && - key1->uuid.Data4[6]==key2->uuid.Data4[6] && - key1->uuid.Data4[7]==key2->uuid.Data4[7]); + are_equal = (key1->uuid.data1==key2->uuid.data1 && + key1->uuid.data2==key2->uuid.data2 && + key1->uuid.data3==key2->uuid.data3 && + key1->uuid.data4[0]==key2->uuid.data4[0] && + key1->uuid.data4[1]==key2->uuid.data4[1] && + key1->uuid.data4[2]==key2->uuid.data4[2] && + key1->uuid.data4[3]==key2->uuid.data4[3] && + key1->uuid.data4[4]==key2->uuid.data4[4] && + key1->uuid.data4[5]==key2->uuid.data4[5] && + key1->uuid.data4[6]==key2->uuid.data4[6] && + key1->uuid.data4[7]==key2->uuid.data4[7]); return are_equal; } @@ -4201,9 +4201,9 @@ smb2_set_dcerpc_file_id(packet_info *pinfo, smb2_info_t *si) /* * the first 8 bytes are the persistent part of the file handle */ - persistent = si->saved->policy_hnd.uuid.Data1; - persistent |= ((guint64)si->saved->policy_hnd.uuid.Data2) << 32; - persistent |= ((guint64)si->saved->policy_hnd.uuid.Data3) << 48; + persistent = si->saved->policy_hnd.uuid.data1; + persistent |= ((guint64)si->saved->policy_hnd.uuid.data2) << 32; + persistent |= ((guint64)si->saved->policy_hnd.uuid.data3) << 48; dcerpc_set_transport_salt(persistent, pinfo); } |