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 /epan/dissectors/packet-pres.c | |
| parent | 22a569ad3acd0833e593c02813edd8fe2eb73b3e (diff) | |
| download | wireshark-7d26339a2fa9d8e707eee0f1e8ac61a2affb2e83.tar.gz | |
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 'epan/dissectors/packet-pres.c')
| -rw-r--r-- | epan/dissectors/packet-pres.c | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/epan/dissectors/packet-pres.c b/epan/dissectors/packet-pres.c index f84dea5fa6..651620e6ea 100644 --- a/epan/dissectors/packet-pres.c +++ b/epan/dissectors/packet-pres.c @@ -274,12 +274,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 { @@ -319,12 +315,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 { @@ -1367,7 +1359,7 @@ static int dissect_UD_type_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_ /*--- End of included file: packet-pres-fn.c ---*/ -#line 232 "../../asn1/pres/packet-pres-template.c" +#line 224 "../../asn1/pres/packet-pres-template.c" /* @@ -1849,7 +1841,7 @@ void proto_register_pres(void) { NULL, HFILL }}, /*--- End of included file: packet-pres-hfarr.c ---*/ -#line 401 "../../asn1/pres/packet-pres-template.c" +#line 393 "../../asn1/pres/packet-pres-template.c" }; /* List of subtrees */ @@ -1896,7 +1888,7 @@ void proto_register_pres(void) { &ett_pres_UD_type, /*--- End of included file: packet-pres-ettarr.c ---*/ -#line 407 "../../asn1/pres/packet-pres-template.c" +#line 399 "../../asn1/pres/packet-pres-template.c" }; static ei_register_info ei[] = { |