diff options
| author | Anders Broman <a.broman58@gmail.com> | 2016-02-08 16:16:27 +0000 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2016-02-08 16:32:15 +0000 |
| commit | 7d26339a2fa9d8e707eee0f1e8ac61a2affb2e83 (patch) | |
| tree | b984e39d8055d9cd34c88322ad3b5c607e51d55c /asn1 | |
| parent | 22a569ad3acd0833e593c02813edd8fe2eb73b3e (diff) | |
Revert "RTSE and PRES relies on the TCP conversation to do reassembly, switch to the new interface."
This reverts commit c296001158b979497242dd726430b0b7cb26f984.
Change-Id: Ie67001c181b1e7437e5d6ecd8f64b61da15df2c3
Reviewed-on: https://code.wireshark.org/review/13823
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'asn1')
| -rw-r--r-- | asn1/pres/packet-pres-template.c | 12 | ||||
| -rw-r--r-- | asn1/rtse/packet-rtse-template.c | 10 |
2 files changed, 5 insertions, 17 deletions
diff --git a/asn1/pres/packet-pres-template.c b/asn1/pres/packet-pres-template.c index 86d4ed192a..0c1c2d823e 100644 --- a/asn1/pres/packet-pres-template.c +++ b/asn1/pres/packet-pres-template.c @@ -142,12 +142,8 @@ register_ctx_id_and_oid(packet_info *pinfo _U_, guint32 idx, const char *oid) pco=wmem_new(wmem_file_scope(), pres_ctx_oid_t); pco->ctx_id=idx; pco->oid=wmem_strdup(wmem_file_scope(), oid); - if (pinfo->ptype == PT_TCP) { - conversation = find_conversation_ext_from_pinfo(pinfo); - } else { - conversation = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst, + conversation=find_conversation (pinfo->num, &pinfo->src, &pinfo->dst, pinfo->ptype, pinfo->srcport, pinfo->destport, 0); - } if (conversation) { pco->idx = conversation->index; } else { @@ -187,12 +183,8 @@ find_oid_by_pres_ctx_id(packet_info *pinfo, guint32 idx) conversation_t *conversation; pco.ctx_id=idx; - if (pinfo->ptype == PT_TCP) { - conversation = find_conversation_ext_from_pinfo(pinfo); - } else { - conversation = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst, + conversation=find_conversation (pinfo->num, &pinfo->src, &pinfo->dst, pinfo->ptype, pinfo->srcport, pinfo->destport, 0); - } if (conversation) { pco.idx = conversation->index; } else { diff --git a/asn1/rtse/packet-rtse-template.c b/asn1/rtse/packet-rtse-template.c index 3fa382adea..4cbba302c0 100644 --- a/asn1/rtse/packet-rtse-template.c +++ b/asn1/rtse/packet-rtse-template.c @@ -232,13 +232,9 @@ dissect_rtse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* d (session->spdu_type == SES_MAJOR_SYNC_POINT))) { /* Use conversation index as fragment id */ - if (pinfo->ptype == PT_TCP) { - conversation = find_conversation_ext_from_pinfo(pinfo); - } else { - conversation = find_conversation(pinfo->num, - &pinfo->src, &pinfo->dst, pinfo->ptype, - pinfo->srcport, pinfo->destport, 0); - } + conversation = find_conversation (pinfo->num, + &pinfo->src, &pinfo->dst, pinfo->ptype, + pinfo->srcport, pinfo->destport, 0); if (conversation != NULL) { rtse_id = conversation->index; } |