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

Convert to using find_conversation_pinfo where appropriate 

This makes it easier to identify the simpler/common conversations

Change-Id: I7094f23e49156ee27f5f72c8e130308470f3e462
Reviewed-on: https://code.wireshark.org/review/24145
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
This commit is contained in:
Michael Mann 2017-10-28 09:58:28 -04:00
parent 27c10ed72e
commit 23afd9a184
47 changed files with 82 additions and 240 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
epan/conversation.c
View File

@ -1269,21 +1269,8 @@ find_or_create_conversation(packet_info *pinfo)
{
conversation_t *conv=NULL;
DPRINT(("called for frame #%d: %s:%d -> %s:%d (ptype=%d)",
pinfo->num, address_to_str(wmem_packet_scope(), &pinfo->src), pinfo->srcport,
address_to_str(wmem_packet_scope(), &pinfo->dst), pinfo->destport, pinfo->ptype));
DINDENT();
/* Have we seen this conversation before? */
if((conv = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst,
pinfo->ptype, pinfo->srcport,
pinfo->destport, 0)) != NULL) {
DPRINT(("found previous conversation for frame #%d (last_frame=%d)",
pinfo->num, conv->last_frame));
if (pinfo->num > conv->last_frame) {
conv->last_frame = pinfo->num;
}
} else {
if((conv = find_conversation_pinfo(pinfo, 0)) == NULL) {
/* No, this is a new conversation. */
DPRINT(("did not find previous conversation for frame #%d",
pinfo->num));

4
epan/dissectors/asn1/h225/packet-h225-template.c
View File

@ -1041,9 +1041,7 @@ static void ras_call_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre
/* end of request message handling*/
}
else { /* Confirm or Reject Message */
conversation = find_conversation(pinfo->num, &pinfo->src,
&pinfo->dst, pinfo->ptype, pinfo->srcport,
pinfo->destport, 0);
conversation = find_conversation_pinfo(pinfo, 0);
if (conversation != NULL) {
/* look only for matching request, if
matching conversation is available. */

3
epan/dissectors/asn1/idmp/packet-idmp-template.c
View File

@ -158,8 +158,7 @@ static int dissect_idmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tr
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
conv = find_conversation (pinfo->num, &pinfo->src, &pinfo->dst,
pinfo->ptype, pinfo->srcport, pinfo->destport, 0);
conv = find_conversation_pinfo(pinfo, 0);
if (conv) {
/* Found a conversation, also use index for the generated dst_ref */
dst_ref = conv->conv_index;

3
epan/dissectors/asn1/ldap/packet-ldap-template.c
View File

@ -1764,8 +1764,7 @@ dissect_ldap_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data
/*
* Do we have a conversation for this connection?
*/
conversation = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst,
pinfo->ptype, pinfo->srcport, pinfo->destport, 0);
conversation = find_conversation_pinfo(pinfo, 0);
if(conversation){
ldap_info = (ldap_conv_info_t *)conversation_get_proto_data(conversation, proto_ldap);
}

6
epan/dissectors/asn1/pres/packet-pres-template.c
View File

@ -128,8 +128,7 @@ 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);
conversation=find_conversation (pinfo->num, &pinfo->src, &pinfo->dst,
pinfo->ptype, pinfo->srcport, pinfo->destport, 0);
conversation=find_conversation_pinfo(pinfo, 0);
if (conversation) {
pco->idx = conversation->conv_index;
} else {
@ -169,8 +168,7 @@ find_oid_by_pres_ctx_id(packet_info *pinfo, guint32 idx)
conversation_t *conversation;
pco.ctx_id=idx;
conversation=find_conversation (pinfo->num, &pinfo->src, &pinfo->dst,
pinfo->ptype, pinfo->srcport, pinfo->destport, 0);
conversation=find_conversation_pinfo(pinfo, 0);
if (conversation) {
pco.idx = conversation->conv_index;
} else {

4
epan/dissectors/asn1/rtse/packet-rtse-template.c
View File

@ -226,9 +226,7 @@ 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 */
conversation = find_conversation (pinfo->num,
&pinfo->src, &pinfo->dst, pinfo->ptype,
pinfo->srcport, pinfo->destport, 0);
conversation = find_conversation_pinfo(pinfo, 0);
if (conversation != NULL) {
rtse_id = conversation->conv_index;
}

4
epan/dissectors/asn1/spnego/packet-spnego-template.c
View File

@ -1283,9 +1283,7 @@ dissect_spnego(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void*
* If we have a conversation, try to get the handle,
* and if we get one, attach it to the frame.
*/
conversation = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst,
pinfo->ptype, pinfo->srcport,
pinfo->destport, 0);
conversation = find_conversation_pinfo(pinfo, 0);
if (conversation) {
next_level_value = (gssapi_oid_value *)conversation_get_proto_data(conversation, proto_spnego);

9
epan/dissectors/packet-dcerpc.c
View File

@ -4542,8 +4542,7 @@ dissect_dcerpc_cn_rqst(tvbuff_t *tvb, gint offset, packet_info *pinfo,
*/
dissect_dcerpc_cn_auth(tvb, offset, pinfo, dcerpc_tree, hdr, &auth_info);
conv = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst, pinfo->ptype,
pinfo->srcport, pinfo->destport, 0);
conv = find_conversation_pinfo(pinfo, 0);
if (!conv)
show_stub_data(pinfo, tvb, offset, dcerpc_tree, &auth_info, TRUE);
else {
@ -4707,8 +4706,7 @@ dissect_dcerpc_cn_resp(tvbuff_t *tvb, gint offset, packet_info *pinfo,
*/
dissect_dcerpc_cn_auth(tvb, offset, pinfo, dcerpc_tree, hdr, &auth_info);
conv = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst, pinfo->ptype,
pinfo->srcport, pinfo->destport, 0);
conv = find_conversation_pinfo(pinfo, 0);
if (!conv) {
/* no point in creating one here, really */
@ -4877,8 +4875,7 @@ dissect_dcerpc_cn_fault(tvbuff_t *tvb, gint offset, packet_info *pinfo,
length = reported_length;
stub_tvb = tvb_new_subset_length_caplen(tvb, offset, length, reported_length);
conv = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst, pinfo->ptype,
pinfo->srcport, pinfo->destport, 0);
conv = find_conversation_pinfo(pinfo, 0);
if (!conv) {
/* no point in creating one here, really */
} else {

3
epan/dissectors/packet-dcm.c
View File

@ -6665,8 +6665,7 @@ dissect_dcm_pdv_fragmented(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
if (global_dcm_reassemble)
{
conv = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst,
pinfo->ptype, pinfo->srcport, pinfo->destport, 0);
conv = find_conversation_pinfo(pinfo, 0);
/* Try to create somewhat unique ID.
Include the conversation index, to separate TCP session

10
epan/dissectors/packet-dof.c
View File

@ -5892,7 +5892,7 @@ static int dissect_dof_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
* so we can "mirror" that by attaching our own data to that conversation. If our
* data cannot be found, then it is a new connection (to us).
*/
conversation = find_conversation(pinfo->fd->num, &pinfo->src, &pinfo->dst, pinfo->ptype, pinfo->srcport, pinfo->destport, 0);
conversation = find_conversation_pinfo(pinfo, 0);
{
/* This should be impossible - the TCP dissector requires this conversation.
* Bail...
@ -6099,11 +6099,7 @@ static int dissect_tunnel_udp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre
if (!udp_transport_session)
udp_transport_session = se_alloc0(sizeof(*udp_transport_session));
conversation = find_conversation(pinfo->fd->num, &pinfo->src, &pinfo->dst, PT_UDP, pinfo->srcport, pinfo->destport, 0);
if (!conversation)
{
conversation = conversation_new(pinfo->fd->num, &pinfo->src, &pinfo->dst, PT_UDP, pinfo->srcport, pinfo->destport, 0);
}
conversation = find_or_create_conversation(pinfo);
/* Add the packet data. */
packet = p_get_proto_data(wmem_file_scope(), proto_2012_1_tunnel, 0);
@ -6145,7 +6141,7 @@ static int dissect_tunnel_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre
* so we can "mirror" that by attaching our own data to that conversation. If our
* data cannot be found, then it is a new connection (to us).
*/
conversation = find_conversation(pinfo->fd->num, &pinfo->src, &pinfo->dst, pinfo->ptype, pinfo->srcport, pinfo->destport, 0);
conversation = find_conversation_pinfo(pinfo, 0);
{
/* This should be impossible - the TCP dissector requires this conversation.
* Bail...

5
epan/dissectors/packet-enip.c
View File

@ -1267,10 +1267,7 @@ enip_get_explicit_connid(packet_info *pinfo, enip_request_key_t *prequest_key, g
/*
* Do we have a conversation for this connection?
*/
conversation = find_conversation(pinfo->num,
&pinfo->src, &pinfo->dst,
pinfo->ptype,
pinfo->srcport, pinfo->destport, 0);
conversation = find_conversation_pinfo(pinfo, 0);
if (conversation == NULL)
return NULL;

4
epan/dissectors/packet-fcp.c
View File

@ -660,9 +660,7 @@ dissect_fcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data)
fcp_iu_val, "Unknown 0x%02x"));
fcp_tree = proto_item_add_subtree(ti, ett_fcp);
fc_conv = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst,
pinfo->ptype, pinfo->srcport,
pinfo->destport, 0);
fc_conv = find_conversation_pinfo(pinfo, 0);
if (fc_conv != NULL) {
fcp_conv_data = (fcp_conv_data_t *)conversation_get_proto_data(fc_conv, proto_fcp);
}

7
epan/dissectors/packet-fp_mux.c
View File

@ -319,12 +319,7 @@ static int heur_dissect_fp_mux(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr
/* This is FP Mux! */
/* Set conversation dissector and dissect */
conversation = find_conversation(pinfo->num, &pinfo->net_dst, &pinfo->net_src,
pinfo->ptype, pinfo->destport, pinfo->srcport, 0);
if (!conversation) {
conversation = conversation_new(pinfo->num, &pinfo->net_dst, &pinfo->net_src,
pinfo->ptype, pinfo->destport, pinfo->srcport, 0);
}
conversation = find_or_create_conversation(pinfo);
conversation_set_dissector(conversation, fp_mux_handle);
dissect_fp_mux(tvb, pinfo, tree, data);

5
epan/dissectors/packet-ftp.c
View File

@ -1306,10 +1306,7 @@ dissect_ftpdata(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data
data_ti = proto_tree_add_item(tree, proto_ftp_data, tvb, 0, -1, ENC_NA);
/* Link back to setup of this stream */
p_conv = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst,
PT_TCP,
pinfo->srcport, pinfo->destport,
0);
p_conv = find_conversation_pinfo(pinfo, 0);
if (p_conv) {
/* Link back to FTP frame where this conversation was created */

2
epan/dissectors/packet-gadu-gadu.c
View File

@ -564,7 +564,7 @@ gadu_gadu_get_conversation_data(packet_info *pinfo)
{
conversation_t *conv;
conv = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst, pinfo->ptype, pinfo->srcport, pinfo->destport, 0);
conv = find_conversation_pinfo(pinfo, 0);
if (conv)
return (struct gadu_gadu_conv_data *)conversation_get_proto_data(conv, hfi_gadu_gadu->id);
return NULL;

5
epan/dissectors/packet-h223.c
View File

@ -487,10 +487,7 @@ find_or_create_call_info_conv(packet_info * pinfo)
conversation_t *conv;
/* assume we're running atop TCP or RTP; use the conversation support */
conv = find_conversation( pinfo->num,
&pinfo->src,&pinfo->dst,
pinfo->ptype,
pinfo->srcport,pinfo->destport, 0 );
conv = find_conversation_pinfo(pinfo, 0 );
/* both RTP and TCP track their conversations, so just assert here if
* we can't find one */

4
epan/dissectors/packet-h225.c
View File

@ -11953,9 +11953,7 @@ static void ras_call_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre
/* end of request message handling*/
}
else { /* Confirm or Reject Message */
conversation = find_conversation(pinfo->num, &pinfo->src,
&pinfo->dst, pinfo->ptype, pinfo->srcport,
pinfo->destport, 0);
conversation = find_conversation_pinfo(pinfo, 0);
if (conversation != NULL) {
/* look only for matching request, if
matching conversation is available. */

7
epan/dissectors/packet-idmp.c
View File

@ -644,8 +644,7 @@ static int dissect_idmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tr
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
conv = find_conversation (pinfo->num, &pinfo->src, &pinfo->dst,
pinfo->ptype, pinfo->srcport, pinfo->destport, 0);
conv = find_conversation_pinfo(pinfo, 0);
if (conv) {
/* Found a conversation, also use index for the generated dst_ref */
dst_ref = conv->conv_index;
@ -927,7 +926,7 @@ void proto_register_idmp(void)
NULL, HFILL }},
/*--- End of included file: packet-idmp-hfarr.c ---*/
#line 312 "./asn1/idmp/packet-idmp-template.c"
#line 311 "./asn1/idmp/packet-idmp-template.c"
};
/* List of subtrees */
@ -950,7 +949,7 @@ void proto_register_idmp(void)
&ett_idmp_InvokeId,
/*--- End of included file: packet-idmp-ettarr.c ---*/
#line 320 "./asn1/idmp/packet-idmp-template.c"
#line 319 "./asn1/idmp/packet-idmp-template.c"
};
module_t *idmp_module;

4
epan/dissectors/packet-isakmp.c
View File

@ -4391,9 +4391,7 @@ dissect_ikev2_fragmentation(tvbuff_t *tvb, int offset, proto_tree *tree,
if (fragment_number == total_fragments) {
if (!pinfo->fd->flags.visited) {
/* On first pass, get it from the conversation info */
conversation_t *p_conv = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst,
pinfo->ptype, pinfo->srcport,
pinfo->destport, 0);
conversation_t *p_conv = find_conversation_pinfo(pinfo, 0);
if (p_conv != NULL) {
ikev2_fragmentation_state_t *p_state = (ikev2_fragmentation_state_t*)conversation_get_proto_data(p_conv, proto_isakmp);
if (p_state != NULL) {

11
epan/dissectors/packet-iwarp-mpa.c
View File

@ -384,9 +384,7 @@ is_mpa_rep(tvbuff_t *tvb, packet_info *pinfo)
return FALSE;
}
conversation = find_conversation(pinfo->num, &pinfo->src,
&pinfo->dst, pinfo->ptype, pinfo->srcport,
pinfo->destport, 0);
conversation = find_conversation_pinfo(pinfo, 0);
if (!conversation) {
return FALSE;
@ -420,9 +418,7 @@ is_mpa_fpdu(packet_info *pinfo)
conversation_t *conversation = NULL;
mpa_state_t *state = NULL;
conversation = find_conversation(pinfo->num, &pinfo->src,
&pinfo->dst, pinfo->ptype, pinfo->srcport,
pinfo->destport, 0);
conversation = find_conversation_pinfo(pinfo, 0);
if (!conversation) {
return FALSE;
@ -786,8 +782,7 @@ dissect_iwarp_mpa(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat
/* FPDU */
if (tvb_captured_length(tvb) >= MPA_SMALLEST_FPDU_LEN && is_mpa_fpdu(pinfo)) {
conversation = find_conversation(pinfo->num, &pinfo->src,
&pinfo->dst, pinfo->ptype, pinfo->srcport, pinfo->destport, 0);
conversation = find_conversation_pinfo(pinfo, 0);
state = get_mpa_state(conversation);

11
epan/dissectors/packet-jxta.c
View File

@ -746,18 +746,9 @@ Common_Exit:
**/
static jxta_stream_conversation_data *get_tpt_conversation(packet_info * pinfo)
{
conversation_t *tpt_conversation =
find_conversation(pinfo->num, &pinfo->src, &pinfo->dst, pinfo->ptype, pinfo->srcport, pinfo->destport, 0);
conversation_t *tpt_conversation = find_or_create_conversation(pinfo);
jxta_stream_conversation_data *tpt_conv_data;
if (tpt_conversation == NULL) {
/*
* No conversation exists yet - create one.
*/
tpt_conversation =
conversation_new(pinfo->num, &pinfo->src, &pinfo->dst, pinfo->ptype, pinfo->srcport, pinfo->destport, 0);
}
conversation_set_dissector(tpt_conversation, stream_jxta_handle);
tpt_conv_data = (jxta_stream_conversation_data *) conversation_get_proto_data(tpt_conversation, proto_jxta);

9
epan/dissectors/packet-ldap.c
View File

@ -4682,8 +4682,7 @@ dissect_ldap_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data
/*
* Do we have a conversation for this connection?
*/
conversation = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst,
pinfo->ptype, pinfo->srcport, pinfo->destport, 0);
conversation = find_conversation_pinfo(pinfo, 0);
if(conversation){
ldap_info = (ldap_conv_info_t *)conversation_get_proto_data(conversation, proto_ldap);
}
@ -5639,7 +5638,7 @@ void proto_register_ldap(void) {
NULL, HFILL }},
/*--- End of included file: packet-ldap-hfarr.c ---*/
#line 2156 "./asn1/ldap/packet-ldap-template.c"
#line 2155 "./asn1/ldap/packet-ldap-template.c"
};
/* List of subtrees */
@ -5713,7 +5712,7 @@ void proto_register_ldap(void) {
&ett_ldap_T_warning,
/*--- End of included file: packet-ldap-ettarr.c ---*/
#line 2170 "./asn1/ldap/packet-ldap-template.c"
#line 2169 "./asn1/ldap/packet-ldap-template.c"
};
/* UAT for header fields */
static uat_field_t custom_attribute_types_uat_fields[] = {
@ -5901,7 +5900,7 @@ proto_reg_handoff_ldap(void)
/*--- End of included file: packet-ldap-dis-tab.c ---*/
#line 2341 "./asn1/ldap/packet-ldap-template.c"
#line 2340 "./asn1/ldap/packet-ldap-template.c"
dissector_add_uint_range_with_preference("tcp.port", TCP_PORT_RANGE_LDAP, ldap_handle);
}

8
epan/dissectors/packet-mgcp.c
View File

@ -1247,9 +1247,7 @@ static void dissect_mgcp_firstline(tvbuff_t *tvb, packet_info *pinfo, proto_tree
to which the call was sent. */
if (pinfo->ptype == PT_TCP)
{
conversation = find_conversation(pinfo->num, &pinfo->src,
&pinfo->dst, pinfo->ptype, pinfo->srcport,
pinfo->destport, 0);
conversation = find_conversation_pinfo(pinfo, 0);
}
else
{
@ -1349,9 +1347,7 @@ static void dissect_mgcp_firstline(tvbuff_t *tvb, packet_info *pinfo, proto_tree
*/
if (pinfo->ptype == PT_TCP)
{
conversation = find_conversation(pinfo->num, &pinfo->src,
&pinfo->dst, pinfo->ptype, pinfo->srcport,
pinfo->destport, 0);
conversation = find_conversation_pinfo(pinfo, 0);
}
else
{

3
epan/dissectors/packet-msproxy.c
View File

@ -204,8 +204,7 @@ static int msproxy_sub_dissector( tvbuff_t *tvb, packet_info *pinfo,
proto_tree *msp_tree;
proto_item *ti;
conversation = find_conversation( pinfo->num, &pinfo->src, &pinfo->dst,
pinfo->ptype, pinfo->srcport, pinfo->destport, 0);
conversation = find_conversation_pinfo(pinfo, 0);
DISSECTOR_ASSERT( conversation); /* should always find a conversation */

12
epan/dissectors/packet-msrp.c
View File

@ -426,15 +426,9 @@ dissect_msrp_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat
*/
if (pinfo->fd->flags.visited){
/* Look for existing conversation */
conversation = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst, pinfo->ptype,
pinfo->srcport, pinfo->destport, 0);
/* Create new one if not found */
if (conversation == NULL){
conversation = conversation_new(pinfo->num, &pinfo->src, &pinfo->dst,
pinfo->ptype, pinfo->srcport, pinfo->destport, 0);
/* Set dissector */
conversation_set_dissector(conversation, msrp_handle);
}
conversation = find_or_create_conversation(pinfo);
/* Set dissector */
conversation_set_dissector(conversation, msrp_handle);
}
dissect_msrp(tvb, pinfo, tree, NULL);
return TRUE;

5
epan/dissectors/packet-nbd.c
View File

@ -103,10 +103,7 @@ get_nbd_tcp_pdu_len(packet_info *pinfo, tvbuff_t *tvb, int offset, void *data _U
/*
* Do we have a conversation for this connection?
*/
conversation = find_conversation(pinfo->num,
&pinfo->src, &pinfo->dst,
pinfo->ptype,
pinfo->srcport, pinfo->destport, 0);
conversation = find_conversation_pinfo(pinfo, 0);
if (conversation == NULL) {
/* No, so just return the rest of the current packet */
return tvb_captured_length(tvb);

16
epan/dissectors/packet-ntlmssp.c
View File

@ -1874,9 +1874,7 @@ get_sign_key(packet_info *pinfo, int cryptpeer)
conversation_t *conversation;
ntlmssp_info *conv_ntlmssp_info;
conversation = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst,
pinfo->ptype, pinfo->srcport,
pinfo->destport, 0);
conversation = find_conversation_pinfo(pinfo, 0);
if (conversation == NULL) {
/* We don't have a conversation. In this case, stop processing
because we do not have enough info to decrypt the payload */
@ -1914,9 +1912,7 @@ get_encrypted_state(packet_info *pinfo, int cryptpeer)
conversation_t *conversation;
ntlmssp_info *conv_ntlmssp_info;
conversation = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst,
pinfo->ptype, pinfo->srcport,
pinfo->destport, 0);
conversation = find_conversation_pinfo(pinfo, 0);
if (conversation == NULL) {
/* We don't have a conversation. In this case, stop processing
because we do not have enough info to decrypt the payload */
@ -2041,9 +2037,7 @@ decrypt_data_payload(tvbuff_t *tvb, int offset, guint32 encrypted_block_length,
ntlmssp_info *conv_ntlmssp_info;
/* Pull the challenge info from the conversation */
conversation = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst,
pinfo->ptype, pinfo->srcport,
pinfo->destport, 0);
conversation = find_conversation_pinfo(pinfo, 0);
if (conversation == NULL) {
/* There is no conversation, thus no encryption state */
return NULL;
@ -2249,9 +2243,7 @@ decrypt_verifier(tvbuff_t *tvb, int offset, guint32 encrypted_block_length,
/* We don't have data for this packet */
return;
}
conversation = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst,
pinfo->ptype, pinfo->srcport,
pinfo->destport, 0);
conversation = find_conversation_pinfo(pinfo, 0);
if (conversation == NULL) {
/* There is no conversation, thus no encryption state */
return;

4
epan/dissectors/packet-ositp.c
View File

@ -975,9 +975,7 @@ static int ositp_decode_DT(tvbuff_t *tvb, int offset, guint8 li, guint8 tpdu,
cotp_frame_reset = FALSE;
cotp_last_fragment = fragment;
dst_ref = cotp_dst_ref;
conv = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst,
pinfo->ptype, pinfo->srcport, pinfo->destport,
0);
conv = find_conversation_pinfo(pinfo, 0);
if (conv) {
/* Found a conversation, also use index for the generated dst_ref */
dst_ref += (conv->conv_index << 16);

4
epan/dissectors/packet-pcp.c
View File

@ -558,9 +558,7 @@ static pcp_conv_info_t* get_pcp_conversation_info(packet_info *pinfo) {
conversation_t *conversation;
pcp_conv_info_t *pcp_conv_info;
conversation = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst,
pinfo->ptype, pinfo->srcport,
pinfo->destport, 0);
conversation = find_conversation_pinfo(pinfo, 0);
/* Conversation setup is done in the main dissecting routine so it should never be null */
DISSECTOR_ASSERT(conversation);

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

@ -260,8 +260,7 @@ 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);
conversation=find_conversation (pinfo->num, &pinfo->src, &pinfo->dst,
pinfo->ptype, pinfo->srcport, pinfo->destport, 0);
conversation=find_conversation_pinfo(pinfo, 0);
if (conversation) {
pco->idx = conversation->conv_index;
} else {
@ -301,8 +300,7 @@ find_oid_by_pres_ctx_id(packet_info *pinfo, guint32 idx)
conversation_t *conversation;
pco.ctx_id=idx;
conversation=find_conversation (pinfo->num, &pinfo->src, &pinfo->dst,
pinfo->ptype, pinfo->srcport, pinfo->destport, 0);
conversation=find_conversation_pinfo(pinfo, 0);
if (conversation) {
pco.idx = conversation->conv_index;
} else {
@ -1345,7 +1343,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 210 "./asn1/pres/packet-pres-template.c"
#line 208 "./asn1/pres/packet-pres-template.c"
/*
@ -1827,7 +1825,7 @@ void proto_register_pres(void) {
NULL, HFILL }},
/*--- End of included file: packet-pres-hfarr.c ---*/
#line 379 "./asn1/pres/packet-pres-template.c"
#line 377 "./asn1/pres/packet-pres-template.c"
};
/* List of subtrees */
@ -1874,7 +1872,7 @@ void proto_register_pres(void) {
&ett_pres_UD_type,
/*--- End of included file: packet-pres-ettarr.c ---*/
#line 385 "./asn1/pres/packet-pres-template.c"
#line 383 "./asn1/pres/packet-pres-template.c"
};
static ei_register_info ei[] = {

3
epan/dissectors/packet-reload-framing.c
View File

@ -137,8 +137,7 @@ dissect_reload_framing_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr
if (effective_length < MIN_HDR_LENGTH)
return 0;
conversation = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst,
pinfo->ptype, pinfo->srcport, pinfo->destport, 0);
conversation = find_conversation_pinfo(pinfo, 0);
if (conversation)
reload_framing_info = (reload_conv_info_t *)conversation_get_proto_data(conversation, proto_reload_framing);

16
epan/dissectors/packet-rpc.c
View File

@ -1311,9 +1311,7 @@ dissect_rpc_opaque_auth(tvbuff_t* tvb, proto_tree* tree, int offset,
rpc_conv_info_t *conv_info = NULL;
if (pinfo->ptype == PT_TCP)
conv = find_conversation(pinfo->num, &pinfo->src,
&pinfo->dst, pinfo->ptype, pinfo->srcport,
pinfo->destport, 0);
conv = find_conversation_pinfo(pinfo, 0);
if (conv)
conv_info = (rpc_conv_info_t *)conversation_get_proto_data(conv,
@ -1655,9 +1653,7 @@ get_conversation_for_call(packet_info *pinfo)
* the original request.
*/
if (pinfo->ptype == PT_TCP || pinfo->ptype == PT_IBQP) {
conversation = find_conversation(pinfo->num,
&pinfo->src, &pinfo->dst, pinfo->ptype,
pinfo->srcport, pinfo->destport, 0);
conversation = find_conversation_pinfo(pinfo, 0);
} else {
/*
* XXX - you currently still have to pass a non-null
@ -1709,9 +1705,7 @@ find_conversation_for_reply(packet_info *pinfo)
* might be sent to different ports.
*/
if (pinfo->ptype == PT_TCP || pinfo->ptype == PT_IBQP) {
conversation = find_conversation(pinfo->num,
&pinfo->src, &pinfo->dst, pinfo->ptype,
pinfo->srcport, pinfo->destport, 0);
conversation = find_conversation_pinfo(pinfo, 0);
} else {
/*
* XXX - you currently still have to pass a non-null
@ -1752,9 +1746,7 @@ get_conversation_for_tcp(packet_info *pinfo)
* not wildcard either address or port, regardless of whether
* this is a call or reply.
*/
conversation = find_conversation(pinfo->num,
&pinfo->src, &pinfo->dst, pinfo->ptype,
pinfo->srcport, pinfo->destport, 0);
conversation = find_conversation_pinfo(pinfo, 0);
if (conversation == NULL) {
/*
* It's not part of any conversation - create a new one.

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

@ -774,9 +774,7 @@ 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 */
conversation = find_conversation (pinfo->num,
&pinfo->src, &pinfo->dst, pinfo->ptype,
pinfo->srcport, pinfo->destport, 0);
conversation = find_conversation_pinfo(pinfo, 0);
if (conversation != NULL) {
rtse_id = conversation->conv_index;
}
@ -994,7 +992,7 @@ void proto_register_rtse(void) {
NULL, HFILL }},
/*--- End of included file: packet-rtse-hfarr.c ---*/
#line 349 "./asn1/rtse/packet-rtse-template.c"
#line 347 "./asn1/rtse/packet-rtse-template.c"
};
/* List of subtrees */
@ -1016,7 +1014,7 @@ void proto_register_rtse(void) {
&ett_rtse_CallingSSuserReference,
/*--- End of included file: packet-rtse-ettarr.c ---*/
#line 358 "./asn1/rtse/packet-rtse-template.c"
#line 356 "./asn1/rtse/packet-rtse-template.c"
};
static ei_register_info ei[] = {

3
epan/dissectors/packet-rtsp.c
View File

@ -390,8 +390,7 @@ dissect_rtspinterleaved(tvbuff_t *tvb, int offset, packet_info *pinfo,
length_remaining = rf_len;
next_tvb = tvb_new_subset_length_caplen(tvb, offset, length_remaining, rf_len);
conv = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst, pinfo->ptype,
pinfo->srcport, pinfo->destport, 0);
conv = find_conversation_pinfo(pinfo, 0);
if (conv &&
(data = (rtsp_conversation_data_t *)conversation_get_proto_data(conv, proto_rtsp)) &&

4
epan/dissectors/packet-ses.c
View File

@ -1003,9 +1003,7 @@ dissect_spdu(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree,
guint32 ses_id = 0;
/* Use conversation index as segment id */
conversation = find_conversation (pinfo->num,
&pinfo->src, &pinfo->dst, pinfo->ptype,
pinfo->srcport, pinfo->destport, 0);
conversation = find_conversation_pinfo(pinfo, 0);
if (conversation != NULL) {
ses_id = conversation->conv_index;
}

6
epan/dissectors/packet-socks.c
View File

@ -335,8 +335,7 @@ socks_udp_dissector(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* d
proto_tree *socks_tree;
proto_item *ti;
conversation = find_conversation( pinfo->num, &pinfo->src, &pinfo->dst, pinfo->ptype,
pinfo->srcport, pinfo->destport, 0);
conversation = find_conversation_pinfo( pinfo, 0);
DISSECTOR_ASSERT( conversation); /* should always find a conversation */
@ -1003,8 +1002,7 @@ dissect_socks(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) {
if (state_info->in_socks_dissector_flag)
return 0;
conversation = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst,
pinfo->ptype, pinfo->srcport, pinfo->destport, 0);
conversation = find_conversation_pinfo(pinfo, 0);
if (conversation == NULL) {
/* If we don't already have a conversation, make sure the first
byte is a valid version number */

8
epan/dissectors/packet-soupbintcp.c
View File

@ -228,13 +228,7 @@ dissect_soupbintcp_common(
if (pkt_type == 'S') {
if (!PINFO_FD_VISITED(pinfo)) {
/* Get next expected sequence number from conversation */
conv = find_conversation(pinfo->num,
&pinfo->src,
&pinfo->dst,
pinfo->ptype,
pinfo->srcport,
pinfo->destport,
0);
conv = find_conversation_pinfo(pinfo, 0);
if (!conv) {
this_seq = 0;
} else {

8
epan/dissectors/packet-spnego.c
View File

@ -1735,9 +1735,7 @@ dissect_spnego(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void*
* If we have a conversation, try to get the handle,
* and if we get one, attach it to the frame.
*/
conversation = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst,
pinfo->ptype, pinfo->srcport,
pinfo->destport, 0);
conversation = find_conversation_pinfo(pinfo, 0);
if (conversation) {
next_level_value = (gssapi_oid_value *)conversation_get_proto_data(conversation, proto_spnego);
@ -1936,7 +1934,7 @@ void proto_register_spnego(void) {
NULL, HFILL }},
/*--- End of included file: packet-spnego-hfarr.c ---*/
#line 1391 "./asn1/spnego/packet-spnego-template.c"
#line 1389 "./asn1/spnego/packet-spnego-template.c"
};
/* List of subtrees */
@ -1959,7 +1957,7 @@ void proto_register_spnego(void) {
&ett_spnego_InitialContextToken_U,
/*--- End of included file: packet-spnego-ettarr.c ---*/
#line 1401 "./asn1/spnego/packet-spnego-template.c"
#line 1399 "./asn1/spnego/packet-spnego-template.c"
};
static ei_register_info ei[] = {

8
epan/dissectors/packet-sprt.c
View File

@ -745,13 +745,7 @@ static struct _sprt_conversation_info* find_sprt_conversation_data(packet_info *
conversation_t *p_conv = NULL;
struct _sprt_conversation_info *p_conv_data = NULL;
/* Use existing packet info if available */
p_conv = find_conversation(pinfo->num,
&pinfo->src,
&pinfo->dst,
pinfo->ptype,
pinfo->srcport,
pinfo->destport,
NO_ADDR_B|NO_PORT_B);
p_conv = find_conversation_pinfo(pinfo, NO_ADDR_B|NO_PORT_B);
if (p_conv)
{
p_conv_data = (struct _sprt_conversation_info*)conversation_get_proto_data(p_conv, proto_sprt);

6
epan/dissectors/packet-synphasor.c
View File

@ -510,11 +510,7 @@ static int dissect_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, v
conversation_add_proto_data(conversation, proto_synphasor, frame);
}
else if (DATA == frame_type) {
conversation_t *conversation = find_conversation(pinfo->num,
&pinfo->src, &pinfo->dst,
pinfo->ptype,
pinfo->srcport, pinfo->destport,
0);
conversation_t *conversation = find_conversation_pinfo(pinfo, 0);
if (conversation) {
config_frame *conf = (config_frame *)conversation_get_proto_data(conversation, proto_synphasor);

25
epan/dissectors/packet-tcp.c
View File

@ -913,8 +913,7 @@ gchar* tcp_follow_conv_filter(packet_info* pinfo, int* stream)
if (((pinfo->net_src.type == AT_IPv4 && pinfo->net_dst.type == AT_IPv4) ||
(pinfo->net_src.type == AT_IPv6 && pinfo->net_dst.type == AT_IPv6))
&& (conv=find_conversation(pinfo->num, &pinfo->src, &pinfo->dst, pinfo->ptype,
pinfo->srcport, pinfo->destport, 0)) != NULL )
&& (conv=find_conversation_pinfo(pinfo, 0)) != NULL )
{
/* TCP over IPv4/6 */
tcpd=get_tcp_conversation_data(conv, pinfo);
@ -5320,27 +5319,13 @@ dissect_tcpopt_rvbd_trpy(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, vo
*/
if (sport_handle != NULL) {
conversation_t *conversation;
conversation = find_conversation(pinfo->num,
&pinfo->src, &pinfo->dst, pinfo->ptype,
pinfo->srcport, pinfo->destport, 0);
if (conversation == NULL) {
conversation = conversation_new(pinfo->num,
&pinfo->src, &pinfo->dst, pinfo->ptype,
pinfo->srcport, pinfo->destport, 0);
}
conversation = find_or_create_conversation(pinfo);
if (conversation_get_dissector(conversation, pinfo->num) != sport_handle) {
conversation_set_dissector(conversation, sport_handle);
}
} else if (data_handle != NULL) {
conversation_t *conversation;
conversation = find_conversation(pinfo->num,
&pinfo->src, &pinfo->dst, pinfo->ptype,
pinfo->srcport, pinfo->destport, 0);
if (conversation == NULL) {
conversation = conversation_new(pinfo->num,
&pinfo->src, &pinfo->dst, pinfo->ptype,
pinfo->srcport, pinfo->destport, 0);
}
conversation = find_or_create_conversation(pinfo);
if (conversation_get_dissector(conversation, pinfo->num) != data_handle) {
conversation_set_dissector(conversation, data_handle);
}
@ -5841,9 +5826,7 @@ dissect_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
* in case a new conversation is found and the previous conversation needs
* to be adjusted,
*/
if((conv = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst,
pinfo->ptype, pinfo->srcport,
pinfo->destport, 0)) != NULL) {
if((conv = find_conversation_pinfo(pinfo, 0)) != NULL) {
/* Update how far the conversation reaches */
if (pinfo->num > conv->last_frame) {
save_last_frame = conv->last_frame;

3
epan/dissectors/packet-tftp.c
View File

@ -667,8 +667,7 @@ dissect_tftp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_
conversation_set_dissector(conversation, tftp_handle);
}
} else {
conversation = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst,
pinfo->ptype, pinfo->srcport, pinfo->destport, 0);
conversation = find_conversation_pinfo(pinfo, 0);
if( (conversation == NULL) || (conversation_get_dissector(conversation, pinfo->num) != tftp_handle) ){
conversation = conversation_new(pinfo->num, &pinfo->src, &pinfo->dst, PT_UDP,
pinfo->destport, pinfo->srcport, 0);

8
epan/dissectors/packet-tn3270.c
View File

@ -5248,9 +5248,7 @@ dissect_tn3270(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _
pinfo->fd->flags.encoding = PACKET_CHAR_ENC_CHAR_EBCDIC;
/* Do we have a conversation for this connection? */
conversation = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst,
pinfo->ptype, pinfo->srcport,
pinfo->destport, 0);
conversation = find_conversation_pinfo(pinfo, 0);
if (conversation != NULL) {
/* Do we already have a type and mechanism? */
tn3270_info = (tn3270_conv_info_t *)conversation_get_proto_data(conversation, proto_tn3270);
@ -5354,9 +5352,7 @@ find_tn3270_conversation(packet_info *pinfo)
/*
* Do we have a conversation for this connection?
*/
conversation = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst,
pinfo->ptype, pinfo->srcport,
pinfo->destport, 0);
conversation = find_conversation_pinfo(pinfo, 0);
if (conversation != NULL) {
tn3270_info = (tn3270_conv_info_t *)conversation_get_proto_data(conversation, proto_tn3270);
if (tn3270_info != NULL) {

8
epan/dissectors/packet-tn5250.c
View File

@ -5125,9 +5125,7 @@ dissect_tn5250(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _
int sna_flag;
/* Do we have a conversation for this connection? */
conversation = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst,
pinfo->ptype, pinfo->srcport,
pinfo->destport, 0);
conversation = find_conversation_pinfo(pinfo, 0);
if (conversation != NULL) {
/* Do we already have a type and mechanism? */
tn5250_info = (tn5250_conv_info_t *)conversation_get_proto_data(conversation, proto_tn5250);
@ -5203,9 +5201,7 @@ find_tn5250_conversation(packet_info *pinfo)
/*
* Do we have a conversation for this connection?
*/
conversation = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst,
pinfo->ptype, pinfo->srcport,
pinfo->destport, 0);
conversation = find_conversation_pinfo(pinfo, 0);
if (conversation != NULL) {
tn5250_info = (tn5250_conv_info_t *)conversation_get_proto_data(conversation, proto_tn5250);

3
epan/dissectors/packet-udp.c
View File

@ -428,8 +428,7 @@ static gchar* udp_follow_conv_filter(packet_info *pinfo, int* stream)
if( ((pinfo->net_src.type == AT_IPv4 && pinfo->net_dst.type == AT_IPv4) ||
(pinfo->net_src.type == AT_IPv6 && pinfo->net_dst.type == AT_IPv6))
&& (conv=find_conversation(pinfo->num, &pinfo->src, &pinfo->dst, pinfo->ptype,
pinfo->srcport, pinfo->destport, 0)) != NULL )
&& (conv=find_conversation_pinfo(pinfo, 0)) != NULL )
{
/* UDP over IPv4/6 */
udpd=get_udp_conversation_data(conv, pinfo);

3
ui/qt/models/packet_list_record.cpp
View File

@ -199,8 +199,7 @@ void PacketListRecord::dissect(capture_file *cap_file, bool dissect_color)
data_ver_ = col_data_ver_;
packet_info *pi = &edt.pi;
conv_ = find_conversation(pi->num, &pi->src, &pi->dst, pi->ptype,
pi->srcport, pi->destport, 0);
conv_ = find_conversation_pinfo(pi, 0);
epan_dissect_cleanup(&edt);
ws_buffer_free(&buf);

3
ui/qt/packet_list.cpp
View File

@ -518,8 +518,7 @@ void PacketList::selectionChanged (const QItemSelection & selected, const QItemS
packet_info *pi = &cap_file_->edt->pi;
related_packet_delegate_.setCurrentFrame(pi->num);
proto_tree_->fillProtocolTree(cap_file_->edt->tree);
conversation_t *conv = find_conversation(pi->num, &pi->src, &pi->dst, pi->ptype,
pi->srcport, pi->destport, 0);
conversation_t *conv = find_conversation_pinfo(pi, 0);
if (conv) {
related_packet_delegate_.setConversation(conv);
}