diff options
| author | Guy Harris <guy@alum.mit.edu> | 2006-03-19 20:45:45 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2006-03-19 20:45:45 +0000 |
| commit | 7db8eea5c68284a468924639eecc2ca8959225d0 (patch) | |
| tree | 8615d9607a760ce4721551cd031660083076cd49 /epan/dissectors/packet-h225.c | |
| parent | 624db0dc41ab9bad1bacbd95462d6dffa4afba61 (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/dissectors/packet-h225.c')
| -rw-r--r-- | epan/dissectors/packet-h225.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/epan/dissectors/packet-h225.c b/epan/dissectors/packet-h225.c index 4c3e94033d..d44488088f 100644 --- a/epan/dissectors/packet-h225.c +++ b/epan/dissectors/packet-h225.c @@ -4173,8 +4173,8 @@ dissect_h225_T_guid(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tre #line 450 "h225.cnf" tvbuff_t *guid_tvb; - offset = dissect_per_octet_string(tvb,offset,pinfo,tree,hf_index,16,16,&guid_tvb); - tvb_memcpy(guid_tvb,h225_pi->guid,0,tvb_length(guid_tvb)); + offset = dissect_per_octet_string(tvb,offset,pinfo,tree,hf_index,GUID_LEN,GUID_LEN,&guid_tvb); + tvb_memcpy(guid_tvb,(guint8 *)&h225_pi->guid,0,GUID_LEN); return offset; @@ -12815,7 +12815,7 @@ static void reset_h225_packet_info(h225_packet_info *pi) pi->msg_tag = -1; pi->reason = -1; pi->requestSeqNum = 0; - memset(pi->guid,0,16); + memset(&pi->guid,0,sizeof pi->guid); pi->is_duplicate = FALSE; pi->request_available = FALSE; pi->is_faststart = FALSE; @@ -12914,7 +12914,7 @@ static void ras_call_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre and last request occured more than 1800 seconds ago, we decide that we have a new request */ /* Append new ras call to list */ - h225ras_call = append_h225ras_call(h225ras_call, pinfo, pi->guid, msg_category); + h225ras_call = append_h225ras_call(h225ras_call, pinfo, &pi->guid, msg_category); } else { /* No, so it's a duplicate request. Mark it as such. */ @@ -12927,7 +12927,7 @@ static void ras_call_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre } while (h225ras_call != NULL ); } else { - h225ras_call = new_h225ras_call(&h225ras_call_key, pinfo, pi->guid, msg_category); + h225ras_call = new_h225ras_call(&h225ras_call_key, pinfo, &pi->guid, msg_category); } /* add link to response frame, if available */ @@ -12968,8 +12968,8 @@ static void ras_call_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre /* if this is an ACF, ARJ or DCF, DRJ, give guid to tap and make it filterable */ if (msg_category == 3 || msg_category == 5) { - memcpy(pi->guid, h225ras_call->guid,16); - proto_tree_add_guid_hidden(tree, hf_h225_guid, tvb, 0, 16, pi->guid); + pi->guid = h225ras_call->guid; + proto_tree_add_guid_hidden(tree, hf_h225_guid, tvb, 0, GUID_LEN, &pi->guid); } if (h225ras_call->rsp_num == 0) { |