osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Revert "RTSE and PRES relies on the TCP conversation to do reassembly, switch to the new interface." 

This reverts commit c296001158.

Change-Id: Ie67001c181b1e7437e5d6ecd8f64b61da15df2c3
Reviewed-on: https://code.wireshark.org/review/13823
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
Anders Broman 2016-02-08 16:16:27 +00:00
parent 22a569ad3a
commit 7d26339a2f
4 changed files with 21 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
asn1/pres/packet-pres-template.c
View File

@ -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 {

10
asn1/rtse/packet-rtse-template.c
View File

@ -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;
}

18
epan/dissectors/packet-pres.c
View File

@ -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[] = {

18
epan/dissectors/packet-rtse.c
View File

@ -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[] = {