diff options
| author | Guy Harris <guy@alum.mit.edu> | 2007-04-26 07:57:44 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2007-04-26 07:57:44 +0000 |
| commit | 08ab8d873444e9a944ff9ed1a856655a8a01322f (patch) | |
| tree | da7b3e6314a0973cea9f9fd1e99d3cdc9835b497 /epan/tcap-persistentdata.c | |
| parent | ccac0e798358b53f4efea8988421f7a8c26ffaa5 (diff) | |
mtp3_addr_to_str_buf() and mtp3_pc_hash() expect to be passed a pointer
to a mtp3_addr_pc_t; declare them as such, and pass the argument as
such.
svn path=/trunk/; revision=21595
Diffstat (limited to 'epan/tcap-persistentdata.c')
| -rw-r--r-- | epan/tcap-persistentdata.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/epan/tcap-persistentdata.c b/epan/tcap-persistentdata.c index d41cd5d56c..b750b9c35a 100644 --- a/epan/tcap-persistentdata.c +++ b/epan/tcap-persistentdata.c @@ -824,8 +824,8 @@ tcaphash_begin_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, /* prepare the key data */ tcaphash_begin_key.tid = p_tcapsrt_info->src_tid; - tcaphash_begin_key.opc_hash = mtp3_pc_hash( ((address *)(&pinfo->src))->data); - tcaphash_begin_key.dpc_hash = mtp3_pc_hash( ((address *)(&pinfo->dst))->data); + tcaphash_begin_key.opc_hash = mtp3_pc_hash((const mtp3_addr_pc_t *)pinfo->src.data); + tcaphash_begin_key.dpc_hash = mtp3_pc_hash((const mtp3_addr_pc_t *)pinfo->dst.data); tcaphash_begin_key.hashKey=tcaphash_begin_calchash(&tcaphash_begin_key); /* look up the request */ @@ -988,8 +988,8 @@ tcaphash_cont_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, /* look only for matching request, if matching conversation is available. */ tcaphash_cont_key.src_tid = p_tcapsrt_info->src_tid; tcaphash_cont_key.dst_tid = p_tcapsrt_info->dst_tid; - tcaphash_cont_key.opc_hash=mtp3_pc_hash( ((address*)(&pinfo->src))->data); - tcaphash_cont_key.dpc_hash=mtp3_pc_hash( ((address*)(&pinfo->dst))->data); + tcaphash_cont_key.opc_hash=mtp3_pc_hash((const mtp3_addr_pc_t *)pinfo->src.data); + tcaphash_cont_key.dpc_hash=mtp3_pc_hash((const mtp3_addr_pc_t *)pinfo->dst.data); tcaphash_cont_key.hashKey=tcaphash_cont_calchash(&tcaphash_cont_key); #ifdef DEBUG_TCAPSRT @@ -1014,8 +1014,8 @@ tcaphash_cont_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, struct tcaphash_endcall_t *p_tcaphash_endcall; tcaphash_begin_key.tid = p_tcapsrt_info->dst_tid; - tcaphash_begin_key.opc_hash=mtp3_pc_hash( ((address*)(&pinfo->src))->data); - tcaphash_begin_key.dpc_hash=mtp3_pc_hash( ((address*)(&pinfo->dst))->data); + tcaphash_begin_key.opc_hash=mtp3_pc_hash((const mtp3_addr_pc_t *)pinfo->src.data); + tcaphash_begin_key.dpc_hash=mtp3_pc_hash((const mtp3_addr_pc_t *)pinfo->dst.data); tcaphash_begin_key.hashKey=tcaphash_begin_calchash(&tcaphash_begin_key); #ifdef DEBUG_TCAPSRT @@ -1043,8 +1043,8 @@ tcaphash_cont_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, dbg(11,"Frame reqlink #%u ", pinfo->fd->num); #endif tcaphash_end_key.tid = p_tcapsrt_info->src_tid; - tcaphash_end_key.opc_hash=mtp3_pc_hash( ((address*)(&pinfo->src))->data); - tcaphash_end_key.dpc_hash=mtp3_pc_hash( ((address*)(&pinfo->dst))->data); + tcaphash_end_key.opc_hash=mtp3_pc_hash((const mtp3_addr_pc_t *)pinfo->src.data); + tcaphash_end_key.dpc_hash=mtp3_pc_hash((const mtp3_addr_pc_t *)pinfo->dst.data); tcaphash_end_key.hashKey=tcaphash_end_calchash(&tcaphash_end_key); #ifdef DEBUG_TCAPSRT @@ -1100,8 +1100,8 @@ tcaphash_end_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, #endif /* look only for matching request, if matching conversation is available. */ tcaphash_end_key.tid = p_tcapsrt_info->dst_tid; - tcaphash_end_key.opc_hash = mtp3_pc_hash( ((address*)(&pinfo->src))->data); - tcaphash_end_key.dpc_hash = mtp3_pc_hash( ((address*)(&pinfo->dst))->data); + tcaphash_end_key.opc_hash = mtp3_pc_hash((const mtp3_addr_pc_t *)pinfo->src.data); + tcaphash_end_key.dpc_hash = mtp3_pc_hash((const mtp3_addr_pc_t *)pinfo->dst.data); tcaphash_end_key.hashKey=tcaphash_end_calchash(&tcaphash_end_key); #ifdef DEBUG_TCAPSRT @@ -1116,8 +1116,8 @@ tcaphash_end_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, dbg(12,"EnotFound "); #endif tcaphash_begin_key.tid = p_tcapsrt_info->dst_tid; - tcaphash_begin_key.opc_hash=mtp3_pc_hash( ((address*)(&pinfo->src))->data); - tcaphash_begin_key.dpc_hash=mtp3_pc_hash( ((address*)(&pinfo->dst))->data); + tcaphash_begin_key.opc_hash=mtp3_pc_hash((const mtp3_addr_pc_t *)pinfo->src.data); + tcaphash_begin_key.dpc_hash=mtp3_pc_hash((const mtp3_addr_pc_t *)pinfo->dst.data); tcaphash_begin_key.hashKey=tcaphash_begin_calchash(&tcaphash_begin_key); #ifdef DEBUG_TCAPSRT |