forked from osmocom/wireshark
conversation: rename shadow variable
Change-Id: I8f738b2e01d7f448b21cdc1b488b16b7dd581911 Reviewed-on: https://code.wireshark.org/review/16104 Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
parent
46fc6f5d39
commit
f8500f39e2
|
@ -706,7 +706,7 @@ conversation_new(const guint32 setup_frame, const address *addr1, const address
|
|||
conversation = wmem_new(wmem_file_scope(), conversation_t);
|
||||
memset(conversation, 0, sizeof(conversation_t));
|
||||
|
||||
conversation->index = new_index;
|
||||
conversation->conv_index = new_index;
|
||||
conversation->setup_frame = conversation->last_frame = setup_frame;
|
||||
conversation->data_list = NULL;
|
||||
|
||||
|
|
|
@ -74,7 +74,7 @@ typedef struct conversation {
|
|||
struct conversation *last; /** pointer to the last conversation on hash chain */
|
||||
struct conversation *latest_found;
|
||||
/** pointer to the last conversation on hash chain */
|
||||
guint32 index; /** unique ID for conversation */
|
||||
guint32 conv_index; /** unique ID for conversation */
|
||||
guint32 setup_frame; /** frame number that setup this conversation */
|
||||
/* Assume that setup_frame is also the lowest frame number for now. */
|
||||
guint32 last_frame; /** highest frame number in this conversation */
|
||||
|
|
|
@ -164,7 +164,7 @@ static int dissect_idmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tr
|
|||
pinfo->ptype, pinfo->srcport, pinfo->destport, 0);
|
||||
if (conv) {
|
||||
/* Found a conversation, also use index for the generated dst_ref */
|
||||
dst_ref = conv->index;
|
||||
dst_ref = conv->conv_index;
|
||||
}
|
||||
|
||||
/* save parent_tree so subdissectors can create new top nodes */
|
||||
|
|
|
@ -145,7 +145,7 @@ register_ctx_id_and_oid(packet_info *pinfo _U_, guint32 idx, const char *oid)
|
|||
conversation=find_conversation (pinfo->num, &pinfo->src, &pinfo->dst,
|
||||
pinfo->ptype, pinfo->srcport, pinfo->destport, 0);
|
||||
if (conversation) {
|
||||
pco->idx = conversation->index;
|
||||
pco->idx = conversation->conv_index;
|
||||
} else {
|
||||
pco->idx = 0;
|
||||
}
|
||||
|
@ -186,7 +186,7 @@ find_oid_by_pres_ctx_id(packet_info *pinfo, guint32 idx)
|
|||
conversation=find_conversation (pinfo->num, &pinfo->src, &pinfo->dst,
|
||||
pinfo->ptype, pinfo->srcport, pinfo->destport, 0);
|
||||
if (conversation) {
|
||||
pco.idx = conversation->index;
|
||||
pco.idx = conversation->conv_index;
|
||||
} else {
|
||||
pco.idx = 0;
|
||||
}
|
||||
|
|
|
@ -236,7 +236,7 @@ dissect_rtse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* d
|
|||
&pinfo->src, &pinfo->dst, pinfo->ptype,
|
||||
pinfo->srcport, pinfo->destport, 0);
|
||||
if (conversation != NULL) {
|
||||
rtse_id = conversation->index;
|
||||
rtse_id = conversation->conv_index;
|
||||
}
|
||||
session->rtse_reassemble = TRUE;
|
||||
}
|
||||
|
|
|
@ -1036,7 +1036,7 @@ static void _9p_hash_set(packet_info *pinfo, guint16 tag, guint32 fid, struct _9
|
|||
|
||||
key = wmem_new(wmem_file_scope(), struct _9p_hashkey);
|
||||
|
||||
key->conv_index = conv->index;
|
||||
key->conv_index = conv->conv_index;
|
||||
key->tag = tag;
|
||||
key->fid = fid;
|
||||
|
||||
|
@ -1055,7 +1055,7 @@ static struct _9p_hashval *_9p_hash_get(packet_info *pinfo, guint16 tag, guint32
|
|||
|
||||
conv = find_or_create_conversation(pinfo);
|
||||
|
||||
key.conv_index = conv->index;
|
||||
key.conv_index = conv->conv_index;
|
||||
key.tag = tag;
|
||||
key.fid = fid;
|
||||
|
||||
|
@ -1069,7 +1069,7 @@ static void _9p_hash_free(packet_info *pinfo, guint16 tag, guint32 fid)
|
|||
|
||||
conv = find_or_create_conversation(pinfo);
|
||||
|
||||
key.conv_index = conv->index;
|
||||
key.conv_index = conv->conv_index;
|
||||
key.tag = tag;
|
||||
key.fid = fid;
|
||||
|
||||
|
|
|
@ -5121,7 +5121,7 @@ dissect_afp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
|
|||
|
||||
conversation = find_or_create_conversation(pinfo);
|
||||
|
||||
request_key.conversation = conversation->index;
|
||||
request_key.conversation = conversation->conv_index;
|
||||
request_key.seq = aspinfo->seq;
|
||||
|
||||
request_val = (afp_request_val *) g_hash_table_lookup(
|
||||
|
|
|
@ -2766,7 +2766,7 @@ dissect_afs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data)
|
|||
*/
|
||||
conversation = find_or_create_conversation(pinfo);
|
||||
|
||||
request_key.conversation = conversation->index;
|
||||
request_key.conversation = conversation->conv_index;
|
||||
request_key.service = rxinfo->serviceid;
|
||||
request_key.epoch = rxinfo->epoch;
|
||||
request_key.cid = rxinfo->cid;
|
||||
|
|
|
@ -798,11 +798,11 @@ dissect_ajp13_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void*
|
|||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "AJP13");
|
||||
|
||||
if (mag == 0x1234 && !fd->is_request_body)
|
||||
col_append_fstr(pinfo->cinfo, COL_INFO, "%d:REQ:", conv->index);
|
||||
col_append_fstr(pinfo->cinfo, COL_INFO, "%d:REQ:", conv->conv_index);
|
||||
else if (mag == 0x1234 && fd->is_request_body)
|
||||
col_append_fstr(pinfo->cinfo, COL_INFO, "%d:REQ:Body", conv->index);
|
||||
col_append_fstr(pinfo->cinfo, COL_INFO, "%d:REQ:Body", conv->conv_index);
|
||||
else if (mag == 0x4142)
|
||||
col_append_fstr(pinfo->cinfo, COL_INFO, "%d:RSP:", conv->index);
|
||||
col_append_fstr(pinfo->cinfo, COL_INFO, "%d:RSP:", conv->conv_index);
|
||||
else
|
||||
col_set_str(pinfo->cinfo, COL_INFO, "AJP13 Error?");
|
||||
|
||||
|
|
|
@ -746,7 +746,7 @@ dissect_atp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
|
|||
if (atp_defragment) {
|
||||
asp_request_key request_key;
|
||||
|
||||
request_key.conversation = conversation->index;
|
||||
request_key.conversation = conversation->conv_index;
|
||||
memcpy(request_key.src, (!aspinfo.reply)?pinfo->src.data:pinfo->dst.data, 4);
|
||||
request_key.seq = aspinfo.seq;
|
||||
|
||||
|
@ -994,7 +994,7 @@ get_transaction(tvbuff_t *tvb, packet_info *pinfo, struct aspinfo *aspinfo)
|
|||
|
||||
conversation = find_or_create_conversation(pinfo);
|
||||
|
||||
request_key.conversation = conversation->index;
|
||||
request_key.conversation = conversation->conv_index;
|
||||
memcpy(request_key.src, (!aspinfo->reply)?pinfo->src.data:pinfo->dst.data, 4);
|
||||
request_key.seq = aspinfo->seq;
|
||||
|
||||
|
|
|
@ -782,14 +782,14 @@ dissect_beep(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_
|
|||
/*
|
||||
* Check for and insert an entry in the request table if does not exist
|
||||
*/
|
||||
request_key.conversation = conversation->index;
|
||||
request_key.conversation = conversation->conv_index;
|
||||
|
||||
request_val = (struct beep_request_val *)g_hash_table_lookup(beep_request_hash, &request_key);
|
||||
|
||||
if (!request_val) { /* Create one */
|
||||
|
||||
new_request_key = wmem_new(wmem_file_scope(), struct beep_request_key);
|
||||
new_request_key->conversation = conversation->index;
|
||||
new_request_key->conversation = conversation->conv_index;
|
||||
|
||||
request_val = wmem_new(wmem_file_scope(), struct beep_request_val);
|
||||
request_val->processed = 0;
|
||||
|
|
|
@ -6682,7 +6682,7 @@ dissect_dcm_pdv_fragmented(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
|
|||
*/
|
||||
DISSECTOR_ASSERT(conv);
|
||||
|
||||
reassembly_id = (((conv->index) & 0x00FFFFFF) << 8) + pdv->pctx_id;
|
||||
reassembly_id = (((conv->conv_index) & 0x00FFFFFF) << 8) + pdv->pctx_id;
|
||||
|
||||
head = fragment_add_seq_next(&dcm_pdv_reassembly_table,
|
||||
tvb, offset, pinfo, reassembly_id, NULL,
|
||||
|
|
|
@ -3352,7 +3352,7 @@ dissect_dnp3_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void*
|
|||
* conversation and the DNP src and dst addresses
|
||||
*/
|
||||
|
||||
dl_conversation_key.conversation = conversation->index;
|
||||
dl_conversation_key.conversation = conversation->conv_index;
|
||||
dl_conversation_key.src = dl_src;
|
||||
dl_conversation_key.dst = dl_dst;
|
||||
|
||||
|
|
|
@ -2278,7 +2278,7 @@ dissect_cpf(enip_request_key_t *request_key, int command, tvbuff_t *tvb,
|
|||
*/
|
||||
request_key->session_handle = GPOINTER_TO_UINT(conversation);
|
||||
request_key->sender_context = trans_id;
|
||||
request_key->conversation = conversation->index;
|
||||
request_key->conversation = conversation->conv_index;
|
||||
}
|
||||
|
||||
|
||||
|
@ -2713,7 +2713,7 @@ dissect_enip_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data
|
|||
request_key.type = EPDT_UNKNOWN;
|
||||
request_key.session_handle = tvb_get_letohl( tvb, 4 );
|
||||
request_key.sender_context = tvb_get_letoh64( tvb, 12 );
|
||||
request_key.conversation = conversation->index;
|
||||
request_key.conversation = conversation->conv_index;
|
||||
|
||||
encap_data_length = tvb_get_letohs( tvb, 2 );
|
||||
enip_tree = NULL;
|
||||
|
|
|
@ -1073,7 +1073,7 @@ dissect_fc_helper (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean
|
|||
* SEQ_CNT of the first frame in sequence and use this value to
|
||||
* determine the actual offset into a frame.
|
||||
*/
|
||||
ckey.conv_idx = conversation->index;
|
||||
ckey.conv_idx = conversation->conv_index;
|
||||
|
||||
cdata = (fcseq_conv_data_t *)g_hash_table_lookup (fcseq_req_hash,
|
||||
&ckey);
|
||||
|
@ -1088,7 +1088,7 @@ dissect_fc_helper (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean
|
|||
}
|
||||
else {
|
||||
req_key = wmem_new(wmem_file_scope(), fcseq_conv_key_t);
|
||||
req_key->conv_idx = conversation->index;
|
||||
req_key->conv_idx = conversation->conv_index;
|
||||
|
||||
cdata = wmem_new(wmem_file_scope(), fcseq_conv_data_t);
|
||||
cdata->seq_cnt = fchdr->seqcnt;
|
||||
|
|
|
@ -1737,7 +1737,7 @@ dissect_fcdns (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data)
|
|||
fchdr->rxid, NO_PORT2);
|
||||
}
|
||||
|
||||
ckey.conv_idx = conversation->index;
|
||||
ckey.conv_idx = conversation->conv_index;
|
||||
|
||||
cdata = (fcdns_conv_data_t *)g_hash_table_lookup (fcdns_req_hash,
|
||||
&ckey);
|
||||
|
@ -1750,7 +1750,7 @@ dissect_fcdns (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data)
|
|||
}
|
||||
else {
|
||||
req_key = wmem_new(wmem_file_scope(), fcdns_conv_key_t);
|
||||
req_key->conv_idx = conversation->index;
|
||||
req_key->conv_idx = conversation->conv_index;
|
||||
|
||||
cdata = wmem_new(wmem_file_scope(), fcdns_conv_data_t);
|
||||
cdata->opcode = opcode;
|
||||
|
@ -1777,7 +1777,7 @@ dissect_fcdns (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data)
|
|||
}
|
||||
}
|
||||
else {
|
||||
ckey.conv_idx = conversation->index;
|
||||
ckey.conv_idx = conversation->conv_index;
|
||||
|
||||
cdata = (fcdns_conv_data_t *)g_hash_table_lookup (fcdns_req_hash, &ckey);
|
||||
|
||||
|
|
|
@ -1892,7 +1892,7 @@ dissect_fcels (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data)
|
|||
fchdr->rxid, options);
|
||||
}
|
||||
|
||||
ckey.conv_idx = conversation->index;
|
||||
ckey.conv_idx = conversation->conv_index;
|
||||
|
||||
cdata = (fcels_conv_data_t *)g_hash_table_lookup (fcels_req_hash,
|
||||
&ckey);
|
||||
|
@ -1905,7 +1905,7 @@ dissect_fcels (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data)
|
|||
}
|
||||
else {
|
||||
req_key = wmem_new(wmem_file_scope(), fcels_conv_key_t);
|
||||
req_key->conv_idx = conversation->index;
|
||||
req_key->conv_idx = conversation->conv_index;
|
||||
|
||||
cdata = wmem_new(wmem_file_scope(), fcels_conv_data_t);
|
||||
cdata->opcode = opcode;
|
||||
|
@ -1962,7 +1962,7 @@ dissect_fcels (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data)
|
|||
}
|
||||
|
||||
if (conversation) {
|
||||
ckey.conv_idx = conversation->index;
|
||||
ckey.conv_idx = conversation->conv_index;
|
||||
|
||||
cdata = (fcels_conv_data_t *)g_hash_table_lookup (fcels_req_hash, &ckey);
|
||||
|
||||
|
|
|
@ -736,7 +736,7 @@ dissect_fcfcs (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data)
|
|||
fchdr->rxid, NO_PORT2);
|
||||
}
|
||||
|
||||
ckey.conv_idx = conversation->index;
|
||||
ckey.conv_idx = conversation->conv_index;
|
||||
|
||||
cdata = (fcfcs_conv_data_t *)g_hash_table_lookup (fcfcs_req_hash,
|
||||
&ckey);
|
||||
|
@ -749,7 +749,7 @@ dissect_fcfcs (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data)
|
|||
}
|
||||
else {
|
||||
req_key = wmem_new(wmem_file_scope(), fcfcs_conv_key_t);
|
||||
req_key->conv_idx = conversation->index;
|
||||
req_key->conv_idx = conversation->conv_index;
|
||||
|
||||
cdata = wmem_new(wmem_file_scope(), fcfcs_conv_data_t);
|
||||
cdata->opcode = opcode;
|
||||
|
@ -776,7 +776,7 @@ dissect_fcfcs (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data)
|
|||
}
|
||||
}
|
||||
else {
|
||||
ckey.conv_idx = conversation->index;
|
||||
ckey.conv_idx = conversation->conv_index;
|
||||
|
||||
cdata = (fcfcs_conv_data_t *)g_hash_table_lookup (fcfcs_req_hash,
|
||||
&ckey);
|
||||
|
|
|
@ -559,7 +559,7 @@ dissect_fcfzs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data)
|
|||
fchdr->rxid, NO_PORT2);
|
||||
}
|
||||
|
||||
ckey.conv_idx = conversation->index;
|
||||
ckey.conv_idx = conversation->conv_index;
|
||||
|
||||
cdata = (fcfzs_conv_data_t *)g_hash_table_lookup(fcfzs_req_hash,
|
||||
&ckey);
|
||||
|
@ -572,7 +572,7 @@ dissect_fcfzs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data)
|
|||
}
|
||||
else {
|
||||
req_key = wmem_new(wmem_file_scope(), fcfzs_conv_key_t);
|
||||
req_key->conv_idx = conversation->index;
|
||||
req_key->conv_idx = conversation->conv_index;
|
||||
|
||||
cdata = wmem_new(wmem_file_scope(), fcfzs_conv_data_t);
|
||||
cdata->opcode = opcode;
|
||||
|
@ -601,7 +601,7 @@ dissect_fcfzs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data)
|
|||
}
|
||||
}
|
||||
else {
|
||||
ckey.conv_idx = conversation->index;
|
||||
ckey.conv_idx = conversation->conv_index;
|
||||
|
||||
cdata = (fcfzs_conv_data_t *)g_hash_table_lookup(fcfzs_req_hash, &ckey);
|
||||
|
||||
|
|
|
@ -1722,7 +1722,7 @@ dissect_fcswils(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data)
|
|||
fchdr->rxid, NO_PORT2);
|
||||
}
|
||||
|
||||
ckey.conv_idx = conversation->index;
|
||||
ckey.conv_idx = conversation->conv_index;
|
||||
|
||||
cdata = (fcswils_conv_data_t *)g_hash_table_lookup(fcswils_req_hash,
|
||||
&ckey);
|
||||
|
@ -1735,7 +1735,7 @@ dissect_fcswils(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data)
|
|||
}
|
||||
else {
|
||||
req_key = wmem_new(wmem_file_scope(), fcswils_conv_key_t);
|
||||
req_key->conv_idx = conversation->index;
|
||||
req_key->conv_idx = conversation->conv_index;
|
||||
|
||||
cdata = wmem_new(wmem_file_scope(), fcswils_conv_data_t);
|
||||
cdata->opcode = opcode;
|
||||
|
@ -1757,7 +1757,7 @@ dissect_fcswils(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data)
|
|||
}
|
||||
}
|
||||
else {
|
||||
ckey.conv_idx = conversation->index;
|
||||
ckey.conv_idx = conversation->conv_index;
|
||||
|
||||
cdata = (fcswils_conv_data_t *)g_hash_table_lookup(fcswils_req_hash, &ckey);
|
||||
|
||||
|
|
|
@ -650,7 +650,7 @@ static int dissect_idmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tr
|
|||
pinfo->ptype, pinfo->srcport, pinfo->destport, 0);
|
||||
if (conv) {
|
||||
/* Found a conversation, also use index for the generated dst_ref */
|
||||
dst_ref = conv->index;
|
||||
dst_ref = conv->conv_index;
|
||||
}
|
||||
|
||||
/* save parent_tree so subdissectors can create new top nodes */
|
||||
|
|
|
@ -418,7 +418,7 @@ static guint mgcp_call_hash(gconstpointer k)
|
|||
{
|
||||
const mgcp_call_info_key* key = (const mgcp_call_info_key*) k;
|
||||
|
||||
return key->transid + key->conversation->index;
|
||||
return key->transid + key->conversation->conv_index;
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -989,7 +989,7 @@ static int ositp_decode_DT(tvbuff_t *tvb, int offset, guint8 li, guint8 tpdu,
|
|||
0);
|
||||
if (conv) {
|
||||
/* Found a conversation, also use index for the generated dst_ref */
|
||||
dst_ref += (conv->index << 16);
|
||||
dst_ref += (conv->conv_index << 16);
|
||||
}
|
||||
if (!fragment) {
|
||||
cotp_dst_ref++;
|
||||
|
|
|
@ -204,7 +204,7 @@ dissect_pop(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
|
|||
|
||||
frame_data_p = wmem_new(wmem_file_scope(), struct pop_proto_data);
|
||||
|
||||
frame_data_p->conversation_id = conversation->index;
|
||||
frame_data_p->conversation_id = conversation->conv_index;
|
||||
frame_data_p->more_frags = data_val->msg_read_len < data_val->msg_tot_len;
|
||||
|
||||
p_add_proto_data(wmem_file_scope(), pinfo, proto_pop, 0, frame_data_p);
|
||||
|
|
|
@ -277,7 +277,7 @@ register_ctx_id_and_oid(packet_info *pinfo _U_, guint32 idx, const char *oid)
|
|||
conversation=find_conversation (pinfo->num, &pinfo->src, &pinfo->dst,
|
||||
pinfo->ptype, pinfo->srcport, pinfo->destport, 0);
|
||||
if (conversation) {
|
||||
pco->idx = conversation->index;
|
||||
pco->idx = conversation->conv_index;
|
||||
} else {
|
||||
pco->idx = 0;
|
||||
}
|
||||
|
@ -318,7 +318,7 @@ find_oid_by_pres_ctx_id(packet_info *pinfo, guint32 idx)
|
|||
conversation=find_conversation (pinfo->num, &pinfo->src, &pinfo->dst,
|
||||
pinfo->ptype, pinfo->srcport, pinfo->destport, 0);
|
||||
if (conversation) {
|
||||
pco.idx = conversation->index;
|
||||
pco.idx = conversation->conv_index;
|
||||
} else {
|
||||
pco.idx = 0;
|
||||
}
|
||||
|
|
|
@ -573,7 +573,7 @@ radius_call_hash(gconstpointer k)
|
|||
{
|
||||
const radius_call_info_key *key = (const radius_call_info_key *) k;
|
||||
|
||||
return key->ident + key->conversation->index;
|
||||
return key->ident + key->conversation->conv_index;
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -3406,7 +3406,7 @@ dissect_rpc_fragment(tvbuff_t *tvb, int offset, packet_info *pinfo,
|
|||
*/
|
||||
if (conversation == NULL)
|
||||
conversation = get_conversation_for_tcp(pinfo);
|
||||
old_rfk.conv_id = conversation->index;
|
||||
old_rfk.conv_id = conversation->conv_index;
|
||||
old_rfk.seq = seq;
|
||||
old_rfk.port = pinfo->srcport;
|
||||
rfk = (rpc_fragment_key *)g_hash_table_lookup(rpc_reassembly_table, &old_rfk);
|
||||
|
@ -3447,7 +3447,7 @@ dissect_rpc_fragment(tvbuff_t *tvb, int offset, packet_info *pinfo,
|
|||
*/
|
||||
|
||||
rfk = wmem_new(wmem_file_scope(), rpc_fragment_key);
|
||||
rfk->conv_id = conversation->index;
|
||||
rfk->conv_id = conversation->conv_index;
|
||||
rfk->seq = seq;
|
||||
rfk->port = pinfo->srcport;
|
||||
rfk->offset = 0;
|
||||
|
|
|
@ -7472,7 +7472,7 @@ dissect_rsvp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolea
|
|||
|
||||
/* Now build the request key */
|
||||
memset(&request_key, 0, sizeof(request_key));
|
||||
request_key.conversation = conversation->index;
|
||||
request_key.conversation = conversation->conv_index;
|
||||
request_key.session_type = rsvph->session_type;
|
||||
|
||||
switch (request_key.session_type) {
|
||||
|
@ -7563,7 +7563,7 @@ dissect_rsvp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolea
|
|||
copy_address_wmem(wmem_file_scope(), &new_request_key->source_info.source, &rsvph->source);
|
||||
|
||||
request_val = wmem_new(wmem_file_scope(), struct rsvp_request_val);
|
||||
request_val->value = conversation->index;
|
||||
request_val->value = conversation->conv_index;
|
||||
|
||||
g_hash_table_insert(rsvp_request_hash, new_request_key, request_val);
|
||||
}
|
||||
|
|
|
@ -783,7 +783,7 @@ dissect_rtse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* d
|
|||
&pinfo->src, &pinfo->dst, pinfo->ptype,
|
||||
pinfo->srcport, pinfo->destport, 0);
|
||||
if (conversation != NULL) {
|
||||
rtse_id = conversation->index;
|
||||
rtse_id = conversation->conv_index;
|
||||
}
|
||||
session->rtse_reassemble = TRUE;
|
||||
}
|
||||
|
|
|
@ -698,7 +698,7 @@ dissect_sbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_
|
|||
|
||||
conversation = find_or_create_conversation(pinfo);
|
||||
|
||||
request_key.conversation = conversation->index;
|
||||
request_key.conversation = conversation->conv_index;
|
||||
request_key.sequence = tvb_get_ntohs(tvb,6);
|
||||
|
||||
request_val = (sbus_request_val *) g_hash_table_lookup(sbus_request_hash,
|
||||
|
|
|
@ -1007,7 +1007,7 @@ dissect_spdu(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree,
|
|||
&pinfo->src, &pinfo->dst, pinfo->ptype,
|
||||
pinfo->srcport, pinfo->destport, 0);
|
||||
if (conversation != NULL) {
|
||||
ses_id = conversation->index;
|
||||
ses_id = conversation->conv_index;
|
||||
}
|
||||
fragment_len = tvb_reported_length_remaining (tvb, offset);
|
||||
ti = proto_tree_add_item (ses_tree, hf_ses_segment_data, tvb, offset,
|
||||
|
|
|
@ -150,7 +150,7 @@ dissect_smb_direct_payload(tvbuff_t *tvb, packet_info *pinfo,
|
|||
pinfo->fd->flags.visited = 0;
|
||||
fd_head = fragment_add_seq_next(&smb_direct_reassembly_table,
|
||||
tvb, 0, pinfo,
|
||||
conversation->index,
|
||||
conversation->conv_index,
|
||||
NULL, tvb_captured_length(tvb),
|
||||
more_frags);
|
||||
}
|
||||
|
@ -165,7 +165,7 @@ dissect_smb_direct_payload(tvbuff_t *tvb, packet_info *pinfo,
|
|||
*/
|
||||
fd_head = fragment_get_reassembled_id(&smb_direct_reassembly_table,
|
||||
pinfo,
|
||||
conversation->index);
|
||||
conversation->conv_index);
|
||||
}
|
||||
|
||||
if (fd_head == NULL) {
|
||||
|
|
|
@ -439,7 +439,7 @@ dissect_smtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_
|
|||
*/
|
||||
spd_frame_data = (struct smtp_proto_data *)wmem_alloc0(wmem_file_scope(), sizeof(struct smtp_proto_data));
|
||||
|
||||
spd_frame_data->conversation_id = conversation->index;
|
||||
spd_frame_data->conversation_id = conversation->conv_index;
|
||||
spd_frame_data->more_frags = TRUE;
|
||||
|
||||
p_add_proto_data(wmem_file_scope(), pinfo, proto_smtp, 0, spd_frame_data);
|
||||
|
|
Loading…
Reference in New Issue