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-rtse.c | |
| 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 'epan/dissectors/packet-rtse.c')
| -rw-r--r-- | epan/dissectors/packet-rtse.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/epan/dissectors/packet-rtse.c b/epan/dissectors/packet-rtse.c index 50b4a9dc7c..48a11ec4f5 100644 --- a/epan/dissectors/packet-rtse.c +++ b/epan/dissectors/packet-rtse.c @@ -779,13 +779,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; } @@ -1014,7 +1010,11 @@ void proto_register_rtse(void) { NULL, HFILL }}, /*--- End of included file: packet-rtse-hfarr.c ---*/ +<<<<<<< HEAD #line 370 "../../asn1/rtse/packet-rtse-template.c" +======= +#line 365 "../../asn1/rtse/packet-rtse-template.c" +>>>>>>> Revert "RTSE and PRES relies on the TCP conversation to do reassembly, switch to the new interface." }; /* List of subtrees */ @@ -1036,7 +1036,11 @@ void proto_register_rtse(void) { &ett_rtse_CallingSSuserReference, /*--- End of included file: packet-rtse-ettarr.c ---*/ +<<<<<<< HEAD #line 379 "../../asn1/rtse/packet-rtse-template.c" +======= +#line 374 "../../asn1/rtse/packet-rtse-template.c" +>>>>>>> Revert "RTSE and PRES relies on the TCP conversation to do reassembly, switch to the new interface." }; static ei_register_info ei[] = { |