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-dcerpc-epm.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-dcerpc-epm.c')
-rw-r--r-- | epan/dissectors/packet-dcerpc-epm.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/epan/dissectors/packet-dcerpc-epm.c b/epan/dissectors/packet-dcerpc-epm.c index b6e46b6f98..a0c4abb71e 100644 --- a/epan/dissectors/packet-dcerpc-epm.c +++ b/epan/dissectors/packet-dcerpc-epm.c @@ -81,7 +81,6 @@ static guint16 ver_epm3 = 3; static guint16 ver_epm4 = 4; -GHashTable *uuids=NULL; static e_uuid_t uuid_data_repr_proto = { 0x8a885d04, 0x1ceb, 0x11c9, { 0x9f, 0xe8, 0x08, 0x00, 0x2b, 0x10, 0x48, 0x60 } }; @@ -364,7 +363,7 @@ epm_dissect_tower_data (tvbuff_t *tvb, int offset, case PROTO_ID_UUID: dcerpc_tvb_get_uuid (tvb, offset+1, drep, &uuid); - uuid_name = guids_get_guid_name(uuids, (e_guid_t *) &uuid); + uuid_name = guids_get_uuid_name(&uuid); if(uuid_name != NULL) { proto_tree_add_guid_format (tr, hf_epm_uuid, tvb, offset+1, 16, (e_guid_t *) &uuid, @@ -767,9 +766,6 @@ proto_register_epm (void) &ett_epm_entry }; - uuids = guids_new(); - guids_add_guid(uuids, (e_guid_t *) &uuid_data_repr_proto, "Version 1.1 network data representation protocol", NULL); - /* interface version 3 */ proto_epm3 = proto_register_protocol ("DCE/RPC Endpoint Mapper", "EPM", "epm"); proto_register_field_array (proto_epm3, hf, array_length (hf)); @@ -782,6 +778,9 @@ proto_register_epm (void) void proto_reg_handoff_epm (void) { + /* Register the UUIDs */ + guids_add_uuid(&uuid_data_repr_proto, "Version 1.1 network data representation protocol"); + /* Register the protocol as dcerpc */ dcerpc_init_uuid (proto_epm3, ett_epm, &uuid_epm, ver_epm3, epm_dissectors, hf_epm_opnum); dcerpc_init_uuid (proto_epm4, ett_epm, &uuid_epm, ver_epm4, epm_dissectors, hf_epm_opnum); |