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

Add the packet number to the packet_info structure, and use it. 

That removes most of the uses of the frame number field in the
frame_data structure.

Change-Id: Ie22e4533e87f8360d7c0a61ca6ffb796cc233f22
Reviewed-on: https://code.wireshark.org/review/13509
Reviewed-by: Guy Harris <guy@alum.mit.edu>
This commit is contained in:
Guy Harris 2016-01-23 19:40:51 -08:00
parent baea677290
commit bc5a0374bf
335 changed files with 1914 additions and 1913 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
asn1/ansi_map/packet-ansi_map-template.c
View File

@ -444,7 +444,7 @@ update_saved_invokedata(packet_info *pinfo, struct ansi_tcap_private_t *p_privat
wmem_strdup(wmem_file_scope(), buf),
ansi_map_saved_invokedata);
/*g_warning("Invoke Hash string %s pkt: %u",buf,pinfo->fd->num);*/
/*g_warning("Invoke Hash string %s pkt: %u",buf,pinfo->num);*/
}
}
/* value strings */
@ -4354,7 +4354,7 @@ find_saved_invokedata(asn1_ctx_t *actx, struct ansi_tcap_private_t *p_private_tc
break;
}
/*g_warning("Find Hash string %s pkt: %u",buf,actx->pinfo->fd->num);*/
/*g_warning("Find Hash string %s pkt: %u",buf,actx->pinfo->num);*/
ansi_map_saved_invokedata = (struct ansi_map_invokedata_t *)g_hash_table_lookup(TransactionId_table, buf);
if(ansi_map_saved_invokedata){
OperationCode = ansi_map_saved_invokedata->opcode & 0xff;

50
asn1/camel/packet-camel-template.c
View File

@ -523,7 +523,7 @@ static void
update_camelsrt_call(struct camelsrt_call_t *p_camelsrt_call, packet_info *pinfo,
guint msg_category)
{
p_camelsrt_call->category[msg_category].req_num = pinfo->fd->num;
p_camelsrt_call->category[msg_category].req_num = pinfo->num;
p_camelsrt_call->category[msg_category].rsp_num = 0;
p_camelsrt_call->category[msg_category].responded = FALSE;
p_camelsrt_call->category[msg_category].req_time = pinfo->abs_ts;
@ -543,7 +543,7 @@ camelsrt_close_call_matching(packet_info *pinfo,
p_camelsrt_info->bool_msginfo[CAMELSRT_SESSION]=TRUE;
#ifdef DEBUG_CAMELSRT
dbg(10,"\n Session end #%u\n", pinfo->fd->num);
dbg(10,"\n Session end #%u\n", pinfo->num);
#endif
/* look only for matching request, if matching conversation is available. */
camelsrt_call_key.SessionIdKey = p_camelsrt_info->tcap_session_id;
@ -625,7 +625,7 @@ camelsrt_begin_call_matching(packet_info *pinfo,
/* look up the request */
#ifdef DEBUG_CAMELSRT
dbg(10,"\n Session begin #%u\n", pinfo->fd->num);
dbg(10,"\n Session begin #%u\n", pinfo->num);
dbg(11,"Search key %lu ",camelsrt_call_key.SessionIdKey);
#endif
p_camelsrt_call = (struct camelsrt_call_t *)g_hash_table_lookup(srt_calls, &camelsrt_call_key);
@ -664,7 +664,7 @@ camelsrt_request_call_matching(tvbuff_t *tvb, packet_info *pinfo,
proto_item *ti, *hidden_item;
#ifdef DEBUG_CAMELSRT
dbg(10,"\n %s #%u\n", val_to_str_const(srt_type, camelSRTtype_naming, "Unk"),pinfo->fd->num);
dbg(10,"\n %s #%u\n", val_to_str_const(srt_type, camelSRTtype_naming, "Unk"),pinfo->num);
#endif
/* look only for matching request, if matching conversation is available. */
@ -689,20 +689,20 @@ camelsrt_request_call_matching(tvbuff_t *tvb, packet_info *pinfo,
srt_type=CAMELSRT_VOICE_ACR1;
} else if ( (p_camelsrt_call->category[CAMELSRT_VOICE_ACR2].req_num == 0)
&& (p_camelsrt_call->category[CAMELSRT_VOICE_ACR1].rsp_num != 0)
&& (p_camelsrt_call->category[CAMELSRT_VOICE_ACR1].rsp_num < pinfo->fd->num) ) {
&& (p_camelsrt_call->category[CAMELSRT_VOICE_ACR1].rsp_num < pinfo->num) ) {
srt_type=CAMELSRT_VOICE_ACR2;
} else if ( (p_camelsrt_call->category[CAMELSRT_VOICE_ACR3].req_num == 0)
&& (p_camelsrt_call->category[CAMELSRT_VOICE_ACR2].rsp_num != 0)
&& (p_camelsrt_call->category[CAMELSRT_VOICE_ACR2].rsp_num < pinfo->fd->num) ) {
&& (p_camelsrt_call->category[CAMELSRT_VOICE_ACR2].rsp_num < pinfo->num) ) {
srt_type=CAMELSRT_VOICE_ACR3;
} else if (p_camelsrt_call->category[CAMELSRT_VOICE_ACR1].rsp_num != 0
&& p_camelsrt_call->category[CAMELSRT_VOICE_ACR1].rsp_num > pinfo->fd->num) {
&& p_camelsrt_call->category[CAMELSRT_VOICE_ACR1].rsp_num > pinfo->num) {
srt_type=CAMELSRT_VOICE_ACR1;
} else if ( p_camelsrt_call->category[CAMELSRT_VOICE_ACR2].rsp_num != 0
&& p_camelsrt_call->category[CAMELSRT_VOICE_ACR2].rsp_num > pinfo->fd->num) {
&& p_camelsrt_call->category[CAMELSRT_VOICE_ACR2].rsp_num > pinfo->num) {
srt_type=CAMELSRT_VOICE_ACR2;
} else if (p_camelsrt_call->category[CAMELSRT_VOICE_ACR1].rsp_num != 0
&& p_camelsrt_call->category[CAMELSRT_VOICE_ACR3].rsp_num > pinfo->fd->num) {
&& p_camelsrt_call->category[CAMELSRT_VOICE_ACR3].rsp_num > pinfo->num) {
srt_type=CAMELSRT_VOICE_ACR3;
}
#ifdef DEBUG_CAMELSRT
@ -719,12 +719,12 @@ camelsrt_request_call_matching(tvbuff_t *tvb, packet_info *pinfo,
/* We have not yet seen a request to that call, so this must be the first request
remember its frame number. */
#ifdef DEBUG_CAMELSRT
dbg(5,"Set reqlink #%u ", pinfo->fd->num);
dbg(5,"Set reqlink #%u ", pinfo->num);
#endif
update_camelsrt_call(p_camelsrt_call, pinfo, srt_type);
} else {
/* We have seen a request to this call - but was it *this* request? */
if (p_camelsrt_call->category[srt_type].req_num != pinfo->fd->num) {
if (p_camelsrt_call->category[srt_type].req_num != pinfo->num) {
if (srt_type!=CAMELSRT_VOICE_DISC) {
/* No, so it's a duplicate request. Mark it as such. */
@ -739,10 +739,10 @@ camelsrt_request_call_matching(tvbuff_t *tvb, packet_info *pinfo,
} else {
/* Ignore duplicate frame */
if (pinfo->fd->num > p_camelsrt_call->category[srt_type].req_num) {
p_camelsrt_call->category[srt_type].req_num = pinfo->fd->num;
if (pinfo->num > p_camelsrt_call->category[srt_type].req_num) {
p_camelsrt_call->category[srt_type].req_num = pinfo->num;
#ifdef DEBUG_CAMELSRT
dbg(5,"DISC Set reqlink #%u ", pinfo->fd->num);
dbg(5,"DISC Set reqlink #%u ", pinfo->num);
#endif
update_camelsrt_call(p_camelsrt_call, pinfo, srt_type);
} /* greater frame */
@ -754,7 +754,7 @@ camelsrt_request_call_matching(tvbuff_t *tvb, packet_info *pinfo,
if ( gcamel_DisplaySRT &&
(p_camelsrt_call->category[srt_type].rsp_num != 0) &&
(p_camelsrt_call->category[srt_type].req_num != 0) &&
(p_camelsrt_call->category[srt_type].req_num == pinfo->fd->num) ) {
(p_camelsrt_call->category[srt_type].req_num == pinfo->num) ) {
#ifdef DEBUG_CAMELSRT
dbg(20,"Display_framersplink %d ",p_camelsrt_call->category[srt_type].rsp_num);
#endif
@ -834,7 +834,7 @@ camelsrt_report_call_matching(tvbuff_t *tvb, packet_info *pinfo,
proto_item *ti, *hidden_item;
#ifdef DEBUG_CAMELSRT
dbg(10,"\n %s #%u\n", val_to_str_const(srt_type, camelSRTtype_naming, "Unk"),pinfo->fd->num);
dbg(10,"\n %s #%u\n", val_to_str_const(srt_type, camelSRTtype_naming, "Unk"),pinfo->num);
#endif
camelsrt_call_key.SessionIdKey = p_camelsrt_info->tcap_session_id;
/* look only for matching request, if matching conversation is available. */
@ -852,13 +852,13 @@ camelsrt_report_call_matching(tvbuff_t *tvb, packet_info *pinfo,
if (srt_type==CAMELSRT_VOICE_ACR1) {
if (p_camelsrt_call->category[CAMELSRT_VOICE_ACR3].req_num != 0
&& p_camelsrt_call->category[CAMELSRT_VOICE_ACR3].req_num < pinfo->fd->num) {
&& p_camelsrt_call->category[CAMELSRT_VOICE_ACR3].req_num < pinfo->num) {
srt_type=CAMELSRT_VOICE_ACR1;
} else if ( p_camelsrt_call->category[CAMELSRT_VOICE_ACR2].req_num != 0
&& p_camelsrt_call->category[CAMELSRT_VOICE_ACR2].req_num < pinfo->fd->num) {
&& p_camelsrt_call->category[CAMELSRT_VOICE_ACR2].req_num < pinfo->num) {
srt_type=CAMELSRT_VOICE_ACR2;
} else if (p_camelsrt_call->category[CAMELSRT_VOICE_ACR1].req_num != 0
&& p_camelsrt_call->category[CAMELSRT_VOICE_ACR1].req_num < pinfo->fd->num) {
&& p_camelsrt_call->category[CAMELSRT_VOICE_ACR1].req_num < pinfo->num) {
srt_type=CAMELSRT_VOICE_ACR1;
}
#ifdef DEBUG_CAMELSRT
@ -869,22 +869,22 @@ camelsrt_report_call_matching(tvbuff_t *tvb, packet_info *pinfo,
if (p_camelsrt_call->category[srt_type].rsp_num == 0) {
if ( (p_camelsrt_call->category[srt_type].req_num != 0)
&& (pinfo->fd->num > p_camelsrt_call->category[srt_type].req_num) ){
&& (pinfo->num > p_camelsrt_call->category[srt_type].req_num) ){
/* We have not yet seen a response to that call, so this must be the first response;
remember its frame number only if response comes after request */
#ifdef DEBUG_CAMELSRT
dbg(14,"Set reslink #%d req %u ",pinfo->fd->num, p_camelsrt_call->category[srt_type].req_num);
dbg(14,"Set reslink #%d req %u ",pinfo->num, p_camelsrt_call->category[srt_type].req_num);
#endif
p_camelsrt_call->category[srt_type].rsp_num = pinfo->fd->num;
p_camelsrt_call->category[srt_type].rsp_num = pinfo->num;
} else {
#ifdef DEBUG_CAMELSRT
dbg(2,"badreslink #%u req %u ",pinfo->fd->num, p_camelsrt_call->category[srt_type].req_num);
dbg(2,"badreslink #%u req %u ",pinfo->num, p_camelsrt_call->category[srt_type].req_num);
#endif
} /* req_num != 0 */
} else { /* rsp_num != 0 */
/* We have seen a response to this call - but was it *this* response? */
if (p_camelsrt_call->category[srt_type].rsp_num != pinfo->fd->num) {
if (p_camelsrt_call->category[srt_type].rsp_num != pinfo->num) {
/* No, so it's a duplicate response. Mark it as such. */
#ifdef DEBUG_CAMELSRT
dbg(21,"Display_duplicate rsp=%d ", p_camelsrt_call->category[srt_type].rsp_num);
@ -899,7 +899,7 @@ camelsrt_report_call_matching(tvbuff_t *tvb, packet_info *pinfo,
if ( (p_camelsrt_call->category[srt_type].req_num != 0) &&
(p_camelsrt_call->category[srt_type].rsp_num != 0) &&
(p_camelsrt_call->category[srt_type].rsp_num == pinfo->fd->num) ) {
(p_camelsrt_call->category[srt_type].rsp_num == pinfo->num) ) {
p_camelsrt_call->category[srt_type].responded = TRUE;
p_camelsrt_info->msginfo[srt_type].request_available = TRUE;

4
asn1/h225/h225.cnf
View File

@ -464,9 +464,9 @@ IsupNumber/nationalStandardPartyNumber isupNationalStandardPartyNumber
return offset;
}
conv=find_conversation(actx->pinfo->fd->num, &src_addr, &src_addr, PT_TCP, ip_port, ip_port, NO_ADDR_B|NO_PORT_B);
conv=find_conversation(actx->pinfo->num, &src_addr, &src_addr, PT_TCP, ip_port, ip_port, NO_ADDR_B|NO_PORT_B);
if(!conv){
conv=conversation_new(actx->pinfo->fd->num, &src_addr, &src_addr, PT_TCP, ip_port, ip_port, NO_ADDR2|NO_PORT2);
conv=conversation_new(actx->pinfo->num, &src_addr, &src_addr, PT_TCP, ip_port, ip_port, NO_ADDR2|NO_PORT2);
conversation_set_dissector(conv, h245_handle);
}
}

18
asn1/h225/packet-h225-template.c
View File

@ -298,7 +298,7 @@ h225ras_call_t * new_h225ras_call(h225ras_call_info_key *h225ras_call_key, packe
new_h225ras_call_key->reqSeqNum = h225ras_call_key->reqSeqNum;
new_h225ras_call_key->conversation = h225ras_call_key->conversation;
h225ras_call = wmem_new(wmem_file_scope(), h225ras_call_t);
h225ras_call->req_num = pinfo->fd->num;
h225ras_call->req_num = pinfo->num;
h225ras_call->rsp_num = 0;
h225ras_call->requestSeqNum = h225ras_call_key->reqSeqNum;
h225ras_call->responded = FALSE;
@ -321,7 +321,7 @@ h225ras_call_t * append_h225ras_call(h225ras_call_t *prev_call, packet_info *pin
to mean "we don't yet know in which frame
the reply for this call appears". */
h225ras_call = wmem_new(wmem_file_scope(), h225ras_call_t);
h225ras_call->req_num = pinfo->fd->num;
h225ras_call->req_num = pinfo->num;
h225ras_call->rsp_num = 0;
h225ras_call->requestSeqNum = prev_call->requestSeqNum;
h225ras_call->responded = FALSE;
@ -1044,16 +1044,16 @@ static void ras_call_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre
*this* request already? */
/* Walk through list of ras requests with identical keys */
do {
if (pinfo->fd->num == h225ras_call->req_num) {
if (pinfo->num == h225ras_call->req_num) {
/* We have seen this request before -> do nothing */
break;
}
/* if end of list is reached, exit loop and decide if request is duplicate or not. */
if (h225ras_call->next_call == NULL) {
if ( (pinfo->fd->num > h225ras_call->rsp_num && h225ras_call->rsp_num != 0
if ( (pinfo->num > h225ras_call->rsp_num && h225ras_call->rsp_num != 0
&& pinfo->abs_ts.secs > (h225ras_call->req_time.secs + THRESHOLD_REPEATED_RESPONDED_CALL) )
||(pinfo->fd->num > h225ras_call->req_num && h225ras_call->rsp_num == 0
||(pinfo->num > h225ras_call->req_num && h225ras_call->rsp_num == 0
&& pinfo->abs_ts.secs > (h225ras_call->req_time.secs + THRESHOLD_REPEATED_NOT_RESPONDED_CALL) ) )
{
/* if last request has been responded
@ -1093,7 +1093,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->fd->num, &pinfo->src,
conversation = find_conversation(pinfo->num, &pinfo->src,
&pinfo->dst, pinfo->ptype, pinfo->srcport,
pinfo->destport, 0);
if (conversation != NULL) {
@ -1105,7 +1105,7 @@ static void ras_call_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre
if(h225ras_call) {
/* find matching ras_call in list of ras calls with identical keys */
do {
if (pinfo->fd->num == h225ras_call->rsp_num) {
if (pinfo->num == h225ras_call->rsp_num) {
/* We have seen this response before -> stop now with matching ras call */
break;
}
@ -1132,12 +1132,12 @@ static void ras_call_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre
/* We have not yet seen a response to that call, so
this must be the first response; remember its
frame number. */
h225ras_call->rsp_num = pinfo->fd->num;
h225ras_call->rsp_num = pinfo->num;
}
else {
/* We have seen a response to this call - but was it
*this* response? */
if (h225ras_call->rsp_num != pinfo->fd->num) {
if (h225ras_call->rsp_num != pinfo->num) {
/* No, so it's a duplicate response.
Mark it as such. */
pi->is_duplicate = TRUE;

6
asn1/h245/packet-h245-template.c
View File

@ -352,7 +352,7 @@ static void h245_setup_channels(packet_info *pinfo, channel_info_t *upcoming_cha
if (upcoming_channel_lcl->media_addr.addr.type!=AT_NONE && upcoming_channel_lcl->media_addr.port!=0) {
t38_add_address(pinfo, &upcoming_channel_lcl->media_addr.addr,
upcoming_channel_lcl->media_addr.port, 0,
"H245", pinfo->fd->num);
"H245", pinfo->num);
}
return;
}
@ -372,12 +372,12 @@ static void h245_setup_channels(packet_info *pinfo, channel_info_t *upcoming_cha
if (upcoming_channel_lcl->media_addr.addr.type!=AT_NONE && upcoming_channel_lcl->media_addr.port!=0) {
srtp_add_address(pinfo, &upcoming_channel_lcl->media_addr.addr,
upcoming_channel_lcl->media_addr.port, 0,
"H245", pinfo->fd->num, upcoming_channel_lcl->is_video , rtp_dyn_payload, dummy_srtp_info);
"H245", pinfo->num, upcoming_channel_lcl->is_video , rtp_dyn_payload, dummy_srtp_info);
}
if (upcoming_channel_lcl->media_control_addr.addr.type!=AT_NONE && upcoming_channel_lcl->media_control_addr.port!=0 && rtcp_handle) {
srtcp_add_address(pinfo, &upcoming_channel_lcl->media_control_addr.addr,
upcoming_channel_lcl->media_control_addr.port, 0,
"H245", pinfo->fd->num, dummy_srtp_info);
"H245", pinfo->num, dummy_srtp_info);
}
}

4
asn1/idmp/packet-idmp-template.c
View File

@ -160,7 +160,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->fd->num, &pinfo->src, &pinfo->dst,
conv = find_conversation (pinfo->num, &pinfo->src, &pinfo->dst,
pinfo->ptype, pinfo->srcport, pinfo->destport, 0);
if (conv) {
/* Found a conversation, also use index for the generated dst_ref */
@ -205,7 +205,7 @@ static int dissect_idmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tr
tvb = process_reassembled_data (tvb, offset, pinfo,
"Reassembled IDMP", fd_head, &idmp_frag_items, NULL, tree);
offset = 0;
} else if (pinfo->fd->num != fd_head->reassembled_in) {
} else if (pinfo->num != fd_head->reassembled_in) {
/* Add a "Reassembled in" link if not reassembled in this frame */
proto_tree_add_uint (tree, hf_idmp_reassembled_in,
tvb, 0, 0, fd_head->reassembled_in);

4
asn1/kerberos/kerberos.cnf
View File

@ -362,10 +362,10 @@ AuthorizationData/_item/ad-type STRINGS=VALS(krb5_ad_types)
* http://www.ietf.org/internet-drafts/draft-ietf-krb-wg-kerberos-clarifications-07.txt
*/
if (actx->pinfo->destport == UDP_PORT_KERBEROS && actx->pinfo->ptype == PT_UDP) {
conversation = find_conversation(actx->pinfo->fd->num, &actx->pinfo->src, &actx->pinfo->dst, PT_UDP,
conversation = find_conversation(actx->pinfo->num, &actx->pinfo->src, &actx->pinfo->dst, PT_UDP,
actx->pinfo->srcport, 0, NO_PORT_B);
if (conversation == NULL) {
conversation = conversation_new(actx->pinfo->fd->num, &actx->pinfo->src, &actx->pinfo->dst, PT_UDP,
conversation = conversation_new(actx->pinfo->num, &actx->pinfo->src, &actx->pinfo->dst, PT_UDP,
actx->pinfo->srcport, 0, NO_PORT2);
conversation_set_dissector(conversation, kerberos_handle_udp);
}

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

@ -278,8 +278,8 @@ add_encryption_key(packet_info *pinfo, int keytype, int keylength, const char *k
}
new_key=(enc_key_t *)g_malloc(sizeof(enc_key_t));
g_snprintf(new_key->key_origin, KRB_MAX_ORIG_LEN, "%s learnt from frame %u",origin,pinfo->fd->num);
new_key->fd_num = pinfo->fd->num;
g_snprintf(new_key->key_origin, KRB_MAX_ORIG_LEN, "%s learnt from frame %u",origin,pinfo->num);
new_key->fd_num = pinfo->num;
new_key->next=enc_key_list;
enc_key_list=new_key;
new_key->keytype=keytype;
@ -413,7 +413,7 @@ decrypt_krb5_data(proto_tree *tree _U_, packet_info *pinfo,
expert_add_info_format(pinfo, NULL, &ei_kerberos_decrypted_keytype,
"Decrypted keytype %d in frame %u using %s",
ek->keytype, pinfo->fd->num, ek->key_origin);
ek->keytype, pinfo->num, ek->key_origin);
/* return a private g_malloced blob to the caller */
user_data=data.data;
@ -565,7 +565,7 @@ decrypt_krb5_data(proto_tree *tree _U_, packet_info *pinfo,
expert_add_info_format(pinfo, NULL, &ei_kerberos_decrypted_keytype,
"Decrypted keytype %d in frame %u using %s",
ek->keytype, pinfo->fd->num, ek->key_origin);
ek->keytype, pinfo->num, ek->key_origin);
krb5_crypto_destroy(krb5_ctx, crypto);
/* return a private g_malloced blob to the caller */
@ -609,7 +609,7 @@ add_encryption_key(packet_info *pinfo, int keytype, int keylength, const char *k
new_key->keytype = keytype;
new_key->length = keylength;
new_key->contents = g_memdup(keyvalue, keylength);
g_snprintf(new_key->origin, KRB_MAX_ORIG_LEN, "%s learnt from frame %u", origin, pinfo->fd->num);
g_snprintf(new_key->origin, KRB_MAX_ORIG_LEN, "%s learnt from frame %u", origin, pinfo->num);
service_key_list = g_slist_append(service_key_list, (gpointer) new_key);
}

2
asn1/ldap/ldap.cnf
View File

@ -267,7 +267,7 @@ ldap_conv_info_t *ldap_info;
* assumption that we won't have more than 2^24 bytes of
* encapsulated stuff.
*/
ldap_info->first_auth_frame = actx->pinfo->fd->num + 1;
ldap_info->first_auth_frame = actx->pinfo->num + 1;
if (ldap_info->auth_mech != NULL &&
strcmp(ldap_info->auth_mech, "GSS-SPNEGO") == 0) {
/* It could be the second leg of GSS-SPNEGO wrapping NTLMSSP

14
asn1/ldap/packet-ldap-template.c
View File

@ -800,7 +800,7 @@ ldap_match_call_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gu
case LDAP_REQ_COMPARE:
case LDAP_REQ_EXTENDED:
lcr.is_request=TRUE;
lcr.req_frame=pinfo->fd->num;
lcr.req_frame=pinfo->num;
lcr.rep_frame=0;
break;
case LDAP_RES_BIND:
@ -816,7 +816,7 @@ ldap_match_call_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gu
case LDAP_RES_INTERMEDIATE:
lcr.is_request=FALSE;
lcr.req_frame=0;
lcr.rep_frame=pinfo->fd->num;
lcr.rep_frame=pinfo->num;
break;
default:
return NULL;
@ -856,7 +856,7 @@ ldap_match_call_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gu
lcrp=wmem_new0(wmem_file_scope(), ldap_call_response_t);
}
lcrp->messageId=messageId;
lcrp->req_frame=pinfo->fd->num;
lcrp->req_frame=pinfo->num;
lcrp->req_time=pinfo->abs_ts;
lcrp->rep_frame=0;
lcrp->protocolOpTag=protocolOpTag;
@ -885,7 +885,7 @@ ldap_match_call_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gu
if(!lcrp->rep_frame){
g_hash_table_remove(ldap_info->unmatched, lcrp);
lcrp->rep_frame=pinfo->fd->num;
lcrp->rep_frame=pinfo->num;
lcrp->is_request=FALSE;
g_hash_table_insert(ldap_info->matched, lcrp, lcrp);
}
@ -1097,7 +1097,7 @@ static void
* It's SASL; are we using a security layer?
*/
if (ldap_info->first_auth_frame != 0 &&
pinfo->fd->num >= ldap_info->first_auth_frame) {
pinfo->num >= ldap_info->first_auth_frame) {
doing_sasl_security = TRUE; /* yes */
}
}
@ -1113,7 +1113,7 @@ static void
&&(tvb_get_ntohl(tvb, offset)<=(guint)(tvb_reported_length_remaining(tvb, offset)-4))
&&(tvb_get_guint8(tvb, offset+4)==0x60) ){
ldap_info->auth_type=LDAP_AUTH_SASL;
ldap_info->first_auth_frame=pinfo->fd->num;
ldap_info->first_auth_frame=pinfo->num;
ldap_info->auth_mech=g_strdup("GSS-SPNEGO");
doing_sasl_security=TRUE;
}
@ -1777,7 +1777,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->fd->num, &pinfo->src, &pinfo->dst,
conversation = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst,
pinfo->ptype, pinfo->srcport, pinfo->destport, 0);
if(conversation){
ldap_info = (ldap_conv_info_t *)conversation_get_proto_data(conversation, proto_ldap);

6
asn1/lte-rrc/lte-rrc.cnf
View File

@ -1514,7 +1514,7 @@ SoundingRS-UL-ConfigDedicated/setup/duration STRINGS=TFS(&lte_rrc_duration_val)
if (!actx->pinfo->fd->flags.visited) {
if (system_info_value_current_set && (value != system_info_value_current)) {
/* Add entry to the hash table. Offset by one to distinguish 0 from lookup failure */
g_hash_table_insert(lte_rrc_system_info_value_changed_hash, GUINT_TO_POINTER(actx->pinfo->fd->num),
g_hash_table_insert(lte_rrc_system_info_value_changed_hash, GUINT_TO_POINTER(actx->pinfo->num),
GUINT_TO_POINTER(system_info_value_current+1));
}
system_info_value_current_set = TRUE;
@ -1522,7 +1522,7 @@ SoundingRS-UL-ConfigDedicated/setup/duration STRINGS=TFS(&lte_rrc_duration_val)
}
else {
/* Look up indication of changed info value from hash table */
gpointer p_previous = g_hash_table_lookup(lte_rrc_system_info_value_changed_hash, GUINT_TO_POINTER(actx->pinfo->fd->num));
gpointer p_previous = g_hash_table_lookup(lte_rrc_system_info_value_changed_hash, GUINT_TO_POINTER(actx->pinfo->num));
if (p_previous != NULL) {
/* Subtract one from stored result to get previous value */
guint32 previous = GPOINTER_TO_UINT(p_previous) - 1;
@ -1933,7 +1933,7 @@ PUCCH-ConfigDedicated-v13xy/codebooksizeDetermination-r13 DISPLAY=BASE_DEC STRIN
pdcp_security_info_t *p_security_algorithms;
%(DEFAULT_BODY)s
p_security_algorithms = private_data_pdcp_security_algorithms(actx);
p_security_algorithms->configuration_frame = actx->pinfo->fd->num;
p_security_algorithms->configuration_frame = actx->pinfo->num;
p_security_algorithms->previous_configuration_frame = 0;
p_security_algorithms->previous_integrity = eia0;
p_security_algorithms->previous_ciphering = eea0;

88
asn1/nbap/nbap.cnf
View File

@ -744,13 +744,13 @@ transportFormatSet_type = NBAP_CPCH;
set_address(&dst_addr, AT_IPv4, 4, &transportLayerAddress_ipv4);
conversation = find_conversation(actx->pinfo->fd->num,&dst_addr,
conversation = find_conversation(actx->pinfo->num,&dst_addr,
&null_addr, PT_UDP, BindingID_port,
0, NO_ADDR_B|NO_PORT_B);
if (conversation == NULL) {
/* It's not part of any conversation - create a new one. */
conversation = conversation_new(actx->pinfo->fd->num, &dst_addr,
conversation = conversation_new(actx->pinfo->num, &dst_addr,
&null_addr, PT_UDP,BindingID_port ,
0, NO_ADDR2|NO_PORT2);
@ -763,7 +763,7 @@ transportFormatSet_type = NBAP_CPCH;
umts_fp_conversation_info->division = Division_FDD;
umts_fp_conversation_info->channel = CHANNEL_RACH_FDD;
umts_fp_conversation_info->dl_frame_number = 0;
umts_fp_conversation_info->ul_frame_number = actx->pinfo->fd->num;
umts_fp_conversation_info->ul_frame_number = actx->pinfo->num;
copy_address_wmem(wmem_file_scope(), &(umts_fp_conversation_info->crnc_address), &dst_addr);
umts_fp_conversation_info->crnc_port = BindingID_port;
umts_fp_conversation_info->rlc_mode = FP_RLC_MODE_UNKNOWN;
@ -837,13 +837,13 @@ num_items = 1;
set_address(&dst_addr, AT_IPv4, 4, &transportLayerAddress_ipv4);
conversation = find_conversation(actx->pinfo->fd->num,&dst_addr,
conversation = find_conversation(actx->pinfo->num,&dst_addr,
&null_addr, PT_UDP, BindingID_port,
0, NO_ADDR_B|NO_PORT_B);
if (conversation == NULL) {
/* It's not part of any conversation - create a new one. */
conversation = conversation_new(actx->pinfo->fd->num, &dst_addr,
conversation = conversation_new(actx->pinfo->num, &dst_addr,
&null_addr, PT_UDP,BindingID_port ,
0, NO_ADDR2|NO_PORT2);
@ -856,7 +856,7 @@ num_items = 1;
umts_fp_conversation_info->division = Division_FDD;
umts_fp_conversation_info->channel = CHANNEL_PCH;
umts_fp_conversation_info->dl_frame_number = 0;
umts_fp_conversation_info->ul_frame_number = actx->pinfo->fd->num;
umts_fp_conversation_info->ul_frame_number = actx->pinfo->num;
copy_address_wmem(wmem_file_scope(), &(umts_fp_conversation_info->crnc_address), &dst_addr);
umts_fp_conversation_info->crnc_port = BindingID_port;
umts_fp_conversation_info->paging_indications = paging_indications;
@ -868,7 +868,7 @@ num_items = 1;
umts_fp_conversation_info->fp_dch_channel_info[0].num_ul_chans = num_tf = nbap_dch_chnl_info[commontransportchannelid].num_ul_chans;
nbap_debug("Frame %%u PCH-ParametersItem-CTCH-SetupRqstFDD Start: num_tf %%u",
actx->pinfo->fd->num,
actx->pinfo->num,
num_tf);
for (j = 0; j < num_tf; j++) {
@ -917,7 +917,7 @@ num_items = 1;
set_umts_fp_conv_data(conversation, umts_fp_conversation_info);
nbap_debug("Frame %%u PCH-ParametersItem-CTCH-SetupRqstFDD End",
actx->pinfo->fd->num);
actx->pinfo->num);
}
@ -946,13 +946,13 @@ transportFormatSet_type = NBAP_CPCH;
set_address(&dst_addr, AT_IPv4, 4, &transportLayerAddress_ipv4);
conversation = find_conversation(actx->pinfo->fd->num,&dst_addr,
conversation = find_conversation(actx->pinfo->num,&dst_addr,
&null_addr, PT_UDP, BindingID_port,
0, NO_ADDR_B|NO_PORT_B);
if (conversation == NULL) {
/* It's not part of any conversation - create a new one. */
conversation = conversation_new(actx->pinfo->fd->num, &dst_addr,
conversation = conversation_new(actx->pinfo->num, &dst_addr,
&null_addr, PT_UDP,BindingID_port ,
0, NO_ADDR2|NO_PORT2);
@ -965,7 +965,7 @@ transportFormatSet_type = NBAP_CPCH;
umts_fp_conversation_info->division = Division_FDD;
umts_fp_conversation_info->channel = CHANNEL_FACH_FDD;
umts_fp_conversation_info->dl_frame_number = 0;
umts_fp_conversation_info->ul_frame_number = actx->pinfo->fd->num;
umts_fp_conversation_info->ul_frame_number = actx->pinfo->num;
copy_address_wmem(wmem_file_scope(), &(umts_fp_conversation_info->crnc_address), &dst_addr);
umts_fp_conversation_info->crnc_port = BindingID_port;
umts_fp_conversation_info->rlc_mode = FP_RLC_MODE_UNKNOWN;
@ -1152,13 +1152,13 @@ dch_id = 0xFFFFFFFF;
set_address(&dst_addr, AT_IPv4, 4, &transportLayerAddress_ipv4);
conversation = find_conversation(actx->pinfo->fd->num,&dst_addr,
conversation = find_conversation(actx->pinfo->num,&dst_addr,
&null_addr, PT_UDP, BindingID_port,
0, NO_ADDR_B|NO_PORT_B);
if (conversation == NULL) {
/* It's not part of any conversation - create a new one. */
conversation = conversation_new(actx->pinfo->fd->num, &dst_addr,
conversation = conversation_new(actx->pinfo->num, &dst_addr,
&null_addr, PT_UDP,BindingID_port ,
0, NO_ADDR2|NO_PORT2);
@ -1172,7 +1172,7 @@ dch_id = 0xFFFFFFFF;
umts_fp_conversation_info->division = Division_FDD;
umts_fp_conversation_info->channel = CHANNEL_DCH;
umts_fp_conversation_info->dl_frame_number = 0;
umts_fp_conversation_info->ul_frame_number = actx->pinfo->fd->num;
umts_fp_conversation_info->ul_frame_number = actx->pinfo->num;
copy_address_wmem(wmem_file_scope(), &(umts_fp_conversation_info->crnc_address), &dst_addr);
umts_fp_conversation_info->crnc_port = BindingID_port;
umts_fp_conversation_info->rlc_mode = FP_RLC_MODE_UNKNOWN;
@ -1229,9 +1229,9 @@ dch_id = 0xFFFFFFFF;
set_umts_fp_conv_data(conversation, umts_fp_conversation_info);
}
nbap_debug("Frame %%u RL-Specific-DCH-Info-Item Start", actx->pinfo->fd->num);
nbap_debug("Frame %%u RL-Specific-DCH-Info-Item Start", actx->pinfo->num);
nbap_debug(" Total no of ch in flow will be: %%d", umts_fp_conversation_info->num_dch_in_flow);
nbap_debug("Frame %%u RL-Specific-DCH-Info-Item End", actx->pinfo->fd->num);
nbap_debug("Frame %%u RL-Specific-DCH-Info-Item End", actx->pinfo->num);
}
@ -1260,7 +1260,7 @@ BindingID_port = 0;
set_address(&dst_addr, AT_IPv4, 4, &transportLayerAddress_ipv4);
conversation = find_conversation(actx->pinfo->fd->num,&dst_addr,
conversation = find_conversation(actx->pinfo->num,&dst_addr,
&null_addr, PT_UDP, BindingID_port,
0, NO_ADDR_B|NO_PORT_B);
if (conversation) {
@ -1275,7 +1275,7 @@ BindingID_port = 0;
/* It's not part of any conversation - create a new one. */
conversation = conversation_new(actx->pinfo->fd->num, &dst_addr,
conversation = conversation_new(actx->pinfo->num, &dst_addr,
&null_addr, PT_UDP,BindingID_port ,
0, NO_ADDR2|NO_PORT2);
@ -1288,7 +1288,7 @@ BindingID_port = 0;
umts_fp_conversation_info->division = Division_FDD;
umts_fp_conversation_info->channel = CHANNEL_EDCH;
umts_fp_conversation_info->dl_frame_number = 0;
umts_fp_conversation_info->ul_frame_number = actx->pinfo->fd->num;
umts_fp_conversation_info->ul_frame_number = actx->pinfo->num;
copy_address_wmem(wmem_file_scope(), &(umts_fp_conversation_info->crnc_address), &dst_addr);
umts_fp_conversation_info->crnc_port = BindingID_port;
@ -1320,7 +1320,7 @@ BindingID_port = 0;
nbap_edch_port_info->crnc_address = transportLayerAddress_ipv4;
nbap_debug("Frame %%u RL-Specific-E-DCH-Information-Item Start",
actx->pinfo->fd->num);
actx->pinfo->num);
nbap_debug(" g_tree_insert(edch_flow_port_map) com_context_id %%u e_dch_macdflow_id %%u IP %%s Port %%u",
umts_fp_conversation_info->com_context_id,
@ -1347,7 +1347,7 @@ BindingID_port = 0;
set_umts_fp_conv_data(conversation, umts_fp_conversation_info);
nbap_debug("Frame %%u RL-Specific-E-DCH-Information-Item End", actx->pinfo->fd->num);
nbap_debug("Frame %%u RL-Specific-E-DCH-Information-Item End", actx->pinfo->num);
}
}
@ -1366,7 +1366,7 @@ guint32 no_ddi_entries, i;
/* Check if we have conversation info */
set_address(&null_addr, AT_NONE, 0, NULL);
p_conv = find_conversation(actx->pinfo->fd->num, &nbap_edch_channel_info[e_dch_macdflow_id].crnc_address, &null_addr,
p_conv = find_conversation(actx->pinfo->num, &nbap_edch_channel_info[e_dch_macdflow_id].crnc_address, &null_addr,
PT_UDP,
nbap_edch_channel_info[e_dch_macdflow_id].crnc_port, 0, NO_ADDR_B);
if(!p_conv)
@ -1429,24 +1429,24 @@ BindingID_port = 0;
set_address(&dst_addr, AT_IPv4, 4, &transportLayerAddress_ipv4);
old_conversation = find_conversation(actx->pinfo->fd->num,&dst_addr,
old_conversation = find_conversation(actx->pinfo->num,&dst_addr,
&null_addr, PT_UDP, BindingID_port,
0, NO_ADDR_B|NO_PORT_B);
if(old_conversation){
nbap_debug("Frame %%u E-DCH-FDD-Information-to-Modify: found old conv on IP %%s Port %%u",
actx->pinfo->fd->num,
actx->pinfo->num,
address_to_str(wmem_packet_scope(), &dst_addr),
BindingID_port);
}else{
nbap_debug("Frame %%u E-DCH-FDD-Information-to-Modify: Did not find old conv on IP %%s Port %%u",
actx->pinfo->fd->num,
actx->pinfo->num,
address_to_str(wmem_packet_scope(), &dst_addr),
BindingID_port);
}
/* It's not part of any conversation - create a new one. */
conversation = conversation_new(actx->pinfo->fd->num, &dst_addr,
conversation = conversation_new(actx->pinfo->num, &dst_addr,
&null_addr, PT_UDP,BindingID_port ,
0, NO_ADDR2|NO_PORT2);
@ -1465,7 +1465,7 @@ BindingID_port = 0;
umts_fp_conversation_info->division = Division_FDD;
umts_fp_conversation_info->channel = CHANNEL_EDCH;
umts_fp_conversation_info->dl_frame_number = 0;
umts_fp_conversation_info->ul_frame_number = actx->pinfo->fd->num;
umts_fp_conversation_info->ul_frame_number = actx->pinfo->num;
copy_address_wmem(wmem_file_scope(), &(umts_fp_conversation_info->crnc_address), &dst_addr);
umts_fp_conversation_info->crnc_port = BindingID_port;
@ -1513,7 +1513,7 @@ num_items = 1;
}
nbap_debug("Frame %%u E-DCH-MACdFlow-Specific-InfoItem-to-Modify",
actx->pinfo->fd->num);
actx->pinfo->num);
/****** Look up old port and ip information since this is not included in this message ******/
/*Find proper communication context ID*/
@ -1548,7 +1548,7 @@ num_items = 1;
/*Do the configurations*/
/* Check if we have conversation info */
set_address(&null_addr, AT_NONE, 0, NULL);
p_conv = find_conversation(actx->pinfo->fd->num, &nbap_edch_channel_info[e_dch_macdflow_id].crnc_address, &null_addr,
p_conv = find_conversation(actx->pinfo->num, &nbap_edch_channel_info[e_dch_macdflow_id].crnc_address, &null_addr,
PT_UDP,
nbap_edch_channel_info[e_dch_macdflow_id].crnc_port, 0, NO_ADDR_B);
if(!p_conv)
@ -1787,19 +1787,19 @@ nbap_edch_channel_info[e_dch_macdflow_id].no_ddi_entries = num_items;
for (i = 0; i < maxNrOfMACdFlows; i++) {
if (nbap_hsdsch_channel_info[i].crnc_port != 0){
nbap_debug("Frame %%u HSDSCH-MACdFlows-Information:hsdsch_macdflow_id %%u Look for conv on IP %%s Port %%u",
actx->pinfo->fd->num,
actx->pinfo->num,
i,
address_to_str (wmem_packet_scope(), &(nbap_hsdsch_channel_info[i].crnc_address)),
nbap_hsdsch_channel_info[i].crnc_port);
conversation = find_conversation(actx->pinfo->fd->num, &(nbap_hsdsch_channel_info[i].crnc_address), &null_addr,
conversation = find_conversation(actx->pinfo->num, &(nbap_hsdsch_channel_info[i].crnc_address), &null_addr,
PT_UDP,
nbap_hsdsch_channel_info[i].crnc_port, 0, NO_ADDR_B);
if (conversation == NULL) {
/* It's not part of any conversation - create a new one. */
nbap_debug("Frame %%u HSDSCH-MACdFlows-Information: Set up conv on Port %%u", actx->pinfo->fd->num, nbap_hsdsch_channel_info[i].crnc_port);
conversation = conversation_new(actx->pinfo->fd->num, &(nbap_hsdsch_channel_info[i].crnc_address),
nbap_debug("Frame %%u HSDSCH-MACdFlows-Information: Set up conv on Port %%u", actx->pinfo->num, nbap_hsdsch_channel_info[i].crnc_port);
conversation = conversation_new(actx->pinfo->num, &(nbap_hsdsch_channel_info[i].crnc_address),
&null_addr, PT_UDP, nbap_hsdsch_channel_info[i].crnc_port,
0, NO_ADDR2|NO_PORT2);
@ -1814,7 +1814,7 @@ nbap_edch_channel_info[e_dch_macdflow_id].no_ddi_entries = num_items;
umts_fp_conversation_info->division = Division_FDD;
umts_fp_conversation_info->channel = CHANNEL_HSDSCH;
umts_fp_conversation_info->dl_frame_number = 0;
umts_fp_conversation_info->ul_frame_number = actx->pinfo->fd->num;
umts_fp_conversation_info->ul_frame_number = actx->pinfo->num;
copy_address_wmem(wmem_file_scope(), &(umts_fp_conversation_info->crnc_address), &nbap_hsdsch_channel_info[i].crnc_address);
umts_fp_conversation_info->crnc_port = nbap_hsdsch_channel_info[i].crnc_port;
@ -1899,7 +1899,7 @@ nbap_edch_channel_info[e_dch_macdflow_id].no_ddi_entries = num_items;
set_address(&null_addr, AT_NONE, 0, NULL);
nbap_debug("Frame %%u HSDSCH-MACdFlows-Information Start",
actx->pinfo->fd->num);
actx->pinfo->num);
for (i = 0; i < maxNrOfMACdFlows; i++) {
if (nbap_hsdsch_channel_info[i].crnc_port != 0){
@ -1907,7 +1907,7 @@ nbap_edch_channel_info[e_dch_macdflow_id].no_ddi_entries = num_items;
i,
address_to_str (wmem_packet_scope(), &(nbap_hsdsch_channel_info[i].crnc_address)),
nbap_hsdsch_channel_info[i].crnc_port);
conversation = find_conversation(actx->pinfo->fd->num, &(nbap_hsdsch_channel_info[i].crnc_address), &null_addr,
conversation = find_conversation(actx->pinfo->num, &(nbap_hsdsch_channel_info[i].crnc_address), &null_addr,
PT_UDP,
nbap_hsdsch_channel_info[i].crnc_port, 0, NO_ADDR_B);
@ -1916,7 +1916,7 @@ nbap_edch_channel_info[e_dch_macdflow_id].no_ddi_entries = num_items;
/* It's not part of any conversation - create a new one. */
nbap_debug(" Set up conv on Port %%u", nbap_hsdsch_channel_info[i].crnc_port);
conversation = conversation_new(actx->pinfo->fd->num, &(nbap_hsdsch_channel_info[i].crnc_address),
conversation = conversation_new(actx->pinfo->num, &(nbap_hsdsch_channel_info[i].crnc_address),
&null_addr, PT_UDP, nbap_hsdsch_channel_info[i].crnc_port,
0, NO_ADDR2|NO_PORT2);
@ -1931,7 +1931,7 @@ nbap_edch_channel_info[e_dch_macdflow_id].no_ddi_entries = num_items;
umts_fp_conversation_info->division = Division_FDD;
umts_fp_conversation_info->channel = CHANNEL_HSDSCH;
umts_fp_conversation_info->dl_frame_number = 0;
umts_fp_conversation_info->ul_frame_number = actx->pinfo->fd->num;
umts_fp_conversation_info->ul_frame_number = actx->pinfo->num;
copy_address_wmem(wmem_file_scope(), &(umts_fp_conversation_info->crnc_address), &nbap_hsdsch_channel_info[i].crnc_address);
umts_fp_conversation_info->crnc_port = nbap_hsdsch_channel_info[i].crnc_port;
@ -1967,7 +1967,7 @@ nbap_edch_channel_info[e_dch_macdflow_id].no_ddi_entries = num_items;
}
}
nbap_debug("Frame %%u HSDSCH-MACdFlows-Information End",
actx->pinfo->fd->num);
actx->pinfo->num);
}
@ -2034,12 +2034,12 @@ int i;
for (i = 0; i < maxNrOfCommonMACFlows; i++) {
if (nbap_common_channel_info[i].crnc_port != 0){
conversation = find_conversation(actx->pinfo->fd->num, &(nbap_common_channel_info[i].crnc_address), &null_addr,
conversation = find_conversation(actx->pinfo->num, &(nbap_common_channel_info[i].crnc_address), &null_addr,
PT_UDP,
nbap_common_channel_info[i].crnc_port, 0, NO_ADDR_B);
if (conversation == NULL) {
conversation = conversation_new(actx->pinfo->fd->num, &(nbap_common_channel_info[i].crnc_address),
conversation = conversation_new(actx->pinfo->num, &(nbap_common_channel_info[i].crnc_address),
&null_addr, PT_UDP, nbap_common_channel_info[i].crnc_port,
0, NO_ADDR2|NO_PORT2);
@ -2054,7 +2054,7 @@ int i;
umts_fp_conversation_info->division = Division_FDD;
umts_fp_conversation_info->dl_frame_number = 0;
umts_fp_conversation_info->ul_frame_number = actx->pinfo->fd->num;
umts_fp_conversation_info->ul_frame_number = actx->pinfo->num;
copy_address_wmem(wmem_file_scope(), &(umts_fp_conversation_info->crnc_address), &nbap_common_channel_info[i].crnc_address);
umts_fp_conversation_info->crnc_port = nbap_common_channel_info[i].crnc_port;
@ -2106,7 +2106,7 @@ if(crcn_context_present){
cur_val = g_new(nbap_com_context_id_t,1);
cur_val->crnc_context = com_context_id;
cur_val->frame_num = actx->pinfo->fd->num;
cur_val->frame_num = actx->pinfo->num;
g_tree_insert(com_context_map, GINT_TO_POINTER((gint)node_b_com_context_id), cur_val);
com_context_id = -1;
}
@ -2128,7 +2128,7 @@ int i;
set_address(&null_addr, AT_NONE, 0, NULL);
for (i = 0; i < maxNrOfMACdFlows; i++) {
if (nbap_hsdsch_channel_info[i].crnc_port != 0){
conversation = find_conversation(actx->pinfo->fd->num, &(nbap_hsdsch_channel_info[i].crnc_address), &null_addr,
conversation = find_conversation(actx->pinfo->num, &(nbap_hsdsch_channel_info[i].crnc_address), &null_addr,
PT_UDP,
nbap_hsdsch_channel_info[i].crnc_port, 0, NO_ADDR_B);
if(conversation != NULL){

6
asn1/nbap/packet-nbap-template.c
View File

@ -349,14 +349,14 @@ static void add_hsdsch_bind(packet_info *pinfo){
set_address(&null_addr, AT_NONE, 0, NULL);
for (i = 0; i < maxNrOfMACdFlows; i++) {
if (nbap_hsdsch_channel_info[i].crnc_port != 0){
conversation = find_conversation(pinfo->fd->num, &(nbap_hsdsch_channel_info[i].crnc_address), &null_addr,
conversation = find_conversation(pinfo->num, &(nbap_hsdsch_channel_info[i].crnc_address), &null_addr,
PT_UDP,
nbap_hsdsch_channel_info[i].crnc_port, 0, NO_ADDR_B);
if (conversation == NULL) {
/* It's not part of any conversation - create a new one. */
conversation = conversation_new(pinfo->fd->num, &(nbap_hsdsch_channel_info[i].crnc_address),
conversation = conversation_new(pinfo->num, &(nbap_hsdsch_channel_info[i].crnc_address),
&null_addr, PT_UDP, nbap_hsdsch_channel_info[i].crnc_port,
0, NO_ADDR2|NO_PORT2);
@ -371,7 +371,7 @@ static void add_hsdsch_bind(packet_info *pinfo){
umts_fp_conversation_info->division = Division_FDD;
umts_fp_conversation_info->channel = CHANNEL_HSDSCH;
umts_fp_conversation_info->dl_frame_number = 0;
umts_fp_conversation_info->ul_frame_number = pinfo->fd->num;
umts_fp_conversation_info->ul_frame_number = pinfo->num;
copy_address_wmem(wmem_file_scope(), &(umts_fp_conversation_info->crnc_address), &nbap_hsdsch_channel_info[i].crnc_address);
umts_fp_conversation_info->crnc_port = nbap_hsdsch_channel_info[i].crnc_port;

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

@ -142,7 +142,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->fd->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;
@ -184,7 +184,7 @@ find_oid_by_pres_ctx_id(packet_info *pinfo, guint32 idx)
conversation_t *conversation;
pco.ctx_id=idx;
conversation=find_conversation (pinfo->fd->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;

8
asn1/ros/packet-ros-template.c
View File

@ -288,11 +288,11 @@ ros_match_call_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gui
rcr.is_request = isInvoke;
if(isInvoke) {
rcr.req_frame=pinfo->fd->num;
rcr.req_frame=pinfo->num;
rcr.rep_frame=0;
} else {
rcr.req_frame=0;
rcr.rep_frame=pinfo->fd->num;
rcr.rep_frame=pinfo->num;
}
rcrp=(ros_call_response_t *)g_hash_table_lookup(ros_info->matched, &rcr);
@ -324,7 +324,7 @@ ros_match_call_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gui
rcrp=wmem_new(wmem_file_scope(), ros_call_response_t);
}
rcrp->invokeId=invokeId;
rcrp->req_frame=pinfo->fd->num;
rcrp->req_frame=pinfo->num;
rcrp->req_time=pinfo->abs_ts;
rcrp->rep_frame=0;
rcrp->is_request=TRUE;
@ -342,7 +342,7 @@ ros_match_call_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gui
if(!rcrp->rep_frame){
g_hash_table_remove(ros_info->unmatched, rcrp);
rcrp->rep_frame=pinfo->fd->num;
rcrp->rep_frame=pinfo->num;
rcrp->is_request=FALSE;
g_hash_table_insert(ros_info->matched, rcrp, rcrp);
}

4
asn1/rrc/rrc.cnf
View File

@ -417,7 +417,7 @@ fp_info *fpinf ;
fpinf = (fp_info *)p_get_proto_data(wmem_file_scope(), actx->pinfo, proto_fp, 0);
if(fpinf && ((c_inf = (rrc_ciphering_info *)g_tree_lookup(rrc_ciph_inf, GINT_TO_POINTER(fpinf->com_context_id))) != NULL) ){
c_inf->setup_frame = actx->pinfo->fd->num;
c_inf->setup_frame = actx->pinfo->num;
}
@ -883,7 +883,7 @@ HNBName TYPE=FT_STRING DISPLAY=STR_UNICODE
*start = tvb_get_bits32(start_val,0,20,ENC_BIG_ENDIAN);
if(c_inf && c_inf->start_ps)
/*Insert the value based on current frame num since this might vary over time*/
g_tree_insert(c_inf->start_ps, GUINT_TO_POINTER(actx->pinfo->fd->num), start);
g_tree_insert(c_inf->start_ps, GUINT_TO_POINTER(actx->pinfo->num), start);
break;
default:

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

@ -231,7 +231,7 @@ dissect_rtse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* d
((session->spdu_type == SES_DATA_TRANSFER) ||
(session->spdu_type == SES_MAJOR_SYNC_POINT))) {
/* Use conversation index as fragment id */
conversation = find_conversation (pinfo->fd->num,
conversation = find_conversation (pinfo->num,
&pinfo->src, &pinfo->dst, pinfo->ptype,
pinfo->srcport, pinfo->destport, 0);
if (conversation != NULL) {
@ -261,7 +261,7 @@ dissect_rtse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* d
data_tvb, 0, pinfo,
rtse_id, NULL,
fragment_length, TRUE);
if (frag_msg && pinfo->fd->num != frag_msg->reassembled_in) {
if (frag_msg && pinfo->num != frag_msg->reassembled_in) {
/* Add a "Reassembled in" link if not reassembled in this frame */
proto_tree_add_uint (tree, *(rtse_frag_items.hf_reassembled_in),
data_tvb, 0, 0, frag_msg->reassembled_in);

6
asn1/snmp/packet-snmp-template.c
View File

@ -2109,10 +2109,10 @@ dissect_snmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_
* wildcarded, and give it the SNMP dissector as a dissector.
*/
if (pinfo->destport == UDP_PORT_SNMP) {
conversation = find_conversation(pinfo->fd->num, &pinfo->src, &pinfo->dst, PT_UDP,
conversation = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst, PT_UDP,
pinfo->srcport, 0, NO_PORT_B);
if( (conversation == NULL) || (conversation_get_dissector(conversation, pinfo->fd->num)!=snmp_handle) ) {
conversation = conversation_new(pinfo->fd->num, &pinfo->src, &pinfo->dst, PT_UDP,
if( (conversation == NULL) || (conversation_get_dissector(conversation, pinfo->num)!=snmp_handle) ) {
conversation = conversation_new(pinfo->num, &pinfo->src, &pinfo->dst, PT_UDP,
pinfo->srcport, 0, NO_PORT2);
conversation_set_dissector(conversation, snmp_handle);
}

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

@ -608,7 +608,7 @@ decrypt_gssapi_krb_arcfour_wrap(proto_tree *tree _U_, packet_info *pinfo, tvbuff
if (ret >= 0) {
expert_add_info_format(pinfo, NULL, &ei_spnego_decrypted_keytype,
"Decrypted keytype %d in frame %u using %s",
ek->keytype, pinfo->fd->num, ek->key_origin);
ek->keytype, pinfo->num, ek->key_origin);
gssapi_encrypt->gssapi_decrypted_tvb=tvb_new_child_real_data(tvb,
output_message_buffer,
@ -1306,7 +1306,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->fd->num, &pinfo->src, &pinfo->dst,
conversation = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst,
pinfo->ptype, pinfo->srcport,
pinfo->destport, 0);

6
asn1/t38/packet-t38-template.c
View File

@ -378,7 +378,7 @@ force_reassemble_seq(reassembly_table *table, packet_info *pinfo, guint32 id)
/* mark this packet as defragmented */
fd_head->flags |= FD_DEFRAGMENTED;
fd_head->reassembled_in=pinfo->fd->num;
fd_head->reassembled_in=pinfo->num;
col_append_fstr(pinfo->cinfo, COL_INFO, " (t4-data Reassembled: %d pack lost, %d pack burst lost)", packet_lost, burst_lost);
@ -428,13 +428,13 @@ init_t38_info_conv(packet_info *pinfo)
/* find the conversation used for Reassemble and Setup Info */
p_conv = find_conversation(pinfo->fd->num, &pinfo->net_dst, &pinfo->net_src,
p_conv = find_conversation(pinfo->num, &pinfo->net_dst, &pinfo->net_src,
pinfo->ptype,
pinfo->destport, pinfo->srcport, NO_ADDR_B | NO_PORT_B);
/* create a conv if it doen't exist */
if (!p_conv) {
p_conv = conversation_new(pinfo->fd->num, &pinfo->net_src, &pinfo->net_dst,
p_conv = conversation_new(pinfo->num, &pinfo->net_src, &pinfo->net_dst,
pinfo->ptype, pinfo->srcport, pinfo->destport, NO_ADDR_B | NO_PORT_B);
/* Set dissector */

2
asn1/t38/t38.cnf
View File

@ -182,7 +182,7 @@ VAL_PTR=&Data_Field_field_type_value
/* if we have not reassembled this packet and it is the first fragment, reset the reassemble ID and the start seq number*/
if (p_t38_packet_conv && p_t38_conv && (p_t38_packet_conv_info->reass_ID == 0)) {
/* we use the first fragment's frame_number as fragment ID because the protocol doesn't provide it */
p_t38_conv_info->reass_ID = actx->pinfo->fd->num;
p_t38_conv_info->reass_ID = actx->pinfo->num;
p_t38_conv_info->reass_start_seqnum = seq_number;
p_t38_conv_info->time_first_t4_data = nstime_to_sec(&actx->pinfo->rel_ts);
p_t38_conv_info->additional_hdlc_data_field_counter = 0;

76
asn1/tcap/packet-tcap-template.c
View File

@ -317,7 +317,7 @@ static void
update_tcaphash_begincall(struct tcaphash_begincall_t *p_tcaphash_begincall,
packet_info *pinfo)
{
p_tcaphash_begincall->context->first_frame = pinfo->fd->num;
p_tcaphash_begincall->context->first_frame = pinfo->num;
p_tcaphash_begincall->context->last_frame = 0;
p_tcaphash_begincall->context->responded = FALSE;
p_tcaphash_begincall->context->begin_time = pinfo->abs_ts;
@ -345,7 +345,7 @@ append_tcaphash_begincall(struct tcaphash_begincall_t *prev_begincall,
p_new_tcaphash_begincall->context=p_tcaphash_context;
p_tcaphash_context->begincall=p_new_tcaphash_begincall;
p_new_tcaphash_begincall->beginkey=prev_begincall->beginkey;
p_new_tcaphash_begincall->context->first_frame = pinfo->fd->num;
p_new_tcaphash_begincall->context->first_frame = pinfo->num;
p_new_tcaphash_begincall->next_begincall=NULL;
p_new_tcaphash_begincall->previous_begincall=prev_begincall;
p_new_tcaphash_begincall->father=FALSE;
@ -359,7 +359,7 @@ append_tcaphash_begincall(struct tcaphash_begincall_t *prev_begincall,
#ifdef DEBUG_TCAPSRT
dbg(10,"last ");
#endif
prev_begincall->context->last_frame = pinfo->fd->num-1;
prev_begincall->context->last_frame = pinfo->num-1;
}
return p_new_tcaphash_begincall;
}
@ -371,7 +371,7 @@ static void
update_tcaphash_ansicall(struct tcaphash_ansicall_t *p_tcaphash_ansicall,
packet_info *pinfo)
{
p_tcaphash_ansicall->context->first_frame = pinfo->fd->num;
p_tcaphash_ansicall->context->first_frame = pinfo->num;
p_tcaphash_ansicall->context->last_frame = 0;
p_tcaphash_ansicall->context->responded = FALSE;
p_tcaphash_ansicall->context->begin_time = pinfo->abs_ts;
@ -399,7 +399,7 @@ append_tcaphash_ansicall(struct tcaphash_ansicall_t *prev_ansicall,
p_new_tcaphash_ansicall->context=p_tcaphash_context;
p_tcaphash_context->ansicall=p_new_tcaphash_ansicall;
p_new_tcaphash_ansicall->ansikey=prev_ansicall->ansikey;
p_new_tcaphash_ansicall->context->first_frame = pinfo->fd->num;
p_new_tcaphash_ansicall->context->first_frame = pinfo->num;
p_new_tcaphash_ansicall->next_ansicall=NULL;
p_new_tcaphash_ansicall->previous_ansicall=prev_ansicall;
p_new_tcaphash_ansicall->father=FALSE;
@ -413,7 +413,7 @@ append_tcaphash_ansicall(struct tcaphash_ansicall_t *prev_ansicall,
#ifdef DEBUG_TCAPSRT
dbg(10,"last ");
#endif
prev_ansicall->context->last_frame = pinfo->fd->num-1;
prev_ansicall->context->last_frame = pinfo->num-1;
}
return p_new_tcaphash_ansicall;
}
@ -493,11 +493,11 @@ find_tcaphash_begin(struct tcaphash_begin_info_key_t *p_tcaphash_begin_key,
do {
if ( p_tcaphash_begincall->context ) {
if ( ( isBegin &&
pinfo->fd->num == p_tcaphash_begincall->context->first_frame )
pinfo->num == p_tcaphash_begincall->context->first_frame )
||
( !isBegin &&
pinfo->fd->num >= p_tcaphash_begincall->context->first_frame &&
( p_tcaphash_begincall->context->last_frame?pinfo->fd->num <= p_tcaphash_begincall->context->last_frame:1 )
pinfo->num >= p_tcaphash_begincall->context->first_frame &&
( p_tcaphash_begincall->context->last_frame?pinfo->num <= p_tcaphash_begincall->context->last_frame:1 )
)
) {
/* We have a dialogue, with this key, opened before this request */
@ -539,8 +539,8 @@ find_tcaphash_cont(struct tcaphash_cont_info_key_t *p_tcaphash_cont_key,
if(p_tcaphash_contcall) {
do {
if ( p_tcaphash_contcall->context ) {
if (pinfo->fd->num >= p_tcaphash_contcall->context->first_frame &&
(p_tcaphash_contcall->context->last_frame?pinfo->fd->num <= p_tcaphash_contcall->context->last_frame:1) ) {
if (pinfo->num >= p_tcaphash_contcall->context->first_frame &&
(p_tcaphash_contcall->context->last_frame?pinfo->num <= p_tcaphash_contcall->context->last_frame:1) ) {
/* We have a dialogue, with this key, opened before this request */
#ifdef DEBUG_TCAPSRT
dbg(10,"C%d ", p_tcaphash_contcall->context->session_id);
@ -579,12 +579,12 @@ find_tcaphash_end(struct tcaphash_end_info_key_t *p_tcaphash_end_key,
do {
if ( p_tcaphash_endcall->context ) {
if ( ( isEnd &&
(p_tcaphash_endcall->context->last_frame?pinfo->fd->num == p_tcaphash_endcall->context->last_frame:1)
(p_tcaphash_endcall->context->last_frame?pinfo->num == p_tcaphash_endcall->context->last_frame:1)
)
||
( !isEnd &&
pinfo->fd->num >= p_tcaphash_endcall->context->first_frame &&
(p_tcaphash_endcall->context->last_frame?pinfo->fd->num <= p_tcaphash_endcall->context->last_frame:1)
pinfo->num >= p_tcaphash_endcall->context->first_frame &&
(p_tcaphash_endcall->context->last_frame?pinfo->num <= p_tcaphash_endcall->context->last_frame:1)
)
) {
/* We have a dialogue, with this key, opened before this request */
@ -642,7 +642,7 @@ new_tcaphash_context(struct tcaphash_context_key_t *p_tcaphash_context_key,
#endif
p_new_tcaphash_context->key = p_new_tcaphash_context_key;
p_new_tcaphash_context->session_id = p_tcaphash_context_key->session_id;
p_new_tcaphash_context->first_frame = pinfo->fd->num;
p_new_tcaphash_context->first_frame = pinfo->num;
#ifdef DEBUG_TCAPSRT
dbg(10,"S%d ", p_new_tcaphash_context->session_id);
#endif
@ -985,7 +985,7 @@ tcaphash_begin_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
/* look up the request */
#ifdef DEBUG_TCAPSRT
dbg(10,"\n Hbegin #%u ", pinfo->fd->num);
dbg(10,"\n Hbegin #%u ", pinfo->num);
dbg(11,"key %lx ",tcaphash_begin_key.hashKey);
dbg(51,"addr %s ", address_to_str(wmem_packet_scope(), &pinfo->src));
dbg(51,"Tid %lx \n",tcaphash_begin_key.tid);
@ -998,7 +998,7 @@ tcaphash_begin_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
/* Walk through list of transaction with identical keys */
do {
/* Check if the request with this reqSeqNum has been seen, with the same Message Type */
if (pinfo->fd->num == p_tcaphash_begincall->context->first_frame) {
if (pinfo->num == p_tcaphash_begincall->context->first_frame) {
/* We have seen this request before -> do nothing */
#ifdef DEBUG_TCAPSRT
dbg(22,"Already seen ");
@ -1017,11 +1017,11 @@ tcaphash_begin_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
and this request appears after last request (has bigger frame number)
and this request occurred after the timeout for message lost */
if ( ( p_tcaphash_begincall->context->last_frame != 0
&& pinfo->fd->num > p_tcaphash_begincall->context->first_frame
&& pinfo->num > p_tcaphash_begincall->context->first_frame
&& (guint) pinfo->abs_ts.secs > (guint)(p_tcaphash_begincall->context->begin_time.secs + gtcap_RepetitionTimeout)
) ||
( p_tcaphash_begincall->context->last_frame == 0
&& pinfo->fd->num > p_tcaphash_begincall->context->first_frame
&& pinfo->num > p_tcaphash_begincall->context->first_frame
&& (guint)pinfo->abs_ts.secs > (guint)(p_tcaphash_begincall->context->begin_time.secs + gtcap_LostTimeout)
)
)
@ -1030,7 +1030,7 @@ tcaphash_begin_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
/* Append new record to the list */
#ifdef DEBUG_TCAPSRT
dbg(12,"(timeout) Append key %lx ",tcaphash_begin_key.hashKey);
dbg(12,"Frame %u rsp %u ",pinfo->fd->num,p_tcaphash_begincall->context->last_frame );
dbg(12,"Frame %u rsp %u ",pinfo->num,p_tcaphash_begincall->context->last_frame );
#endif
tcaphash_context_key.session_id = tcapsrt_global_SessionId++;
p_tcaphash_context = new_tcaphash_context(&tcaphash_context_key, pinfo);
@ -1051,7 +1051,7 @@ tcaphash_begin_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
if ( p_tcaphash_begincall->context->closed) {
#ifdef DEBUG_TCAPSRT
dbg(12,"(closed) Append key %lu ",tcaphash_begin_key.hashKey);
dbg(12,"Frame %u rsp %u ",pinfo->fd->num,p_tcaphash_begincall->context->last_frame );
dbg(12,"Frame %u rsp %u ",pinfo->num,p_tcaphash_begincall->context->last_frame );
#endif
tcaphash_context_key.session_id = tcapsrt_global_SessionId++;
p_tcaphash_context = new_tcaphash_context(&tcaphash_context_key, pinfo);
@ -1105,7 +1105,7 @@ tcaphash_begin_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
#ifdef DEBUG_TCAPSRT
dbg(11,"Update key %lx ",tcaphash_begin_key.hashKey);
dbg(11,"Frame reqlink #%u ", pinfo->fd->num);
dbg(11,"Frame reqlink #%u ", pinfo->num);
#endif
update_tcaphash_begincall(p_tcaphash_begincall, pinfo);
}
@ -1159,7 +1159,7 @@ tcaphash_cont_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
#ifdef DEBUG_TCAPSRT
dbg(51,"src %s srcTid %lx dst %s dstTid %lx ", address_to_str(wmem_packet_scope(), &pinfo->src), p_tcapsrt_info->src_tid, address_to_str(wmem_packet_scope(), &pinfo->dst), p_tcapsrt_info->dst_tid);
dbg(10,"\n Hcont #%u ", pinfo->fd->num);
dbg(10,"\n Hcont #%u ", pinfo->num);
#endif
/* look only for matching request, if matching conversation is available. */
@ -1243,7 +1243,7 @@ tcaphash_cont_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
#ifdef DEBUG_TCAPSRT
dbg(10,"New Ckey %lx ",tcaphash_cont_key.hashKey);
dbg(11,"Frame reqlink #%u \n", pinfo->fd->num);
dbg(11,"Frame reqlink #%u \n", pinfo->num);
#endif
create_tcaphash_cont(&tcaphash_cont_key,
p_tcaphash_begincall->context);
@ -1264,7 +1264,7 @@ tcaphash_cont_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
dbg(10,"New Ekey %lx ",tcaphash_end_key.hashKey);
dbg(51,"addr %s ", address_to_str(wmem_packet_scope(), &pinfo->src));
dbg(51,"Tid %lx ",tcaphash_end_key.tid);
dbg(11,"Frame reqlink #%u ", pinfo->fd->num);
dbg(11,"Frame reqlink #%u ", pinfo->num);
#endif
create_tcaphash_end(&tcaphash_end_key,
p_tcaphash_begincall->context);
@ -1317,7 +1317,7 @@ tcaphash_end_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
#ifdef DEBUG_TCAPSRT
dbg(51,"src %s dst %s dstTid %lx ", address_to_str(wmem_packet_scope(), &pinfo->src), address_to_str(wmem_packet_scope(), &pinfo->dst), p_tcapsrt_info->dst_tid);
dbg(10,"\n Hend #%u ", pinfo->fd->num);
dbg(10,"\n Hend #%u ", pinfo->num);
#endif
/* look only for matching request, if matching conversation is available. */
tcaphash_end_key.tid = p_tcapsrt_info->dst_tid;
@ -1453,7 +1453,7 @@ tcaphash_ansi_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
/* look up the request */
#ifdef DEBUG_TCAPSRT
dbg(10,"\n Hansi #%u ", pinfo->fd->num);
dbg(10,"\n Hansi #%u ", pinfo->num);
dbg(11,"key %lx ",tcaphash_ansi_key.hashKey);
dbg(51,"PC %s %s ",address_to_str(wmem_packet_scope(), &pinfo->src), address_to_str(wmem_packet_scope(), &pinfo->dst));
dbg(51,"Tid %lx ",tcaphash_ansi_key.tid);
@ -1465,7 +1465,7 @@ tcaphash_ansi_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
/* Walk through list of transaction with identical keys */
do {
/* Check if the request with this reqSeqNum has been seen */
if (pinfo->fd->num == p_tcaphash_ansicall->context->first_frame) {
if (pinfo->num == p_tcaphash_ansicall->context->first_frame) {
/* We have seen this request before -> do nothing */
#ifdef DEBUG_TCAPSRT
dbg(22,"Request already seen ");
@ -1476,7 +1476,7 @@ tcaphash_ansi_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
}
/* Check if the reponse with this reqSeqNum has been seen */
if (pinfo->fd->num == p_tcaphash_ansicall->context->last_frame) {
if (pinfo->num == p_tcaphash_ansicall->context->last_frame) {
/* We have seen this response before -> do nothing */
#ifdef DEBUG_TCAPSRT
dbg(22,"Response already seen ");
@ -1488,14 +1488,14 @@ tcaphash_ansi_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
/* Check for the first Request without Response
received before this frame */
if ( pinfo->fd->num > p_tcaphash_ansicall->context->first_frame &&
if ( pinfo->num > p_tcaphash_ansicall->context->first_frame &&
p_tcaphash_ansicall->context->last_frame==0 ) {
/* Take it, and update the context */
#ifdef DEBUG_TCAPSRT
dbg(12,"Update key %lx ",tcaphash_ansi_key.hashKey);
#endif
p_tcaphash_ansicall->context->last_frame = pinfo->fd->num;
p_tcaphash_ansicall->context->last_frame = pinfo->num;
p_tcaphash_ansicall->context->responded = TRUE;
p_tcaphash_ansicall->context->closed = TRUE;
p_tcaphash_context=p_tcaphash_ansicall->context;
@ -1539,11 +1539,11 @@ tcaphash_ansi_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
and this request appears after last request (has bigger frame number)
and this request occurred after the timeout for message lost */
if ( ( p_tcaphash_ansicall->context->last_frame != 0
&& pinfo->fd->num > p_tcaphash_ansicall->context->first_frame
&& pinfo->num > p_tcaphash_ansicall->context->first_frame
&& (guint) pinfo->abs_ts.secs > (guint)(p_tcaphash_ansicall->context->begin_time.secs + gtcap_RepetitionTimeout)
) ||
( p_tcaphash_ansicall->context->last_frame == 0
&& pinfo->fd->num > p_tcaphash_ansicall->context->first_frame
&& pinfo->num > p_tcaphash_ansicall->context->first_frame
&& (guint)pinfo->abs_ts.secs > (guint)(p_tcaphash_ansicall->context->begin_time.secs + gtcap_LostTimeout)
)
)
@ -1552,7 +1552,7 @@ tcaphash_ansi_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
/* Append new record to the list */
#ifdef DEBUG_TCAPSRT
dbg(12,"(timeout) Append key %lx ",tcaphash_ansi_key.hashKey);
dbg(12,"Frame %u rsp %u ",pinfo->fd->num,p_tcaphash_ansicall->context->last_frame );
dbg(12,"Frame %u rsp %u ",pinfo->num,p_tcaphash_ansicall->context->last_frame );
#endif
tcaphash_context_key.session_id = tcapsrt_global_SessionId++;
p_tcaphash_context = new_tcaphash_context(&tcaphash_context_key, pinfo);
@ -1571,7 +1571,7 @@ tcaphash_ansi_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
if ( p_tcaphash_ansicall->context->closed) {
#ifdef DEBUG_TCAPSRT
dbg(12,"(closed) Append key %lu ",tcaphash_ansi_key.hashKey);
dbg(12,"Frame %u rsp %u ",pinfo->fd->num,p_tcaphash_ansicall->context->last_frame );
dbg(12,"Frame %u rsp %u ",pinfo->num,p_tcaphash_ansicall->context->last_frame );
#endif
tcaphash_context_key.session_id = tcapsrt_global_SessionId++;
p_tcaphash_context = new_tcaphash_context(&tcaphash_context_key, pinfo);
@ -1637,7 +1637,7 @@ tcaphash_ansi_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
#ifdef DEBUG_TCAPSRT
dbg(11,"Update key %lx ",tcaphash_ansi_key.hashKey);
dbg(11,"Frame reqlink #%u ", pinfo->fd->num);
dbg(11,"Frame reqlink #%u ", pinfo->num);
#endif
update_tcaphash_ansicall(p_tcaphash_ansicall, pinfo);
}
@ -1710,7 +1710,7 @@ tcapsrt_call_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
struct tcaphash_context_t *tcap_context=NULL;
/* if this packet isn't loaded because of a read filter, don't output anything */
if(pinfo == NULL || pinfo->fd->num == 0) {
if(pinfo == NULL || pinfo->num == 0) {
return NULL;
}
@ -1795,7 +1795,7 @@ tcapsrt_close(struct tcaphash_context_t *p_tcaphash_context,
#endif
if (p_tcaphash_context) {
p_tcaphash_context->responded=TRUE;
p_tcaphash_context->last_frame = pinfo->fd->num;
p_tcaphash_context->last_frame = pinfo->num;
p_tcaphash_context->end_time = pinfo->abs_ts;
p_tcaphash_context->closed=TRUE;

18
epan/conversation.c
View File

@ -1312,12 +1312,12 @@ try_conversation_dissector(const address *addr_a, const address *addr_b, const p
{
conversation_t *conversation;
conversation = find_conversation(pinfo->fd->num, addr_a, addr_b, ptype, port_a,
conversation = find_conversation(pinfo->num, addr_a, addr_b, ptype, port_a,
port_b, 0);
if (conversation != NULL) {
int ret;
dissector_handle_t handle = (dissector_handle_t)wmem_tree_lookup32_le(conversation->dissector_tree, pinfo->fd->num);
dissector_handle_t handle = (dissector_handle_t)wmem_tree_lookup32_le(conversation->dissector_tree, pinfo->num);
if (handle == NULL)
return FALSE;
ret=call_dissector_only(handle, tvb, pinfo, tree, data);
@ -1345,25 +1345,25 @@ find_or_create_conversation(packet_info *pinfo)
conversation_t *conv=NULL;
DPRINT(("called for frame #%d: %s:%d -> %s:%d (ptype=%d)",
pinfo->fd->num, address_to_str(wmem_packet_scope(), &pinfo->src), pinfo->srcport,
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->fd->num, &pinfo->src, &pinfo->dst,
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->fd->num, conv->last_frame));
if (pinfo->fd->num > conv->last_frame) {
conv->last_frame = pinfo->fd->num;
pinfo->num, conv->last_frame));
if (pinfo->num > conv->last_frame) {
conv->last_frame = pinfo->num;
}
} else {
/* No, this is a new conversation. */
DPRINT(("did not find previous conversation for frame #%d",
pinfo->fd->num));
pinfo->num));
DINDENT();
conv = conversation_new(pinfo->fd->num, &pinfo->src,
conv = conversation_new(pinfo->num, &pinfo->src,
&pinfo->dst, pinfo->ptype,
pinfo->srcport, pinfo->destport, 0);
DENDENT();

6
epan/dissectors/file-btsnoop.c
View File

@ -192,7 +192,7 @@ dissect_btsnoop(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data
if (pref_dissect_next_layer) switch (datalink) {\
case 1001: /* H1 */
pinfo->fd->num = frame_number;
pinfo->num = frame_number;
pinfo->abs_ts = timestamp;
pinfo->pseudo_header->bthci.sent = (flags & 0x01) ? FALSE : TRUE;
@ -209,7 +209,7 @@ dissect_btsnoop(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data
call_dissector(hci_h1_handle, next_tvb, pinfo, payload_tree);
break;
case 1002: /* H4 */
pinfo->fd->num = frame_number;
pinfo->num = frame_number;
pinfo->abs_ts = timestamp;
pinfo->p2p_dir = (flags & 0x01) ? P2P_DIR_RECV : P2P_DIR_SENT;
@ -217,7 +217,7 @@ dissect_btsnoop(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data
call_dissector(hci_h4_handle, next_tvb, pinfo, payload_tree);
break;
case 2001: /* Linux Monitor */
pinfo->fd->num = frame_number;
pinfo->num = frame_number;
pinfo->abs_ts = timestamp;
pinfo->pseudo_header->btmon.opcode = flags & 0xFFFF;

4
epan/dissectors/file-file.c
View File

@ -119,7 +119,7 @@ dissect_file_record(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree,
ti = proto_tree_add_protocol_format(tree, proto_file, tvb, 0, -1,
"File record %u: %u byte%s",
pinfo->fd->num, frame_len, frame_plurality);
pinfo->num, frame_len, frame_plurality);
proto_item_append_text(ti, ", %u byte%s",
cap_len, cap_plurality);
@ -127,7 +127,7 @@ dissect_file_record(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree,
proto_tree_add_int(fh_tree, hf_file_ftap_encap, tvb, 0, 0, pinfo->pkt_encap);
proto_tree_add_uint(fh_tree, hf_file_record_number, tvb, 0, 0, pinfo->fd->num);
proto_tree_add_uint(fh_tree, hf_file_record_number, tvb, 0, 0, pinfo->num);
proto_tree_add_uint_format(fh_tree, hf_file_record_len, tvb,
0, 0, frame_len, "Record Length: %u byte%s (%u bits)",

2
epan/dissectors/file-pcap.c
View File

@ -182,7 +182,7 @@ dissect_pcap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_
packet_data_item = proto_tree_add_item(packet_tree, hf_pcap_packet_data, tvb, offset, length, ENC_NA);
packet_data_tree = proto_item_add_subtree(packet_data_item, ett_pcap_packet_data);
pinfo->fd->num = frame_number;
pinfo->num = frame_number;
pinfo->abs_ts = timestamp;
if (pref_dissect_next_layer) {

6
epan/dissectors/file-pcapng.c
View File

@ -1024,7 +1024,7 @@ static gint dissect_block(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb,
struct interface_description *interface_description;
proto_tree *packet_data_tree = proto_item_add_subtree(packet_data_item, ett_pcapng_packet_data);
pinfo->fd->num = info->frame_number;
pinfo->num = info->frame_number;
interface_description = (struct interface_description *) wmem_array_index(info->interfaces, interface_id);
TRY {
@ -1062,7 +1062,7 @@ static gint dissect_block(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb,
struct interface_description *interface_description;
proto_tree *packet_data_tree = proto_item_add_subtree(packet_data_item, ett_pcapng_packet_data);
pinfo->fd->num = info->frame_number;
pinfo->num = info->frame_number;
interface_description = (struct interface_description *) wmem_array_index(info->interfaces, interface_id);
TRY {
@ -1227,7 +1227,7 @@ static gint dissect_block(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb,
struct interface_description *interface_description;
proto_tree *packet_data_tree = proto_item_add_subtree(packet_data_item, ett_pcapng_packet_data);
pinfo->fd->num = info->frame_number;
pinfo->num = info->frame_number;
interface_description = (struct interface_description *) wmem_array_index(info->interfaces, interface_id);
TRY {

4
epan/dissectors/packet-9p.c
View File

@ -1134,7 +1134,7 @@ static void conv_set_fid_nocopy(packet_info *pinfo, guint32 fid, const char *pat
}
/* fill it */
wmem_tree_insert32((wmem_tree_t *)val->data, pinfo->fd->num, (void *)path);
wmem_tree_insert32((wmem_tree_t *)val->data, pinfo->num, (void *)path);
}
static void conv_set_fid(packet_info *pinfo, guint32 fid, const gchar *path, gsize len)
@ -1162,7 +1162,7 @@ static const char *conv_get_fid(packet_info *pinfo, guint32 fid)
/* -1 because the fid needs to have been set on a previous message.
Let's ignore the possibility of num == 0... */
return (char*)wmem_tree_lookup32_le((wmem_tree_t*)val->data, pinfo->fd->num-1);
return (char*)wmem_tree_lookup32_le((wmem_tree_t*)val->data, pinfo->num-1);
}
static inline void conv_free_fid(packet_info *pinfo, guint32 fid)

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

@ -256,7 +256,7 @@ dissect_acr122(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
k_bus_id = bus_id;
k_device_address = device_address;
k_endpoint = endpoint;
k_frame_number = pinfo->fd->num;
k_frame_number = pinfo->num;
key[0].length = 1;
key[0].key = &k_bus_id;
@ -472,7 +472,7 @@ dissect_acr122(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
command_data->endpoint = endpoint;
command_data->command = command;
command_data->command_frame_number = pinfo->fd->num;
command_data->command_frame_number = pinfo->num;
command_data->response_frame_number = 0;
wmem_tree_insert32_array(command_info, key, command_data);
@ -488,15 +488,15 @@ dissect_acr122(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
wmem_tree = (wmem_tree_t *) wmem_tree_lookup32_array(command_info, key);
if (wmem_tree) {
command_data = (command_data_t *) wmem_tree_lookup32_le(wmem_tree, pinfo->fd->num);
command_data = (command_data_t *) wmem_tree_lookup32_le(wmem_tree, pinfo->num);
if (command_data && (command_data->response_frame_number == 0 ||
command_data->response_frame_number == pinfo->fd->num)) {
command_data->response_frame_number == pinfo->num)) {
command = command_data->command;
command_frame_number = command_data->command_frame_number;
if (!pinfo->fd->flags.visited && command_data->response_frame_number == 0) {
command_data->response_frame_number = pinfo->fd->num;
command_data->response_frame_number = pinfo->num;
}
}
}

14
epan/dissectors/packet-adb.c
View File

@ -165,7 +165,7 @@ save_command(guint32 cmd, guint32 arg0, guint32 arg1, guint32 data_length,
gint direction = P2P_DIR_UNKNOWN;
usb_conv_info_t *usb_conv_info = (usb_conv_info_t *) data;
frame_number = pinfo->fd->num;
frame_number = pinfo->num;
if (pinfo->phdr->presence_flags & WTAP_HAS_INTERFACE_ID)
interface_id = pinfo->phdr->interface_id;
@ -229,7 +229,7 @@ save_command(guint32 cmd, guint32 arg0, guint32 arg1, guint32 data_length,
if (cmd == A_OPEN) {
service_data = wmem_new(wmem_file_scope(), service_data_t);
service_data->start_in_frame = pinfo->fd->num;
service_data->start_in_frame = pinfo->num;
service_data->close_local_in_frame = max_in_frame;
service_data->close_remote_in_frame = max_in_frame;
@ -247,13 +247,13 @@ save_command(guint32 cmd, guint32 arg0, guint32 arg1, guint32 data_length,
command_data->arg0 = arg0;
command_data->arg1 = arg1;
command_data->command_in_frame = pinfo->fd->num;
command_data->command_in_frame = pinfo->num;
command_data->response_in_frame = max_in_frame;
command_data->crc32 = crc32;
command_data->data_length = data_length;
if (data_length == 0)
command_data->completed_in_frame = pinfo->fd->num;
command_data->completed_in_frame = pinfo->num;
else
command_data->completed_in_frame = max_in_frame;
command_data->reassemble_data_length = 0;
@ -315,9 +315,9 @@ save_command(guint32 cmd, guint32 arg0, guint32 arg1, guint32 data_length,
} else if (cmd == A_CLSE) {
if (service_data) {
if (direction == P2P_DIR_RECV && service_data->local_id == arg1)
service_data->close_local_in_frame = pinfo->fd->num;
service_data->close_local_in_frame = pinfo->num;
else if (direction == P2P_DIR_SENT && service_data->remote_id == arg1)
service_data->close_remote_in_frame = pinfo->fd->num;
service_data->close_remote_in_frame = pinfo->num;
}
}
@ -367,7 +367,7 @@ dissect_adb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
main_item = proto_tree_add_item(tree, proto_adb, tvb, offset, -1, ENC_NA);
main_tree = proto_item_add_subtree(main_item, ett_adb);
frame_number = pinfo->fd->num;
frame_number = pinfo->num;
/* XXX: Why? If interface is USB only first try is correct
* (and seems strange...), in other cases standard check for

20
epan/dissectors/packet-adb_cs.c
View File

@ -131,14 +131,14 @@ dissect_adb_cs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _
key[3].key = NULL;
subtree = (wmem_tree_t *) wmem_tree_lookup32_array(client_requests, key);
client_request = (subtree) ? (client_request_t *) wmem_tree_lookup32_le(subtree, pinfo->fd->num) : NULL;
if (client_request && client_request->service_in > -1 && client_request->service_in < pinfo->fd->num) {
client_request = (subtree) ? (client_request_t *) wmem_tree_lookup32_le(subtree, pinfo->num) : NULL;
if (client_request && client_request->service_in > -1 && client_request->service_in < pinfo->num) {
p_item = proto_tree_add_string(main_tree, hf_service, tvb, offset, 0, client_request->service);
PROTO_ITEM_SET_GENERATED(p_item);
service = client_request->service;
client_request_service = TRUE;
} else {
if (client_request && client_request->service_in > -1 && client_request->service_in <= pinfo->fd->num)
if (client_request && client_request->service_in > -1 && client_request->service_in <= pinfo->num)
client_request_service = TRUE;
client_request = NULL;
}
@ -193,7 +193,7 @@ dissect_adb_cs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _
key[2].length = 1;
key[2].key = &pinfo->destport;
key[3].length = 1;
key[3].key = &pinfo->fd->num;
key[3].key = &pinfo->num;
key[4].length = 0;
key[4].key = NULL;
@ -202,7 +202,7 @@ dissect_adb_cs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _
client_request->service_length = length;
client_request->service = SERVICE_NONE;
client_request->response_frame = -1;
client_request->first_in = pinfo->fd->num;
client_request->first_in = pinfo->num;
client_request->service_in = -1;
client_request->data_length = -1;
wmem_tree_insert32_array(client_requests, key, client_request);
@ -223,14 +223,14 @@ dissect_adb_cs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _
key[3].key = NULL;
subtree = (wmem_tree_t *) wmem_tree_lookup32_array(client_requests, key);
client_request = (subtree) ? (client_request_t *) wmem_tree_lookup32_le(subtree, pinfo->fd->num - 1) : NULL;
client_request = (subtree) ? (client_request_t *) wmem_tree_lookup32_le(subtree, pinfo->num - 1) : NULL;
}
if (client_request) {
client_request->service = (guint8 *) wmem_alloc(wmem_file_scope(), (const size_t)(client_request->service_length + 1));
tvb_memcpy(tvb, client_request->service, offset, (size_t) client_request->service_length);
client_request->service[client_request->service_length] = '\0';
client_request->service_in = pinfo->fd->num;
client_request->service_in = pinfo->num;
}
}
@ -268,7 +268,7 @@ dissect_adb_cs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _
key[3].key = NULL;
subtree = (wmem_tree_t *) wmem_tree_lookup32_array(client_requests, key);
client_request = (subtree) ? (client_request_t *) wmem_tree_lookup32_le(subtree, pinfo->fd->num - 1) : NULL;
client_request = (subtree) ? (client_request_t *) wmem_tree_lookup32_le(subtree, pinfo->num - 1) : NULL;
if (client_request) {
service = client_request->service;
status = client_request->status;
@ -291,7 +291,7 @@ dissect_adb_cs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _
return tvb_captured_length(tvb);
}
if (response_frame == -1 || response_frame == (gint64) pinfo->fd->num) {
if (response_frame == -1 || response_frame == (gint64) pinfo->num) {
proto_tree_add_item(main_tree, hf_status, tvb, offset, 4, ENC_NA | ENC_ASCII);
col_append_fstr(pinfo->cinfo, COL_INFO, " Status=%c%c%c%c", tvb_get_guint8(tvb, offset),
tvb_get_guint8(tvb, offset + 1), tvb_get_guint8(tvb, offset + 2), tvb_get_guint8(tvb, offset + 3));
@ -310,7 +310,7 @@ dissect_adb_cs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _
}
if (!pinfo->fd->flags.visited && client_request) {
client_request->response_frame = pinfo->fd->num;
client_request->response_frame = pinfo->num;
client_request->status = status;
client_request->data_length = length;
}

34
epan/dissectors/packet-adb_service.c
View File

@ -184,21 +184,21 @@ dissect_adb_service(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *d
key[i_key].key = NULL;
subtree = (wmem_tree_t *) wmem_tree_lookup32_array(continuation_infos, key);
continuation_data = (subtree) ? (continuation_data_t *) wmem_tree_lookup32_le(subtree, pinfo->fd->num) : NULL;
if (continuation_data && continuation_data->completed_in_frame < pinfo->fd->num)
continuation_data = (subtree) ? (continuation_data_t *) wmem_tree_lookup32_le(subtree, pinfo->num) : NULL;
if (continuation_data && continuation_data->completed_in_frame < pinfo->num)
continuation_data = NULL;
if (!continuation_data || (continuation_data && continuation_data->length_in_frame == pinfo->fd->num))
if (!continuation_data || (continuation_data && continuation_data->length_in_frame == pinfo->num))
offset = dissect_ascii_uint32(main_tree, hf_hex_ascii_length, ett_length, hf_length, tvb, offset, &data_length);
if (!pinfo->fd->flags.visited && !continuation_data && tvb_reported_length_remaining(tvb, offset) < 4) {
key[i_key].length = 1;
key[i_key++].key = &pinfo->fd->num;
key[i_key++].key = &pinfo->num;
key[i_key].length = 0;
key[i_key].key = NULL;
continuation_data = wmem_new(wmem_file_scope(), continuation_data_t);
continuation_data->length_in_frame = pinfo->fd->num;
continuation_data->length_in_frame = pinfo->num;
continuation_data->completed_in_frame = G_MAXUINT32;
continuation_data->length = data_length;
@ -207,9 +207,9 @@ dissect_adb_service(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *d
}
if (tvb_reported_length_remaining(tvb, offset) >= 4 ||
(continuation_data && continuation_data->completed_in_frame == pinfo->fd->num)) {
(continuation_data && continuation_data->completed_in_frame == pinfo->num)) {
if (!pinfo->fd->flags.visited && continuation_data) {
continuation_data->completed_in_frame = pinfo->fd->num;
continuation_data->completed_in_frame = pinfo->num;
}
offset = dissect_ascii_uint32(main_tree, hf_hex_ascii_version, ett_version, hf_version, tvb, offset, &version);
@ -252,18 +252,18 @@ dissect_adb_service(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *d
key[i_key].key = NULL;
subtree = (wmem_tree_t *) wmem_tree_lookup32_array(framebuffer_infos, key);
framebuffer_data = (subtree) ? (framebuffer_data_t *) wmem_tree_lookup32_le(subtree, pinfo->fd->num) : NULL;
if (framebuffer_data && framebuffer_data->completed_in_frame < pinfo->fd->num)
framebuffer_data = (subtree) ? (framebuffer_data_t *) wmem_tree_lookup32_le(subtree, pinfo->num) : NULL;
if (framebuffer_data && framebuffer_data->completed_in_frame < pinfo->num)
framebuffer_data = NULL;
if (!pinfo->fd->flags.visited && !framebuffer_data) {
key[i_key].length = 1;
key[i_key++].key = &pinfo->fd->num;
key[i_key++].key = &pinfo->num;
key[i_key].length = 0;
key[i_key].key = NULL;
framebuffer_data = wmem_new(wmem_file_scope(), framebuffer_data_t);
framebuffer_data->data_in = pinfo->fd->num;
framebuffer_data->data_in = pinfo->num;
framebuffer_data->current_size = 0;
framebuffer_data->completed_in_frame = G_MAXUINT32;
framebuffer_data->size = tvb_get_letohl(tvb, offset + 4 * 2);
@ -279,7 +279,7 @@ dissect_adb_service(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *d
wmem_tree_insert32_array(framebuffer_infos, key, framebuffer_data);
}
if (framebuffer_data && framebuffer_data->data_in == pinfo->fd->num) {
if (framebuffer_data && framebuffer_data->data_in == pinfo->num) {
proto_tree_add_item(main_tree, hf_framebuffer_version, tvb, offset, 4, ENC_LITTLE_ENDIAN);
offset += 4;
@ -327,7 +327,7 @@ dissect_adb_service(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *d
if (!pinfo->fd->flags.visited && framebuffer_data) {
framebuffer_data->current_size += tvb_captured_length_remaining(tvb, offset);
if (framebuffer_data->current_size >= framebuffer_data->size)
framebuffer_data->completed_in_frame = pinfo->fd->num;
framebuffer_data->completed_in_frame = pinfo->num;
}
if (pref_dissect_more_detail_framebuffer) {
@ -429,12 +429,12 @@ dissect_adb_service(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *d
key[i_key].key = NULL;
subtree = (wmem_tree_t *) wmem_tree_lookup32_array(fragments, key);
fragment = (subtree) ? (fragment_t *) wmem_tree_lookup32_le(subtree, pinfo->fd->num - 1) : NULL;
fragment = (subtree) ? (fragment_t *) wmem_tree_lookup32_le(subtree, pinfo->num - 1) : NULL;
if (fragment) {
if (!pinfo->fd->flags.visited && fragment->reassembled_in_frame == -1)
fragment->reassembled_in_frame = pinfo->fd->num;
fragment->reassembled_in_frame = pinfo->num;
if (fragment->reassembled_in_frame == pinfo->fd->num) {
if (fragment->reassembled_in_frame == pinfo->num) {
size += fragment->length;
i_char += fragment->length;
}
@ -514,7 +514,7 @@ dissect_adb_service(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *d
key[i_key].key = &adb_service_data->session_key[i_key];
}
key[i_key].length = 1;
key[i_key++].key = &pinfo->fd->num;
key[i_key++].key = &pinfo->num;
key[i_key].length = 0;
key[i_key].key = NULL;

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

@ -548,14 +548,14 @@ adwin_request_response_handling(tvbuff_t *tvb, packet_info *pinfo,
if (direction == ADWIN_REQUEST) {
/* This is a request */
adwin_trans = wmem_new(wmem_file_scope(), adwin_transaction_t);
adwin_trans->req_frame = pinfo->fd->num;
adwin_trans->req_frame = pinfo->num;
adwin_trans->rep_frame = 0;
adwin_trans->req_time = pinfo->abs_ts;
wmem_map_insert(adwin_info->pdus, GUINT_TO_POINTER(seq_num), (void *)adwin_trans);
} else {
adwin_trans = (adwin_transaction_t *)wmem_map_lookup(adwin_info->pdus, GUINT_TO_POINTER(seq_num));
if (adwin_trans) {
adwin_trans->rep_frame = pinfo->fd->num;
adwin_trans->rep_frame = pinfo->num;
}
}
} else {

20
epan/dissectors/packet-aeron.c
View File

@ -1606,7 +1606,7 @@ static void aeron_sequence_report(tvbuff_t * tvb, packet_info * pinfo, proto_tre
aeron_frame_info_t * frag_frame = (aeron_frame_info_t *) wmem_list_frame_data(lf);
if (frag_frame != NULL)
{
if (frag_frame->frame != pinfo->fd->num)
if (frag_frame->frame != pinfo->num)
{
aeron_sequence_report_frame(tvb, frame_tree, frag_frame);
}
@ -2023,7 +2023,7 @@ static aeron_msg_fragment_t * aeron_msg_fragment_create(tvbuff_t * tvb, int offs
frag->term_offset = info->term_offset;
frag->frame_length = info->length;
frag->data_length = info->data_length;
frag->frame = pinfo->fd->num;
frag->frame = pinfo->num;
frag->frame_offset = offset;
frag->data = (gchar *) tvb_memdup(wmem_file_scope(), tvb, frag->frame_offset + O_AERON_DATA_DATA, (size_t) frag->data_length);
frag->flags = info->flags;
@ -2082,8 +2082,8 @@ static aeron_msg_t * aeron_term_msg_add(aeron_term_t * term, packet_info * pinfo
msg->frame_length = 0;
msg->fragment_count = 0;
msg->contiguous_length = 0;
msg->begin_frame = pinfo->fd->num;
msg->first_frame = pinfo->fd->num;
msg->begin_frame = pinfo->num;
msg->first_frame = pinfo->num;
msg->end_frame = 0;
msg->last_frame = 0;
msg->complete = FALSE;
@ -2201,7 +2201,7 @@ static int dissect_aeron_pad(tvbuff_t * tvb, int offset, packet_info * pinfo, pr
return 0;
term_offset = tvb_get_letohl(tvb, offset + O_AERON_PAD_TERM_OFFSET);
session_id = tvb_get_letohl(tvb, offset + O_AERON_PAD_SESSION_ID);
transport = aeron_transport_add(cinfo, session_id, pinfo->fd->num);
transport = aeron_transport_add(cinfo, session_id, pinfo->num);
stream_id = tvb_get_letohl(tvb, offset + O_AERON_PAD_STREAM_ID);
term_id = tvb_get_letohl(tvb, offset + O_AERON_PAD_TERM_ID);
pad_length = frame_length - L_AERON_PAD_MIN;
@ -2345,7 +2345,7 @@ static int dissect_aeron_data(tvbuff_t * tvb, int offset, packet_info * pinfo, p
}
term_offset = tvb_get_letohl(tvb, offset + O_AERON_DATA_TERM_OFFSET);
session_id = tvb_get_letohl(tvb, offset + O_AERON_DATA_SESSION_ID);
transport = aeron_transport_add(cinfo, session_id, pinfo->fd->num);
transport = aeron_transport_add(cinfo, session_id, pinfo->num);
stream_id = tvb_get_letohl(tvb, offset + O_AERON_DATA_STREAM_ID);
term_id = tvb_get_letohl(tvb, offset + O_AERON_DATA_TERM_ID);
memset((void *) &pktinfo, 0, sizeof(aeron_packet_info_t));
@ -2449,7 +2449,7 @@ static int dissect_aeron_nak(tvbuff_t * tvb, int offset, packet_info * pinfo, pr
if (rounded_length < 0)
return 0;
session_id = tvb_get_letohl(tvb, offset + O_AERON_NAK_SESSION_ID);
transport = aeron_transport_add(cinfo, session_id, pinfo->fd->num);
transport = aeron_transport_add(cinfo, session_id, pinfo->num);
stream_id = tvb_get_letohl(tvb, offset + O_AERON_NAK_STREAM_ID);
term_id = tvb_get_letohl(tvb, offset + O_AERON_NAK_TERM_ID);
nak_term_offset = tvb_get_letohl(tvb, offset + O_AERON_NAK_TERM_OFFSET);
@ -2534,7 +2534,7 @@ static int dissect_aeron_sm(tvbuff_t * tvb, int offset, packet_info * pinfo, pro
if (rounded_length < 0)
return 0;
session_id = tvb_get_letohl(tvb, offset + O_AERON_SM_SESSION_ID);
transport = aeron_transport_add(cinfo, session_id, pinfo->fd->num);
transport = aeron_transport_add(cinfo, session_id, pinfo->num);
stream_id = tvb_get_letohl(tvb, offset + O_AERON_SM_STREAM_ID);
term_id = tvb_get_letohl(tvb, offset + O_AERON_SM_TERM_ID);
consumption_offset = tvb_get_letohl(tvb, offset + O_AERON_SM_COMPLETED_TERM_OFFSET);
@ -2677,7 +2677,7 @@ static int dissect_aeron_setup(tvbuff_t * tvb, int offset, packet_info * pinfo,
return 0;
term_offset = tvb_get_letohl(tvb, offset + O_AERON_SETUP_TERM_OFFSET);
session_id = tvb_get_letohl(tvb, offset + O_AERON_SETUP_SESSION_ID);
transport = aeron_transport_add(cinfo, session_id, pinfo->fd->num);
transport = aeron_transport_add(cinfo, session_id, pinfo->num);
stream_id = tvb_get_letohl(tvb, offset + O_AERON_SETUP_STREAM_ID);
initial_term_id = tvb_get_letohl(tvb, offset + O_AERON_SETUP_INITIAL_TERM_ID);
active_term_id = tvb_get_letohl(tvb, offset + O_AERON_SETUP_ACTIVE_TERM_ID);
@ -2762,7 +2762,7 @@ static int dissect_aeron(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree,
if (aeron_sequence_analysis)
{
finfo = aeron_frame_info_add(pinfo->fd->num, (guint32) offset);
finfo = aeron_frame_info_add(pinfo->num, (guint32) offset);
}
frame_type = tvb_get_letohs(tvb, offset + O_AERON_BASIC_TYPE);
cinfo = aeron_setup_conversation_info(pinfo, frame_type);

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

@ -5141,7 +5141,7 @@ dissect_afp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
else
request_val->spotlight_req_command = -1;
request_val->frame_req = pinfo->fd->num;
request_val->frame_req = pinfo->num;
request_val->frame_res = 0;
request_val->req_time=pinfo->abs_ts;
@ -5411,7 +5411,7 @@ dissect_afp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
* Set "frame_res" if it's not already known.
*/
if (request_val->frame_res == 0)
request_val->frame_res = pinfo->fd->num;
request_val->frame_res = pinfo->num;
/*
* Tap the packet before the dissectors are called so we

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

@ -2784,7 +2784,7 @@ dissect_afs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data)
request_val = wmem_new(wmem_file_scope(), struct afs_request_val);
request_val -> opcode = tvb_get_ntohl(tvb, offset);
request_val -> req_num = pinfo->fd->num;
request_val -> req_num = pinfo->num;
request_val -> rep_num = 0;
request_val -> req_time = pinfo->abs_ts;
@ -2792,7 +2792,7 @@ dissect_afs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data)
request_val);
}
if( request_val && reply ) {
request_val -> rep_num = pinfo->fd->num;
request_val -> rep_num = pinfo->num;
}
}

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

@ -1456,10 +1456,10 @@ static int dissect_alcap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, vo
break;
}
if (leg != NULL && ( (! leg->msgs) || leg->msgs->last->framenum < pinfo->fd->num ) ) {
if (leg != NULL && ( (! leg->msgs) || leg->msgs->last->framenum < pinfo->num ) ) {
alcap_msg_data_t* msg = wmem_new(wmem_file_scope(), alcap_msg_data_t);
msg->msg_type = msg_info->msg_type;
msg->framenum = pinfo->fd->num;
msg->framenum = pinfo->num;
msg->next = NULL;
msg->last = NULL;

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

@ -10538,7 +10538,7 @@ record_msg_delivery_c(conversation_t *conv, amqp_channel_t *channel,
delivery = wmem_new0(wmem_file_scope(), amqp_delivery);
delivery->delivery_tag = delivery_tag;
delivery->msg_framenum = pinfo->fd->num;
delivery->msg_framenum = pinfo->num;
/* append to the list of unacked deliveries */
delivery->prev = (*dptr);
(*dptr) = delivery;
@ -10579,7 +10579,7 @@ record_delivery_ack_c(conversation_t *conv, amqp_channel_t *channel,
amqp_delivery *delivery = (*dptr);
*dptr = delivery->prev; /* remove from the list of unacked */
delivery->ack_framenum = pinfo->fd->num;
delivery->ack_framenum = pinfo->num;
/* append to the list of acked deliveries */
delivery->prev = last_acked;
last_acked = delivery;

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

@ -6847,7 +6847,7 @@ elem_a2p_bearer_format(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guin
first_assigned_found = TRUE;
rtp_add_address(pinfo, &data_p->rtp_src_addr, data_p->rtp_port, 0, "IOS5",
pinfo->fd->num, FALSE, rtp_dyn_payload);
pinfo->num, FALSE, rtp_dyn_payload);
}
if (in_band_format_assigned)

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

@ -1232,7 +1232,7 @@ update_saved_invokedata(packet_info *pinfo, struct ansi_tcap_private_t *p_privat
wmem_strdup(wmem_file_scope(), buf),
ansi_map_saved_invokedata);
/*g_warning("Invoke Hash string %s pkt: %u",buf,pinfo->fd->num);*/
/*g_warning("Invoke Hash string %s pkt: %u",buf,pinfo->num);*/
}
}
/* value strings */
@ -16003,7 +16003,7 @@ find_saved_invokedata(asn1_ctx_t *actx, struct ansi_tcap_private_t *p_private_tc
break;
}
/*g_warning("Find Hash string %s pkt: %u",buf,actx->pinfo->fd->num);*/
/*g_warning("Find Hash string %s pkt: %u",buf,actx->pinfo->num);*/
ansi_map_saved_invokedata = (struct ansi_map_invokedata_t *)g_hash_table_lookup(TransactionId_table, buf);
if(ansi_map_saved_invokedata){
OperationCode = ansi_map_saved_invokedata->opcode & 0xff;

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

@ -222,7 +222,7 @@ dissect_ata_pdu(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset,
ata_info=wmem_new(wmem_file_scope(), ata_info_t);
ata_info->tag=tag;
ata_info->conversation=conversation;
ata_info->request_frame=pinfo->fd->num;
ata_info->request_frame=pinfo->num;
ata_info->response_frame=0;
ata_info->cmd=tvb_get_guint8(tvb, offset+3);
ata_info->req_time=pinfo->abs_ts;
@ -242,14 +242,14 @@ dissect_ata_pdu(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset,
/* woo hoo we could, so no need to store this in unmatched any more,
move both request and response to the matched table */
if(ata_info){
ata_info->response_frame=pinfo->fd->num;
ata_info->response_frame=pinfo->num;
g_hash_table_remove(ata_cmd_unmatched, ata_info);
g_hash_table_insert(ata_cmd_matched, GUINT_TO_POINTER(ata_info->request_frame), ata_info);
g_hash_table_insert(ata_cmd_matched, GUINT_TO_POINTER(ata_info->response_frame), ata_info);
}
}
} else {
ata_info=(ata_info_t *)g_hash_table_lookup(ata_cmd_matched, GUINT_TO_POINTER(pinfo->fd->num));
ata_info=(ata_info_t *)g_hash_table_lookup(ata_cmd_matched, GUINT_TO_POINTER(pinfo->num));
}
if(ata_info){

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

@ -297,7 +297,7 @@ dissect_applemidi_heur( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi
rtp_dyn_payload = rtp_dyn_payload_new();
rtp_dyn_payload_insert(rtp_dyn_payload, 97, "rtp-midi", 10000);
rtp_add_address( pinfo, &pinfo->src, pinfo->srcport, 0, APPLEMIDI_DISSECTOR_SHORTNAME,
pinfo->fd->num, FALSE, rtp_dyn_payload);
pinfo->num, FALSE, rtp_dyn_payload);
/* call dissect_applemidi() from now on for UDP packets on this "connection"
it is important to do this step after calling rtp_add_address, otherwise

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

@ -645,7 +645,7 @@ check_for_duplicate_addresses(packet_info *pinfo, proto_tree *tree,
{
address_hash_value *value;
address_hash_value *result = NULL;
duplicate_result_key result_key = {pinfo->fd->num, ip};
duplicate_result_key result_key = {pinfo->num, ip};
/* Look up existing result */
if (pinfo->fd->flags.visited) {
@ -662,12 +662,12 @@ check_for_duplicate_addresses(packet_info *pinfo, proto_tree *tree,
/* If MAC matches table, just update details */
if (value != NULL)
{
if (pinfo->fd->num > value->frame_num)
if (pinfo->num > value->frame_num)
{
if ((memcmp(value->mac, mac, 6) == 0))
{
/* Same MAC as before - update existing entry */
value->frame_num = pinfo->fd->num;
value->frame_num = pinfo->num;
value->time_of_entry = pinfo->abs_ts.secs;
}
else
@ -688,7 +688,7 @@ check_for_duplicate_addresses(packet_info *pinfo, proto_tree *tree,
/* No existing entry. Prepare one */
value = wmem_new(wmem_file_scope(), struct address_hash_value);
memcpy(value->mac, mac, 6);
value->frame_num = pinfo->fd->num;
value->frame_num = pinfo->num;
value->time_of_entry = pinfo->abs_ts.secs;
/* Add it */

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

@ -857,7 +857,7 @@ dissect_atp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
call_dissector_with_data(zip_atp_handle, new_tvb, pinfo, tree, &aspinfo);
else {
/* XXX need a conversation_get_dissector function ? */
if (!aspinfo.reply && !conversation_get_dissector(conversation, pinfo->fd->num)) {
if (!aspinfo.reply && !conversation_get_dissector(conversation, pinfo->num)) {
dissector_handle_t sub;
/* if it's a known ASP function call ASP dissector
@ -994,12 +994,12 @@ get_transaction(tvbuff_t *tvb, packet_info *pinfo, struct aspinfo *aspinfo)
asp_request_val *request_val;
guint8 fn;
conversation = find_conversation(pinfo->fd->num, &pinfo->src, &pinfo->dst, pinfo->ptype,
conversation = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst, pinfo->ptype,
pinfo->srcport, pinfo->destport, 0);
if (conversation == NULL)
{
conversation = conversation_new(pinfo->fd->num, &pinfo->src, &pinfo->dst,
conversation = conversation_new(pinfo->num, &pinfo->src, &pinfo->dst,
pinfo->ptype, pinfo->srcport, pinfo->destport, 0);
}

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

@ -2804,7 +2804,7 @@ printf("CHOICE dissect_ber_choice(%s) entered len:%d\n", name, tvb_reported_leng
proto_tree_add_expert_format(
tree, actx->pinfo, &ei_hf_field_not_integer_type, tvb, offset, len,
"dissect_ber_choice(): frame:%u offset:%d Was passed an HF field that was not integer type : %s",
actx->pinfo->fd->num, offset, hfinfo->abbrev);
actx->pinfo->num, offset, hfinfo->abbrev);
return end_offset;
}
}
@ -3918,7 +3918,7 @@ dissect_ber_constrained_bitstring(gboolean implicit_tag, asn1_ctx_t *actx, proto
proto_tree_add_expert_format(
parent_tree, actx->pinfo, &ei_ber_constr_bitstr, tvb, offset, len,
"dissect_ber_constrained_bitstring(): frame:%u offset:%d Was passed an illegal length of 0",
actx->pinfo->fd->num, offset);
actx->pinfo->num, offset);
return offset;
}
actx->created_item = NULL;

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

@ -1489,7 +1489,7 @@ save_local_device_name_from_eir_ad(tvbuff_t *tvb, gint offset, packet_info *pinf
k_interface_id = bluetooth_data->interface_id;
k_adapter_id = bluetooth_data->adapter_id;
k_frame_number = pinfo->fd->num;
k_frame_number = pinfo->num;
key[0].length = 1;
key[0].key = &k_interface_id;
@ -1575,7 +1575,7 @@ get_conversation(packet_info *pinfo,
{
conversation_t *conversation;
conversation = find_conversation(pinfo->fd->num,
conversation = find_conversation(pinfo->num,
src_addr, dst_addr,
pinfo->ptype,
src_endpoint, dst_endpoint, 0);
@ -1583,7 +1583,7 @@ get_conversation(packet_info *pinfo,
return conversation;
}
conversation = conversation_new(pinfo->fd->num,
conversation = conversation_new(pinfo->num,
src_addr, dst_addr,
pinfo->ptype,
src_endpoint, dst_endpoint, 0);

34
epan/dissectors/packet-btatt.c
View File

@ -3054,17 +3054,17 @@ get_request(tvbuff_t *tvb, gint offset, packet_info *pinfo, guint8 opcode,
key[2].length = 0;
key[2].key = NULL;
frame_number = pinfo->fd->num;
frame_number = pinfo->num;
sub_wmemtree = (wmem_tree_t *) wmem_tree_lookup32_array(requests, key);
request_data = (sub_wmemtree) ? (request_data_t *) wmem_tree_lookup32_le(sub_wmemtree, frame_number) : NULL;
if (request_data && request_data->request_in_frame == pinfo->fd->num)
if (request_data && request_data->request_in_frame == pinfo->num)
return request_data;
if (request_data) do {
frame_number = request_data->request_in_frame - 1;
if (request_data->request_in_frame == pinfo->fd->num)
if (request_data->request_in_frame == pinfo->num)
break;
switch (opcode) {
@ -3097,7 +3097,7 @@ get_request(tvbuff_t *tvb, gint offset, packet_info *pinfo, guint8 opcode,
if (!request_data)
return NULL;
if (request_data->request_in_frame == pinfo->fd->num)
if (request_data->request_in_frame == pinfo->num)
return request_data;
switch (opcode) {
@ -3155,7 +3155,7 @@ save_request(packet_info *pinfo, guint8 opcode, union request_parameters_union p
guint32 frame_number;
request_data_t *request_data;
frame_number = pinfo->fd->num;
frame_number = pinfo->num;
key[0].length = 1;
key[0].key = &bluetooth_data->interface_id;
@ -3197,7 +3197,7 @@ save_handle(packet_info *pinfo, bluetooth_uuid_t uuid, guint32 handle,
guint32 frame_number;
handle_data_t *handle_data;
frame_number = pinfo->fd->num;
frame_number = pinfo->num;
key[0].length = 1;
key[0].key = &bluetooth_data->interface_id;
@ -3230,7 +3230,7 @@ get_uuid_from_handle(packet_info *pinfo, guint32 handle,
memset(&uuid, 0, sizeof uuid);
frame_number = pinfo->fd->num;
frame_number = pinfo->num;
key[0].length = 1;
key[0].key = &bluetooth_data->interface_id;
@ -3262,7 +3262,7 @@ get_service_uuid_from_handle(packet_info *pinfo, guint32 handle,
memset(&uuid, 0, sizeof uuid);
frame_number = pinfo->fd->num;
frame_number = pinfo->num;
key[0].length = 1;
key[0].key = &bluetooth_data->interface_id;
@ -3300,7 +3300,7 @@ get_characteristic_uuid_from_handle(packet_info *pinfo, guint32 handle,
memset(&uuid, 0, sizeof uuid);
frame_number = pinfo->fd->num;
frame_number = pinfo->num;
key[0].length = 1;
key[0].key = &bluetooth_data->interface_id;
@ -6094,7 +6094,7 @@ get_mtu(packet_info *pinfo, bluetooth_data_t *bluetooth_data)
wmem_tree_t *sub_wmemtree;
guint mtu = 23;
frame_number = pinfo->fd->num;
frame_number = pinfo->num;
key[0].length = 1;
key[0].key = &bluetooth_data->interface_id;
@ -6119,7 +6119,7 @@ save_mtu(packet_info *pinfo, bluetooth_data_t *bluetooth_data, guint mtu)
guint32 frame_number;
mtu_data_t *mtu_data;
frame_number = pinfo->fd->num;
frame_number = pinfo->num;
key[0].length = 1;
key[0].key = &bluetooth_data->interface_id;
@ -6144,7 +6144,7 @@ save_value_fragment(packet_info *pinfo, tvbuff_t *tvb, gint offset,
guint32 frame_number;
fragment_data_t *fragment_data;
frame_number = pinfo->fd->num;
frame_number = pinfo->num;
key[0].length = 1;
key[0].key = &bluetooth_data->interface_id;
@ -6179,7 +6179,7 @@ get_value(packet_info *pinfo, guint32 handle, bluetooth_data_t *bluetooth_data,
guint8 *data = NULL;
frame_number = pinfo->fd->num;
frame_number = pinfo->num;
key[0].length = 1;
key[0].key = &bluetooth_data->interface_id;
@ -6849,16 +6849,16 @@ dissect_btatt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
}
if (request_data) {
if (request_data->request_in_frame > 0 && request_data->request_in_frame != pinfo->fd->num) {
if (request_data->request_in_frame > 0 && request_data->request_in_frame != pinfo->num) {
sub_item = proto_tree_add_uint(main_tree, hf_request_in_frame, tvb, 0, 0, request_data->request_in_frame);
PROTO_ITEM_SET_GENERATED(sub_item);
}
if (!pinfo->fd->flags.visited && request_data->response_in_frame == 0 &&
pinfo->fd->num > request_data->request_in_frame)
request_data->response_in_frame = pinfo->fd->num;
pinfo->num > request_data->request_in_frame)
request_data->response_in_frame = pinfo->num;
if (request_data->response_in_frame > 0 && request_data->response_in_frame != pinfo->fd->num) {
if (request_data->response_in_frame > 0 && request_data->response_in_frame != pinfo->num) {
sub_item = proto_tree_add_uint(main_tree, hf_response_in_frame, tvb, 0, 0, request_data->response_in_frame);
PROTO_ITEM_SET_GENERATED(sub_item);
}

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

@ -238,7 +238,7 @@ dissect_btavctp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
wmem_tree_key_t key[6];
guint32 frame_number;
frame_number = pinfo->fd->num;
frame_number = pinfo->num;
key[0].length = 1;
key[0].key = &interface_id;
@ -308,7 +308,7 @@ dissect_btavctp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
fragments->chandle = chandle;
fragments->psm = psm;
frame_number = pinfo->fd->num;
frame_number = pinfo->num;
key[0].length = 1;
key[0].key = &interface_id;
@ -352,7 +352,7 @@ dissect_btavctp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
fragments->chandle = chandle;
fragments->psm = psm;
frame_number = pinfo->fd->num;
frame_number = pinfo->num;
key[0].length = 1;
key[0].key = &interface_id;

28
epan/dissectors/packet-btavdtp.c
View File

@ -714,7 +714,7 @@ dissect_sep(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint offset,
if (!pinfo->fd->flags.visited) {
sep_entry_t *sep_data;
wmem_tree_key_t key[7];
guint32 frame_number = pinfo->fd->num;
guint32 frame_number = pinfo->num;
key[0].length = 1;
key[0].key = &interface_id;
@ -1353,7 +1353,7 @@ dissect_btavdtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
chandle = l2cap_data->chandle;
psm = l2cap_data->psm;
cid = l2cap_data->cid;
frame_number = pinfo->fd->num;
frame_number = pinfo->num;
key[0].length = 1;
key[0].key = &interface_id;
@ -1369,10 +1369,10 @@ dissect_btavdtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
subtree = (wmem_tree_t *) wmem_tree_lookup32_array(channels, key);
channels_info = (subtree) ? (channels_info_t *) wmem_tree_lookup32_le(subtree, frame_number) : NULL;
if (!(channels_info &&
((*channels_info->adapter_disconnect_in_frame >= pinfo->fd->num &&
*channels_info->hci_disconnect_in_frame >= pinfo->fd->num &&
*channels_info->l2cap_disconnect_in_frame >= pinfo->fd->num &&
channels_info->disconnect_in_frame >= pinfo->fd->num) ||
((*channels_info->adapter_disconnect_in_frame >= pinfo->num &&
*channels_info->hci_disconnect_in_frame >= pinfo->num &&
*channels_info->l2cap_disconnect_in_frame >= pinfo->num &&
channels_info->disconnect_in_frame >= pinfo->num) ||
(*channels_info->adapter_disconnect_in_frame == 0 ||
*channels_info->hci_disconnect_in_frame == 0 ||
*channels_info->l2cap_disconnect_in_frame == 0 ||
@ -1465,10 +1465,10 @@ dissect_btavdtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
if (media_stream_number_value) {
sep_data.stream_number = media_stream_number_value->stream_number;
if (media_stream_number_value->stream_start_in_frame == 0)
media_stream_number_value->stream_start_in_frame = pinfo->fd->num;
media_stream_number_value->stream_start_in_frame = pinfo->num;
if (!pinfo->fd->flags.visited)
media_stream_number_value->stream_end_in_frame = pinfo->fd->num;
media_stream_number_value->stream_end_in_frame = pinfo->num;
sep_data.stream_start_in_frame = media_stream_number_value->stream_start_in_frame;
sep_data.stream_end_in_frame = media_stream_number_value->stream_end_in_frame;
@ -1939,8 +1939,8 @@ dissect_btavdtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
break;
}
if (!pinfo->fd->flags.visited && message_type == MESSAGE_TYPE_ACCEPT &&
channels_info->disconnect_in_frame > pinfo->fd->num) {
channels_info->disconnect_in_frame = pinfo->fd->num;
channels_info->disconnect_in_frame > pinfo->num) {
channels_info->disconnect_in_frame = pinfo->num;
}
break;
case SIGNAL_ID_SUSPEND:
@ -1976,8 +1976,8 @@ dissect_btavdtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
break;
}
if (!pinfo->fd->flags.visited && message_type == MESSAGE_TYPE_ACCEPT &&
channels_info->disconnect_in_frame > pinfo->fd->num) {
channels_info->disconnect_in_frame = pinfo->fd->num;
channels_info->disconnect_in_frame > pinfo->num) {
channels_info->disconnect_in_frame = pinfo->num;
}
break;
case SIGNAL_ID_SECURITY_CONTROL:
@ -3082,7 +3082,7 @@ dissect_bta2dp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
if (bta2dp_codec_info.content_protection_type == 0 && codec_dissector == aptx_handle) {
call_dissector_with_data(aptx_handle, tvb, pinfo, tree, &bta2dp_codec_info);
} else {
bluetooth_add_address(pinfo, &pinfo->net_dst, sep_data.stream_number, "BT A2DP", pinfo->fd->num, FALSE, &bta2dp_codec_info);
bluetooth_add_address(pinfo, &pinfo->net_dst, sep_data.stream_number, "BT A2DP", pinfo->num, FALSE, &bta2dp_codec_info);
call_dissector(rtp_handle, tvb, pinfo, tree);
}
offset += tvb_reported_length_remaining(tvb, offset);
@ -3315,7 +3315,7 @@ dissect_btvdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
pinfo->destport = sep_data.stream_number;
#endif
bluetooth_add_address(pinfo, &pinfo->net_dst, 0, "BT VDP", pinfo->fd->num, TRUE, &btvdp_codec_info);
bluetooth_add_address(pinfo, &pinfo->net_dst, 0, "BT VDP", pinfo->num, TRUE, &btvdp_codec_info);
call_dissector(rtp_handle, tvb, pinfo, tree);
offset += tvb_reported_length_remaining(tvb, offset);

24
epan/dissectors/packet-btavrcp.c
View File

@ -1070,10 +1070,10 @@ dissect_vendor_dependant(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
if (packet_type == PACKET_TYPE_START) {
if (pinfo->fd->flags.visited == 0 && tvb_captured_length_remaining(tvb, offset) == length) {
k_op = pdu_id | (company_id << 8);
frame_number = pinfo->fd->num;
frame_number = pinfo->num;
fragment = wmem_new(wmem_file_scope(), fragment_t);
fragment->start_frame_number = pinfo->fd->num;
fragment->start_frame_number = pinfo->num;
fragment->end_frame_number = 0;
fragment->state = 0;
@ -1116,7 +1116,7 @@ dissect_vendor_dependant(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
} else if (packet_type == PACKET_TYPE_CONTINUE) {
if (pinfo->fd->flags.visited == 0 && tvb_captured_length_remaining(tvb, offset) == length) {
k_op = pdu_id | (company_id << 8);
frame_number = pinfo->fd->num;
frame_number = pinfo->num;
key[0].length = 1;
key[0].key = &avrcp_proto_data->interface_id;
@ -1160,7 +1160,7 @@ dissect_vendor_dependant(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
col_append_str(pinfo->cinfo, COL_INFO, " [end]");
k_op = pdu_id | (company_id << 8);
frame_number = pinfo->fd->num;
frame_number = pinfo->num;
key[0].length = 1;
key[0].key = &avrcp_proto_data->interface_id;
@ -1186,7 +1186,7 @@ dissect_vendor_dependant(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
if (fragment->state == 1 && pinfo->fd->flags.visited == 0) {
fragment->end_frame_number = pinfo->fd->num;
fragment->end_frame_number = pinfo->num;
fragment->count += 1;
fragment->state = 2;
@ -1577,7 +1577,7 @@ dissect_vendor_dependant(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
} else if (!pinfo->fd->flags.visited) {
btavrcp_song_position_data_t *song_position_data;
frame_number = pinfo->fd->num;
frame_number = pinfo->num;
key[0].length = 1;
key[0].key = &avrcp_proto_data->interface_id;
@ -1671,7 +1671,7 @@ dissect_vendor_dependant(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
if (pinfo->fd->flags.visited == 0) {
k_op = continuing_op;
frame_number = pinfo->fd->num;
frame_number = pinfo->num;
key[0].length = 1;
key[0].key = &avrcp_proto_data->interface_id;
@ -1716,7 +1716,7 @@ dissect_vendor_dependant(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
if (pinfo->fd->flags.visited == 0) {
k_op = continuing_op;
frame_number = pinfo->fd->num;
frame_number = pinfo->num;
key[0].length = 1;
key[0].key = &avrcp_proto_data->interface_id;
@ -2158,7 +2158,7 @@ dissect_btavrcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
};
k_op_arg = (ctype == 0x0a) ? G_MAXUINT32 : op_arg;
frame_number = pinfo->fd->num;
frame_number = pinfo->num;
key[0].length = 1;
key[0].key = &avrcp_proto_data.interface_id;
@ -2191,7 +2191,7 @@ dissect_btavrcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
}
timing_info = wmem_new(wmem_file_scope(), timing_info_t);
timing_info->command_frame_number = pinfo->fd->num;
timing_info->command_frame_number = pinfo->num;
timing_info->command_timestamp = pinfo->abs_ts;
timing_info->response_frame_number = 0;
timing_info->response_timestamp.secs = 0;
@ -2218,14 +2218,14 @@ dissect_btavrcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
timing_info->op == op &&
((ctype == 0x0a) ? 1 : (timing_info->op_arg == op_arg)) &&
timing_info->used == 0) {
timing_info->response_frame_number = pinfo->fd->num;
timing_info->response_frame_number = pinfo->num;
timing_info->response_timestamp = pinfo->abs_ts;
timing_info->used = 1;
}
}
k_op_arg = (ctype == 0x0a) ? G_MAXUINT32 : op_arg;
frame_number = pinfo->fd->num;
frame_number = pinfo->num;
key[0].length = 1;
key[0].key = &avrcp_proto_data.interface_id;

36
epan/dissectors/packet-bthci_acl.c
View File

@ -76,7 +76,7 @@ typedef struct _multi_fragment_pdu_t {
} multi_fragment_pdu_t;
typedef struct _chandle_data_t {
wmem_tree_t *start_fragments; /* indexed by pinfo->fd->num */
wmem_tree_t *start_fragments; /* indexed by pinfo->num */
} chandle_data_t;
static wmem_tree_t *chandle_tree = NULL;
@ -197,7 +197,7 @@ dissect_bthci_acl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat
adapter_id = bluetooth_data->adapter_id;
connection_handle = flags & 0x0fff;
direction = pinfo->p2p_dir;
frame_number = pinfo->fd->num;
frame_number = pinfo->num;
acl_data = wmem_new(wmem_packet_scope(), bthci_acl_data_t);
acl_data->interface_id = interface_id;
@ -215,10 +215,10 @@ dissect_bthci_acl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat
key[3].key = NULL;
subtree = (wmem_tree_t *) wmem_tree_lookup32_array(bluetooth_data->chandle_sessions, key);
chandle_session = (subtree) ? (chandle_session_t *) wmem_tree_lookup32_le(subtree, pinfo->fd->num) : NULL;
chandle_session = (subtree) ? (chandle_session_t *) wmem_tree_lookup32_le(subtree, pinfo->num) : NULL;
if (chandle_session &&
chandle_session->connect_in_frame < pinfo->fd->num &&
chandle_session->disconnect_in_frame > pinfo->fd->num) {
chandle_session->connect_in_frame < pinfo->num &&
chandle_session->disconnect_in_frame > pinfo->num) {
acl_data->disconnect_in_frame = &chandle_session->disconnect_in_frame;
} else {
acl_data->disconnect_in_frame = &invalid_session;
@ -229,7 +229,7 @@ dissect_bthci_acl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat
acl_data->remote_bd_addr_id = 0;
subtree = (wmem_tree_t *) wmem_tree_lookup32_array(bluetooth_data->chandle_to_mode, key);
connection_mode = (subtree) ? (connection_mode_t *) wmem_tree_lookup32_le(subtree, pinfo->fd->num) : NULL;
connection_mode = (subtree) ? (connection_mode_t *) wmem_tree_lookup32_le(subtree, pinfo->num) : NULL;
if (connection_mode) {
mode = connection_mode->mode;
mode_last_change_in_frame = connection_mode->change_in_frame;
@ -237,7 +237,7 @@ dissect_bthci_acl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat
/* remote bdaddr and name */
subtree = (wmem_tree_t *) wmem_tree_lookup32_array(bluetooth_data->chandle_to_bdaddr, key);
remote_bdaddr = (subtree) ? (remote_bdaddr_t *) wmem_tree_lookup32_le(subtree, pinfo->fd->num) : NULL;
remote_bdaddr = (subtree) ? (remote_bdaddr_t *) wmem_tree_lookup32_le(subtree, pinfo->num) : NULL;
if (remote_bdaddr) {
guint32 k_bd_addr_oui;
guint32 k_bd_addr_id;
@ -271,7 +271,7 @@ dissect_bthci_acl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat
key[4].key = NULL;
subtree = (wmem_tree_t *) wmem_tree_lookup32_array(bluetooth_data->bdaddr_to_role, key);
device_role = (subtree) ? (device_role_t *) wmem_tree_lookup32_le(subtree, pinfo->fd->num) : NULL;
device_role = (subtree) ? (device_role_t *) wmem_tree_lookup32_le(subtree, pinfo->num) : NULL;
if (device_role) {
if ((pinfo->p2p_dir == P2P_DIR_SENT && device_role->role == ROLE_MASTER) ||
(pinfo->p2p_dir == P2P_DIR_RECV && device_role->role == ROLE_SLAVE)) {
@ -286,7 +286,7 @@ dissect_bthci_acl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat
}
subtree = (wmem_tree_t *) wmem_tree_lookup32_array(bluetooth_data->bdaddr_to_name, key);
device_name = (subtree) ? (device_name_t *) wmem_tree_lookup32_le(subtree, pinfo->fd->num) : NULL;
device_name = (subtree) ? (device_name_t *) wmem_tree_lookup32_le(subtree, pinfo->num) : NULL;
if (device_name)
remote_name = device_name->name;
else
@ -324,7 +324,7 @@ dissect_bthci_acl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat
subtree = (wmem_tree_t *) wmem_tree_lookup32_array(bluetooth_data->localhost_bdaddr, key);
localhost_bdaddr_entry = (subtree) ? (localhost_bdaddr_entry_t *) wmem_tree_lookup32_le(subtree, pinfo->fd->num) : NULL;
localhost_bdaddr_entry = (subtree) ? (localhost_bdaddr_entry_t *) wmem_tree_lookup32_le(subtree, pinfo->num) : NULL;
if (localhost_bdaddr_entry) {
localhost_ether_addr = get_ether_name(localhost_bdaddr_entry->bd_addr);
memcpy(localhost_bdaddr, localhost_bdaddr_entry->bd_addr, 6);
@ -334,7 +334,7 @@ dissect_bthci_acl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat
}
subtree = (wmem_tree_t *) wmem_tree_lookup32_array(bluetooth_data->localhost_name, key);
localhost_name_entry = (subtree) ? (localhost_name_entry_t *) wmem_tree_lookup32_le(subtree, pinfo->fd->num) : NULL;
localhost_name_entry = (subtree) ? (localhost_name_entry_t *) wmem_tree_lookup32_le(subtree, pinfo->num) : NULL;
if (localhost_name_entry)
localhost_name = localhost_name_entry->name;
else
@ -368,7 +368,7 @@ dissect_bthci_acl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat
key[4].key = NULL;
subtree = (wmem_tree_t *) wmem_tree_lookup32_array(chandle_tree, key);
chandle_data = (subtree) ? (chandle_data_t *) wmem_tree_lookup32_le(subtree, pinfo->fd->num) : NULL;
chandle_data = (subtree) ? (chandle_data_t *) wmem_tree_lookup32_le(subtree, pinfo->num) : NULL;
if (!pinfo->fd->flags.visited && !chandle_data) {
key[0].length = 1;
key[0].key = &interface_id;
@ -430,7 +430,7 @@ dissect_bthci_acl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat
if (!(pb_flag & 0x01)) { /* first fragment */
if (!pinfo->fd->flags.visited) {
mfp = (multi_fragment_pdu_t *) wmem_new(wmem_file_scope(), multi_fragment_pdu_t);
mfp->first_frame = pinfo->fd->num;
mfp->first_frame = pinfo->num;
mfp->last_frame = 0;
mfp->tot_len = l2cap_length + 4;
mfp->reassembled = (char *) wmem_alloc(wmem_file_scope(), mfp->tot_len);
@ -438,10 +438,10 @@ dissect_bthci_acl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat
if (len <= mfp->tot_len) {
tvb_memcpy(tvb, (guint8 *) mfp->reassembled, offset, len);
mfp->cur_off = len;
wmem_tree_insert32(chandle_data->start_fragments, pinfo->fd->num, mfp);
wmem_tree_insert32(chandle_data->start_fragments, pinfo->num, mfp);
}
} else {
mfp = (multi_fragment_pdu_t *)wmem_tree_lookup32(chandle_data->start_fragments, pinfo->fd->num);
mfp = (multi_fragment_pdu_t *)wmem_tree_lookup32(chandle_data->start_fragments, pinfo->num);
}
if (mfp != NULL && mfp->last_frame) {
proto_item *item;
@ -452,14 +452,14 @@ dissect_bthci_acl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat
}
}
if (pb_flag == 0x01) { /* continuation fragment */
mfp = (multi_fragment_pdu_t *)wmem_tree_lookup32_le(chandle_data->start_fragments, pinfo->fd->num);
mfp = (multi_fragment_pdu_t *)wmem_tree_lookup32_le(chandle_data->start_fragments, pinfo->num);
if (!pinfo->fd->flags.visited) {
len = tvb_captured_length_remaining(tvb, offset);
if (mfp != NULL && !mfp->last_frame && (mfp->tot_len >= mfp->cur_off + len)) {
tvb_memcpy(tvb, (guint8 *) mfp->reassembled + mfp->cur_off, offset, len);
mfp->cur_off += len;
if (mfp->cur_off == mfp->tot_len) {
mfp->last_frame = pinfo->fd->num;
mfp->last_frame = pinfo->num;
}
}
}
@ -470,7 +470,7 @@ dissect_bthci_acl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat
PROTO_ITEM_SET_GENERATED(item);
col_append_fstr(pinfo->cinfo, COL_INFO, " [Continuation to #%u]", mfp->first_frame);
}
if (mfp != NULL && mfp->last_frame == pinfo->fd->num) {
if (mfp != NULL && mfp->last_frame == pinfo->num) {
next_tvb = tvb_new_child_real_data(tvb, (guint8 *) mfp->reassembled, mfp->tot_len, mfp->tot_len);
add_new_data_source(pinfo, next_tvb, "Reassembled BTHCI ACL");

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

@ -1697,7 +1697,7 @@ dissect_link_control_cmd(tvbuff_t *tvb, int offset, packet_info *pinfo,
interface_id = bluetooth_data->interface_id;
adapter_id = bluetooth_data->adapter_id;
frame_number = pinfo->fd->num;
frame_number = pinfo->num;
bd_addr_oui = bd_addr[0] << 16 | bd_addr[1] << 8 | bd_addr[2];
bd_addr_id = bd_addr[3] << 16 | bd_addr[4] << 8 | bd_addr[5];
@ -1764,7 +1764,7 @@ dissect_link_control_cmd(tvbuff_t *tvb, int offset, packet_info *pinfo,
interface_id = bluetooth_data->interface_id;
adapter_id = bluetooth_data->adapter_id;
frame_number = pinfo->fd->num;
frame_number = pinfo->num;
bd_addr_oui = bd_addr[0] << 16 | bd_addr[1] << 8 | bd_addr[2];
bd_addr_id = bd_addr[3] << 16 | bd_addr[4] << 8 | bd_addr[5];
@ -3185,7 +3185,7 @@ dissect_bthci_cmd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat
interface_id = bluetooth_data->interface_id;
adapter_id = bluetooth_data->adapter_id;
frame_number = pinfo->fd->num;
frame_number = pinfo->num;
ti_cmd = proto_tree_add_item(tree, proto_bthci_cmd, tvb, offset, -1, ENC_NA);
bthci_cmd_tree = proto_item_add_subtree(ti_cmd, ett_bthci_cmd);
@ -3384,7 +3384,7 @@ dissect_bthci_cmd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat
key[3].key = NULL;
subtree = (wmem_tree_t *) wmem_tree_lookup32_array(bthci_cmds, key);
bthci_cmd_data = (subtree) ? (bthci_cmd_data_t *) wmem_tree_lookup32_le(subtree, pinfo->fd->num) : NULL;
bthci_cmd_data = (subtree) ? (bthci_cmd_data_t *) wmem_tree_lookup32_le(subtree, pinfo->num) : NULL;
if (bthci_cmd_data && bthci_cmd_data->pending_in_frame < max_disconnect_in_frame) {
nstime_t delta;

36
epan/dissectors/packet-bthci_evt.c
View File

@ -777,7 +777,7 @@ save_remote_device_name(tvbuff_t *tvb, gint offset, packet_info *pinfo,
case 0x09: /* Device Name, full */
name = tvb_get_string_enc(wmem_packet_scope(), tvb, offset + i + 2, length - 1, ENC_UTF_8);
frame_number = pinfo->fd->num;
frame_number = pinfo->num;
bd_addr_oui = bd_addr[0] << 16 | bd_addr[1] << 8 | bd_addr[2];
bd_addr_id = bd_addr[3] << 16 | bd_addr[4] << 8 | bd_addr[5];
@ -918,7 +918,7 @@ dissect_bthci_evt_connect_complete(tvbuff_t *tvb, int offset, packet_info *pinfo
k_interface_id = bluetooth_data->interface_id;
k_adapter_id = bluetooth_data->adapter_id;
k_connection_handle = connection_handle;
k_frame_number = pinfo->fd->num;
k_frame_number = pinfo->num;
key[0].length = 1;
key[0].key = &k_interface_id;
@ -1014,9 +1014,9 @@ dissect_bthci_evt_disconnect_complete(tvbuff_t *tvb, int offset, packet_info *pi
key[3].key = NULL;
subtree = (wmem_tree_t *) wmem_tree_lookup32_array(bluetooth_data->chandle_sessions, key);
chandle_session = (subtree) ? (chandle_session_t *) wmem_tree_lookup32_le(subtree, pinfo->fd->num) : NULL;
if (chandle_session && chandle_session->connect_in_frame < pinfo->fd->num)
chandle_session->disconnect_in_frame = pinfo->fd->num;
chandle_session = (subtree) ? (chandle_session_t *) wmem_tree_lookup32_le(subtree, pinfo->num) : NULL;
if (chandle_session && chandle_session->connect_in_frame < pinfo->num)
chandle_session->disconnect_in_frame = pinfo->num;
}
return offset;
@ -1242,7 +1242,7 @@ dissect_bthci_evt_remote_name_req_complete(tvbuff_t *tvb, int offset,
name = tvb_get_string_enc(wmem_file_scope(), tvb, offset, 248, ENC_UTF_8);
interface_id = bluetooth_data->interface_id;
adapter_id = bluetooth_data->adapter_id;
frame_number = pinfo->fd->num;
frame_number = pinfo->num;
bd_addr_oui = bd_addr[0] << 16 | bd_addr[1] << 8 | bd_addr[2];
bd_addr_id = bd_addr[3] << 16 | bd_addr[4] << 8 | bd_addr[5];
@ -1336,7 +1336,7 @@ dissect_bthci_evt_read_remote_version_information_complete(tvbuff_t *tvb, int of
key[3].key = NULL;
subtree = (wmem_tree_t *) wmem_tree_lookup32_array(bluetooth_data->chandle_to_bdaddr, key);
remote_bdaddr = (subtree) ? (remote_bdaddr_t *) wmem_tree_lookup32_le(subtree, pinfo->fd->num) : NULL;
remote_bdaddr = (subtree) ? (remote_bdaddr_t *) wmem_tree_lookup32_le(subtree, pinfo->num) : NULL;
tap_device = wmem_new(wmem_packet_scope(), bluetooth_device_tap_t);
tap_device->type = BLUETOOTH_DEVICE_REMOTE_VERSION;
@ -1424,7 +1424,7 @@ dissect_bthci_evt_mode_change(tvbuff_t *tvb, int offset, packet_info *pinfo,
interface_id = bluetooth_data->interface_id;
adapter_id = bluetooth_data->adapter_id;
frame_number = pinfo->fd->num;
frame_number = pinfo->num;
key[0].length = 1;
key[0].key = &interface_id;
@ -1477,7 +1477,7 @@ dissect_bthci_evt_role_change(tvbuff_t *tvb, int offset, packet_info *pinfo,
interface_id = bluetooth_data->interface_id;
adapter_id = bluetooth_data->adapter_id;
frame_number = pinfo->fd->num;
frame_number = pinfo->num;
bd_addr_oui = bd_addr[0] << 16 | bd_addr[1] << 8 | bd_addr[2];
bd_addr_id = bd_addr[3] << 16 | bd_addr[4] << 8 | bd_addr[5];
@ -2006,7 +2006,7 @@ dissect_bthci_evt_le_meta(tvbuff_t *tvb, int offset, packet_info *pinfo,
k_interface_id = bluetooth_data->interface_id;
k_adapter_id = bluetooth_data->adapter_id;
k_connection_handle = connection_handle;
k_frame_number = pinfo->fd->num;
k_frame_number = pinfo->num;
key[0].length = 1;
key[0].key = &k_interface_id;
@ -2337,7 +2337,7 @@ dissect_bthci_evt_command_complete(tvbuff_t *tvb, int offset,
interface_id = bluetooth_data->interface_id;
adapter_id = bluetooth_data->adapter_id;
frame_number = pinfo->fd->num;
frame_number = pinfo->num;
ti_opcode = proto_tree_add_item(tree, hf_bthci_evt_opcode, tvb, offset, 2, ENC_LITTLE_ENDIAN);
opcode_tree = proto_item_add_subtree(ti_opcode, ett_opcode);
@ -2496,7 +2496,7 @@ dissect_bthci_evt_command_complete(tvbuff_t *tvb, int offset,
interface_id = bluetooth_data->interface_id;
adapter_id = bluetooth_data->adapter_id;
frame_number = pinfo->fd->num;
frame_number = pinfo->num;
key[0].length = 1;
key[0].key = &interface_id;
@ -3176,9 +3176,9 @@ dissect_bthci_evt_command_complete(tvbuff_t *tvb, int offset,
new_hci_vendor_data->hci_revision = hci_revision;
new_hci_vendor_data->manufacturer = manufacturer;
new_hci_vendor_data->lmp_subversion = lmp_subversion;
new_hci_vendor_data->change_in_frame = pinfo->fd->num;
new_hci_vendor_data->change_in_frame = pinfo->num;
if (hci_vendor_data && hci_vendor_data->change_in_frame < pinfo->fd->num)
if (hci_vendor_data && hci_vendor_data->change_in_frame < pinfo->num)
new_hci_vendor_data->previous = hci_vendor_data;
else
new_hci_vendor_data->previous = NULL;
@ -3725,7 +3725,7 @@ dissect_bthci_evt_sync_connection_complete(tvbuff_t *tvb, int offset,
interface_id = bluetooth_data->interface_id;
adapter_id = bluetooth_data->adapter_id;
frame_number = pinfo->fd->num;
frame_number = pinfo->num;
if (!pinfo->fd->flags.visited && status == STATUS_SUCCESS) {
remote_bdaddr_t *remote_bdaddr;
@ -3764,7 +3764,7 @@ dissect_bthci_evt_sync_connection_complete(tvbuff_t *tvb, int offset,
key[2].key = NULL;
subtree = (wmem_tree_t *) wmem_tree_lookup32_array(bthci_sco_stream_numbers, key);
sco_stream_number = (subtree) ? (bthci_sco_stream_number_t *) wmem_tree_lookup32_le(subtree, pinfo->fd->num) : NULL;
sco_stream_number = (subtree) ? (bthci_sco_stream_number_t *) wmem_tree_lookup32_le(subtree, pinfo->num) : NULL;
if (!sco_stream_number) {
stream_number = 1;
} else {
@ -4412,7 +4412,7 @@ dissect_bthci_evt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat
interface_id = bluetooth_data->interface_id;
adapter_id = bluetooth_data->adapter_id;
frame_number = pinfo->fd->num;
frame_number = pinfo->num;
opcode_list_data = (opcode_list_data_t *) wmem_list_frame_data(opcode_list_frame);
opcode = opcode_list_data->opcode;
@ -4475,7 +4475,7 @@ dissect_bthci_evt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat
guint32 frame_number;
nstime_t delta;
frame_number = pinfo->fd->num;
frame_number = pinfo->num;
if (opcode != G_MAXUINT32 && opcode >> 10 != HCI_OGF_VENDOR_SPECIFIC) {
guint8 status;

14
epan/dissectors/packet-bthci_sco.c
View File

@ -119,7 +119,7 @@ dissect_bthci_sco(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void
k_interface_id = bluetooth_data->interface_id;
k_adapter_id = bluetooth_data->adapter_id;
k_connection_handle = flags & 0x0fff;
k_frame_number = pinfo->fd->num;
k_frame_number = pinfo->num;
key[0].length = 1;
key[0].key = &k_interface_id;
@ -129,7 +129,7 @@ dissect_bthci_sco(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void
key[2].key = NULL;
subtree = (wmem_tree_t *) wmem_tree_lookup32_array(bthci_sco_stream_numbers, key);
sco_stream_number = (subtree) ? (bthci_sco_stream_number_t *) wmem_tree_lookup32_le(subtree, pinfo->fd->num) : NULL;
sco_stream_number = (subtree) ? (bthci_sco_stream_number_t *) wmem_tree_lookup32_le(subtree, pinfo->num) : NULL;
key[2].length = 1;
key[2].key = &k_connection_handle;
@ -137,10 +137,10 @@ dissect_bthci_sco(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void
key[3].key = NULL;
subtree = (wmem_tree_t *) wmem_tree_lookup32_array(bluetooth_data->chandle_sessions, key);
chandle_session = (subtree) ? (chandle_session_t *) wmem_tree_lookup32_le(subtree, pinfo->fd->num) : NULL;
chandle_session = (subtree) ? (chandle_session_t *) wmem_tree_lookup32_le(subtree, pinfo->num) : NULL;
if (!(chandle_session &&
chandle_session->connect_in_frame < pinfo->fd->num &&
chandle_session->disconnect_in_frame > pinfo->fd->num)){
chandle_session->connect_in_frame < pinfo->num &&
chandle_session->disconnect_in_frame > pinfo->num)){
chandle_session = NULL;
}
@ -169,7 +169,7 @@ dissect_bthci_sco(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void
k_bd_addr_oui = bd_addr_oui;
k_bd_addr_id = bd_addr_id;
k_frame_number = pinfo->fd->num;
k_frame_number = pinfo->num;
key[0].length = 1;
key[0].key = &k_interface_id;
@ -219,7 +219,7 @@ dissect_bthci_sco(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void
k_interface_id = bluetooth_data->interface_id;
k_adapter_id = bluetooth_data->adapter_id;
k_frame_number = pinfo->fd->num;
k_frame_number = pinfo->num;
/* localhost bdaddr and name */
key[0].length = 1;

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

@ -465,7 +465,7 @@ dissect_bthci_vendor_broadcom(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre
guint32 frame_number;
localhost_bdaddr_entry_t *localhost_bdaddr_entry;
frame_number = pinfo->fd->num;
frame_number = pinfo->num;
key[0].length = 1;
key[0].key = &bluetooth_data->interface_id;

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

@ -398,7 +398,7 @@ dissect_bthcrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
service_type = BTSDP_L2CAP_PROTOCOL_UUID;
service_channel = l2cap_data->psm;
frame_number = pinfo->fd->num;
frame_number = pinfo->num;
key[0].length = 1;
key[0].key = &interface_id;

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

@ -1950,7 +1950,7 @@ dissect_bthfp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
service_type = BTSDP_RFCOMM_PROTOCOL_UUID;
service_channel = dlci >> 1;
frame_number = pinfo->fd->num;
frame_number = pinfo->num;
key[0].length = 1;
key[0].key = &interface_id;
@ -2008,7 +2008,7 @@ dissect_bthfp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
/* save fragments */
if (!pinfo->fd->flags.visited) {
frame_number = pinfo->fd->num - 1;
frame_number = pinfo->num - 1;
key[0].length = 1;
key[0].key = &interface_id;
@ -2035,7 +2035,7 @@ dissect_bthfp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
previous_fragment = NULL;
}
frame_number = pinfo->fd->num;
frame_number = pinfo->num;
key[0].length = 1;
key[0].key = &interface_id;
@ -2088,7 +2088,7 @@ dissect_bthfp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
reassemble_start_offset = i_length + 1;
}
frame_number = pinfo->fd->num;
frame_number = pinfo->num;
key[0].length = 1;
key[0].key = &interface_id;
@ -2150,7 +2150,7 @@ dissect_bthfp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
}
/* recover reassembled payload */
frame_number = pinfo->fd->num;
frame_number = pinfo->num;
key[0].length = 1;
key[0].key = &interface_id;

14
epan/dissectors/packet-bthsp.c
View File

@ -521,7 +521,7 @@ dissect_at_command(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
adapter_id = adapter_id;
chandle = chandle;
dlci = dlci;
frame_number = pinfo->fd->num;
frame_number = pinfo->num;
key[0].length = 1;
@ -543,7 +543,7 @@ dissect_at_command(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
cmd->chandle = chandle;
cmd->dlci = dlci;
cmd->frame_number = pinfo->fd->num;
cmd->frame_number = pinfo->num;
cmd->status = STATUS_NO_RESPONSE;
cmd->time = pinfo->abs_ts;
cmd->at_command
@ -718,7 +718,7 @@ dissect_bthsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
service_type = BTSDP_RFCOMM_PROTOCOL_UUID;
service_channel = dlci >> 1;
frame_number = pinfo->fd->num;
frame_number = pinfo->num;
key[0].length = 1;
key[0].key = &interface_id;
@ -776,7 +776,7 @@ dissect_bthsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
/* save fragments */
if (!pinfo->fd->flags.visited) {
frame_number = pinfo->fd->num - 1;
frame_number = pinfo->num - 1;
key[0].length = 1;
key[0].key = &interface_id;
@ -803,7 +803,7 @@ dissect_bthsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
previous_fragment = NULL;
}
frame_number = pinfo->fd->num;
frame_number = pinfo->num;
key[0].length = 1;
key[0].key = &interface_id;
@ -856,7 +856,7 @@ dissect_bthsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
reassemble_start_offset = i_length + 1;
}
frame_number = pinfo->fd->num;
frame_number = pinfo->num;
key[0].length = 1;
key[0].key = &interface_id;
@ -918,7 +918,7 @@ dissect_bthsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
}
/* recover reassembled payload */
frame_number = pinfo->fd->num;
frame_number = pinfo->num;
key[0].length = 1;
key[0].key = &interface_id;

50
epan/dissectors/packet-btl2cap.c
View File

@ -162,7 +162,7 @@ static wmem_tree_t *cid_to_psm_table = NULL;
typedef struct _config_data_t {
guint8 mode;
guint8 txwindow;
wmem_tree_t *start_fragments; /* indexed by pinfo->fd->num */
wmem_tree_t *start_fragments; /* indexed by pinfo->num */
} config_data_t;
typedef struct _sdu_reassembly_t
@ -491,7 +491,7 @@ get_service_uuid(packet_info *pinfo, btl2cap_data_t *l2cap_data, guint16 psm, gb
k_service_type = BTSDP_L2CAP_PROTOCOL_UUID;
k_service_channel = psm;
k_frame_number = pinfo->fd->num;
k_frame_number = pinfo->num;
key[0].length = 1;
key[0].key = &k_interface_id;
@ -638,7 +638,7 @@ dissect_connrequest(tvbuff_t *tvb, int offset, packet_info *pinfo,
k_adapter_id = adapter_id;
k_chandle = chandle;
k_cid = scid | ((pinfo->p2p_dir == P2P_DIR_RECV) ? 0x80000000 : 0x00000000);
k_frame_number = pinfo->fd->num;
k_frame_number = pinfo->num;
psm_data = wmem_new(wmem_file_scope(), psm_data_t);
if (pinfo->p2p_dir == P2P_DIR_RECV) {
@ -659,7 +659,7 @@ dissect_connrequest(tvbuff_t *tvb, int offset, packet_info *pinfo,
psm_data->interface_id = k_interface_id;
psm_data->adapter_id = k_adapter_id;
psm_data->chandle = k_chandle;
psm_data->connect_in_frame = pinfo->fd->num;
psm_data->connect_in_frame = pinfo->num;
psm_data->disconnect_in_frame = max_disconnect_in_frame;
key[0].length = 1;
@ -704,7 +704,7 @@ dissect_connrequest(tvbuff_t *tvb, int offset, packet_info *pinfo,
k_adapter_id = adapter_id;
k_chandle = chandle;
k_cid = scid | ((pinfo->p2p_dir == P2P_DIR_RECV) ? 0x80000000 : 0x00000000);
k_frame_number = pinfo->fd->num;
k_frame_number = pinfo->num;
key[0].length = 1;
key[0].key = &k_interface_id;
@ -947,7 +947,7 @@ dissect_configrequest(tvbuff_t *tvb, int offset, packet_info *pinfo,
k_adapter_id = adapter_id;
k_chandle = chandle;
k_cid = cid;
k_frame_number = pinfo->fd->num;
k_frame_number = pinfo->num;
key[0].length = 1;
key[0].key = &k_interface_id;
@ -968,7 +968,7 @@ dissect_configrequest(tvbuff_t *tvb, int offset, packet_info *pinfo,
psm_data->chandle == chandle &&
((pinfo->p2p_dir == P2P_DIR_SENT && psm_data->remote_cid == cid) ||
(pinfo->p2p_dir == P2P_DIR_RECV && psm_data->local_cid == cid)) &&
psm_data->disconnect_in_frame > pinfo->fd->num) {
psm_data->disconnect_in_frame > pinfo->num) {
if (pinfo->p2p_dir == P2P_DIR_RECV)
config_data = &(psm_data->out);
else
@ -1142,7 +1142,7 @@ dissect_configresponse(tvbuff_t *tvb, int offset, packet_info *pinfo,
k_adapter_id = adapter_id;
k_chandle = chandle;
k_cid = cid;
k_frame_number = pinfo->fd->num;
k_frame_number = pinfo->num;
key[0].length = 1;
key[0].key = &k_interface_id;
@ -1163,7 +1163,7 @@ dissect_configresponse(tvbuff_t *tvb, int offset, packet_info *pinfo,
psm_data->chandle == chandle &&
((pinfo->p2p_dir == P2P_DIR_SENT && psm_data->local_cid == cid) ||
(pinfo->p2p_dir == P2P_DIR_RECV && psm_data->remote_cid == cid)) &&
psm_data->disconnect_in_frame > pinfo->fd->num) {
psm_data->disconnect_in_frame > pinfo->num) {
if (pinfo->p2p_dir == P2P_DIR_RECV)
config_data = &(psm_data->out);
else
@ -1231,7 +1231,7 @@ dissect_connresponse(tvbuff_t *tvb, int offset, packet_info *pinfo,
k_adapter_id = adapter_id;
k_chandle = chandle;
k_cid = cid;
k_frame_number = pinfo->fd->num;
k_frame_number = pinfo->num;
key[0].length = 1;
key[0].key = &k_interface_id;
@ -1252,14 +1252,14 @@ dissect_connresponse(tvbuff_t *tvb, int offset, packet_info *pinfo,
psm_data->chandle == chandle &&
((pinfo->p2p_dir == P2P_DIR_SENT && psm_data->remote_cid == cid) ||
(pinfo->p2p_dir == P2P_DIR_RECV && psm_data->local_cid == cid)) &&
psm_data->disconnect_in_frame > pinfo->fd->num) {
psm_data->disconnect_in_frame > pinfo->num) {
cid = dcid | ((pinfo->p2p_dir == P2P_DIR_RECV) ? 0x80000000 : 0x00000000);
k_interface_id = interface_id;
k_adapter_id = adapter_id;
k_chandle = chandle;
k_cid = cid;
k_frame_number = pinfo->fd->num;
k_frame_number = pinfo->num;
key[0].length = 1;
key[0].key = &k_interface_id;
@ -1437,7 +1437,7 @@ dissect_disconnrequestresponse(tvbuff_t *tvb, int offset, packet_info *pinfo,
k_adapter_id = adapter_id;
k_chandle = chandle;
k_cid = key_dcid;
k_frame_number = pinfo->fd->num;
k_frame_number = pinfo->num;
key[0].length = 1;
key[0].key = &k_interface_id;
@ -1458,14 +1458,14 @@ dissect_disconnrequestresponse(tvbuff_t *tvb, int offset, packet_info *pinfo,
psm_data->chandle == chandle &&
psm_data->remote_cid == key_dcid &&
psm_data->disconnect_in_frame == max_disconnect_in_frame) {
psm_data->disconnect_in_frame = pinfo->fd->num;
psm_data->disconnect_in_frame = pinfo->num;
}
k_interface_id = interface_id;
k_adapter_id = adapter_id;
k_chandle = chandle;
k_cid = key_scid;
k_frame_number = pinfo->fd->num;
k_frame_number = pinfo->num;
key[0].length = 1;
key[0].key = &k_interface_id;
@ -1486,7 +1486,7 @@ dissect_disconnrequestresponse(tvbuff_t *tvb, int offset, packet_info *pinfo,
psm_data->chandle == chandle &&
psm_data->local_cid == key_scid &&
psm_data->disconnect_in_frame == max_disconnect_in_frame) {
psm_data->disconnect_in_frame = pinfo->fd->num;
psm_data->disconnect_in_frame = pinfo->num;
}
}
@ -1523,7 +1523,7 @@ dissect_disconnrequestresponse(tvbuff_t *tvb, int offset, packet_info *pinfo,
k_adapter_id = adapter_id;
k_chandle = chandle;
k_cid = key_dcid;
k_frame_number = pinfo->fd->num;
k_frame_number = pinfo->num;
key[0].length = 1;
key[0].key = &k_interface_id;
@ -1728,15 +1728,15 @@ dissect_i_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
if (!pinfo->fd->flags.visited) {
mfp = wmem_new(wmem_file_scope(), sdu_reassembly_t);
mfp->first_frame = pinfo->fd->num;
mfp->first_frame = pinfo->num;
mfp->last_frame = 0;
mfp->tot_len = sdulen;
mfp->reassembled = (guint8 *) wmem_alloc(wmem_file_scope(), sdulen);
tvb_memcpy(tvb, mfp->reassembled, offset, sdulen);
mfp->cur_off = sdulen;
wmem_tree_insert32(config_data->start_fragments, pinfo->fd->num, mfp);
wmem_tree_insert32(config_data->start_fragments, pinfo->num, mfp);
} else {
mfp = (sdu_reassembly_t *)wmem_tree_lookup32(config_data->start_fragments, pinfo->fd->num);
mfp = (sdu_reassembly_t *)wmem_tree_lookup32(config_data->start_fragments, pinfo->num);
}
if (mfp != NULL && mfp->last_frame) {
proto_item *item;
@ -1753,13 +1753,13 @@ dissect_i_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
length -= 4; /*Control, FCS*/
}
if (segment == 0x02 || segment == 0x03) {
mfp = (sdu_reassembly_t *)wmem_tree_lookup32_le(config_data->start_fragments, pinfo->fd->num);
mfp = (sdu_reassembly_t *)wmem_tree_lookup32_le(config_data->start_fragments, pinfo->num);
if (!pinfo->fd->flags.visited) {
if (mfp != NULL && !mfp->last_frame && (mfp->tot_len>=mfp->cur_off + length)) {
tvb_memcpy(tvb, mfp->reassembled + mfp->cur_off, offset, length);
mfp->cur_off += length;
if (segment == 0x02) {
mfp->last_frame = pinfo->fd->num;
mfp->last_frame = pinfo->num;
}
}
}
@ -1770,7 +1770,7 @@ dissect_i_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
col_append_fstr(pinfo->cinfo, COL_INFO, "[Continuation to #%u] ", mfp->first_frame);
}
}
if (segment == 0x02 && mfp != NULL && mfp->last_frame == pinfo->fd->num) {
if (segment == 0x02 && mfp != NULL && mfp->last_frame == pinfo->num) {
next_tvb = tvb_new_child_real_data(tvb, (guint8 *)mfp->reassembled, mfp->tot_len, mfp->tot_len);
add_new_data_source(pinfo, next_tvb, "Reassembled L2CAP");
}
@ -2246,7 +2246,7 @@ dissect_btl2cap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
k_adapter_id = adapter_id;
k_chandle = chandle;
k_cid = key_cid;
k_frame_number = pinfo->fd->num;
k_frame_number = pinfo->num;
key[0].length = 1;
key[0].key = &k_interface_id;
@ -2267,7 +2267,7 @@ dissect_btl2cap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
psm_data->chandle == chandle &&
(psm_data->local_cid == key_cid ||
psm_data->remote_cid == key_cid) &&
psm_data->disconnect_in_frame > pinfo->fd->num) {
psm_data->disconnect_in_frame > pinfo->num) {
config_data_t *config_data;
proto_item *sub_item;
guint32 bt_uuid;

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

@ -394,7 +394,7 @@ dissect_btle(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
else
adapter_id = HCI_ADAPTER_DEFAULT;
frame_number = pinfo->fd->num;
frame_number = pinfo->num;
if (access_address == ACCESS_ADDRESS_ADVERTISING) {
proto_item *advertising_header_item;
@ -668,7 +668,7 @@ dissect_btle(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
wmem_tree = (wmem_tree_t *) wmem_tree_lookup32_array(connection_addresses, key);
if (wmem_tree) {
connection_address = (connection_address_t *) wmem_tree_lookup32_le(wmem_tree, pinfo->fd->num);
connection_address = (connection_address_t *) wmem_tree_lookup32_le(wmem_tree, pinfo->num);
if (connection_address) {
gchar *str_addr;
int str_addr_len = 18 + 1;

22
epan/dissectors/packet-btobex.c
View File

@ -1018,7 +1018,7 @@ save_path(packet_info *pinfo, const gchar *current_path, const gchar *name,
guint32 frame_number;
const gchar *path = path_unknown;
frame_number = pinfo->fd->num;
frame_number = pinfo->num;
key[0].length = 1;
key[0].key = &obex_proto_data->interface_id;
@ -2010,7 +2010,7 @@ dissect_headers(proto_tree *tree, tvbuff_t *tvb, int offset, packet_info *pinfo,
obex_profile_data_t *obex_profile_data;
wmem_tree_key_t key[6];
frame_number = pinfo->fd->num;
frame_number = pinfo->num;
key[0].length = 1;
key[0].key = &obex_proto_data->interface_id;
@ -2296,7 +2296,7 @@ dissect_btobex(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
save_fragmented = pinfo->fragmented;
frame_number = pinfo->fd->num;
frame_number = pinfo->num;
key[0].length = 1;
key[0].key = &obex_proto_data.interface_id;
@ -2353,12 +2353,12 @@ dissect_btobex(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
if (tvb_captured_length(tvb) == tvb_reported_length(tvb)) {
frag_msg = fragment_get_reassembled_id(&btobex_reassembly_table, pinfo, pinfo->p2p_dir);
if (frag_msg && pinfo->fd->num != frag_msg->reassembled_in) {
if (frag_msg && pinfo->num != frag_msg->reassembled_in) {
/* reassembled but not last */
new_tvb = process_reassembled_data(tvb, 0, pinfo,
"Reassembled Obex packet", frag_msg, &btobex_frag_items, NULL, main_tree);
} else if (frag_msg && pinfo->fd->num == frag_msg->reassembled_in) {
} else if (frag_msg && pinfo->num == frag_msg->reassembled_in) {
/* reassembled and last, so dissect reassembled packet here */
new_tvb = process_reassembled_data(tvb, 0, pinfo,
@ -2451,7 +2451,7 @@ dissect_btobex(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
if (!pinfo->fd->flags.visited &&
(pinfo->p2p_dir == P2P_DIR_SENT ||
pinfo->p2p_dir == P2P_DIR_RECV)) {
frame_number = pinfo->fd->num;
frame_number = pinfo->num;
key[0].length = 1;
key[0].key = &obex_proto_data.interface_id;
@ -2490,7 +2490,7 @@ dissect_btobex(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
length = tvb_get_ntohs(tvb, offset) - 3;
offset += 2;
frame_number = pinfo->fd->num;
frame_number = pinfo->num;
key[0].length = 1;
key[0].key = &obex_proto_data.interface_id;
@ -2510,16 +2510,16 @@ dissect_btobex(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
obex_last_opcode_data->adapter_id == obex_proto_data.adapter_id &&
obex_last_opcode_data->chandle == obex_proto_data.chandle &&
obex_last_opcode_data->channel == obex_proto_data.channel) {
if (obex_last_opcode_data->request_in_frame > 0 && obex_last_opcode_data->request_in_frame != pinfo->fd->num) {
if (obex_last_opcode_data->request_in_frame > 0 && obex_last_opcode_data->request_in_frame != pinfo->num) {
sub_item = proto_tree_add_uint(main_tree, hf_request_in_frame, next_tvb, 0, 0, obex_last_opcode_data->request_in_frame);
PROTO_ITEM_SET_GENERATED(sub_item);
}
if (!pinfo->fd->flags.visited && obex_last_opcode_data->response_in_frame == 0 && obex_last_opcode_data->request_in_frame < pinfo->fd->num) {
obex_last_opcode_data->response_in_frame = pinfo->fd->num;
if (!pinfo->fd->flags.visited && obex_last_opcode_data->response_in_frame == 0 && obex_last_opcode_data->request_in_frame < pinfo->num) {
obex_last_opcode_data->response_in_frame = pinfo->num;
}
if (obex_last_opcode_data->response_in_frame > 0 && obex_last_opcode_data->response_in_frame != pinfo->fd->num) {
if (obex_last_opcode_data->response_in_frame > 0 && obex_last_opcode_data->response_in_frame != pinfo->num) {
sub_item = proto_tree_add_uint(main_tree, hf_response_in_frame, next_tvb, 0, 0, obex_last_opcode_data->response_in_frame);
PROTO_ITEM_SET_GENERATED(sub_item);
}

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

@ -648,7 +648,7 @@ dissect_btrfcomm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data
k_chandle = l2cap_data->chandle;
k_psm = l2cap_data->psm;
k_channel = dlci >> 1;
k_frame_number = pinfo->fd->num;
k_frame_number = pinfo->num;
k_dlci = dlci;
key[0].length = 1;

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

@ -1158,7 +1158,7 @@ get_uuids(packet_info *pinfo, guint32 record_handle, btl2cap_data_t *l2cap_data)
adapter_id = l2cap_data->adapter_id;
chandle = l2cap_data->chandle;
psm = l2cap_data->psm;
frame_number = pinfo->fd->num;
frame_number = pinfo->num;
k_interface_id = interface_id;
k_adapter_id = adapter_id;
@ -1239,7 +1239,7 @@ save_channel(packet_info *pinfo, guint32 type_protocol, guint32 channel,
k_bd_addr_id = service_info->bd_addr_id;
k_service_type = service_info->type;
k_service_channel = service_info->channel;
k_frame_number = pinfo->fd->num;
k_frame_number = pinfo->num;
key[0].length = 1;
key[0].key = &k_interface_id;
@ -1467,7 +1467,7 @@ reassemble_continuation_state(tvbuff_t *tvb, packet_info *pinfo,
adapter_id = l2cap_data->adapter_id;
chandle = l2cap_data->chandle;
psm = l2cap_data->psm;
frame_number = pinfo->fd->num;
frame_number = pinfo->num;
k_interface_id = interface_id;
k_adapter_id = adapter_id;
@ -3992,7 +3992,7 @@ dissect_sdp_service_attribute_list(proto_tree *tree, tvbuff_t *tvb, gint offset,
k_bd_addr_id = service_info->bd_addr_id;
k_service_type = service_info->type;
k_service_channel = service_info->channel;
k_frame_number = pinfo->fd->num;
k_frame_number = pinfo->num;
key[0].length = 1;
key[0].key = &k_interface_id;
@ -4196,7 +4196,7 @@ dissect_sdp_service_search_response(proto_tree *tree, tvbuff_t *tvb,
adapter_id = l2cap_data->adapter_id;
chandle = l2cap_data->chandle;
psm = l2cap_data->psm;
frame_number = pinfo->fd->num;
frame_number = pinfo->num;
k_interface_id = interface_id;
k_adapter_id = adapter_id;

50
epan/dissectors/packet-camel.c
View File

@ -7484,7 +7484,7 @@ static void
update_camelsrt_call(struct camelsrt_call_t *p_camelsrt_call, packet_info *pinfo,
guint msg_category)
{
p_camelsrt_call->category[msg_category].req_num = pinfo->fd->num;
p_camelsrt_call->category[msg_category].req_num = pinfo->num;
p_camelsrt_call->category[msg_category].rsp_num = 0;
p_camelsrt_call->category[msg_category].responded = FALSE;
p_camelsrt_call->category[msg_category].req_time = pinfo->abs_ts;
@ -7504,7 +7504,7 @@ camelsrt_close_call_matching(packet_info *pinfo,
p_camelsrt_info->bool_msginfo[CAMELSRT_SESSION]=TRUE;
#ifdef DEBUG_CAMELSRT
dbg(10,"\n Session end #%u\n", pinfo->fd->num);
dbg(10,"\n Session end #%u\n", pinfo->num);
#endif
/* look only for matching request, if matching conversation is available. */
camelsrt_call_key.SessionIdKey = p_camelsrt_info->tcap_session_id;
@ -7586,7 +7586,7 @@ camelsrt_begin_call_matching(packet_info *pinfo,
/* look up the request */
#ifdef DEBUG_CAMELSRT
dbg(10,"\n Session begin #%u\n", pinfo->fd->num);
dbg(10,"\n Session begin #%u\n", pinfo->num);
dbg(11,"Search key %lu ",camelsrt_call_key.SessionIdKey);
#endif
p_camelsrt_call = (struct camelsrt_call_t *)g_hash_table_lookup(srt_calls, &camelsrt_call_key);
@ -7625,7 +7625,7 @@ camelsrt_request_call_matching(tvbuff_t *tvb, packet_info *pinfo,
proto_item *ti, *hidden_item;
#ifdef DEBUG_CAMELSRT
dbg(10,"\n %s #%u\n", val_to_str_const(srt_type, camelSRTtype_naming, "Unk"),pinfo->fd->num);
dbg(10,"\n %s #%u\n", val_to_str_const(srt_type, camelSRTtype_naming, "Unk"),pinfo->num);
#endif
/* look only for matching request, if matching conversation is available. */
@ -7650,20 +7650,20 @@ camelsrt_request_call_matching(tvbuff_t *tvb, packet_info *pinfo,
srt_type=CAMELSRT_VOICE_ACR1;
} else if ( (p_camelsrt_call->category[CAMELSRT_VOICE_ACR2].req_num == 0)
&& (p_camelsrt_call->category[CAMELSRT_VOICE_ACR1].rsp_num != 0)
&& (p_camelsrt_call->category[CAMELSRT_VOICE_ACR1].rsp_num < pinfo->fd->num) ) {
&& (p_camelsrt_call->category[CAMELSRT_VOICE_ACR1].rsp_num < pinfo->num) ) {
srt_type=CAMELSRT_VOICE_ACR2;
} else if ( (p_camelsrt_call->category[CAMELSRT_VOICE_ACR3].req_num == 0)
&& (p_camelsrt_call->category[CAMELSRT_VOICE_ACR2].rsp_num != 0)
&& (p_camelsrt_call->category[CAMELSRT_VOICE_ACR2].rsp_num < pinfo->fd->num) ) {
&& (p_camelsrt_call->category[CAMELSRT_VOICE_ACR2].rsp_num < pinfo->num) ) {
srt_type=CAMELSRT_VOICE_ACR3;
} else if (p_camelsrt_call->category[CAMELSRT_VOICE_ACR1].rsp_num != 0
&& p_camelsrt_call->category[CAMELSRT_VOICE_ACR1].rsp_num > pinfo->fd->num) {
&& p_camelsrt_call->category[CAMELSRT_VOICE_ACR1].rsp_num > pinfo->num) {
srt_type=CAMELSRT_VOICE_ACR1;
} else if ( p_camelsrt_call->category[CAMELSRT_VOICE_ACR2].rsp_num != 0
&& p_camelsrt_call->category[CAMELSRT_VOICE_ACR2].rsp_num > pinfo->fd->num) {
&& p_camelsrt_call->category[CAMELSRT_VOICE_ACR2].rsp_num > pinfo->num) {
srt_type=CAMELSRT_VOICE_ACR2;
} else if (p_camelsrt_call->category[CAMELSRT_VOICE_ACR1].rsp_num != 0
&& p_camelsrt_call->category[CAMELSRT_VOICE_ACR3].rsp_num > pinfo->fd->num) {
&& p_camelsrt_call->category[CAMELSRT_VOICE_ACR3].rsp_num > pinfo->num) {
srt_type=CAMELSRT_VOICE_ACR3;
}
#ifdef DEBUG_CAMELSRT
@ -7680,12 +7680,12 @@ camelsrt_request_call_matching(tvbuff_t *tvb, packet_info *pinfo,
/* We have not yet seen a request to that call, so this must be the first request
remember its frame number. */
#ifdef DEBUG_CAMELSRT
dbg(5,"Set reqlink #%u ", pinfo->fd->num);
dbg(5,"Set reqlink #%u ", pinfo->num);
#endif
update_camelsrt_call(p_camelsrt_call, pinfo, srt_type);
} else {
/* We have seen a request to this call - but was it *this* request? */
if (p_camelsrt_call->category[srt_type].req_num != pinfo->fd->num) {
if (p_camelsrt_call->category[srt_type].req_num != pinfo->num) {
if (srt_type!=CAMELSRT_VOICE_DISC) {
/* No, so it's a duplicate request. Mark it as such. */
@ -7700,10 +7700,10 @@ camelsrt_request_call_matching(tvbuff_t *tvb, packet_info *pinfo,
} else {
/* Ignore duplicate frame */
if (pinfo->fd->num > p_camelsrt_call->category[srt_type].req_num) {
p_camelsrt_call->category[srt_type].req_num = pinfo->fd->num;
if (pinfo->num > p_camelsrt_call->category[srt_type].req_num) {
p_camelsrt_call->category[srt_type].req_num = pinfo->num;
#ifdef DEBUG_CAMELSRT
dbg(5,"DISC Set reqlink #%u ", pinfo->fd->num);
dbg(5,"DISC Set reqlink #%u ", pinfo->num);
#endif
update_camelsrt_call(p_camelsrt_call, pinfo, srt_type);
} /* greater frame */
@ -7715,7 +7715,7 @@ camelsrt_request_call_matching(tvbuff_t *tvb, packet_info *pinfo,
if ( gcamel_DisplaySRT &&
(p_camelsrt_call->category[srt_type].rsp_num != 0) &&
(p_camelsrt_call->category[srt_type].req_num != 0) &&
(p_camelsrt_call->category[srt_type].req_num == pinfo->fd->num) ) {
(p_camelsrt_call->category[srt_type].req_num == pinfo->num) ) {
#ifdef DEBUG_CAMELSRT
dbg(20,"Display_framersplink %d ",p_camelsrt_call->category[srt_type].rsp_num);
#endif
@ -7795,7 +7795,7 @@ camelsrt_report_call_matching(tvbuff_t *tvb, packet_info *pinfo,
proto_item *ti, *hidden_item;
#ifdef DEBUG_CAMELSRT
dbg(10,"\n %s #%u\n", val_to_str_const(srt_type, camelSRTtype_naming, "Unk"),pinfo->fd->num);
dbg(10,"\n %s #%u\n", val_to_str_const(srt_type, camelSRTtype_naming, "Unk"),pinfo->num);
#endif
camelsrt_call_key.SessionIdKey = p_camelsrt_info->tcap_session_id;
/* look only for matching request, if matching conversation is available. */
@ -7813,13 +7813,13 @@ camelsrt_report_call_matching(tvbuff_t *tvb, packet_info *pinfo,
if (srt_type==CAMELSRT_VOICE_ACR1) {
if (p_camelsrt_call->category[CAMELSRT_VOICE_ACR3].req_num != 0
&& p_camelsrt_call->category[CAMELSRT_VOICE_ACR3].req_num < pinfo->fd->num) {
&& p_camelsrt_call->category[CAMELSRT_VOICE_ACR3].req_num < pinfo->num) {
srt_type=CAMELSRT_VOICE_ACR1;
} else if ( p_camelsrt_call->category[CAMELSRT_VOICE_ACR2].req_num != 0
&& p_camelsrt_call->category[CAMELSRT_VOICE_ACR2].req_num < pinfo->fd->num) {
&& p_camelsrt_call->category[CAMELSRT_VOICE_ACR2].req_num < pinfo->num) {
srt_type=CAMELSRT_VOICE_ACR2;
} else if (p_camelsrt_call->category[CAMELSRT_VOICE_ACR1].req_num != 0
&& p_camelsrt_call->category[CAMELSRT_VOICE_ACR1].req_num < pinfo->fd->num) {
&& p_camelsrt_call->category[CAMELSRT_VOICE_ACR1].req_num < pinfo->num) {
srt_type=CAMELSRT_VOICE_ACR1;
}
#ifdef DEBUG_CAMELSRT
@ -7830,22 +7830,22 @@ camelsrt_report_call_matching(tvbuff_t *tvb, packet_info *pinfo,
if (p_camelsrt_call->category[srt_type].rsp_num == 0) {
if ( (p_camelsrt_call->category[srt_type].req_num != 0)
&& (pinfo->fd->num > p_camelsrt_call->category[srt_type].req_num) ){
&& (pinfo->num > p_camelsrt_call->category[srt_type].req_num) ){
/* We have not yet seen a response to that call, so this must be the first response;
remember its frame number only if response comes after request */
#ifdef DEBUG_CAMELSRT
dbg(14,"Set reslink #%d req %u ",pinfo->fd->num, p_camelsrt_call->category[srt_type].req_num);
dbg(14,"Set reslink #%d req %u ",pinfo->num, p_camelsrt_call->category[srt_type].req_num);
#endif
p_camelsrt_call->category[srt_type].rsp_num = pinfo->fd->num;
p_camelsrt_call->category[srt_type].rsp_num = pinfo->num;
} else {
#ifdef DEBUG_CAMELSRT
dbg(2,"badreslink #%u req %u ",pinfo->fd->num, p_camelsrt_call->category[srt_type].req_num);
dbg(2,"badreslink #%u req %u ",pinfo->num, p_camelsrt_call->category[srt_type].req_num);
#endif
} /* req_num != 0 */
} else { /* rsp_num != 0 */
/* We have seen a response to this call - but was it *this* response? */
if (p_camelsrt_call->category[srt_type].rsp_num != pinfo->fd->num) {
if (p_camelsrt_call->category[srt_type].rsp_num != pinfo->num) {
/* No, so it's a duplicate response. Mark it as such. */
#ifdef DEBUG_CAMELSRT
dbg(21,"Display_duplicate rsp=%d ", p_camelsrt_call->category[srt_type].rsp_num);
@ -7860,7 +7860,7 @@ camelsrt_report_call_matching(tvbuff_t *tvb, packet_info *pinfo,
if ( (p_camelsrt_call->category[srt_type].req_num != 0) &&
(p_camelsrt_call->category[srt_type].rsp_num != 0) &&
(p_camelsrt_call->category[srt_type].rsp_num == pinfo->fd->num) ) {
(p_camelsrt_call->category[srt_type].rsp_num == pinfo->num) ) {
p_camelsrt_call->category[srt_type].responded = TRUE;
p_camelsrt_info->msginfo[srt_type].request_available = TRUE;

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

@ -5247,7 +5247,7 @@ dissect_cip_cm_fwd_open_req(cip_req_info_t *preq_info, proto_tree *cmd_tree, tvb
preq_info->connInfo->ConnSerialNumber = ConnSerialNumber;
preq_info->connInfo->VendorID = VendorID;
preq_info->connInfo->DeviceSerialNumber = DeviceSerialNumber;
preq_info->connInfo->forward_open_frame = pinfo->fd->num;
preq_info->connInfo->forward_open_frame = pinfo->num;
preq_info->connInfo->O2T.connID = O2TConnID;
preq_info->connInfo->T2O.connID = T2OConnID;
preq_info->connInfo->TransportClass_trigger = TransportClass_trigger;

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

@ -289,7 +289,7 @@ dissect_classicstun(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *d
if (((msg_type & CLASS_MASK) >> 4) == REQUEST) {
/* This is a request */
classicstun_trans=wmem_new(wmem_file_scope(), classicstun_transaction_t);
classicstun_trans->req_frame=pinfo->fd->num;
classicstun_trans->req_frame=pinfo->num;
classicstun_trans->rep_frame=0;
classicstun_trans->req_time=pinfo->abs_ts;
wmem_tree_insert32_array(classicstun_info->pdus, transaction_id_key,
@ -298,7 +298,7 @@ dissect_classicstun(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *d
classicstun_trans=(classicstun_transaction_t *)wmem_tree_lookup32_array(classicstun_info->pdus,
transaction_id_key);
if(classicstun_trans){
classicstun_trans->rep_frame=pinfo->fd->num;
classicstun_trans->rep_frame=pinfo->num;
}
}
} else {

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

@ -1058,7 +1058,7 @@ dissect_cops_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data
cops_call = wmem_new(wmem_file_scope(), cops_call_t);
cops_call->op_code = op_code;
cops_call->solicited = is_solicited;
cops_call->req_num = PINFO_FD_NUM(pinfo);
cops_call->req_num = pinfo->num;
cops_call->rsp_num = 0;
cops_call->req_time = pinfo->abs_ts;
g_ptr_array_add(pdus_array, cops_call);
@ -1066,7 +1066,7 @@ dissect_cops_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data
else {
for (i=0; i < pdus_array->len; i++) {
cops_call = (cops_call_t*)g_ptr_array_index(pdus_array, i);
if ( cops_call->req_num == PINFO_FD_NUM(pinfo)
if ( cops_call->req_num == pinfo->num
&& cops_call->rsp_num != 0) {
ti = proto_tree_add_uint_format(cops_tree, hf_cops_response_in, tvb, 0, 0, cops_call->rsp_num,
"Response to this request is in frame %u", cops_call->rsp_num);
@ -1104,7 +1104,7 @@ dissect_cops_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data
op_code == COPS_MSG_CC) ) ||
( (cops_call->op_code == COPS_MSG_KA && !(cops_call->solicited)) &&
(op_code == COPS_MSG_KA && is_solicited) ) ) {
cops_call->rsp_num = PINFO_FD_NUM(pinfo);
cops_call->rsp_num = pinfo->num;
break;
}
}
@ -1112,7 +1112,7 @@ dissect_cops_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data
else {
for (i=0; i < pdus_array->len; i++) {
cops_call = (cops_call_t*)g_ptr_array_index(pdus_array, i);
if ( cops_call->rsp_num == PINFO_FD_NUM(pinfo) ) {
if ( cops_call->rsp_num == pinfo->num ) {
ti = proto_tree_add_uint_format(cops_tree, hf_cops_response_to, tvb, 0, 0, cops_call->req_num,
"Response to a request in frame %u", cops_call->req_num);
PROTO_ITEM_SET_GENERATED(ti);

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

@ -552,7 +552,7 @@ dissect_bs_response_frame(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, i
req_frame_num = request_data->fnum;
req_command_code = request_data->commmand_code;
req_address_word = request_data->address_word;
if ((pinfo->fd->num > req_frame_num) && (req_address_word == address_word)) {
if ((pinfo->num > req_frame_num) && (req_address_word == address_word)) {
bs_response_item = proto_tree_add_uint(cp2179_proto_tree, hf_cp2179_request_frame, tvb, 0, 0, req_frame_num);
PROTO_ITEM_SET_GENERATED(bs_response_item);
request_found = TRUE;
@ -919,7 +919,7 @@ dissect_cp2179_pdu(tvbuff_t *cp2179_tvb, packet_info *pinfo, proto_tree *tree, v
frame_ptr = copy_bs_request_frame(cp2179_tvb);
/*also hold the current frame number*/
frame_ptr->fnum = pinfo->fd->num;
frame_ptr->fnum = pinfo->num;
wmem_list_prepend(bs_conv_data->bs_request_frame_data, frame_ptr);
}
} /* !visited */

20
epan/dissectors/packet-ctdb.c
View File

@ -459,18 +459,18 @@ ctdb_display_trans(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, ctdb_tra
{
proto_item *item;
if(ctdb_trans->request_in!=pinfo->fd->num){
if(ctdb_trans->request_in!=pinfo->num){
item=proto_tree_add_uint(tree, hf_ctdb_request_in, tvb, 0, 0, ctdb_trans->request_in);
PROTO_ITEM_SET_GENERATED(item);
}
if( (ctdb_trans->response_in!=0)
&&(ctdb_trans->response_in!=pinfo->fd->num) ){
&&(ctdb_trans->response_in!=pinfo->num) ){
item=proto_tree_add_uint(tree, hf_ctdb_response_in, tvb, 0, 0, ctdb_trans->response_in);
PROTO_ITEM_SET_GENERATED(item);
}
if(pinfo->fd->num==ctdb_trans->response_in){
if(pinfo->num==ctdb_trans->response_in){
nstime_t ns;
nstime_delta(&ns, &pinfo->abs_ts, &ctdb_trans->req_time);
@ -484,18 +484,18 @@ ctdb_display_control(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, ctdb_c
{
proto_item *item;
if(ctdb_control->request_in!=pinfo->fd->num){
if(ctdb_control->request_in!=pinfo->num){
item=proto_tree_add_uint(tree, hf_ctdb_request_in, tvb, 0, 0, ctdb_control->request_in);
PROTO_ITEM_SET_GENERATED(item);
}
if( (ctdb_control->response_in!=0)
&&(ctdb_control->response_in!=pinfo->fd->num) ){
&&(ctdb_control->response_in!=pinfo->num) ){
item=proto_tree_add_uint(tree, hf_ctdb_response_in, tvb, 0, 0, ctdb_control->response_in);
PROTO_ITEM_SET_GENERATED(item);
}
if(pinfo->fd->num==ctdb_control->response_in){
if(pinfo->num==ctdb_control->response_in){
nstime_t ns;
nstime_delta(&ns, &pinfo->abs_ts, &ctdb_control->req_time);
@ -619,7 +619,7 @@ dissect_ctdb_reply_dmaster(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, pr
ctdb_trans=(ctdb_trans_t *)wmem_tree_lookup32_array(ctdb_transactions, &tkey[0]);
if(ctdb_trans){
ctdb_trans->response_in=pinfo->fd->num;
ctdb_trans->response_in=pinfo->num;
ctdb_display_trans(pinfo, tree, tvb, ctdb_trans);
}
@ -750,7 +750,7 @@ dissect_ctdb_req_control(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, prot
ctdb_control=wmem_new(wmem_file_scope(), ctdb_control_t);
ctdb_control->opcode=opcode;
ctdb_control->request_in=pinfo->fd->num;
ctdb_control->request_in=pinfo->num;
ctdb_control->response_in=0;
ctdb_control->req_time=pinfo->abs_ts;
tkey[0].length=1;
@ -810,7 +810,7 @@ dissect_ctdb_reply_control(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, pr
}
if(!pinfo->fd->flags.visited){
ctdb_control->response_in = pinfo->fd->num;
ctdb_control->response_in = pinfo->num;
}
/* ctrl opcode */
@ -940,7 +940,7 @@ dissect_ctdb_req_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree
ctdb_trans=wmem_new(wmem_file_scope(), ctdb_trans_t);
ctdb_trans->key_hash=keyhash;
ctdb_trans->request_in=pinfo->fd->num;
ctdb_trans->request_in=pinfo->num;
ctdb_trans->response_in=0;
ctdb_trans->req_time=pinfo->abs_ts;
tkey[0].length=1;

2
epan/dissectors/packet-dcerpc-lsa.c
View File

@ -1432,7 +1432,7 @@ cnf_dissect_sec_desc_buf_(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_t
}
if(polhnd){
dcerpc_fetch_polhnd_data(polhnd, NULL, &type, NULL, NULL,
pinfo->fd->num);
pinfo->num);
}
switch(type){
case PIDL_POLHND_TYPE_LSA_POLICY:

24
epan/dissectors/packet-dcerpc-netlogon.c
View File

@ -2444,7 +2444,7 @@ netlogon_dissect_netrserverreqchallenge_rqst(tvbuff_t *tvb, int offset,
hf_client_challenge,&vars->client_challenge);
memcpy(tab,&vars->client_challenge,8);
vars->start = pinfo->fd->num;
vars->start = pinfo->num;
vars->next_start = -1;
vars->next = NULL;
@ -2466,7 +2466,7 @@ netlogon_dissect_netrserverreqchallenge_rqst(tvbuff_t *tvb, int offset,
}
else {
debugprintf("Adding a new entry with this start packet = %d\n",vars->start);
existing_vars->next_start = pinfo->fd->num;
existing_vars->next_start = pinfo->num;
existing_vars->next = vars;
}
}
@ -2488,7 +2488,7 @@ netlogon_dissect_netrserverreqchallenge_rqst(tvbuff_t *tvb, int offset,
debugprintf("It seems that I already record this vars (schannel hash)%d\n",vars->start);
}
else {
existing_vars->next_start = pinfo->fd->num;
existing_vars->next_start = pinfo->num;
existing_vars->next = vars;
}
#endif
@ -2515,10 +2515,10 @@ netlogon_dissect_netrserverreqchallenge_reply(tvbuff_t *tvb, int offset,
offset = dissect_ntstatus(tvb, offset, pinfo, tree, di, drep,
hf_netlogon_rc, NULL);
if(vars != NULL) {
while(vars !=NULL && vars->next_start != -1 && vars->next_start < (int)pinfo->fd->num )
while(vars !=NULL && vars->next_start != -1 && vars->next_start < (int)pinfo->num )
{
vars = vars->next;
debugprintf("looping challenge reply... %d %d \n", vars->next_start, pinfo->fd->num);
debugprintf("looping challenge reply... %d %d \n", vars->next_start, pinfo->num);
}
if(vars == NULL)
{
@ -6642,7 +6642,7 @@ netlogon_dissect_netrserverauthenticate23_reply(tvbuff_t *tvb, int offset,
vars = (netlogon_auth_vars *)g_hash_table_lookup(netlogon_auths, &key);
if(vars != NULL) {
debugprintf("Found some vars (ie. server/client challenges), let's see if I can get a session key\n");
while(vars != NULL && vars->next_start != -1 && vars->next_start < (int) pinfo->fd->num ) {
while(vars != NULL && vars->next_start != -1 && vars->next_start < (int) pinfo->num ) {
debugprintf("looping auth reply...\n");
vars = vars->next;
}
@ -7685,13 +7685,13 @@ dissect_packet_data(tvbuff_t *tvb ,tvbuff_t *auth_tvb _U_,
guint8* decrypted;
netlogon_auth_vars *vars;
netlogon_auth_key key;
/*debugprintf("Dissection of request data offset %d len=%d on packet %d\n",offset,tvb_length_remaining(tvb,offset),pinfo->fd->num);*/
/*debugprintf("Dissection of request data offset %d len=%d on packet %d\n",offset,tvb_length_remaining(tvb,offset),pinfo->num);*/
generate_hash_key(pinfo,is_server,&key,NULL);
vars = (netlogon_auth_vars *)g_hash_table_lookup(netlogon_auths, &key);
if(vars != NULL ) {
while(vars != NULL && vars->next_start != -1 && vars->next_start < (int) pinfo->fd->num ) {
while(vars != NULL && vars->next_start != -1 && vars->next_start < (int) pinfo->num ) {
vars = vars->next;
}
if(vars == NULL ) {
@ -7756,7 +7756,7 @@ dissect_secchan_verf(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
generate_hash_key(pinfo,is_server,&key,NULL);
vars = (netlogon_auth_vars *)g_hash_table_lookup(netlogon_auths,(gconstpointer*) &key);
if( ! (seen.isseen && seen.num == pinfo->fd->num) ) {
if( ! (seen.isseen && seen.num == pinfo->num) ) {
/*
* Create a new tree, and split into x components ...
*/
@ -7788,7 +7788,7 @@ dissect_secchan_verf(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
update_vars = 1;
}
if( vars != NULL ) {
while(vars != NULL && vars->next_start != -1 && vars->next_start < (int)pinfo->fd->num ) {
while(vars != NULL && vars->next_start != -1 && vars->next_start < (int)pinfo->num ) {
vars = vars->next;
}
if(vars == NULL ) {
@ -7815,9 +7815,9 @@ dissect_secchan_verf(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
{
debugprintf("Vars not found (is null %d) %d (dissect_verf)\n",vars==NULL,g_hash_table_size(netlogon_auths));
}
/*debugprintf("Setting isseen to true, old packet %d new %d\n",seen.num,pinfo->fd->num);*/
/*debugprintf("Setting isseen to true, old packet %d new %d\n",seen.num,pinfo->num);*/
seen.isseen = TRUE;
seen.num = pinfo->fd->num;
seen.num = pinfo->num;
return offset;
}

28
epan/dissectors/packet-dcerpc-nt.c
View File

@ -679,7 +679,7 @@ void dcerpc_smb_store_pol_pkts(e_ctx_hnd *policy_hnd, packet_info *pinfo,
return;
/* Look up existing value */
pol = find_pol_handle(policy_hnd, pinfo->fd->num, &value);
pol = find_pol_handle(policy_hnd, pinfo->num, &value);
if (pol != NULL) {
/*
@ -703,15 +703,15 @@ void dcerpc_smb_store_pol_pkts(e_ctx_hnd *policy_hnd, packet_info *pinfo,
* is 0; if so, this is presumably a duplicate call,
* and we don't do an implicit close.
*/
if (pol->first_frame == pinfo->fd->num &&
if (pol->first_frame == pinfo->num &&
pol->last_frame == 0)
return;
pol->last_frame = pinfo->fd->num;
pol->last_frame = pinfo->num;
pol = NULL;
} else {
if (is_close) {
pol->close_frame = pinfo->fd->num;
pol->last_frame = pinfo->fd->num;
pol->close_frame = pinfo->num;
pol->last_frame = pinfo->num;
}
return;
}
@ -721,14 +721,14 @@ void dcerpc_smb_store_pol_pkts(e_ctx_hnd *policy_hnd, packet_info *pinfo,
pol = (pol_value *)wmem_alloc(wmem_file_scope(), sizeof(pol_value));
pol->open_frame = is_open ? pinfo->fd->num : 0;
pol->close_frame = is_close ? pinfo->fd->num : 0;
pol->first_frame = pinfo->fd->num;
pol->open_frame = is_open ? pinfo->num : 0;
pol->close_frame = is_close ? pinfo->num : 0;
pol->first_frame = pinfo->num;
pol->last_frame = pol->close_frame; /* if 0, unknown; if non-0, known */
pol->type=0;
pol->name = NULL;
add_pol_handle(policy_hnd, pinfo->fd->num, pol, value);
add_pol_handle(policy_hnd, pinfo->num, pol, value);
}
/* Store the type of a policy handle */
@ -750,7 +750,7 @@ static void dcerpc_store_polhnd_type(e_ctx_hnd *policy_hnd, packet_info *pinfo,
return;
/* Look up existing value */
pol = find_pol_handle(policy_hnd, pinfo->fd->num, &value);
pol = find_pol_handle(policy_hnd, pinfo->num, &value);
if (pol != NULL) {
/*
@ -779,7 +779,7 @@ void dcerpc_store_polhnd_name(e_ctx_hnd *policy_hnd, packet_info *pinfo,
return;
/* Look up existing value */
pol = find_pol_handle(policy_hnd, pinfo->fd->num, &value);
pol = find_pol_handle(policy_hnd, pinfo->num, &value);
if (pol != NULL) {
/*
@ -805,7 +805,7 @@ void dcerpc_store_polhnd_name(e_ctx_hnd *policy_hnd, packet_info *pinfo,
pol->open_frame = 0;
pol->close_frame = 0;
pol->first_frame = pinfo->fd->num;
pol->first_frame = pinfo->num;
pol->last_frame = 0;
pol->type = 0;
if (name)
@ -813,7 +813,7 @@ void dcerpc_store_polhnd_name(e_ctx_hnd *policy_hnd, packet_info *pinfo,
else
pol->name = wmem_strdup(wmem_file_scope(), "<UNKNOWN>");
add_pol_handle(policy_hnd, pinfo->fd->num, pol, value);
add_pol_handle(policy_hnd, pinfo->num, pol, value);
}
/*
@ -997,7 +997,7 @@ dissect_nt_hnd(tvbuff_t *tvb, gint offset, packet_info *pinfo,
/* Insert open/close/name information if known */
if (dcerpc_fetch_polhnd_data(&hnd, &name, NULL, &open_frame,
&close_frame, pinfo->fd->num)) {
&close_frame, pinfo->num)) {
if (open_frame) {
proto_item *item_local;

2
epan/dissectors/packet-dcerpc-samr.c
View File

@ -2145,7 +2145,7 @@ cnf_dissect_sec_desc_buf_(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_t
}
if(polhnd){
dcerpc_fetch_polhnd_data(polhnd, NULL, &type, NULL, NULL,
pinfo->fd->num);
pinfo->num);
}
switch(type){
case PIDL_POLHND_TYPE_SAMR_USER:

14
epan/dissectors/packet-dcerpc-spoolss.c
View File

@ -651,7 +651,7 @@ SpoolssClosePrinter_q(tvbuff_t *tvb, int offset,
FALSE, TRUE);
dcerpc_fetch_polhnd_data(&policy_hnd, &pol_name, NULL, NULL, NULL,
pinfo->fd->num);
pinfo->num);
if (pol_name)
col_append_fstr(pinfo->cinfo, COL_INFO, ", %s",
@ -4610,7 +4610,7 @@ SpoolssStartPagePrinter_q(tvbuff_t *tvb, int offset,
FALSE, FALSE);
dcerpc_fetch_polhnd_data(&policy_hnd, &pol_name, NULL, NULL, NULL,
pinfo->fd->num);
pinfo->num);
if (pol_name)
col_append_fstr(pinfo->cinfo, COL_INFO, ", %s",
@ -4651,7 +4651,7 @@ SpoolssEndPagePrinter_q(tvbuff_t *tvb, int offset,
FALSE, FALSE);
dcerpc_fetch_polhnd_data(&policy_hnd, &pol_name, NULL, NULL, NULL,
pinfo->fd->num);
pinfo->num);
if (pol_name)
col_append_fstr(pinfo->cinfo, COL_INFO, ", %s",
@ -4783,7 +4783,7 @@ SpoolssStartDocPrinter_q(tvbuff_t *tvb, int offset,
FALSE, FALSE);
dcerpc_fetch_polhnd_data(&policy_hnd, &pol_name, NULL, NULL, NULL,
pinfo->fd->num);
pinfo->num);
if (pol_name)
col_append_fstr(pinfo->cinfo, COL_INFO, ", %s",
@ -4829,7 +4829,7 @@ SpoolssEndDocPrinter_q(tvbuff_t *tvb, int offset,
FALSE, FALSE);
dcerpc_fetch_polhnd_data(&policy_hnd, &pol_name, NULL, NULL, NULL,
pinfo->fd->num);
pinfo->num);
if (pol_name)
col_append_fstr(pinfo->cinfo, COL_INFO, ", %s",
@ -4877,7 +4877,7 @@ SpoolssWritePrinter_q(tvbuff_t *tvb, int offset, packet_info *pinfo,
FALSE, FALSE);
dcerpc_fetch_polhnd_data(&policy_hnd, &pol_name, NULL, NULL, NULL,
pinfo->fd->num);
pinfo->num);
if (pol_name)
col_append_fstr(pinfo->cinfo, COL_INFO, ", %s",
@ -5357,7 +5357,7 @@ SpoolssGetPrinterDriver2_q(tvbuff_t *tvb, int offset,
FALSE, FALSE);
dcerpc_fetch_polhnd_data(&policy_hnd, &pol_name, NULL, NULL, NULL,
pinfo->fd->num);
pinfo->num);
col_append_fstr(pinfo->cinfo, COL_INFO, ", %s",
pol_name);

2
epan/dissectors/packet-dcerpc-svcctl.c
View File

@ -530,7 +530,7 @@ svcctl_dissect_CloseServiceHandle_rqst(tvbuff_t *tvb, int offset,
NULL, FALSE, TRUE);
dcerpc_fetch_polhnd_data(&policy_hnd, &pol_name, NULL, NULL, NULL,
pinfo->fd->num);
pinfo->num);
col_append_fstr(pinfo->cinfo, COL_INFO, ", %s",
pol_name);

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

@ -4262,7 +4262,7 @@ dissect_dcerpc_cn_stub(tvbuff_t *tvb, int offset, packet_info *pinfo,
/* debug output of essential fragment data. */
/* leave it here for future debugging sessions */
/*printf("DCE num:%u offset:%u frag_len:%u tvb_len:%u\n",
pinfo->fd->num, offset, hdr->frag_len, tvb_reported_length(decrypted_tvb));*/
pinfo->num, offset, hdr->frag_len, tvb_reported_length(decrypted_tvb));*/
/* if we are not doing reassembly and this is the first fragment
then just dissect it and exit
@ -4337,7 +4337,7 @@ end_cn_stub:
*/
if (fd_head && (fd_head->flags & FD_DEFRAGMENTED) ) {
if ((pinfo->fd->num == fd_head->reassembled_in) && (hdr->flags & PFC_LAST_FRAG) ) {
if ((pinfo->num == fd_head->reassembled_in) && (hdr->flags & PFC_LAST_FRAG) ) {
tvbuff_t *next_tvb;
proto_item *frag_tree_item;
@ -4442,7 +4442,7 @@ dissect_dcerpc_cn_rqst(tvbuff_t *tvb, gint offset, packet_info *pinfo,
*/
dissect_dcerpc_cn_auth(tvb, offset, pinfo, dcerpc_tree, hdr, FALSE, &auth_info);
conv = find_conversation(pinfo->fd->num, &pinfo->src, &pinfo->dst, pinfo->ptype,
conv = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst, pinfo->ptype,
pinfo->srcport, pinfo->destport, 0);
if (!conv)
show_stub_data(pinfo, tvb, offset, dcerpc_tree, &auth_info, TRUE);
@ -4455,7 +4455,7 @@ dissect_dcerpc_cn_rqst(tvbuff_t *tvb, gint offset, packet_info *pinfo,
and desegmented pdu's .
Instead we check if this pdu is already in the matched table or not
*/
matched_key.frame = pinfo->fd->num;
matched_key.frame = pinfo->num;
matched_key.call_id = hdr->call_id;
value = (dcerpc_call_value *)g_hash_table_lookup(dcerpc_matched, &matched_key);
if (!value) {
@ -4505,7 +4505,7 @@ dissect_dcerpc_cn_rqst(tvbuff_t *tvb, gint offset, packet_info *pinfo,
call_value->ver = bind_value->ver;
call_value->object_uuid = obj_id;
call_value->opnum = opnum;
call_value->req_frame = pinfo->fd->num;
call_value->req_frame = pinfo->num;
call_value->req_time = pinfo->abs_ts;
call_value->rep_frame = 0;
call_value->max_ptr = 0;
@ -4605,7 +4605,7 @@ dissect_dcerpc_cn_resp(tvbuff_t *tvb, gint offset, packet_info *pinfo,
*/
dissect_dcerpc_cn_auth(tvb, offset, pinfo, dcerpc_tree, hdr, FALSE, &auth_info);
conv = find_conversation(pinfo->fd->num, &pinfo->src, &pinfo->dst, pinfo->ptype,
conv = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst, pinfo->ptype,
pinfo->srcport, pinfo->destport, 0);
if (!conv) {
@ -4619,7 +4619,7 @@ dissect_dcerpc_cn_resp(tvbuff_t *tvb, gint offset, packet_info *pinfo,
and desegmented pdu's .
Instead we check if this pdu is already in the matched table or not
*/
matched_key.frame = pinfo->fd->num;
matched_key.frame = pinfo->num;
matched_key.call_id = hdr->call_id;
value = (dcerpc_call_value *)g_hash_table_lookup(dcerpc_matched, &matched_key);
if (!value) {
@ -4633,13 +4633,13 @@ dissect_dcerpc_cn_resp(tvbuff_t *tvb, gint offset, packet_info *pinfo,
if ((call_value = (dcerpc_call_value *)g_hash_table_lookup(dcerpc_cn_calls, &call_key))) {
/* extra sanity check, only match them if the reply
came after the request */
if (call_value->req_frame<pinfo->fd->num) {
if (call_value->req_frame<pinfo->num) {
new_matched_key = (dcerpc_matched_key *)wmem_alloc(wmem_file_scope(), sizeof (dcerpc_matched_key));
*new_matched_key = matched_key;
g_hash_table_insert(dcerpc_matched, new_matched_key, call_value);
value = call_value;
if (call_value->rep_frame == 0) {
call_value->rep_frame = pinfo->fd->num;
call_value->rep_frame = pinfo->num;
}
}
}
@ -4751,7 +4751,7 @@ dissect_dcerpc_cn_fault(tvbuff_t *tvb, gint offset, packet_info *pinfo,
*/
dissect_dcerpc_cn_auth(tvb, offset, pinfo, dcerpc_tree, hdr, FALSE, &auth_info);
conv = find_conversation(pinfo->fd->num, &pinfo->src, &pinfo->dst, pinfo->ptype,
conv = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst, pinfo->ptype,
pinfo->srcport, pinfo->destport, 0);
if (!conv) {
/* no point in creating one here, really */
@ -4763,7 +4763,7 @@ dissect_dcerpc_cn_fault(tvbuff_t *tvb, gint offset, packet_info *pinfo,
and desegmented pdu's .
Instead we check if this pdu is already in the matched table or not
*/
matched_key.frame = pinfo->fd->num;
matched_key.frame = pinfo->num;
matched_key.call_id = hdr->call_id;
value = (dcerpc_call_value *)g_hash_table_lookup(dcerpc_matched, &matched_key);
if (!value) {
@ -4781,7 +4781,7 @@ dissect_dcerpc_cn_fault(tvbuff_t *tvb, gint offset, packet_info *pinfo,
value = call_value;
if (call_value->rep_frame == 0) {
call_value->rep_frame = pinfo->fd->num;
call_value->rep_frame = pinfo->num;
}
}
@ -5946,7 +5946,7 @@ dissect_dcerpc_dg_stub(tvbuff_t *tvb, int offset, packet_info *pinfo,
!(hdr->flags1 & PFCL1_LASTFRAG), 0);
if (fd_head != NULL) {
/* We completed reassembly... */
if (pinfo->fd->num == fd_head->reassembled_in) {
if (pinfo->num == fd_head->reassembled_in) {
/* ...and this is the reassembled RPC PDU */
next_tvb = tvb_new_chain(tvb, fd_head->tvb_data);
add_new_data_source(pinfo, next_tvb, "Reassembled DCE/RPC");
@ -6000,7 +6000,7 @@ dissect_dcerpc_dg_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo,
call_value->ver = hdr->if_ver;
call_value->object_uuid = hdr->obj_id;
call_value->opnum = hdr->opnum;
call_value->req_frame = pinfo->fd->num;
call_value->req_frame = pinfo->num;
call_value->req_time = pinfo->abs_ts;
call_value->rep_frame = 0;
call_value->max_ptr = 0;
@ -6013,12 +6013,12 @@ dissect_dcerpc_dg_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo,
g_hash_table_insert(dcerpc_dg_calls, call_key, call_value);
new_matched_key = (dcerpc_matched_key *)wmem_alloc(wmem_file_scope(), sizeof(dcerpc_matched_key));
new_matched_key->frame = pinfo->fd->num;
new_matched_key->frame = pinfo->num;
new_matched_key->call_id = hdr->seqnum;
g_hash_table_insert(dcerpc_matched, new_matched_key, call_value);
}
matched_key.frame = pinfo->fd->num;
matched_key.frame = pinfo->num;
matched_key.call_id = hdr->seqnum;
value = (dcerpc_call_value *)g_hash_table_lookup(dcerpc_matched, &matched_key);
if (!value) {
@ -6027,7 +6027,7 @@ dissect_dcerpc_dg_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo,
value->ver = hdr->if_ver;
value->object_uuid = hdr->obj_id;
value->opnum = hdr->opnum;
value->req_frame = pinfo->fd->num;
value->req_frame = pinfo->num;
value->rep_frame = 0;
value->max_ptr = 0;
value->se_data = NULL;
@ -6075,16 +6075,16 @@ dissect_dcerpc_dg_resp(tvbuff_t *tvb, int offset, packet_info *pinfo,
if ((call_value = (dcerpc_call_value *)g_hash_table_lookup(dcerpc_dg_calls, &call_key))) {
new_matched_key = (dcerpc_matched_key *)wmem_alloc(wmem_file_scope(), sizeof (dcerpc_matched_key));
new_matched_key->frame = pinfo->fd->num;
new_matched_key->frame = pinfo->num;
new_matched_key->call_id = hdr->seqnum;
g_hash_table_insert(dcerpc_matched, new_matched_key, call_value);
if (call_value->rep_frame == 0) {
call_value->rep_frame = pinfo->fd->num;
call_value->rep_frame = pinfo->num;
}
}
}
matched_key.frame = pinfo->fd->num;
matched_key.frame = pinfo->num;
matched_key.call_id = hdr->seqnum;
value = (dcerpc_call_value *)g_hash_table_lookup(dcerpc_matched, &matched_key);
if (!value) {
@ -6093,7 +6093,7 @@ dissect_dcerpc_dg_resp(tvbuff_t *tvb, int offset, packet_info *pinfo,
value->ver = hdr->if_ver;
value->object_uuid = hdr->obj_id;
value->opnum = hdr->opnum;
value->rep_frame = pinfo->fd->num;
value->rep_frame = pinfo->num;
}
di = wmem_new0(wmem_packet_scope(), dcerpc_info);

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

@ -4019,14 +4019,14 @@ dcm_state_get(packet_info *pinfo, gboolean create)
conversation_t *conv=NULL;
dcm_state_t *dcm_data=NULL;
conv = find_conversation(pinfo->fd->num, &pinfo->src, &pinfo->dst,
conv = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst,
pinfo->ptype, pinfo->srcport, pinfo->destport, 0);
if (conv == NULL) {
/* Conversation does not exist, create one.
Usually set for the first packet already. Probably by dissect-tcp
*/
conv = conversation_new(pinfo->fd->num, &pinfo->src, &pinfo->dst, pinfo->ptype,
conv = conversation_new(pinfo->num, &pinfo->src, &pinfo->dst, pinfo->ptype,
pinfo->srcport, pinfo->destport, 0);
}
else { /* conversation exists, try to get data already filled */
@ -4595,7 +4595,7 @@ dcm_export_create_object(packet_info *pinfo, dcm_state_assoc_t *assoc, dcm_state
Even though this should be a valid DICOM UID, apply the same filter rules
in case of bogus data.
*/
filename = wmem_strdup_printf(wmem_packet_scope(), "%06d-%d-%s.dcm", pinfo->fd->num, cnt_same_pkt,
filename = wmem_strdup_printf(wmem_packet_scope(), "%06d-%d-%s.dcm", pinfo->num, cnt_same_pkt,
g_strcanon(pdv_curr->sop_instance_uid, G_CSET_A_2_Z G_CSET_a_2_z G_CSET_DIGITS "-.", '-'));
}
else {
@ -4603,10 +4603,10 @@ dcm_export_create_object(packet_info *pinfo, dcm_state_assoc_t *assoc, dcm_state
sop_class_uid = wmem_strdup(wmem_packet_scope(), WIRESHARK_MEDIA_STORAGE_SOP_CLASS_UID);
sop_instance_uid = wmem_strdup_printf(wmem_packet_scope(), "%s.%d.%d",
WIRESHARK_MEDIA_STORAGE_SOP_INSTANCE_UID_PREFIX, pinfo->fd->num, cnt_same_pkt);
WIRESHARK_MEDIA_STORAGE_SOP_INSTANCE_UID_PREFIX, pinfo->num, cnt_same_pkt);
/* Make sure filename does not contain invalid character. Rather conservative.*/
filename = wmem_strdup_printf(wmem_packet_scope(), "%06d-%d-%s.dcm", pinfo->fd->num, cnt_same_pkt,
filename = wmem_strdup_printf(wmem_packet_scope(), "%06d-%d-%s.dcm", pinfo->num, cnt_same_pkt,
g_strcanon(pdv->desc, G_CSET_A_2_Z G_CSET_a_2_z G_CSET_DIGITS "-.", '-'));
}
@ -5586,7 +5586,7 @@ dissect_dcm_pdv_header(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
we need both values to uniquely identify a PDV
*/
*pdv = dcm_state_pdv_get(pctx, pinfo->fd->num, tvb_raw_offset(tvb)+offset, TRUE);
*pdv = dcm_state_pdv_get(pctx, pinfo->num, tvb_raw_offset(tvb)+offset, TRUE);
if (*pdv == NULL) {
return 0; /* Failed to allocate memory */
}
@ -6680,7 +6680,7 @@ dissect_dcm_pdv_fragmented(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
if (global_dcm_reassemble)
{
conv = find_conversation(pinfo->fd->num, &pinfo->src, &pinfo->dst,
conv = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst,
pinfo->ptype, pinfo->srcport, pinfo->destport, 0);
/* Try to create somewhat unique ID.
@ -6710,7 +6710,7 @@ dissect_dcm_pdv_fragmented(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
*pdv_description = (gchar *)wmem_alloc0(wmem_file_scope(), MAX_BUF_LEN);
if (head && head->reassembled_in != pinfo->fd->num) {
if (head && head->reassembled_in != pinfo->num) {
if (pdv->desc) {
/* We know the presentation context already */
@ -7050,7 +7050,7 @@ dissect_dcm_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint32 off
offset += 4;
/* Find previously detected association, else create a new one object*/
assoc = dcm_state_assoc_get(dcm_data, pinfo->fd->num, TRUE);
assoc = dcm_state_assoc_get(dcm_data, pinfo->num, TRUE);
if (assoc == NULL) { /* Internal error. Failed to create association structure */
return offset;

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

@ -320,12 +320,12 @@ dcom_interface_t *dcom_interface_new(packet_info *pinfo, const address *addr, e_
}
if(oxid == 0 || oid == 0) {
/*g_warning("interface_new#%u", pinfo->fd->num);*/
/*g_warning("interface_new#%u", pinfo->num);*/
interf = wmem_new(wmem_file_scope(), dcom_interface_t);
interf->parent = NULL;
interf->private_data = NULL;
interf->first_packet = pinfo->fd->num;
interf->first_packet = pinfo->num;
interf->iid = *iid;
interf->ipid = *ipid;
@ -348,7 +348,7 @@ dcom_interface_t *dcom_interface_new(packet_info *pinfo, const address *addr, e_
machine = g_new(dcom_machine_t,1);
copy_address(&machine->ip, addr);
machine->objects = NULL;
machine->first_packet = pinfo->fd->num;
machine->first_packet = pinfo->num;
dcom_machines = g_list_append(dcom_machines, machine);
}
@ -368,7 +368,7 @@ dcom_interface_t *dcom_interface_new(packet_info *pinfo, const address *addr, e_
object->parent = machine;
object->interfaces = NULL;
object->private_data = NULL;
object->first_packet = pinfo->fd->num;
object->first_packet = pinfo->num;
object->oid = oid;
object->oxid = oxid;
@ -390,7 +390,7 @@ dcom_interface_t *dcom_interface_new(packet_info *pinfo, const address *addr, e_
interf = g_new(dcom_interface_t,1);
interf->parent = object;
interf->private_data = NULL;
interf->first_packet = pinfo->fd->num;
interf->first_packet = pinfo->num;
interf->iid = *iid;
interf->ipid = *ipid;

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

@ -1342,22 +1342,22 @@ dissect_diameter_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi
diameter_pair->cmd_code = cmd;
diameter_pair->result_code = 0;
diameter_pair->cmd_str = cmd_str;
diameter_pair->req_frame = PINFO_FD_NUM(pinfo);
diameter_pair->req_frame = pinfo->num;
diameter_pair->ans_frame = 0;
diameter_pair->req_time = pinfo->abs_ts;
wmem_tree_insert32(pdus_tree, PINFO_FD_NUM(pinfo), (void *)diameter_pair);
wmem_tree_insert32(pdus_tree, pinfo->num, (void *)diameter_pair);
} else {
/* Look for a request which occurs earlier in the trace than this answer. */
diameter_pair = (diameter_req_ans_pair_t *)wmem_tree_lookup32_le(pdus_tree, PINFO_FD_NUM(pinfo));
diameter_pair = (diameter_req_ans_pair_t *)wmem_tree_lookup32_le(pdus_tree, pinfo->num);
/* Verify the end-to-end-id matches before declaring a match */
if (diameter_pair && diameter_pair->end_to_end_id == end_to_end_id) {
diameter_pair->ans_frame = PINFO_FD_NUM(pinfo);
diameter_pair->ans_frame = pinfo->num;
}
}
} else {
/* Look for a request which occurs earlier in the trace than this answer. */
diameter_pair = (diameter_req_ans_pair_t *)wmem_tree_lookup32_le(pdus_tree, PINFO_FD_NUM(pinfo));
diameter_pair = (diameter_req_ans_pair_t *)wmem_tree_lookup32_le(pdus_tree, pinfo->num);
/* If the end-to-end ID doesn't match then this is not the request we were
* looking for.

4
epan/dissectors/packet-dji-uav.c
View File

@ -125,7 +125,7 @@ request_response_handling(tvbuff_t *tvb, packet_info *pinfo, proto_tree *djiuav_
if (!pinfo->fd->flags.visited) {
if (is_cmd) {
djiuav_trans=wmem_new(wmem_file_scope(), djiuav_transaction_t);
djiuav_trans->request_frame=pinfo->fd->num;
djiuav_trans->request_frame=pinfo->num;
djiuav_trans->reply_frame=0;
djiuav_trans->request_time=pinfo->abs_ts;
djiuav_trans->seqno=seq_no;
@ -136,7 +136,7 @@ request_response_handling(tvbuff_t *tvb, packet_info *pinfo, proto_tree *djiuav_
if (djiuav_trans) {
/* Special case: djiuav seems to send 0x24 replies with seqno 0 and without a request */
if (djiuav_trans->reply_frame == 0)
djiuav_trans->reply_frame=pinfo->fd->num;
djiuav_trans->reply_frame=pinfo->num;
}
}
} else {

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

@ -1441,7 +1441,7 @@ static void register_dmp_id (packet_info *pinfo, guint8 reason)
if (reason == 0) {
if (dmp_data->ack_id == 0) {
/* Only save reference to first ACK */
dmp_data->ack_id = pinfo->fd->num;
dmp_data->ack_id = pinfo->num;
} else {
/* Only count when resending */
dmp_data->ack_resend_count++;
@ -1450,7 +1450,7 @@ static void register_dmp_id (packet_info *pinfo, guint8 reason)
} else {
/* Message resent */
dmp_data->msg_resend_count++;
dmp_data->prev_msg_id = pinfo->fd->num;
dmp_data->prev_msg_id = pinfo->num;
dmp_data->prev_msg_time = dmp_data->msg_time;
dmp_data->msg_time = pinfo->abs_ts;
}
@ -1461,21 +1461,21 @@ static void register_dmp_id (packet_info *pinfo, guint8 reason)
if (dmp.msg_type == ACK) {
/* No matching message for this ack */
dmp_data->ack_id = pinfo->fd->num;
dmp_data->ack_id = pinfo->num;
} else {
dmp_data->first_msg_time = pinfo->abs_ts;
dmp_data->msg_time = pinfo->abs_ts;
if (dmp.msg_type == REPORT) {
dmp_data->rep_id = pinfo->fd->num;
dmp_data->rep_id = pinfo->num;
dmp_data->msg_id = msg_id;
dmp_data->rep_not_msg_time = msg_time;
} else if (dmp.msg_type == NOTIF) {
dmp_data->not_id = pinfo->fd->num;
dmp_data->not_id = pinfo->num;
dmp_data->msg_id = msg_id;
dmp_data->rep_not_msg_time = msg_time;
} else {
dmp_data->msg_id = pinfo->fd->num;
dmp_data->msg_id = pinfo->num;
}
g_hash_table_insert (dmp_id_hash_table, dmp_key, dmp_data);

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

@ -3728,7 +3728,7 @@ dissect_dns_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
key[0].length = 1;
key[0].key = &id;
key[1].length = 1;
key[1].key = &pinfo->fd->num;
key[1].key = &pinfo->num;
key[2].length = 0;
key[2].key = NULL;
@ -3736,7 +3736,7 @@ dissect_dns_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
if (!(flags&F_RESPONSE)) {
/* This is a request */
dns_trans=wmem_new(wmem_file_scope(), dns_transaction_t);
dns_trans->req_frame=pinfo->fd->num;
dns_trans->req_frame=pinfo->num;
dns_trans->rep_frame=0;
dns_trans->req_time=pinfo->abs_ts;
dns_trans->id = id;
@ -3747,7 +3747,7 @@ dissect_dns_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
if (dns_trans->id != id) {
dns_trans = NULL;
} else {
dns_trans->rep_frame=pinfo->fd->num;
dns_trans->rep_frame=pinfo->num;
}
}
}

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

@ -690,12 +690,12 @@ dissect_drda(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_
col_set_str(pinfo->cinfo, COL_PROTOCOL, "DRDA");
/* This is a trick to know whether this is the first PDU in this packet or not */
if (iPreviousFrameNumber != pinfo->fd->num)
if (iPreviousFrameNumber != pinfo->num)
col_clear(pinfo->cinfo, COL_INFO);
else
col_append_str(pinfo->cinfo, COL_INFO, " | ");
iPreviousFrameNumber = pinfo->fd->num;
iPreviousFrameNumber = pinfo->num;
/* There may be multiple DRDA commands in one frame */
while ((guint) (offset + 10) <= tvb_reported_length(tvb))
{

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

@ -373,7 +373,7 @@ dissect_dtls(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_
is_from_server = ssl_packet_from_server(session, dtls_associations, pinfo);
if (session->last_nontls_frame != 0 &&
session->last_nontls_frame >= pinfo->fd->num) {
session->last_nontls_frame >= pinfo->num) {
/* This conversation started at a different protocol and STARTTLS was
* used, but this packet comes too early. */
return 0;

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

@ -4354,7 +4354,7 @@ dissect_dvbci_spdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
break;
}
col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Session opened");
circuit = circuit_new(CT_DVBCI, CT_ID(ssnb, tcid), pinfo->fd->num);
circuit = circuit_new(CT_DVBCI, CT_ID(ssnb, tcid), pinfo->num);
if (circuit) {
/* we always add the resource id immediately after the circuit
was created */
@ -4378,9 +4378,9 @@ dissect_dvbci_spdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
ssnb = tvb_get_ntohs(tvb, offset+1);
proto_tree_add_item(sess_tree, hf_dvbci_sess_nb,
tvb, offset+1, 2, ENC_BIG_ENDIAN);
circuit = find_circuit(CT_DVBCI, CT_ID(ssnb, tcid), pinfo->fd->num);
circuit = find_circuit(CT_DVBCI, CT_ID(ssnb, tcid), pinfo->num);
if (circuit)
close_circuit(circuit, pinfo->fd->num);
close_circuit(circuit, pinfo->num);
break;
case T_SESSION_NUMBER:
ssnb = tvb_get_ntohs(tvb, offset);
@ -4395,7 +4395,7 @@ dissect_dvbci_spdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
}
if (ssnb && !circuit)
circuit = find_circuit(CT_DVBCI, CT_ID(ssnb, tcid), pinfo->fd->num);
circuit = find_circuit(CT_DVBCI, CT_ID(ssnb, tcid), pinfo->num);
/* if the packet contains no resource id, we add the cached id from
the circuit so that each packet has a resource id that can be

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

@ -679,21 +679,21 @@ dissect_eap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
* keep them separate? (Or is that not going to happen?)
*/
if (pinfo->destport == pinfo->match_uint) {
conversation = find_conversation(pinfo->fd->num, &pinfo->dst, &pinfo->src,
conversation = find_conversation(pinfo->num, &pinfo->dst, &pinfo->src,
pinfo->ptype, pinfo->destport,
0, NO_PORT_B);
} else {
conversation = find_conversation(pinfo->fd->num, &pinfo->src, &pinfo->dst,
conversation = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst,
pinfo->ptype, pinfo->srcport,
0, NO_PORT_B);
}
if (conversation == NULL) {
if (pinfo->destport == pinfo->match_uint) {
conversation = conversation_new(pinfo->fd->num, &pinfo->dst, &pinfo->src,
conversation = conversation_new(pinfo->num, &pinfo->dst, &pinfo->src,
pinfo->ptype, pinfo->destport,
0, NO_PORT2);
} else {
conversation = conversation_new(pinfo->fd->num, &pinfo->src, &pinfo->dst,
conversation = conversation_new(pinfo->num, &pinfo->src, &pinfo->dst,
pinfo->ptype, pinfo->srcport,
0, NO_PORT2);
}
@ -945,7 +945,7 @@ dissect_eap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
* also check that we have a length;
*/
needs_reassembly = TRUE;
conversation_state->eap_reass_cookie = pinfo->fd->num;
conversation_state->eap_reass_cookie = pinfo->num;
/*
* Start the reassembly sequence number at 0.

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

@ -752,25 +752,25 @@ enip_match_request( packet_info *pinfo, proto_tree *tree, enip_request_key_t *pr
}
request_info = wmem_new(wmem_file_scope(), enip_request_info_t);
request_info->req_num = pinfo->fd->num;
request_info->req_num = pinfo->num;
request_info->rep_num = 0;
request_info->req_time = pinfo->abs_ts;
request_info->cip_info = NULL;
wmem_tree_insert32(request_val->frames, pinfo->fd->num, (void *)request_info);
wmem_tree_insert32(request_val->frames, pinfo->num, (void *)request_info);
}
if ( request_val && prequest_key && prequest_key->requesttype == ENIP_RESPONSE_PACKET )
{
request_info = (enip_request_info_t*)wmem_tree_lookup32_le( request_val->frames, pinfo->fd->num );
request_info = (enip_request_info_t*)wmem_tree_lookup32_le( request_val->frames, pinfo->num );
if ( request_info )
{
request_info->rep_num = pinfo->fd->num;
request_info->rep_num = pinfo->num;
}
}
}
else
{
if ( request_val )
request_info = (enip_request_info_t *)wmem_tree_lookup32_le( request_val->frames, pinfo->fd->num );
request_info = (enip_request_info_t *)wmem_tree_lookup32_le( request_val->frames, pinfo->num );
}
if ( tree && request_info )
@ -1003,7 +1003,7 @@ enip_open_cip_connection( packet_info *pinfo, cip_conn_info_t* connInfo)
conn_val->motion = connInfo->motion;
conn_val->ClassID = connInfo->ClassID;
conn_val->open_frame = connInfo->forward_open_frame;
conn_val->open_reply_frame = pinfo->fd->num;
conn_val->open_reply_frame = pinfo->num;
conn_val->close_frame = 0;
conn_val->connid = enip_unique_connid++;
@ -1047,10 +1047,10 @@ enip_open_cip_connection( packet_info *pinfo, cip_conn_info_t* connInfo)
/* check for O->T conversation */
/* similar logic to find_or_create_conversation(), but since I/O traffic
is on UDP, the pinfo parameter doesn't have the correct information */
if ((conversation = find_conversation(pinfo->fd->num, &pinfo->dst, &dest_address,
if ((conversation = find_conversation(pinfo->num, &pinfo->dst, &dest_address,
PT_UDP, connInfo->O2T.port, 0, NO_PORT_B)) == NULL) {
conversation = conversation_new(pinfo->fd->num, &pinfo->dst, &dest_address,
conversation = conversation_new(pinfo->num, &pinfo->dst, &dest_address,
PT_UDP, connInfo->O2T.port, 0, NO_PORT2);
}
@ -1068,10 +1068,10 @@ enip_open_cip_connection( packet_info *pinfo, cip_conn_info_t* connInfo)
/* Check if separate T->O conversation is necessary. If either side is multicast
or ports aren't equal, a separate conversation must be generated */
dest_address.data = connInfo->T2O.ipaddress.data;
if ((conversationTO = find_conversation(pinfo->fd->num, &pinfo->src, &dest_address,
if ((conversationTO = find_conversation(pinfo->num, &pinfo->src, &dest_address,
PT_UDP, connInfo->T2O.port, 0, NO_PORT_B)) == NULL) {
conversationTO = conversation_new(pinfo->fd->num, &pinfo->src,
conversationTO = conversation_new(pinfo->num, &pinfo->src,
&dest_address, PT_UDP,
connInfo->T2O.port, 0, NO_PORT2);
}
@ -1134,7 +1134,7 @@ enip_close_cip_connection(packet_info *pinfo, guint16 ConnSerialNumber,
conn_val = (enip_conn_val_t *)g_hash_table_lookup( enip_conn_hashtable, &conn_key );
if ( conn_val )
{
conn_val->close_frame = pinfo->fd->num;
conn_val->close_frame = pinfo->num;
/* Save the connection info for the conversation filter */
if (!pinfo->fd->flags.visited)
@ -1181,7 +1181,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->fd->num,
conversation = find_conversation(pinfo->num,
&pinfo->src, &pinfo->dst,
pinfo->ptype,
pinfo->srcport, pinfo->destport, 0);
@ -1214,7 +1214,7 @@ enip_get_explicit_connid(packet_info *pinfo, enip_request_key_t *prequest_key, g
break;
}
if ((conn_val == NULL ) || (conn_val->open_reply_frame > pinfo->fd->num))
if ((conn_val == NULL ) || (conn_val->open_reply_frame > pinfo->num))
return NULL;
return conn_val;
@ -1232,7 +1232,7 @@ enip_get_io_connid(packet_info *pinfo, guint32 connid, enum enip_connid_type* pc
/*
* Do we have a conversation for this connection?
*/
conversation = find_conversation(pinfo->fd->num,
conversation = find_conversation(pinfo->num,
&pinfo->src, &pinfo->dst,
pinfo->ptype,
pinfo->destport, 0, NO_PORT_B);
@ -1262,7 +1262,7 @@ enip_get_io_connid(packet_info *pinfo, guint32 connid, enum enip_connid_type* pc
*pconnid_type = ECIDT_O2T;
}
if ((conn_val == NULL) || ( conn_val->open_reply_frame > pinfo->fd->num ))
if ((conn_val == NULL) || ( conn_val->open_reply_frame > pinfo->num ))
return NULL;
return conn_val;

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

@ -2695,7 +2695,7 @@ dissect_epl_sdo_sequence(proto_tree *epl_tree, tvbuff_t *tvb, packet_info *pinfo
seq_send = seq_send >> EPL_ASND_SDO_SEQ_MASK;
epl_segmentation.send = seq_send;
/* get the current frame-number */
frame = pinfo->fd->num;
frame = pinfo->num;
/* Create a key */
key = epl_duplication_key(epl_segmentation.src,epl_segmentation.dest,seq_recv,seq_send);
@ -2978,7 +2978,7 @@ dissect_epl_sdo_command_write_by_index(proto_tree *epl_tree, tvbuff_t *tvb, pack
fragment_head *frag_msg = NULL;
/* get the current frame number */
frame = pinfo->fd->num;
frame = pinfo->num;
if (!response)
{ /* request */
@ -3432,7 +3432,7 @@ dissect_epl_sdo_command_read_by_index(proto_tree *epl_tree, tvbuff_t *tvb, packe
fragment_head *frag_msg = NULL;
/* get the current frame number */
frame = pinfo->fd->num;
frame = pinfo->num;
if (!response)
{ /* request */

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

@ -260,7 +260,7 @@ dissect_epmd_response(packet_info *pinfo, tvbuff_t *tvb, gint offset, proto_tree
}
col_append_fstr(pinfo->cinfo, COL_INFO, " %s port=%d", name, port);
if (!pinfo->fd->flags.visited) {
conv = conversation_new(pinfo->fd->num, &pinfo->src, &pinfo->dst, PT_TCP, port, 0, NO_PORT2);
conv = conversation_new(pinfo->num, &pinfo->src, &pinfo->dst, PT_TCP, port, 0, NO_PORT2);
conversation_set_dissector(conv, edp_handle);
}
break;

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

@ -723,11 +723,11 @@ dissect_etch_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void*
gbl_pdu_counter++;
/* Switch to another frame? => Clear column */
if (pinfo->fd->num != gbl_old_frame_num) {
if (pinfo->num != gbl_old_frame_num) {
col_clear(pinfo->cinfo, COL_INFO);
gbl_pdu_counter = 0;
}
gbl_old_frame_num = pinfo->fd->num;
gbl_old_frame_num = pinfo->num;
col_set_writable(pinfo->cinfo, TRUE);
col_append_fstr(pinfo->cinfo, COL_INFO, "%s ", wmem_strbuf_get_str(colInfo));

22
epan/dissectors/packet-exec.c
View File

@ -118,7 +118,7 @@ dissect_exec(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_
if(!hash_info){
hash_info = wmem_new(wmem_file_scope(), exec_hash_entry_t);
hash_info->first_packet_number = pinfo->fd->num;
hash_info->first_packet_number = pinfo->num;
hash_info->second_packet_number = 0;
hash_info->third_packet_number = 0;
hash_info->fourth_packet_number = 0;
@ -144,25 +144,25 @@ dissect_exec(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_
* as we reach them the first time */
if(!hash_info->second_packet_number
&& pinfo->fd->num > hash_info->first_packet_number){
&& pinfo->num > hash_info->first_packet_number){
/* We're on the second packet of the conversation */
hash_info->second_packet_number = pinfo->fd->num;
hash_info->second_packet_number = pinfo->num;
} else if(hash_info->second_packet_number
&& !hash_info->third_packet_number
&& pinfo->fd->num > hash_info->second_packet_number) {
&& pinfo->num > hash_info->second_packet_number) {
/* We're on the third packet of the conversation */
hash_info->third_packet_number = pinfo->fd->num;
hash_info->third_packet_number = pinfo->num;
} else if(hash_info->third_packet_number
&& !hash_info->fourth_packet_number
&& pinfo->fd->num > hash_info->third_packet_number) {
&& pinfo->num > hash_info->third_packet_number) {
/* We're on the fourth packet of the conversation */
hash_info->fourth_packet_number = pinfo->fd->num;
hash_info->fourth_packet_number = pinfo->num;
}
/* Save this packet's state so we can retrieve it if this packet
* is selected again later. If the packet's state was already stored,
* then retrieve it */
if(pinfo->fd->num == hash_info->first_packet_number){
if(pinfo->num == hash_info->first_packet_number){
if(hash_info->first_packet_state == NONE){
hash_info->first_packet_state = hash_info->state;
} else {
@ -170,7 +170,7 @@ dissect_exec(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_
}
}
if(pinfo->fd->num == hash_info->second_packet_number){
if(pinfo->num == hash_info->second_packet_number){
if(hash_info->second_packet_state == NONE){
hash_info->second_packet_state = hash_info->state;
} else {
@ -178,7 +178,7 @@ dissect_exec(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_
}
}
if(pinfo->fd->num == hash_info->third_packet_number){
if(pinfo->num == hash_info->third_packet_number){
if(hash_info->third_packet_state == NONE){
hash_info->third_packet_state = hash_info->state;
} else {
@ -186,7 +186,7 @@ dissect_exec(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_
}
}
if(pinfo->fd->num == hash_info->fourth_packet_number){
if(pinfo->num == hash_info->fourth_packet_number){
if(hash_info->fourth_packet_state == NONE){
hash_info->fourth_packet_state = hash_info->state;
} else {

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

@ -1206,11 +1206,11 @@ dissect_fc_helper (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean
/* populate the exchange struct */
if(!pinfo->fd->flags.visited){
if(fchdr->fctl&FC_FCTL_EXCHANGE_FIRST){
fc_ex->first_exchange_frame=pinfo->fd->num;
fc_ex->first_exchange_frame=pinfo->num;
fc_ex->fc_time = pinfo->abs_ts;
}
if(fchdr->fctl&FC_FCTL_EXCHANGE_LAST){
fc_ex->last_exchange_frame=pinfo->fd->num;
fc_ex->last_exchange_frame=pinfo->num;
}
}

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

@ -1728,11 +1728,11 @@ dissect_fcdns (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data)
}
if ((opcode != FCCT_MSG_ACC) && (opcode != FCCT_MSG_RJT)) {
conversation = find_conversation (pinfo->fd->num, &pinfo->src, &pinfo->dst,
conversation = find_conversation (pinfo->num, &pinfo->src, &pinfo->dst,
pinfo->ptype, fchdr->oxid,
fchdr->rxid, NO_PORT2);
if (!conversation) {
conversation = conversation_new (pinfo->fd->num, &pinfo->src, &pinfo->dst,
conversation = conversation_new (pinfo->num, &pinfo->src, &pinfo->dst,
pinfo->ptype, fchdr->oxid,
fchdr->rxid, NO_PORT2);
}
@ -1762,7 +1762,7 @@ dissect_fcdns (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data)
}
else {
/* Opcode is ACC or RJT */
conversation = find_conversation (pinfo->fd->num, &pinfo->src, &pinfo->dst,
conversation = find_conversation (pinfo->num, &pinfo->src, &pinfo->dst,
pinfo->ptype, fchdr->oxid,
fchdr->rxid, NO_PORT2);
isreq = 0;

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

@ -1882,12 +1882,12 @@ dissect_fcels (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data)
else {
options = NO_PORT2;
}
conversation = find_conversation (pinfo->fd->num, &pinfo->dst, &pinfo->src,
conversation = find_conversation (pinfo->num, &pinfo->dst, &pinfo->src,
pinfo->ptype, fchdr->oxid,
fchdr->rxid, options);
if (!conversation) {
conversation = conversation_new (pinfo->fd->num, &pinfo->dst, &pinfo->src,
conversation = conversation_new (pinfo->num, &pinfo->dst, &pinfo->src,
pinfo->ptype, fchdr->oxid,
fchdr->rxid, options);
}
@ -1917,7 +1917,7 @@ dissect_fcels (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data)
isreq = FC_ELS_RPLY;
options = NO_PORT2;
conversation = find_conversation (pinfo->fd->num, &pinfo->dst, &pinfo->src,
conversation = find_conversation (pinfo->num, &pinfo->dst, &pinfo->src,
pinfo->ptype, fchdr->oxid,
fchdr->rxid, options);
if (!conversation) {
@ -1939,7 +1939,7 @@ dissect_fcels (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data)
addrdata[0] = addrdata[1] = 0;
addrdata[2] = dstfc[2];
set_address (&dstaddr, AT_FC, 3, addrdata);
conversation = find_conversation (pinfo->fd->num, &dstaddr, &pinfo->src,
conversation = find_conversation (pinfo->num, &dstaddr, &pinfo->src,
pinfo->ptype, fchdr->oxid,
fchdr->rxid, options);
}
@ -1947,7 +1947,7 @@ dissect_fcels (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data)
if (!conversation) {
/* Finally check for FLOGI with both NO_PORT2 and NO_ADDR2 set */
options = NO_ADDR2 | NO_PORT2;
conversation = find_conversation (pinfo->fd->num, &pinfo->src, &pinfo->dst,
conversation = find_conversation (pinfo->num, &pinfo->src, &pinfo->dst,
pinfo->ptype, fchdr->oxid,
fchdr->rxid, options);
if (!conversation) {

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

@ -729,11 +729,11 @@ dissect_fcfcs (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data)
cthdr.maxres_size = g_ntohs (cthdr.maxres_size);
if ((opcode != FCCT_MSG_ACC) && (opcode != FCCT_MSG_RJT)) {
conversation = find_conversation (pinfo->fd->num, &pinfo->src, &pinfo->dst,
conversation = find_conversation (pinfo->num, &pinfo->src, &pinfo->dst,
pinfo->ptype, fchdr->oxid,
fchdr->rxid, NO_PORT2);
if (!conversation) {
conversation = conversation_new (pinfo->fd->num, &pinfo->src, &pinfo->dst,
conversation = conversation_new (pinfo->num, &pinfo->src, &pinfo->dst,
pinfo->ptype, fchdr->oxid,
fchdr->rxid, NO_PORT2);
}
@ -763,7 +763,7 @@ dissect_fcfcs (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data)
}
else {
/* Opcode is ACC or RJT */
conversation = find_conversation (pinfo->fd->num, &pinfo->src, &pinfo->dst,
conversation = find_conversation (pinfo->num, &pinfo->src, &pinfo->dst,
pinfo->ptype, fchdr->oxid,
fchdr->rxid, NO_PORT2);
isreq = 0;

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

@ -552,11 +552,11 @@ dissect_fcfzs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data)
}
if ((opcode != FCCT_MSG_ACC) && (opcode != FCCT_MSG_RJT)) {
conversation = find_conversation(pinfo->fd->num, &pinfo->src, &pinfo->dst,
conversation = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst,
pinfo->ptype, fchdr->oxid,
fchdr->rxid, NO_PORT2);
if (!conversation) {
conversation = conversation_new(pinfo->fd->num, &pinfo->src, &pinfo->dst,
conversation = conversation_new(pinfo->num, &pinfo->src, &pinfo->dst,
pinfo->ptype, fchdr->oxid,
fchdr->rxid, NO_PORT2);
}
@ -587,7 +587,7 @@ dissect_fcfzs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data)
}
else {
/* Opcode is ACC or RJT */
conversation = find_conversation(pinfo->fd->num, &pinfo->src, &pinfo->dst,
conversation = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst,
pinfo->ptype, fchdr->oxid,
fchdr->rxid, NO_PORT2);
isreq = FALSE;

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

@ -346,7 +346,7 @@ dissect_fcp_cmnd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, pro
request_data = (fcp_request_data_t*)wmem_map_lookup(fcp_conv_data->luns, GUINT_TO_POINTER((guint)lun));
if (!request_data) {
request_data = wmem_new(wmem_file_scope(), fcp_request_data_t);
request_data->request_frame = pinfo->fd->num;
request_data->request_frame = pinfo->num;
request_data->response_frame = 0;
request_data->request_time = pinfo->abs_ts;
@ -369,11 +369,11 @@ dissect_fcp_cmnd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, pro
/* populate the exchange struct */
if(!pinfo->fd->flags.visited){
if(fchdr->fctl&FC_FCTL_EXCHANGE_FIRST){
request_data->itlq->first_exchange_frame=pinfo->fd->num;
request_data->itlq->first_exchange_frame=pinfo->num;
request_data->itlq->fc_time = pinfo->abs_ts;
}
if(fchdr->fctl&FC_FCTL_EXCHANGE_LAST){
request_data->itlq->last_exchange_frame=pinfo->fd->num;
request_data->itlq->last_exchange_frame=pinfo->num;
}
}
@ -482,16 +482,16 @@ dissect_fcp_rsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, prot
/* Save the response frame */
if (request_data != NULL) {
request_data->response_frame = pinfo->fd->num;
request_data->response_frame = pinfo->num;
/* populate the exchange struct */
if(!pinfo->fd->flags.visited){
if(fchdr->fctl&FC_FCTL_EXCHANGE_FIRST){
request_data->itlq->first_exchange_frame=pinfo->fd->num;
request_data->itlq->first_exchange_frame=pinfo->num;
request_data->itlq->fc_time = pinfo->abs_ts;
}
if(fchdr->fctl&FC_FCTL_EXCHANGE_LAST){
request_data->itlq->last_exchange_frame=pinfo->fd->num;
request_data->itlq->last_exchange_frame=pinfo->num;
}
}
} else {
@ -661,7 +661,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->fd->num, &pinfo->src, &pinfo->dst,
fc_conv = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst,
pinfo->ptype, pinfo->srcport,
pinfo->destport, 0);
if (fc_conv != NULL) {

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

@ -688,7 +688,7 @@ static int dissect_fc_sbccs (tvbuff_t *tvb, packet_info *pinfo,
"0x%x"));
/* Retrieve conversation state to determine expected payload */
conversation = find_conversation (pinfo->fd->num, &pinfo->src, &pinfo->dst,
conversation = find_conversation (pinfo->num, &pinfo->src, &pinfo->dst,
PT_SBCCS, ch_cu_id, dev_addr, 0);
if (conversation) {
@ -702,7 +702,7 @@ static int dissect_fc_sbccs (tvbuff_t *tvb, packet_info *pinfo,
#if 0
conversation =
#endif
conversation_new (pinfo->fd->num, &pinfo->src, &pinfo->dst,
conversation_new (pinfo->num, &pinfo->src, &pinfo->dst,
PT_SBCCS, ch_cu_id, dev_addr, 0);
#if 0
task_key.conv_id = conversation->index;

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

@ -1713,11 +1713,11 @@ dissect_fcswils(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data)
/* Register conversation if this is not a response */
if ((opcode != FC_SWILS_SWACC) && (opcode != FC_SWILS_SWRJT)) {
conversation = find_conversation(pinfo->fd->num, &pinfo->src, &pinfo->dst,
conversation = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst,
pinfo->ptype, fchdr->oxid,
fchdr->rxid, NO_PORT2);
if (!conversation) {
conversation = conversation_new(pinfo->fd->num, &pinfo->src, &pinfo->dst,
conversation = conversation_new(pinfo->num, &pinfo->src, &pinfo->dst,
pinfo->ptype, fchdr->oxid,
fchdr->rxid, NO_PORT2);
}
@ -1745,7 +1745,7 @@ dissect_fcswils(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data)
}
else {
/* Opcode is ACC or RJT */
conversation = find_conversation(pinfo->fd->num, &pinfo->src, &pinfo->dst,
conversation = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst,
pinfo->ptype, fchdr->oxid,
fchdr->rxid, NO_PORT2);
isreq = FC_SWILS_RPLY;

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

@ -85,7 +85,7 @@ dissect_finger(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
pinfo->desegment_offset = 0;
return -1;
} else {
finger_trans->req_frame = pinfo->fd->num;
finger_trans->req_frame = pinfo->num;
finger_trans->req_time = pinfo->abs_ts;
}
} else {
@ -95,7 +95,7 @@ dissect_finger(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
}
}
} else if (is_query && (finger_trans->req_frame == 0)) {
finger_trans->req_frame = pinfo->fd->num;
finger_trans->req_frame = pinfo->num;
finger_trans->req_time = pinfo->abs_ts;
}
@ -105,10 +105,10 @@ dissect_finger(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
* number, and if reassembly is turned off, finger_trans->rep_frame will
* be assigned to the first frame number of the response. This seems
* to match other protocols' behavior. The alternative is:
* if (pinfo->fd->num > finger_trans->rep_frame)
* if (pinfo->num > finger_trans->rep_frame)
* which will give us the same frame number either way.
*/
finger_trans->rep_frame = pinfo->fd->num;
finger_trans->rep_frame = pinfo->num;
}
ti = proto_tree_add_protocol_format(tree, proto_finger, tvb, 0, -1,
@ -137,7 +137,7 @@ dissect_finger(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
tvb, 0, 0, finger_trans->req_frame);
PROTO_ITEM_SET_GENERATED(ti);
if (pinfo->fd->num == finger_trans->rep_frame) {
if (pinfo->num == finger_trans->rep_frame) {
nstime_delta(&ns, &pinfo->abs_ts, &finger_trans->req_time);
ti = proto_tree_add_time(finger_tree, hf_finger_response_time, tvb, 0, 0, &ns);
PROTO_ITEM_SET_GENERATED(ti);

Some files were not shown because too many files have changed in this diff Show More