aboutsummaryrefslogtreecommitdiffstats
path: root/epan/h225-persistentdata.h
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2006-03-19 20:45:45 +0000
committerGuy Harris <guy@alum.mit.edu>2006-03-19 20:45:45 +0000
commit7db8eea5c68284a468924639eecc2ca8959225d0 (patch)
tree8615d9607a760ce4721551cd031660083076cd49 /epan/h225-persistentdata.h
parent624db0dc41ab9bad1bacbd95462d6dffa4afba61 (diff)
Make the GUIDs in various data structures e_guid_t's rather than arrays
of 16 bytes. Use "sizeof" for the size of e_guid_t's, and use structure assignment to copy GUID values. Make functions such as append_h225ras_call() and new_h225ras_call() take pointers to e_guid_t's as arguments. Define GUID_LEN in epan/guid-utils.h and use it as the length of a GUID in a packet. (Note that "sizeof e_guid_t" is not guaranteed to be 16, although it is guaranteed to be the size of an e_guid_t.) When constructing a display filter that matches a GUID, use guid_to_str() to construct the string for the GUID. svn path=/trunk/; revision=17676
Diffstat (limited to 'epan/h225-persistentdata.h')
-rw-r--r--epan/h225-persistentdata.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/h225-persistentdata.h b/epan/h225-persistentdata.h
index aed7972c5f..5defb14874 100644
--- a/epan/h225-persistentdata.h
+++ b/epan/h225-persistentdata.h
@@ -37,7 +37,7 @@
/* Item of ras request list*/
typedef struct _h225ras_call_t {
guint32 requestSeqNum;
- guint8 guid[16];
+ e_guid_t guid;
guint32 req_num; /* frame number request seen */
guint32 rsp_num; /* frame number response seen */
nstime_t req_time; /* arrival time of request */
@@ -54,8 +54,8 @@ typedef struct _h225ras_call_info_key {
/* functions, needed using ras-request and halfcall matching*/
h225ras_call_t * find_h225ras_call(h225ras_call_info_key *h225ras_call_key ,int category);
-h225ras_call_t * new_h225ras_call(h225ras_call_info_key *h225ras_call_key, packet_info *pinfo, guint8 *guid, int category);
-h225ras_call_t * append_h225ras_call(h225ras_call_t *prev_call, packet_info *pinfo, guint8 *guid, int category);
+h225ras_call_t * new_h225ras_call(h225ras_call_info_key *h225ras_call_key, packet_info *pinfo, e_guid_t *guid, int category);
+h225ras_call_t * append_h225ras_call(h225ras_call_t *prev_call, packet_info *pinfo, e_guid_t *guid, int category);
void h225_init_routine(void); /* init routine, used by ethereal */