diff options
author | Ulf Lamping <ulf.lamping@web.de> | 2006-08-17 19:09:41 +0000 |
---|---|---|
committer | Ulf Lamping <ulf.lamping@web.de> | 2006-08-17 19:09:41 +0000 |
commit | 7d040193881dc431ec20e471189f99d16a4cbbf8 (patch) | |
tree | 511ad9a6b80a92c30e8d7a008e3d07fe306bbc6d /epan/dissectors/packet-dcom-remunkn.c | |
parent | 162d87a516782fb04df22471305df0a386a3d996 (diff) |
some further work on the GUID/UUID resolvings
most of the relevant code moved to guid_utils
lot of corresponding code cleanup in packet-dcerpc.c
still using GHashTable
still not using a manuf like file
svn path=/trunk/; revision=18939
Diffstat (limited to 'epan/dissectors/packet-dcom-remunkn.c')
-rw-r--r-- | epan/dissectors/packet-dcom-remunkn.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/epan/dissectors/packet-dcom-remunkn.c b/epan/dissectors/packet-dcom-remunkn.c index 9fe8bde111..a636abe17b 100644 --- a/epan/dissectors/packet-dcom-remunkn.c +++ b/epan/dissectors/packet-dcom-remunkn.c @@ -36,6 +36,7 @@ #include <epan/emem.h> #include "packet-dcerpc.h" #include "packet-dcom.h" +#include "guid-utils.h" static int hf_remunk_opnum = -1; @@ -62,6 +63,8 @@ static e_uuid_t uuid_remunk = { 0x00000131, 0x0000, 0x0000, { 0xc0, 0x00, 0x00, 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 } }; + /* There is a little bit confusion about the IRemUnknown2 interface UUIDs */ /* DCOM documentation tells us: 0x00000142 (7 methods) */ /* win2000 registry tells us: 0x00000142 IRemoteQI (4 methods) */ @@ -273,7 +276,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, - dcom_uuid_to_str(&ipid), + guids_resolve_uuid_to_str(&ipid), u32PublicRefs, u32PrivateRefs); proto_item_set_len(sub_item, offset - u32SubStart); @@ -368,6 +371,10 @@ proto_register_remunk (void) void proto_reg_handoff_remunk (void) { + + /* Register the IPID */ + guids_add_uuid(&ipid_remunk, "IPID-IRemUnknown"); + /* Register the interfaces */ dcerpc_init_uuid(proto_remunk, ett_remunk, &uuid_remunk, ver_remunk, |