diff options
| author | Jeff Morriss <jeff.morriss@ulticom.com> | 2010-05-13 18:55:31 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss@ulticom.com> | 2010-05-13 18:55:31 +0000 |
| commit | 81da8e0b6bed80799f81d711329f1a35c1539b84 (patch) | |
| tree | 1610055010fb39d6ed9a2462e01d72b1c279cccc /asn1/h225 | |
| parent | 729de1a635cd21379db622c93f945a19b9f645b2 (diff) | |
Use find_or_create_conversation() in some ASN.1 dissectors
svn path=/trunk/; revision=32791
Diffstat (limited to 'asn1/h225')
| -rw-r--r-- | asn1/h225/packet-h225-template.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/asn1/h225/packet-h225-template.c b/asn1/h225/packet-h225-template.c index d6d1da338a..50ffa089e8 100644 --- a/asn1/h225/packet-h225-template.c +++ b/asn1/h225/packet-h225-template.c @@ -381,17 +381,7 @@ static void ras_call_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre msg_category = pi->msg_tag / 3; if(pi->msg_tag % 3 == 0) { /* Request Message */ - conversation = find_conversation(pinfo->fd->num, &pinfo->src, - &pinfo->dst, pinfo->ptype, pinfo->srcport, - pinfo->destport, 0); - - if (conversation == NULL) { - /* It's not part of any conversation - create a new one. */ - conversation = conversation_new(pinfo->fd->num, &pinfo->src, - &pinfo->dst, pinfo->ptype, pinfo->srcport, - pinfo->destport, 0); - - } + conversation = find_or_create_conversation(pinfo); /* prepare the key data */ h225ras_call_key.reqSeqNum = pi->requestSeqNum; @@ -478,7 +468,7 @@ static void ras_call_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre } h225ras_call = h225ras_call->next_call; } while (h225ras_call != NULL) ; - + if (!h225ras_call) { return; } |