diff options
| author | Ulf Lamping <ulf.lamping@web.de> | 2006-08-16 23:13:26 +0000 |
|---|---|---|
| committer | Ulf Lamping <ulf.lamping@web.de> | 2006-08-16 23:13:26 +0000 |
| commit | de0594b9a5acc545acfd64e44cd2a9f2e4e84938 (patch) | |
| tree | b47bcb6f1e5e5d8bf3acb1c878934e71759ae5e3 /epan/dissectors/packet-dcom.h | |
| parent | eb7c653073081e10f0e7be97c5420f0884b28a1f (diff) | |
various UUID/GUID based changes.
I think I've changed all corresponding appearances from FT_STRING to FT_GUID, so assert the FT_ type as it should only be a FT_GUID now.
Add a generic implementation in guid_utils.h to have a way to store data about GUID to name resolving (something like value_string for e.g. int). It might be better to have a single registry for all GUID's of all dissectors and implement the GUID name resolving into the proto_tree_add... functions.
svn path=/trunk/; revision=18935
Diffstat (limited to 'epan/dissectors/packet-dcom.h')
| -rw-r--r-- | epan/dissectors/packet-dcom.h | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/epan/dissectors/packet-dcom.h b/epan/dissectors/packet-dcom.h index 0f3914064b..a1163fc79e 100644 --- a/epan/dissectors/packet-dcom.h +++ b/epan/dissectors/packet-dcom.h @@ -36,6 +36,8 @@ extern int hf_dcom_oxid; extern int hf_dcom_oid; extern int hf_dcom_ipid; +extern GHashTable *dcom_uuids; + /* preferences */ extern int dcom_prefs_display_unmarshalling_details; @@ -88,7 +90,6 @@ dissect_dcom_that(tvbuff_t *tvb, int offset, #define dissect_dcom_DWORD dissect_ndr_uint32 #define dissect_dcom_I8 dissect_ndr_uint64 #define dissect_dcom_ID dissect_ndr_duint32 -#define dissect_dcom_UUID dissect_ndr_uuid_t #define dissect_dcom_FILETIME dissect_ndr_duint32 /* ToBeDone */ #define dissect_dcom_VARIANT_BOOL dissect_ndr_uint16 #define dissect_dcom_FLOAT dissect_ndr_float @@ -96,10 +97,17 @@ dissect_dcom_that(tvbuff_t *tvb, int offset, #define dissect_dcom_DATE dissect_ndr_double extern int +dissect_dcom_UUID(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, guint8 *drep, + int hfindex, e_uuid_t *uuid); + +extern int dissect_dcom_append_UUID(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, guint8 *drep, - int hfindex, const gchar *field_name, int field_index, e_uuid_t *uuid); -extern const gchar* dcom_uuid_to_str(e_uuid_t *uuid); + int hfindex, int field_index, e_uuid_t *uuid); + +extern const gchar* +dcom_uuid_to_str(e_uuid_t *uuid); extern int dissect_dcom_indexed_WORD(tvbuff_t *tvb, int offset, packet_info *pinfo, |