diff options
| author | Guy Harris <guy@alum.mit.edu> | 2016-01-23 19:40:51 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2016-01-24 03:41:28 +0000 |
| commit | bc5a0374bfd162d08834f5f7503bebd33d8ec943 (patch) | |
| tree | 6d5be93a3e35c6eb144ce6d2b1d95650b5cbbd86 | |
| parent | baea677290f84d4e30e86194c79bafef0fdc1ad2 (diff) | |
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>
335 files changed, 1914 insertions, 1913 deletions
diff --git a/asn1/ansi_map/packet-ansi_map-template.c b/asn1/ansi_map/packet-ansi_map-template.c index 70bcb33531..e32291d9bf 100644 --- a/asn1/ansi_map/packet-ansi_map-template.c +++ b/asn1/ansi_map/packet-ansi_map-template.c @@ -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; diff --git a/asn1/camel/packet-camel-template.c b/asn1/camel/packet-camel-template.c index 5ee1b45e13..6e6cd6d6b8 100644 --- a/asn1/camel/packet-camel-template.c +++ b/asn1/camel/packet-camel-template.c @@ -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; diff --git a/asn1/h225/h225.cnf b/asn1/h225/h225.cnf index 825b92041d..7a963e92b1 100644 --- a/asn1/h225/h225.cnf +++ b/asn1/h225/h225.cnf @@ -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); } } diff --git a/asn1/h225/packet-h225-template.c b/asn1/h225/packet-h225-template.c index 747fc409b8..1fbfe4a07a 100644 --- a/asn1/h225/packet-h225-template.c +++ b/asn1/h225/packet-h225-template.c @@ -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; diff --git a/asn1/h245/packet-h245-template.c b/asn1/h245/packet-h245-template.c index e0940ee7b1..33ed26bd3a 100644 --- a/asn1/h245/packet-h245-template.c +++ b/asn1/h245/packet-h245-template.c @@ -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); } } diff --git a/asn1/idmp/packet-idmp-template.c b/asn1/idmp/packet-idmp-template.c index 39645dcbbe..a57a035b4d 100644 --- a/asn1/idmp/packet-idmp-template.c +++ b/asn1/idmp/packet-idmp-template.c @@ -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); diff --git a/asn1/kerberos/kerberos.cnf b/asn1/kerberos/kerberos.cnf index e9abbc5603..ff73d2b44b 100644 --- a/asn1/kerberos/kerberos.cnf +++ b/asn1/kerberos/kerberos.cnf @@ -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); } diff --git a/asn1/kerberos/packet-kerberos-template.c b/asn1/kerberos/packet-kerberos-template.c index dd3c790978..631e403098 100644 --- a/asn1/kerberos/packet-kerberos-template.c +++ b/asn1/kerberos/packet-kerberos-template.c @@ -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); } diff --git a/asn1/ldap/ldap.cnf b/asn1/ldap/ldap.cnf index c21fb81473..344dfaa935 100644 --- a/asn1/ldap/ldap.cnf +++ b/asn1/ldap/ldap.cnf @@ -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 diff --git a/asn1/ldap/packet-ldap-template.c b/asn1/ldap/packet-ldap-template.c index 1d157b35af..a5284463e7 100644 --- a/asn1/ldap/packet-ldap-template.c +++ b/asn1/ldap/packet-ldap-template.c @@ -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); diff --git a/asn1/lte-rrc/lte-rrc.cnf b/asn1/lte-rrc/lte-rrc.cnf index f1c5f9a0cb..93dabe18aa 100644 --- a/asn1/lte-rrc/lte-rrc.cnf +++ b/asn1/lte-rrc/lte-rrc.cnf @@ -1514,7 +1514,7 @@ SoundingRS-UL-ConfigDedicated/setup/duration STRINGS=TFS(<e_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(<e_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; diff --git a/asn1/nbap/nbap.cnf b/asn1/nbap/nbap.cnf index f2d7c924bd..c4e968863a 100644 --- a/asn1/nbap/nbap.cnf +++ b/asn1/nbap/nbap.cnf @@ -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){ diff --git a/asn1/nbap/packet-nbap-template.c b/asn1/nbap/packet-nbap-template.c index cba9f240bc..7838181e67 100644 --- a/asn1/nbap/packet-nbap-template.c +++ b/asn1/nbap/packet-nbap-template.c @@ -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; diff --git a/asn1/pres/packet-pres-template.c b/asn1/pres/packet-pres-template.c index eae1d892c0..c3e9367189 100644 --- a/asn1/pres/packet-pres-template.c +++ b/asn1/pres/packet-pres-template.c @@ -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; diff --git a/asn1/ros/packet-ros-template.c b/asn1/ros/packet-ros-template.c index a184f2dce9..6f7cc417b5 100644 --- a/asn1/ros/packet-ros-template.c +++ b/asn1/ros/packet-ros-template.c @@ -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); } diff --git a/asn1/rrc/rrc.cnf b/asn1/rrc/rrc.cnf index 15e11bcbad..0a29d8662d 100644 --- a/asn1/rrc/rrc.cnf +++ b/asn1/rrc/rrc.cnf @@ -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: diff --git a/asn1/rtse/packet-rtse-template.c b/asn1/rtse/packet-rtse-template.c index 0be3ebdc1d..eb8d1bf2ae 100644 --- a/asn1/rtse/packet-rtse-template.c +++ b/asn1/rtse/packet-rtse-template.c @@ -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); diff --git a/asn1/snmp/packet-snmp-template.c b/asn1/snmp/packet-snmp-template.c index 44999eb7bc..17db95d1a1 100644 --- a/asn1/snmp/packet-snmp-template.c +++ b/asn1/snmp/packet-snmp-template.c @@ -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); } diff --git a/asn1/spnego/packet-spnego-template.c b/asn1/spnego/packet-spnego-template.c index 0f52c3b0a7..08b87e6e52 100644 --- a/asn1/spnego/packet-spnego-template.c +++ b/asn1/spnego/packet-spnego-template.c @@ -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); diff --git a/asn1/t38/packet-t38-template.c b/asn1/t38/packet-t38-template.c index c459c31dab..9866309247 100644 --- a/asn1/t38/packet-t38-template.c +++ b/asn1/t38/packet-t38-template.c @@ -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 */ diff --git a/asn1/t38/t38.cnf b/asn1/t38/t38.cnf index c0629d2262..db61672b71 100644 --- a/asn1/t38/t38.cnf +++ b/asn1/t38/t38.cnf @@ -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; diff --git a/asn1/tcap/packet-tcap-template.c b/asn1/tcap/packet-tcap-template.c index f04104dde7..90381a60c2 100644 --- a/asn1/tcap/packet-tcap-template.c +++ b/asn1/tcap/packet-tcap-template.c @@ -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; diff --git a/epan/conversation.c b/epan/conversation.c index b6912e7689..9357f0e9ed 100644 --- a/epan/conversation.c +++ b/epan/conversation.c @@ -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(); diff --git a/epan/dissectors/file-btsnoop.c b/epan/dissectors/file-btsnoop.c index d1b0fe9023..7275afe7eb 100644 --- a/epan/dissectors/file-btsnoop.c +++ b/epan/dissectors/file-btsnoop.c @@ -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; diff --git a/epan/dissectors/file-file.c b/epan/dissectors/file-file.c index 48e17eb89a..ee06ab49d3 100644 --- a/epan/dissectors/file-file.c +++ b/epan/dissectors/file-file.c @@ -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)", diff --git a/epan/dissectors/file-pcap.c b/epan/dissectors/file-pcap.c index b6323fad8a..031b7de725 100644 --- a/epan/dissectors/file-pcap.c +++ b/epan/dissectors/file-pcap.c @@ -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) { diff --git a/epan/dissectors/file-pcapng.c b/epan/dissectors/file-pcapng.c index 96840cf480..c56110efcd 100644 --- a/epan/dissectors/file-pcapng.c +++ b/epan/dissectors/file-pcapng.c @@ -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 { diff --git a/epan/dissectors/packet-9p.c b/epan/dissectors/packet-9p.c index ebb1c24f2d..b439cd06ad 100644 --- a/epan/dissectors/packet-9p.c +++ b/epan/dissectors/packet-9p.c @@ -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) diff --git a/epan/dissectors/packet-acr122.c b/epan/dissectors/packet-acr122.c index f4d027e439..9cc1ae5ffa 100644 --- a/epan/dissectors/packet-acr122.c +++ b/epan/dissectors/packet-acr122.c @@ -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; } } } diff --git a/epan/dissectors/packet-adb.c b/epan/dissectors/packet-adb.c index 73a8dd0137..7c674b75ef 100644 --- a/epan/dissectors/packet-adb.c +++ b/epan/dissectors/packet-adb.c @@ -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 diff --git a/epan/dissectors/packet-adb_cs.c b/epan/dissectors/packet-adb_cs.c index e1636b1f3a..abaf8b124a 100644 --- a/epan/dissectors/packet-adb_cs.c +++ b/epan/dissectors/packet-adb_cs.c @@ -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; } diff --git a/epan/dissectors/packet-adb_service.c b/epan/dissectors/packet-adb_service.c index 23b0451a18..dd024e9357 100644 --- a/epan/dissectors/packet-adb_service.c +++ b/epan/dissectors/packet-adb_service.c @@ -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; diff --git a/epan/dissectors/packet-adwin.c b/epan/dissectors/packet-adwin.c index 53591e68d4..236ef32599 100644 --- a/epan/dissectors/packet-adwin.c +++ b/epan/dissectors/packet-adwin.c @@ -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 { diff --git a/epan/dissectors/packet-aeron.c b/epan/dissectors/packet-aeron.c index 64a64a883a..143a93d018 100644 --- a/epan/dissectors/packet-aeron.c +++ b/epan/dissectors/packet-aeron.c @@ -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); diff --git a/epan/dissectors/packet-afp.c b/epan/dissectors/packet-afp.c index 0314c0d469..e798a2004f 100644 --- a/epan/dissectors/packet-afp.c +++ b/epan/dissectors/packet-afp.c @@ -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 diff --git a/epan/dissectors/packet-afs.c b/epan/dissectors/packet-afs.c index 5a8e0627e0..e18a8f31bc 100644 --- a/epan/dissectors/packet-afs.c +++ b/epan/dissectors/packet-afs.c @@ -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; } } diff --git a/epan/dissectors/packet-alcap.c b/epan/dissectors/packet-alcap.c index dfeaec62c2..d738cc4200 100644 --- a/epan/dissectors/packet-alcap.c +++ b/epan/dissectors/packet-alcap.c @@ -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; diff --git a/epan/dissectors/packet-amqp.c b/epan/dissectors/packet-amqp.c index baad98a160..3d7cfb1401 100644 --- a/epan/dissectors/packet-amqp.c +++ b/epan/dissectors/packet-amqp.c @@ -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; diff --git a/epan/dissectors/packet-ansi_a.c b/epan/dissectors/packet-ansi_a.c index e727ecdea5..0cf5b8a353 100644 --- a/epan/dissectors/packet-ansi_a.c +++ b/epan/dissectors/packet-ansi_a.c @@ -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) diff --git a/epan/dissectors/packet-ansi_map.c b/epan/dissectors/packet-ansi_map.c index 5fdb7f0f77..97c04bda95 100644 --- a/epan/dissectors/packet-ansi_map.c +++ b/epan/dissectors/packet-ansi_map.c @@ -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; diff --git a/epan/dissectors/packet-aoe.c b/epan/dissectors/packet-aoe.c index 9dd554d61c..c27cc2c9a6 100644 --- a/epan/dissectors/packet-aoe.c +++ b/epan/dissectors/packet-aoe.c @@ -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){ diff --git a/epan/dissectors/packet-applemidi.c b/epan/dissectors/packet-applemidi.c index 5dd97cf981..9b0d2eabc2 100644 --- a/epan/dissectors/packet-applemidi.c +++ b/epan/dissectors/packet-applemidi.c @@ -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 diff --git a/epan/dissectors/packet-arp.c b/epan/dissectors/packet-arp.c index 95638595b3..7f82ec15cc 100644 --- a/epan/dissectors/packet-arp.c +++ b/epan/dissectors/packet-arp.c @@ -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 */ diff --git a/epan/dissectors/packet-atalk.c b/epan/dissectors/packet-atalk.c index 67cdac589f..2b9add2fcf 100644 --- a/epan/dissectors/packet-atalk.c +++ b/epan/dissectors/packet-atalk.c @@ -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); } diff --git a/epan/dissectors/packet-ber.c b/epan/dissectors/packet-ber.c index 319353f418..a1edde616c 100644 --- a/epan/dissectors/packet-ber.c +++ b/epan/dissectors/packet-ber.c @@ -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; diff --git a/epan/dissectors/packet-bluetooth.c b/epan/dissectors/packet-bluetooth.c index ffeee8bce8..e9e2787cae 100644 --- a/epan/dissectors/packet-bluetooth.c +++ b/epan/dissectors/packet-bluetooth.c @@ -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); diff --git a/epan/dissectors/packet-btatt.c b/epan/dissectors/packet-btatt.c index ea7fb4f1dd..f266001311 100644 --- a/epan/dissectors/packet-btatt.c +++ b/epan/dissectors/packet-btatt.c @@ -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); } diff --git a/epan/dissectors/packet-btavctp.c b/epan/dissectors/packet-btavctp.c index 661b687a5c..a66f606bb5 100644 --- a/epan/dissectors/packet-btavctp.c +++ b/epan/dissectors/packet-btavctp.c @@ -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; diff --git a/epan/dissectors/packet-btavdtp.c b/epan/dissectors/packet-btavdtp.c index 8db3e0040d..5706f63fe9 100644 --- a/epan/dissectors/packet-btavdtp.c +++ b/epan/dissectors/packet-btavdtp.c @@ -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); diff --git a/epan/dissectors/packet-btavrcp.c b/epan/dissectors/packet-btavrcp.c index e0711d023f..6afa800e57 100644 --- a/epan/dissectors/packet-btavrcp.c +++ b/epan/dissectors/packet-btavrcp.c @@ -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; diff --git a/epan/dissectors/packet-bthci_acl.c b/epan/dissectors/packet-bthci_acl.c index b0b0b66541..4d01bce794 100644 --- a/epan/dissectors/packet-bthci_acl.c +++ b/epan/dissectors/packet-bthci_acl.c @@ -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"); diff --git a/epan/dissectors/packet-bthci_cmd.c b/epan/dissectors/packet-bthci_cmd.c index 8aaad9fa3a..2cb0cb8d69 100644 --- a/epan/dissectors/packet-bthci_cmd.c +++ b/epan/dissectors/packet-bthci_cmd.c @@ -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; diff --git a/epan/dissectors/packet-bthci_evt.c b/epan/dissectors/packet-bthci_evt.c index 2889893a9e..081e2cda28 100644 --- a/epan/dissectors/packet-bthci_evt.c +++ b/epan/dissectors/packet-bthci_evt.c @@ -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; diff --git a/epan/dissectors/packet-bthci_sco.c b/epan/dissectors/packet-bthci_sco.c index fa876c60f4..0e0c04ce23 100644 --- a/epan/dissectors/packet-bthci_sco.c +++ b/epan/dissectors/packet-bthci_sco.c @@ -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; diff --git a/epan/dissectors/packet-bthci_vendor.c b/epan/dissectors/packet-bthci_vendor.c index b03b23eb34..a43c986b12 100644 --- a/epan/dissectors/packet-bthci_vendor.c +++ b/epan/dissectors/packet-bthci_vendor.c @@ -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; diff --git a/epan/dissectors/packet-bthcrp.c b/epan/dissectors/packet-bthcrp.c index 7a41a430ae..f163b1162c 100644 --- a/epan/dissectors/packet-bthcrp.c +++ b/epan/dissectors/packet-bthcrp.c @@ -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; diff --git a/epan/dissectors/packet-bthfp.c b/epan/dissectors/packet-bthfp.c index d2d1bdaeb7..1b495385e2 100644 --- a/epan/dissectors/packet-bthfp.c +++ b/epan/dissectors/packet-bthfp.c @@ -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; diff --git a/epan/dissectors/packet-bthsp.c b/epan/dissectors/packet-bthsp.c index ada292a3f5..4e531f6900 100644 --- a/epan/dissectors/packet-bthsp.c +++ b/epan/dissectors/packet-bthsp.c @@ -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; diff --git a/epan/dissectors/packet-btl2cap.c b/epan/dissectors/packet-btl2cap.c index 3ea0d6c25d..689462e858 100644 --- a/epan/dissectors/packet-btl2cap.c +++ b/epan/dissectors/packet-btl2cap.c @@ -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; diff --git a/epan/dissectors/packet-btle.c b/epan/dissectors/packet-btle.c index 7cf282f43f..d3a8bcee1e 100644 --- a/epan/dissectors/packet-btle.c +++ b/epan/dissectors/packet-btle.c @@ -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; diff --git a/epan/dissectors/packet-btobex.c b/epan/dissectors/packet-btobex.c index 12852b44fb..5fc706eab3 100644 --- a/epan/dissectors/packet-btobex.c +++ b/epan/dissectors/packet-btobex.c @@ -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); } diff --git a/epan/dissectors/packet-btrfcomm.c b/epan/dissectors/packet-btrfcomm.c index 7551a50210..f398582da9 100644 --- a/epan/dissectors/packet-btrfcomm.c +++ b/epan/dissectors/packet-btrfcomm.c @@ -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; diff --git a/epan/dissectors/packet-btsdp.c b/epan/dissectors/packet-btsdp.c index f03aedcb72..0b611bbd64 100644 --- a/epan/dissectors/packet-btsdp.c +++ b/epan/dissectors/packet-btsdp.c @@ -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; diff --git a/epan/dissectors/packet-camel.c b/epan/dissectors/packet-camel.c index a5cea9c477..a7d3c145cf 100644 --- a/epan/dissectors/packet-camel.c +++ b/epan/dissectors/packet-camel.c @@ -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; diff --git a/epan/dissectors/packet-cip.c b/epan/dissectors/packet-cip.c index 6bee51db8a..0b1ffc41d3 100644 --- a/epan/dissectors/packet-cip.c +++ b/epan/dissectors/packet-cip.c @@ -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; diff --git a/epan/dissectors/packet-classicstun.c b/epan/dissectors/packet-classicstun.c index c689dca977..e07e0e13d8 100644 --- a/epan/dissectors/packet-classicstun.c +++ b/epan/dissectors/packet-classicstun.c @@ -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 { diff --git a/epan/dissectors/packet-cops.c b/epan/dissectors/packet-cops.c index 1be2fcb337..d3aa455da3 100644 --- a/epan/dissectors/packet-cops.c +++ b/epan/dissectors/packet-cops.c @@ -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); diff --git a/epan/dissectors/packet-cp2179.c b/epan/dissectors/packet-cp2179.c index 8d61af06c5..69499153c4 100644 --- a/epan/dissectors/packet-cp2179.c +++ b/epan/dissectors/packet-cp2179.c @@ -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 */ diff --git a/epan/dissectors/packet-ctdb.c b/epan/dissectors/packet-ctdb.c index d8e0ae43d4..03bf67239c 100644 --- a/epan/dissectors/packet-ctdb.c +++ b/epan/dissectors/packet-ctdb.c @@ -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; diff --git a/epan/dissectors/packet-dcerpc-lsa.c b/epan/dissectors/packet-dcerpc-lsa.c index b485be5da9..98667be5c3 100644 --- a/epan/dissectors/packet-dcerpc-lsa.c +++ b/epan/dissectors/packet-dcerpc-lsa.c @@ -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: diff --git a/epan/dissectors/packet-dcerpc-netlogon.c b/epan/dissectors/packet-dcerpc-netlogon.c index 6d8f527665..4ba49b5720 100644 --- a/epan/dissectors/packet-dcerpc-netlogon.c +++ b/epan/dissectors/packet-dcerpc-netlogon.c @@ -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; } diff --git a/epan/dissectors/packet-dcerpc-nt.c b/epan/dissectors/packet-dcerpc-nt.c index 5a6b6a4087..ef7ac93d60 100644 --- a/epan/dissectors/packet-dcerpc-nt.c +++ b/epan/dissectors/packet-dcerpc-nt.c @@ -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; diff --git a/epan/dissectors/packet-dcerpc-samr.c b/epan/dissectors/packet-dcerpc-samr.c index 2268d76324..22a29befeb 100644 --- a/epan/dissectors/packet-dcerpc-samr.c +++ b/epan/dissectors/packet-dcerpc-samr.c @@ -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: diff --git a/epan/dissectors/packet-dcerpc-spoolss.c b/epan/dissectors/packet-dcerpc-spoolss.c index 8479845d6d..8774e3416a 100644 --- a/epan/dissectors/packet-dcerpc-spoolss.c +++ b/epan/dissectors/packet-dcerpc-spoolss.c @@ -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); diff --git a/epan/dissectors/packet-dcerpc-svcctl.c b/epan/dissectors/packet-dcerpc-svcctl.c index 3c518354d3..770e288030 100644 --- a/epan/dissectors/packet-dcerpc-svcctl.c +++ b/epan/dissectors/packet-dcerpc-svcctl.c @@ -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); diff --git a/epan/dissectors/packet-dcerpc.c b/epan/dissectors/packet-dcerpc.c index c0aad8fcab..84ac1a68c2 100644 --- a/epan/dissectors/packet-dcerpc.c +++ b/epan/dissectors/packet-dcerpc.c @@ -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); diff --git a/epan/dissectors/packet-dcm.c b/epan/dissectors/packet-dcm.c index 2329b9aca3..62a5174bc4 100644 --- a/epan/dissectors/packet-dcm.c +++ b/epan/dissectors/packet-dcm.c @@ -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; diff --git a/epan/dissectors/packet-dcom.c b/epan/dissectors/packet-dcom.c index df4b729e49..e41a12e0af 100644 --- a/epan/dissectors/packet-dcom.c +++ b/epan/dissectors/packet-dcom.c @@ -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; diff --git a/epan/dissectors/packet-diameter.c b/epan/dissectors/packet-diameter.c index 1dd852ed6d..721a5b8695 100644 --- a/epan/dissectors/packet-diameter.c +++ b/epan/dissectors/packet-diameter.c @@ -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. diff --git a/epan/dissectors/packet-dji-uav.c b/epan/dissectors/packet-dji-uav.c index 10019431e3..c424d355d7 100644 --- a/epan/dissectors/packet-dji-uav.c +++ b/epan/dissectors/packet-dji-uav.c @@ -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 { diff --git a/epan/dissectors/packet-dmp.c b/epan/dissectors/packet-dmp.c index 36ec6c62fc..b5ee4c722f 100644 --- a/epan/dissectors/packet-dmp.c +++ b/epan/dissectors/packet-dmp.c @@ -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); diff --git a/epan/dissectors/packet-dns.c b/epan/dissectors/packet-dns.c index 94c86e59a4..3234cf2cb2 100644 --- a/epan/dissectors/packet-dns.c +++ b/epan/dissectors/packet-dns.c @@ -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; } } } diff --git a/epan/dissectors/packet-drda.c b/epan/dissectors/packet-drda.c index a6e84c042c..6334b2d490 100644 --- a/epan/dissectors/packet-drda.c +++ b/epan/dissectors/packet-drda.c @@ -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)) { diff --git a/epan/dissectors/packet-dtls.c b/epan/dissectors/packet-dtls.c index ce51f8270e..de4b091132 100644 --- a/epan/dissectors/packet-dtls.c +++ b/epan/dissectors/packet-dtls.c @@ -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; diff --git a/epan/dissectors/packet-dvbci.c b/epan/dissectors/packet-dvbci.c index ce8c59d21d..310d50f9b8 100644 --- a/epan/dissectors/packet-dvbci.c +++ b/epan/dissectors/packet-dvbci.c @@ -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 diff --git a/epan/dissectors/packet-eap.c b/epan/dissectors/packet-eap.c index eca7ac5d5e..2c38f3bb50 100644 --- a/epan/dissectors/packet-eap.c +++ b/epan/dissectors/packet-eap.c @@ -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. diff --git a/epan/dissectors/packet-enip.c b/epan/dissectors/packet-enip.c index c91daed60a..bb7eadc1f4 100644 --- a/epan/dissectors/packet-enip.c +++ b/epan/dissectors/packet-enip.c @@ -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; diff --git a/epan/dissectors/packet-epl.c b/epan/dissectors/packet-epl.c index 6c4024ce72..d0b4d56226 100644 --- a/epan/dissectors/packet-epl.c +++ b/epan/dissectors/packet-epl.c @@ -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 */ diff --git a/epan/dissectors/packet-epmd.c b/epan/dissectors/packet-epmd.c index 8448c1af82..f3532ac1fd 100644 --- a/epan/dissectors/packet-epmd.c +++ b/epan/dissectors/packet-epmd.c @@ -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; diff --git a/epan/dissectors/packet-etch.c b/epan/dissectors/packet-etch.c index be5df8b979..80714d6dcb 100644 --- a/epan/dissectors/packet-etch.c +++ b/epan/dissectors/packet-etch.c @@ -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)); diff --git a/epan/dissectors/packet-exec.c b/epan/dissectors/packet-exec.c index 843edec099..da8b7dafa5 100644 --- a/epan/dissectors/packet-exec.c +++ b/epan/dissectors/packet-exec.c @@ -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 { diff --git a/epan/dissectors/packet-fc.c b/epan/dissectors/packet-fc.c index 8a74249b8c..45288d8bd8 100644 --- a/epan/dissectors/packet-fc.c +++ b/epan/dissectors/packet-fc.c @@ -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; } } diff --git a/epan/dissectors/packet-fcdns.c b/epan/dissectors/packet-fcdns.c index eb18503b84..7c4615a32a 100644 --- a/epan/dissectors/packet-fcdns.c +++ b/epan/dissectors/packet-fcdns.c @@ -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; diff --git a/epan/dissectors/packet-fcels.c b/epan/dissectors/packet-fcels.c index e7e4e55e11..d6c883807b 100644 --- a/epan/dissectors/packet-fcels.c +++ b/epan/dissectors/packet-fcels.c @@ -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) { diff --git a/epan/dissectors/packet-fcfcs.c b/epan/dissectors/packet-fcfcs.c index 14956e8348..614f3853e2 100644 --- a/epan/dissectors/packet-fcfcs.c +++ b/epan/dissectors/packet-fcfcs.c @@ -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; diff --git a/epan/dissectors/packet-fcfzs.c b/epan/dissectors/packet-fcfzs.c index b966fd0b91..6c113b68e1 100644 --- a/epan/dissectors/packet-fcfzs.c +++ b/epan/dissectors/packet-fcfzs.c @@ -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; diff --git a/epan/dissectors/packet-fcp.c b/epan/dissectors/packet-fcp.c index c900961e9f..0001281e29 100644 --- a/epan/dissectors/packet-fcp.c +++ b/epan/dissectors/packet-fcp.c @@ -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) { diff --git a/epan/dissectors/packet-fcsb3.c b/epan/dissectors/packet-fcsb3.c index 188e002101..0c58937e3e 100644 --- a/epan/dissectors/packet-fcsb3.c +++ b/epan/dissectors/packet-fcsb3.c @@ -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; diff --git a/epan/dissectors/packet-fcswils.c b/epan/dissectors/packet-fcswils.c index 4896098d57..6c7d4a3b46 100644 --- a/epan/dissectors/packet-fcswils.c +++ b/epan/dissectors/packet-fcswils.c @@ -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; diff --git a/epan/dissectors/packet-finger.c b/epan/dissectors/packet-finger.c index 14583e5d05..c3e8a493b6 100644 --- a/epan/dissectors/packet-finger.c +++ b/epan/dissectors/packet-finger.c @@ -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); diff --git a/epan/dissectors/packet-frame.c b/epan/dissectors/packet-frame.c index 0ed6e4240f..06216aa0e6 100644 --- a/epan/dissectors/packet-frame.c +++ b/epan/dissectors/packet-frame.c @@ -286,7 +286,7 @@ dissect_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* ti = proto_tree_add_protocol_format(tree, proto_frame, tvb, 0, tvb_captured_length(tvb), "Frame %u: %u byte%s on wire", - pinfo->fd->num, frame_len, frame_plurality); + pinfo->num, frame_len, frame_plurality); if (generate_bits_field) proto_item_append_text(ti, " (%u bits)", frame_len * 8); proto_item_append_text(ti, ", %u byte%s captured", @@ -365,7 +365,7 @@ dissect_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* if (proto_field_is_referenced(tree, hf_frame_time_delta)) { nstime_t del_cap_ts; - frame_delta_abs_time(pinfo->epan, pinfo->fd, pinfo->fd->num - 1, &del_cap_ts); + frame_delta_abs_time(pinfo->epan, pinfo->fd, pinfo->num - 1, &del_cap_ts); item = proto_tree_add_time(fh_tree, hf_frame_time_delta, tvb, 0, 0, &(del_cap_ts)); @@ -393,7 +393,7 @@ dissect_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* } proto_tree_add_uint(fh_tree, hf_frame_number, tvb, - 0, 0, pinfo->fd->num); + 0, 0, pinfo->num); proto_tree_add_uint_format(fh_tree, hf_frame_len, tvb, 0, 0, frame_len, "Frame Length: %u byte%s (%u bits)", @@ -662,7 +662,7 @@ dissect_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* "Dissector %s incomplete in frame %u: undecoded byte number %u " "(0x%.4X+%u)", (fi ? fi->hfinfo->abbrev : "[unknown]"), - pinfo->fd->num, i, i - i % 16, i % 16); + pinfo->num, i, i - i % 16, i % 16); proto_tree_add_expert_format(tree, pinfo, &ei_incomplete, tvb, i, 1, "Undecoded byte number: %u (0x%.4X+%u)", i, i - i % 16, i % 16); } } diff --git a/epan/dissectors/packet-ftp.c b/epan/dissectors/packet-ftp.c index 1d8b8a4036..6487d2e9b1 100644 --- a/epan/dissectors/packet-ftp.c +++ b/epan/dissectors/packet-ftp.c @@ -728,7 +728,7 @@ dissect_ftp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) * "ftp_ip_address" and "server_port", and * wildcard everything else? */ - conversation = find_conversation(pinfo->fd->num, &ftp_ip_address, + conversation = find_conversation(pinfo->num, &ftp_ip_address, &pinfo->dst, PT_TCP, ftp_port, 0, NO_PORT_B); if (conversation == NULL) { @@ -750,7 +750,7 @@ dissect_ftp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) * a new one was opened? */ conversation = conversation_new( - pinfo->fd->num, &ftp_ip_address, &pinfo->dst, + pinfo->num, &ftp_ip_address, &pinfo->dst, PT_TCP, ftp_port, 0, NO_PORT2); conversation_set_dissector(conversation, ftpdata_handle); } @@ -792,12 +792,12 @@ dissect_ftp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) tvb, eprt_offset, ftp_port_len, ftp_port); /* Find/create conversation for data */ - conversation = find_conversation(pinfo->fd->num, + conversation = find_conversation(pinfo->num, &pinfo->src, &ftp_ip_address, PT_TCP, ftp_port, 0, NO_PORT_B); if (conversation == NULL) { conversation = conversation_new( - pinfo->fd->num, &pinfo->src, &ftp_ip_address, + pinfo->num, &pinfo->src, &ftp_ip_address, PT_TCP, ftp_port, 0, NO_PORT2); conversation_set_dissector(conversation, ftpdata_handle); @@ -840,12 +840,12 @@ dissect_ftp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) ftp_port_len, ftp_port); /* Find/create conversation for data */ - conversation = find_conversation(pinfo->fd->num, &ftp_ip_address, + conversation = find_conversation(pinfo->num, &ftp_ip_address, &pinfo->dst, PT_TCP, ftp_port, 0, NO_PORT_B); if (conversation == NULL) { conversation = conversation_new( - pinfo->fd->num, &ftp_ip_address, &pinfo->dst, + pinfo->num, &ftp_ip_address, &pinfo->dst, PT_TCP, ftp_port, 0, NO_PORT2); conversation_set_dissector(conversation, ftpdata_handle); diff --git a/epan/dissectors/packet-gadu-gadu.c b/epan/dissectors/packet-gadu-gadu.c index 43682ea3a7..8c63227f27 100644 --- a/epan/dissectors/packet-gadu-gadu.c +++ b/epan/dissectors/packet-gadu-gadu.c @@ -564,7 +564,7 @@ gadu_gadu_get_conversation_data(packet_info *pinfo) { conversation_t *conv; - conv = find_conversation(pinfo->fd->num, &pinfo->src, &pinfo->dst, pinfo->ptype, pinfo->srcport, pinfo->destport, 0); + conv = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst, pinfo->ptype, pinfo->srcport, pinfo->destport, 0); if (conv) return (struct gadu_gadu_conv_data *)conversation_get_proto_data(conv, hfi_gadu_gadu->id); return NULL; diff --git a/epan/dissectors/packet-giop.c b/epan/dissectors/packet-giop.c index 25626fed8a..752aa48dc8 100644 --- a/epan/dissectors/packet-giop.c +++ b/epan/dissectors/packet-giop.c @@ -2029,7 +2029,7 @@ static gboolean try_explicit_giop_dissector(tvbuff_t *tvb, packet_info *pinfo, p /* but only if user not clicking */ if (!pinfo->fd->flags.visited) - add_sub_handle_repoid_to_comp_req_list(pinfo->fd->num, subdiss, repoid); + add_sub_handle_repoid_to_comp_req_list(pinfo->num, subdiss, repoid); /* Call subdissector if current offset exists , and dissector is enabled in GUI "edit protocols" */ @@ -4043,9 +4043,9 @@ dissect_reply_body (tvbuff_t *tvb, guint offset, packet_info *pinfo, /* lookup MFN in hash directly */ - mfn = get_mfn_from_fn(pinfo->fd->num); + mfn = get_mfn_from_fn(pinfo->num); - if (mfn == pinfo->fd->num) + if (mfn == pinfo->num) return; /* no matching frame number, what am I */ /* get entry for this MFN */ @@ -4176,9 +4176,9 @@ static void dissect_giop_reply (tvbuff_t * tvb, packet_info * pinfo, proto_tree */ if (! pinfo->fd->flags.visited) { - mfn = get_mfn_from_fn_and_reqid(pinfo->fd->num, request_id, &pinfo->dst, pinfo->destport); /* find MFN for this FN */ - if (mfn != pinfo->fd->num) { /* if mfn is not fn, good */ - insert_in_complete_reply_hash(pinfo->fd->num, mfn); + mfn = get_mfn_from_fn_and_reqid(pinfo->num, request_id, &pinfo->dst, pinfo->destport); /* find MFN for this FN */ + if (mfn != pinfo->num) { /* if mfn is not fn, good */ + insert_in_complete_reply_hash(pinfo->num, mfn); } } @@ -4242,9 +4242,9 @@ static void dissect_giop_reply_1_2 (tvbuff_t * tvb, packet_info * pinfo, */ if (! pinfo->fd->flags.visited) { - mfn = get_mfn_from_fn_and_reqid(pinfo->fd->num, request_id, &pinfo->dst, pinfo->destport); /* find MFN for this FN */ - if (mfn != pinfo->fd->num) { /* if mfn is not fn, good */ - insert_in_complete_reply_hash(pinfo->fd->num, mfn); + mfn = get_mfn_from_fn_and_reqid(pinfo->num, request_id, &pinfo->dst, pinfo->destport); /* find MFN for this FN */ + if (mfn != pinfo->num) { /* if mfn is not fn, good */ + insert_in_complete_reply_hash(pinfo->num, mfn); } } @@ -4405,7 +4405,7 @@ dissect_giop_request_1_1 (tvbuff_t * tvb, packet_info * pinfo, * But only if user is NOT clicking. */ if (! pinfo->fd->flags.visited) - giop_complete_request_list = insert_in_comp_req_list(giop_complete_request_list, pinfo->fd->num, + giop_complete_request_list = insert_in_comp_req_list(giop_complete_request_list, pinfo->num, request_id, operation, NULL, &pinfo->src, pinfo->srcport); @@ -4528,7 +4528,7 @@ dissect_giop_request_1_2 (tvbuff_t * tvb, packet_info * pinfo, */ if (! pinfo->fd->flags.visited) - giop_complete_request_list = insert_in_comp_req_list(giop_complete_request_list, pinfo->fd->num, + giop_complete_request_list = insert_in_comp_req_list(giop_complete_request_list, pinfo->num, request_id, operation, NULL, &pinfo->src, pinfo->srcport); /* diff --git a/epan/dissectors/packet-gsm_a_bssmap.c b/epan/dissectors/packet-gsm_a_bssmap.c index 697fa17e4f..8517c315c9 100644 --- a/epan/dissectors/packet-gsm_a_bssmap.c +++ b/epan/dissectors/packet-gsm_a_bssmap.c @@ -3689,8 +3689,8 @@ be_aoip_trans_lay_add(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, g } if ((!pinfo->fd->flags.visited) && rtp_port != 0) { - rtp_add_address(pinfo, &rtp_dst_addr, rtp_port, 0, "BSS MAP", pinfo->fd->num, FALSE, 0); - rtcp_add_address(pinfo, &rtp_dst_addr, rtp_port+1, 0, "BSS MAP", pinfo->fd->num); + rtp_add_address(pinfo, &rtp_dst_addr, rtp_port, 0, "BSS MAP", pinfo->num, FALSE, 0); + rtcp_add_address(pinfo, &rtp_dst_addr, rtp_port+1, 0, "BSS MAP", pinfo->num); } return(curr_offset - offset); } diff --git a/epan/dissectors/packet-gsm_sms.c b/epan/dissectors/packet-gsm_sms.c index e826e89a75..d4e6f048dd 100644 --- a/epan/dissectors/packet-gsm_sms.c +++ b/epan/dissectors/packet-gsm_sms.c @@ -1890,7 +1890,7 @@ dis_field_ud(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint32 offset "Reassembled Short Message", fd_sm, &sm_frag_items, NULL, subtree); - if(reassembled && pinfo->fd->num == reassembled_in) + if(reassembled && pinfo->num == reassembled_in) { /* Reassembled */ col_append_str (pinfo->cinfo, COL_INFO, @@ -1927,7 +1927,7 @@ dis_field_ud(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint32 offset /* Per 3GPP 31.111 chapter 6.4.10: */ /* It shall use the SMS default 7-bit coded alphabet */ /* as defined in TS 23.038 with bit 8 set to 0 */ - if(!(reassembled && pinfo->fd->num == reassembled_in)) + if(!(reassembled && pinfo->num == reassembled_in)) { proto_tree_add_item(subtree, hf_gsm_sms_text, tvb, offset, length, ENC_ASCII|ENC_NA); } @@ -1949,7 +1949,7 @@ dis_field_ud(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint32 offset } else if (seven_bit) { - if(!(reassembled && pinfo->fd->num == reassembled_in)) + if(!(reassembled && pinfo->num == reassembled_in)) { /* Show unassembled SMS */ proto_tree_add_ts_23_038_7bits_item(subtree, hf_gsm_sms_text, tvb, (offset<<3)+fill_bits, @@ -1979,7 +1979,7 @@ dis_field_ud(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint32 offset } else if (eight_bit) { - if (!is_fragmented || (reassembled && pinfo->fd->num == reassembled_in)) { + if (!is_fragmented || (reassembled && pinfo->num == reassembled_in)) { if (! dissector_try_uint(gsm_sms_dissector_tbl, udh_fields.port_src, sm_tvb, pinfo, subtree)) { if (! dissector_try_uint(gsm_sms_dissector_tbl, udh_fields.port_dst,sm_tvb, pinfo, subtree)) @@ -1996,7 +1996,7 @@ dis_field_ud(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint32 offset { guint rep_len = tvb_reported_length(sm_tvb); - if (!(reassembled && pinfo->fd->num == reassembled_in)) + if (!(reassembled && pinfo->num == reassembled_in)) { /* Show unreassembled SMS */ proto_tree_add_item(subtree, hf_gsm_sms_text, sm_tvb, diff --git a/epan/dissectors/packet-gsm_sms_ud.c b/epan/dissectors/packet-gsm_sms_ud.c index 3269710f2a..370538956f 100644 --- a/epan/dissectors/packet-gsm_sms_ud.c +++ b/epan/dissectors/packet-gsm_sms_ud.c @@ -386,7 +386,7 @@ parse_gsm_sms_ud_message(proto_tree *sm_tree, tvbuff_t *tvb, packet_info *pinfo, sm_tvb = tvb_new_subset_remaining(tvb, i); /* Try calling a subdissector */ if (sm_tvb) { - if ((reassembled && pinfo->fd->num == reassembled_in) + if ((reassembled && pinfo->num == reassembled_in) || frag==0 || (frag==1 && try_dissect_1st_frag)) { /* Try calling a subdissector only if: * - the Short Message is reassembled in this very packet, diff --git a/epan/dissectors/packet-gssapi.c b/epan/dissectors/packet-gssapi.c index b33fd69f24..47c4fcd392 100644 --- a/epan/dissectors/packet-gssapi.c +++ b/epan/dissectors/packet-gssapi.c @@ -261,7 +261,7 @@ dissect_gssapi_work(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if(!fi){ goto done; } - wmem_tree_insert32(gss_info->frags, pinfo->fd->num, fi); + wmem_tree_insert32(gss_info->frags, pinfo->num, fi); fd_head=fragment_add(&gssapi_reassembly_table, tvb, 0, pinfo, fi->first_frame, NULL, gss_info->frag_offset, @@ -275,7 +275,7 @@ dissect_gssapi_work(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, /* this blob is now fully reassembled */ gss_info->do_reassembly=FALSE; - fi->reassembled_in=pinfo->fd->num; + fi->reassembled_in=pinfo->num; gss_tvb=tvb_new_chain(tvb, fd_head->tvb_data); add_new_data_source(pinfo, gss_tvb, "Reassembled GSSAPI"); @@ -285,12 +285,12 @@ dissect_gssapi_work(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, */ if( (pinfo->fd->flags.visited) && (gssapi_reassembly) ){ - fi=(gssapi_frag_info_t *)wmem_tree_lookup32(gss_info->frags, pinfo->fd->num); + fi=(gssapi_frag_info_t *)wmem_tree_lookup32(gss_info->frags, pinfo->num); if(fi){ fd_head=fragment_get(&gssapi_reassembly_table, pinfo, fi->first_frame, NULL); if(fd_head && (fd_head->flags&FD_DEFRAGMENTED)){ - if(pinfo->fd->num==fi->reassembled_in){ + if(pinfo->num==fi->reassembled_in){ proto_item *frag_tree_item; gss_tvb=tvb_new_chain(tvb, fd_head->tvb_data); add_new_data_source(pinfo, gss_tvb, "Reassembled GSSAPI"); @@ -429,18 +429,18 @@ dissect_gssapi_work(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, && (len1>(guint32)tvb_captured_length_remaining(gss_tvb, oid_start_offset)) && (gssapi_reassembly) ){ fi=wmem_new(wmem_file_scope(), gssapi_frag_info_t); - fi->first_frame=pinfo->fd->num; + fi->first_frame=pinfo->num; fi->reassembled_in=0; - wmem_tree_insert32(gss_info->frags, pinfo->fd->num, fi); + wmem_tree_insert32(gss_info->frags, pinfo->num, fi); fragment_add(&gssapi_reassembly_table, - gss_tvb, 0, pinfo, pinfo->fd->num, NULL, + gss_tvb, 0, pinfo, pinfo->num, NULL, 0, tvb_captured_length(gss_tvb), TRUE); fragment_set_tot_len(&gssapi_reassembly_table, - pinfo, pinfo->fd->num, NULL, len1+oid_start_offset); + pinfo, pinfo->num, NULL, len1+oid_start_offset); gss_info->do_reassembly=TRUE; - gss_info->first_frame=pinfo->fd->num; + gss_info->first_frame=pinfo->num; gss_info->frag_offset=tvb_captured_length(gss_tvb); goto done; } diff --git a/epan/dissectors/packet-gtp.c b/epan/dissectors/packet-gtp.c index 3465194e14..2fe1a3ea44 100644 --- a/epan/dissectors/packet-gtp.c +++ b/epan/dissectors/packet-gtp.c @@ -3205,7 +3205,7 @@ gtp_match_response(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, gint case GTP_MSG_UPDATE_PDP_REQ: case GTP_MSG_DELETE_PDP_REQ: gcr.is_request=TRUE; - gcr.req_frame=pinfo->fd->num; + gcr.req_frame=pinfo->num; gcr.rep_frame=0; break; case GTP_MSG_ECHO_RESP: @@ -3214,7 +3214,7 @@ gtp_match_response(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, gint case GTP_MSG_DELETE_PDP_RESP: gcr.is_request=FALSE; gcr.req_frame=0; - gcr.rep_frame=pinfo->fd->num; + gcr.rep_frame=pinfo->num; break; default: gcr.is_request=FALSE; @@ -3248,7 +3248,7 @@ gtp_match_response(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, gint gcrp = wmem_new(wmem_file_scope(), gtp_msg_hash_t); } gcrp->seq_nr=seq_nr; - gcrp->req_frame = pinfo->fd->num; + gcrp->req_frame = pinfo->num; gcrp->req_time = pinfo->abs_ts; gcrp->rep_frame = 0; gcrp->msgtype = msgtype; @@ -3266,7 +3266,7 @@ gtp_match_response(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, gint if (gcrp) { if (!gcrp->rep_frame) { g_hash_table_remove(gtp_info->unmatched, gcrp); - gcrp->rep_frame=pinfo->fd->num; + gcrp->rep_frame=pinfo->num; gcrp->is_request=FALSE; g_hash_table_insert(gtp_info->matched, gcrp, gcrp); } diff --git a/epan/dissectors/packet-gtpv2.c b/epan/dissectors/packet-gtpv2.c index 41f5a8d2c4..807614b0e5 100644 --- a/epan/dissectors/packet-gtpv2.c +++ b/epan/dissectors/packet-gtpv2.c @@ -6066,7 +6066,7 @@ gtpv2_match_response(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, gin case GTPV2_DELETE_BEARER_REQUEST: case GTPV2_DELETE_SESSION_REQUEST: gcr.is_request = TRUE; - gcr.req_frame = pinfo->fd->num; + gcr.req_frame = pinfo->num; gcr.rep_frame = 0; break; case GTPV2_CREATE_SESSION_RESPONSE: @@ -6077,7 +6077,7 @@ gtpv2_match_response(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, gin case GTPV2_DELETE_SESSION_RESPONSE: gcr.is_request = FALSE; gcr.req_frame = 0; - gcr.rep_frame = pinfo->fd->num; + gcr.rep_frame = pinfo->num; break; default: gcr.is_request = FALSE; @@ -6110,7 +6110,7 @@ gtpv2_match_response(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, gin gcrp = wmem_new(wmem_file_scope(), gtpv2_msg_hash_t); } gcrp->seq_nr = seq_nr; - gcrp->req_frame = pinfo->fd->num; + gcrp->req_frame = pinfo->num; gcrp->req_time = pinfo->abs_ts; gcrp->rep_frame = 0; gcrp->msgtype = msgtype; @@ -6130,7 +6130,7 @@ gtpv2_match_response(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, gin if (gcrp) { if (!gcrp->rep_frame) { wmem_map_remove(gtpv2_info->unmatched, gcrp); - gcrp->rep_frame = pinfo->fd->num; + gcrp->rep_frame = pinfo->num; gcrp->is_request = FALSE; wmem_map_insert(gtpv2_info->matched, gcrp, gcrp); } diff --git a/epan/dissectors/packet-gvcp.c b/epan/dissectors/packet-gvcp.c index c6dc58a95f..e6b93fb362 100644 --- a/epan/dissectors/packet-gvcp.c +++ b/epan/dissectors/packet-gvcp.c @@ -2286,7 +2286,7 @@ static int dissect_gvcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi { /* This is a request */ gvcp_trans = (gvcp_transaction_t*)wmem_alloc(wmem_packet_scope(), sizeof(gvcp_transaction_t)); - gvcp_trans->req_frame = pinfo->fd->num; + gvcp_trans->req_frame = pinfo->num; gvcp_trans->rep_frame = 0; gvcp_trans->addr_list = 0; gvcp_trans->addr_count = 0; @@ -2306,7 +2306,7 @@ static int dissect_gvcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi { gvcp_trans = (gvcp_transaction_t*)wmem_array_index(gvcp_trans_array, i); - if (gvcp_trans && (gvcp_trans->req_frame < pinfo->fd->num)) + if (gvcp_trans && (gvcp_trans->req_frame < pinfo->num)) { if (gvcp_trans->rep_frame != 0) { @@ -2314,7 +2314,7 @@ static int dissect_gvcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi } else { - gvcp_trans->rep_frame = pinfo->fd->num; + gvcp_trans->rep_frame = pinfo->num; } break; @@ -2338,7 +2338,7 @@ static int dissect_gvcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi for (i = 0; i < array_size; ++i) { gvcp_trans = (gvcp_transaction_t*)wmem_array_index(gvcp_trans_array, i); - if (gvcp_trans && (pinfo->fd->num == gvcp_trans->req_frame || pinfo->fd->num == gvcp_trans->rep_frame)) + if (gvcp_trans && (pinfo->num == gvcp_trans->req_frame || pinfo->num == gvcp_trans->rep_frame)) { break; } diff --git a/epan/dissectors/packet-h223.c b/epan/dissectors/packet-h223.c index ef90856066..3a66b4bbd8 100644 --- a/epan/dissectors/packet-h223.c +++ b/epan/dissectors/packet-h223.c @@ -459,18 +459,18 @@ find_or_create_call_info_circ(packet_info * pinfo, circuit_type ctype, guint32 c circuit_t *circ = NULL; if(ctype != CT_NONE) - circ = find_circuit( ctype, circuit_id, pinfo->fd->num ); + circ = find_circuit( ctype, circuit_id, pinfo->num ); if(circ == NULL) return NULL; datax = (h223_call_info *)circuit_get_proto_data(circ, proto_h223); if( datax == NULL ) { - datax = create_call_info(pinfo->fd->num); + datax = create_call_info(pinfo->num); #ifdef DEBUG_H223 g_debug("%u: Created new call %p for circuit %p ctype %d, id %u", - pinfo->fd->num, datax, circ, type, circuit_id); + pinfo->num, datax, circ, type, circuit_id); #endif circuit_add_proto_data(circ, proto_h223, datax); } @@ -490,7 +490,7 @@ find_or_create_call_info_conv(packet_info * pinfo) conversation_t *conv; /* assume we're running atop TCP or RTP; use the conversation support */ - conv = find_conversation( pinfo->fd->num, + conv = find_conversation( pinfo->num, &pinfo->src,&pinfo->dst, pinfo->ptype, pinfo->srcport,pinfo->destport, 0 ); @@ -509,7 +509,7 @@ find_or_create_call_info_conv(packet_info * pinfo) * * Look for another converstation, going in the opposite direction. */ - conv2 = find_conversation( pinfo->fd->num, + conv2 = find_conversation( pinfo->num, &pinfo->dst,&pinfo->src, pinfo->ptype, pinfo->destport,pinfo->srcport, 0 ); @@ -519,7 +519,7 @@ find_or_create_call_info_conv(packet_info * pinfo) if(datax != NULL) { #ifdef DEBUG_H223 g_debug("%u: Identified conv %p as reverse of conv %p with call %p and type=%u src=%u.%u.%u.%u:%u dst=%u.%u.%u.%u:%u", - pinfo->fd->num, conv, conv2, datax, pinfo->ptype, + pinfo->num, conv, conv2, datax, pinfo->ptype, pinfo->dst.data[0], pinfo->dst.data[1], pinfo->dst.data[2], pinfo->dst.data[3], pinfo->destport, pinfo->src.data[0], pinfo->src.data[1], pinfo->src.data[2], pinfo->src.data[3], @@ -532,11 +532,11 @@ find_or_create_call_info_conv(packet_info * pinfo) /* we still haven't found any call data - create a new one for this * conversation */ if(datax == NULL) { - datax = create_call_info(pinfo->fd->num); + datax = create_call_info(pinfo->num); #ifdef DEBUG_H223 g_debug("%u: Created new call %p for conv %p type=%u src=%u.%u.%u.%u:%u dst=%u.%u.%u.%u:%u", - pinfo->fd->num, datax, conv, pinfo->ptype, + pinfo->num, datax, conv, pinfo->ptype, pinfo->src.data[0], pinfo->src.data[1], pinfo->src.data[2], pinfo->src.data[3], pinfo->srcport, pinfo->dst.data[0], pinfo->dst.data[1], pinfo->dst.data[2], pinfo->dst.data[3], @@ -575,14 +575,14 @@ find_or_create_call_info ( packet_info * pinfo, circuit_type ctype, guint32 circ static void h223_set_mc( packet_info* pinfo, guint8 mc, h223_mux_element* me, circuit_type ctype, guint32 circuit_id ) { - circuit_t *circ = find_circuit( ctype, circuit_id, pinfo->fd->num ); + circuit_t *circ = find_circuit( ctype, circuit_id, pinfo->num ); h223_vc_info* vc_info; /* if this h245 pdu packet came from an h223 circuit, add the details on * the new mux entry */ if(circ) { vc_info = (h223_vc_info *)circuit_get_proto_data(circ, proto_h223); - add_h223_mux_element( &(vc_info->call_info->direction_data[pinfo->p2p_dir ? 0 : 1]), mc, me, pinfo->fd->num ); + add_h223_mux_element( &(vc_info->call_info->direction_data[pinfo->p2p_dir ? 0 : 1]), mc, me, pinfo->num ); } } @@ -590,14 +590,14 @@ h223_set_mc( packet_info* pinfo, guint8 mc, h223_mux_element* me, circuit_type c static void h223_add_lc( packet_info* pinfo, guint16 lc, h223_lc_params* params, circuit_type ctype, guint32 circuit_id ) { - circuit_t *circ = find_circuit( ctype, circuit_id, pinfo->fd->num ); + circuit_t *circ = find_circuit( ctype, circuit_id, pinfo->num ); h223_vc_info* vc_info; /* if this h245 pdu packet came from an h223 circuit, add the details on * the new channel */ if(circ) { vc_info = (h223_vc_info *)circuit_get_proto_data(circ, proto_h223); - init_logical_channel( pinfo->fd->num, vc_info->call_info, lc, pinfo->p2p_dir, params ); + init_logical_channel( pinfo->num, vc_info->call_info, lc, pinfo->p2p_dir, params ); } } @@ -733,7 +733,7 @@ dissect_mux_al_pdu( tvbuff_t *tvb, packet_info *pinfo, proto_tree *vc_tree, * tvb buffer containing the MUX-PDU fragment * pinfo info on the packet containing the last fragment of the MUX-PDU * pkt_offset offset within the block from the superdissector where the - * fragment starts (must increase monotonically for constant pinfo->fd->num) + * fragment starts (must increase monotonically for constant pinfo->num) * pdu_tree dissection tree for the PDU; a single item will be added (with * its own subtree) * vc VC for this SDU @@ -754,7 +754,7 @@ dissect_mux_sdu_fragment(tvbuff_t *volatile next_tvb, packet_info *pinfo, TRY { guint32 circuit_id = pinfo->circuit_id; - circuit_t *subcircuit=find_circuit(ctype,circuit_id,pinfo->fd->num); + circuit_t *subcircuit=find_circuit(ctype,circuit_id,pinfo->num); proto_tree *vc_tree = NULL; proto_item *vc_item; h223_vc_info *vc_info = NULL; @@ -766,12 +766,12 @@ dissect_mux_sdu_fragment(tvbuff_t *volatile next_tvb, packet_info *pinfo, } if( subcircuit == NULL ) { - g_message( "Frame %d: Subcircuit id %d not found for call %p VC %d", pinfo->fd->num, + g_message( "Frame %d: Subcircuit id %d not found for call %p VC %d", pinfo->num, circuit_id, (void *)call_info, vc ); } else { vc_info = (h223_vc_info *)circuit_get_proto_data(subcircuit, proto_h223); if( vc_info != NULL ) { - lc_params = find_h223_lc_params( vc_info, pinfo->p2p_dir, pinfo->fd->num ); + lc_params = find_h223_lc_params( vc_info, pinfo->p2p_dir, pinfo->num ); } } @@ -784,19 +784,19 @@ dissect_mux_sdu_fragment(tvbuff_t *volatile next_tvb, packet_info *pinfo, substream = find_stream_circ(subcircuit,pinfo->p2p_dir); if(substream == NULL ) substream = stream_new_circ(subcircuit,pinfo->p2p_dir); - frag = stream_find_frag(substream,pinfo->fd->num,pkt_offset); + frag = stream_find_frag(substream,pinfo->num,pkt_offset); if(frag == NULL ) { #ifdef DEBUG_H223 g_debug("%d: New H.223 VC fragment: Parent circuit %d; subcircuit %d; offset %d; len %d, end %d", - pinfo->fd->num, orig_circuit, circuit_id, pkt_offset, tvb_reported_length(next_tvb), end_of_mux_sdu); + pinfo->num, orig_circuit, circuit_id, pkt_offset, tvb_reported_length(next_tvb), end_of_mux_sdu); #endif - frag = stream_add_frag(substream,pinfo->fd->num,pkt_offset, + frag = stream_add_frag(substream,pinfo->num,pkt_offset, next_tvb,pinfo,!end_of_mux_sdu); } else { #ifdef DEBUG_H223 g_debug("%d: Found H.223 VC fragment: Parent circuit %d; subcircuit %d; offset %d; len %d, end %d", - pinfo->fd->num, orig_circuit, circuit_id, pkt_offset, tvb_reported_length(next_tvb), end_of_mux_sdu); + pinfo->num, orig_circuit, circuit_id, pkt_offset, tvb_reported_length(next_tvb), end_of_mux_sdu); #endif } @@ -851,7 +851,7 @@ mux_element_sublist_size( h223_mux_element* me ) * pinfo info on the packet containing the last fragment of the MUX-PDU * pkt_offset offset within the block from the superdissector where the * MUX-PDU starts (must increase monotonically for constant - * pinfo->fd->num) + * pinfo->num) * pdu_tree dissection tree for the PDU * call_info data structure for h223 call * me top of mux list @@ -908,7 +908,7 @@ dissect_mux_payload_by_me_list( tvbuff_t *tvb, packet_info *pinfo, * pinfo info on the packet containing the last fragment of the MUX-PDU * pkt_offset offset within the block from the superdissector where the * MUX-PDU starts (must increase monotonically for constant - * pinfo->fd->num) + * pinfo->num) * pdu_tree dissection tree for the PDU * call_info data structure for h223 call * mc multiplex code for this PDU @@ -921,7 +921,7 @@ dissect_mux_payload( tvbuff_t *tvb, packet_info *pinfo, guint32 pkt_offset, { guint32 len = tvb_reported_length(tvb); - h223_mux_element* me = find_h223_mux_element( &(call_info->direction_data[pinfo->p2p_dir ? 0 : 1]), mc, pinfo->fd->num, pkt_offset ); + h223_mux_element* me = find_h223_mux_element( &(call_info->direction_data[pinfo->p2p_dir ? 0 : 1]), mc, pinfo->num, pkt_offset ); if( me ) { dissect_mux_payload_by_me_list( tvb, pinfo, pkt_offset, pdu_tree, call_info, me, 0, endOfMuxSdu, ctype, circuit_id ); @@ -943,7 +943,7 @@ dissect_mux_payload( tvbuff_t *tvb, packet_info *pinfo, guint32 pkt_offset, * pinfo packet info for packet containing the end of the mux-pdu * pkt_offset offset within the block from the superdissector where the * MUX-PDU starts (must increase monotonically for constant - * pinfo->fd->num) + * pinfo->num) * h223_tree dissection tree for h223 protocol; a single item will be added * (with a sub-tree) * call_info h223 info structure for this h223 call @@ -969,7 +969,7 @@ dissect_mux_pdu( tvbuff_t *tvb, packet_info *pinfo, guint32 pkt_offset, #ifdef DEBUG_H223_FRAGMENTATION g_debug("%u: dissecting complete H.223 MUX-PDU, pkt_offset %u, len %u", - pinfo->fd->num, pkt_offset, tvb_reported_length(tvb)); + pinfo->num, pkt_offset, tvb_reported_length(tvb)); #endif switch(call_info->h223_level) { @@ -1207,7 +1207,7 @@ dissect_mux_pdu_fragment( tvbuff_t *tvb, guint32 start_offset, #ifdef DEBUG_H223_FRAGMENTATION g_debug("%d: dissecting H.223 PDU, start_offset %u, %u bytes left", - pinfo->fd->num,start_offset, tvb_reported_length_remaining( tvb, start_offset )); + pinfo->num,start_offset, tvb_reported_length_remaining( tvb, start_offset )); #endif while( more_frags && offset < tvb_reported_length( tvb )) { diff --git a/epan/dissectors/packet-h225.c b/epan/dissectors/packet-h225.c index a1dfd246d0..03a4a9d7d6 100644 --- a/epan/dissectors/packet-h225.c +++ b/epan/dissectors/packet-h225.c @@ -1712,9 +1712,9 @@ dissect_h225_H245TransportAddress(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t 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); } } @@ -7716,7 +7716,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; @@ -7739,7 +7739,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; @@ -11795,16 +11795,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 @@ -11844,7 +11844,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) { @@ -11856,7 +11856,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; } @@ -11883,12 +11883,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; diff --git a/epan/dissectors/packet-h245.c b/epan/dissectors/packet-h245.c index 6e51fbea70..36a7ae9c4c 100644 --- a/epan/dissectors/packet-h245.c +++ b/epan/dissectors/packet-h245.c @@ -483,7 +483,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; } @@ -503,12 +503,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); } } diff --git a/epan/dissectors/packet-hartip.c b/epan/dissectors/packet-hartip.c index 1bbac7871a..2c55544fe8 100644 --- a/epan/dissectors/packet-hartip.c +++ b/epan/dissectors/packet-hartip.c @@ -811,12 +811,12 @@ hartip_set_conversation(packet_info *pinfo) * be used for it. This allows the packets to be dissected properly * for this protocol. */ - conversation = find_conversation(pinfo->fd->num, + conversation = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst, pinfo->ptype, pinfo->srcport, 0, NO_PORT_B); if( (conversation == NULL) || - (conversation_get_dissector(conversation, pinfo->fd->num) != hartip_udp_handle) ) { - conversation = conversation_new(pinfo->fd->num, + (conversation_get_dissector(conversation, pinfo->num) != hartip_udp_handle) ) { + conversation = conversation_new(pinfo->num, &pinfo->src, &pinfo->dst, pinfo->ptype, pinfo->srcport, 0, NO_PORT2); conversation_set_dissector(conversation, hartip_udp_handle); diff --git a/epan/dissectors/packet-hci_mon.c b/epan/dissectors/packet-hci_mon.c index eb0b86109c..bcd84f082b 100644 --- a/epan/dissectors/packet-hci_mon.c +++ b/epan/dissectors/packet-hci_mon.c @@ -153,7 +153,7 @@ dissect_hci_mon(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) k_interface_id = bluetooth_data->interface_id; k_adapter_id = adapter_id; - k_frame_number = pinfo->fd->num; + k_frame_number = pinfo->num; key[0].length = 1; key[0].key = &k_interface_id; @@ -171,7 +171,7 @@ dissect_hci_mon(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) disconnect_in_frame = wmem_new(wmem_file_scope(), guint32); if (disconnect_in_frame) { - *disconnect_in_frame = pinfo->fd->num; + *disconnect_in_frame = pinfo->num; wmem_tree_insert32_array(adapter_to_disconnect_in_frame, key, disconnect_in_frame); } diff --git a/epan/dissectors/packet-hci_usb.c b/epan/dissectors/packet-hci_usb.c index bf669c8023..57105f00d4 100644 --- a/epan/dissectors/packet-hci_usb.c +++ b/epan/dissectors/packet-hci_usb.c @@ -213,12 +213,12 @@ dissect_hci_usb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) } reassembled = fragment_get_reassembled_id(&hci_usb_reassembly_table, pinfo, session_id); - if (reassembled && pinfo->fd->num < reassembled->reassembled_in) { + if (reassembled && pinfo->num < reassembled->reassembled_in) { pitem = proto_tree_add_item(ttree, hf_bthci_usb_packet_fragment, tvb, offset, -1, ENC_NA); PROTO_ITEM_SET_GENERATED(pitem); col_append_str(pinfo->cinfo, COL_INFO, " Fragment"); - } else if (reassembled && pinfo->fd->num == reassembled->reassembled_in) { + } else if (reassembled && pinfo->num == reassembled->reassembled_in) { pitem = proto_tree_add_item(ttree, hf_bthci_usb_packet_complete, tvb, offset, -1, ENC_NA); PROTO_ITEM_SET_GENERATED(pitem); diff --git a/epan/dissectors/packet-hdcp.c b/epan/dissectors/packet-hdcp.c index bfe35de0eb..23ffbecd42 100644 --- a/epan/dissectors/packet-hdcp.c +++ b/epan/dissectors/packet-hdcp.c @@ -123,8 +123,8 @@ dissect_hdcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_ if (PINFO_FD_VISITED(pinfo)) { /* we've already dissected the receiver's response */ hdcp_trans = (hdcp_transaction_t *)wmem_tree_lookup32( - transactions, PINFO_FD_NUM(pinfo)); - if (hdcp_trans && hdcp_trans->rqst_frame==PINFO_FD_NUM(pinfo) && + transactions, pinfo->num); + if (hdcp_trans && hdcp_trans->rqst_frame==pinfo->num && hdcp_trans->resp_frame!=0) { it = proto_tree_add_uint_format(hdcp_tree, hf_hdcp_resp_in, @@ -140,7 +140,7 @@ dissect_hdcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_ else { /* we've not yet dissected the response */ hdcp_trans = wmem_new(wmem_file_scope(), hdcp_transaction_t); - hdcp_trans->rqst_frame = PINFO_FD_NUM(pinfo); + hdcp_trans->rqst_frame = pinfo->num; hdcp_trans->resp_frame = 0; hdcp_trans->rqst_type = reg; wmem_tree_insert32(transactions, @@ -172,14 +172,14 @@ dissect_hdcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_ /* transmitter reads from receiver */ hdcp_trans = (hdcp_transaction_t *)wmem_tree_lookup32_le( - transactions, PINFO_FD_NUM(pinfo)); + transactions, pinfo->num); if (hdcp_trans) { if (hdcp_trans->resp_frame==0) { /* there's a pending request, this packet is the response */ - hdcp_trans->resp_frame = PINFO_FD_NUM(pinfo); + hdcp_trans->resp_frame = pinfo->num; } - if (hdcp_trans->resp_frame== PINFO_FD_NUM(pinfo)) { + if (hdcp_trans->resp_frame== pinfo->num) { /* we found the request that corresponds to our response */ col_append_sep_fstr(pinfo->cinfo, COL_INFO, NULL, "send %s", val_to_str_const(hdcp_trans->rqst_type, @@ -231,7 +231,7 @@ dissect_hdcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_ } } - if (!hdcp_trans || hdcp_trans->resp_frame!=PINFO_FD_NUM(pinfo)) { + if (!hdcp_trans || hdcp_trans->resp_frame!=pinfo->num) { /* the packet isn't a response to a request from the * transmitter; it must be a link verification */ if (tvb_reported_length_remaining( diff --git a/epan/dissectors/packet-hislip.c b/epan/dissectors/packet-hislip.c index f022847094..1046411ef7 100644 --- a/epan/dissectors/packet-hislip.c +++ b/epan/dissectors/packet-hislip.c @@ -777,15 +777,15 @@ dissect_hislip_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void { /* This is a new request */ hislip_trans = (hislip_transaction_t *)wmem_alloc(wmem_file_scope(), sizeof(hislip_transaction_t)); - hislip_trans->req_frame = pinfo->fd->num; + hislip_trans->req_frame = pinfo->num; hislip_trans->rep_frame = 0; hislip_trans->messagetype = hislip_data.messagetype; hislip_trans->controltype = hislip_data.controlcode; - wmem_tree_insert32(hislip_info->pdus, pinfo->fd->num , (void *)hislip_trans); + wmem_tree_insert32(hislip_info->pdus, pinfo->num , (void *)hislip_trans); } else { - hislip_trans = (hislip_transaction_t *)wmem_tree_lookup32(hislip_info->pdus, pinfo->fd->num); + hislip_trans = (hislip_transaction_t *)wmem_tree_lookup32(hislip_info->pdus, pinfo->num); } if(hislip_trans && hislip_trans->rep_frame != 0) { @@ -794,7 +794,7 @@ dissect_hislip_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void } /*Retransmisson*/ - if((frame_number = search_for_retransmission(hislip_info->pdus, &hislip_data , pinfo->fd->num))!=0) + if((frame_number = search_for_retransmission(hislip_info->pdus, &hislip_data , pinfo->num))!=0) { it = proto_tree_add_uint( hislip_tree, hf_hislip_retransmission, tvb, 0, 0, frame_number); PROTO_ITEM_SET_GENERATED(it); @@ -811,10 +811,10 @@ dissect_hislip_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void case HISLIP_ASYNCLOCKINFORESPONSE: /*Response*/ - hislip_trans = (hislip_transaction_t *) wmem_tree_lookup32_le( hislip_info->pdus, pinfo->fd->num); + hislip_trans = (hislip_transaction_t *) wmem_tree_lookup32_le( hislip_info->pdus, pinfo->num); if (hislip_trans) { - hislip_trans->rep_frame = pinfo->fd->num; + hislip_trans->rep_frame = pinfo->num; oldcontrolvalue = hislip_trans->controltype; it = proto_tree_add_uint( hislip_tree, hf_hislip_request,tvb, 0, 0, hislip_trans->req_frame); PROTO_ITEM_SET_GENERATED(it); diff --git a/epan/dissectors/packet-http.c b/epan/dissectors/packet-http.c index 956db8691f..2e8d7de9ae 100644 --- a/epan/dissectors/packet-http.c +++ b/epan/dissectors/packet-http.c @@ -686,7 +686,7 @@ static void push_req(http_conv_t *conv_data, packet_info *pinfo) /* a request will always create a new http_req_res_t object */ http_req_res_t *req_res = push_req_res(conv_data); - req_res->req_framenum = pinfo->fd->num; + req_res->req_framenum = pinfo->num; req_res->req_ts = pinfo->abs_ts; p_add_proto_data(wmem_file_scope(), pinfo, proto_http, 0, req_res); @@ -707,7 +707,7 @@ static void push_res(http_conv_t *conv_data, packet_info *pinfo) if (!req_res || req_res->res_framenum > 0) { req_res = push_req_res(conv_data); } - req_res->res_framenum = pinfo->fd->num; + req_res->res_framenum = pinfo->num; p_add_proto_data(wmem_file_scope(), pinfo, proto_http, 0, req_res); } @@ -839,7 +839,7 @@ dissect_http_message(tvbuff_t *tvb, int offset, packet_info *pinfo, is_ssl = proto_is_frame_protocol(pinfo->layers, "ssl"); stat_info = wmem_new(wmem_packet_scope(), http_info_value_t); - stat_info->framenum = pinfo->fd->num; + stat_info->framenum = pinfo->num; stat_info->response_code = 0; stat_info->request_method = NULL; stat_info->request_uri = NULL; @@ -1558,13 +1558,13 @@ dissect_http_message(tvbuff_t *tvb, int offset, packet_info *pinfo, } if (http_type == HTTP_RESPONSE && conv_data->upgrade == UPGRADE_SSTP) { - conv_data->startframe = pinfo->fd->num + 1; + conv_data->startframe = pinfo->num + 1; headers.upgrade = conv_data->upgrade; } if (http_type == HTTP_RESPONSE && pinfo->desegment_offset<=0 && pinfo->desegment_len<=0) { conv_data->upgrade = headers.upgrade; - conv_data->startframe = pinfo->fd->num + 1; + conv_data->startframe = pinfo->num + 1; copy_address_wmem(wmem_file_scope(), &conv_data->server_addr, &pinfo->src); conv_data->server_port = pinfo->srcport; } @@ -2072,14 +2072,14 @@ http_payload_subdissector(tvbuff_t *tvb, proto_tree *tree, destport = pinfo->destport; } - conv = find_conversation(PINFO_FD_NUM(pinfo), &pinfo->src, &pinfo->dst, PT_TCP, srcport, destport, 0); + conv = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst, PT_TCP, srcport, destport, 0); /* We may get stuck in a recursion loop if we let process_tcp_payload() call us. * So, if the port in the URI is one we're registered for or we have set up a * conversation (e.g., one we detected heuristically or via Decode-As) call the data * dissector directly. */ - if (value_is_in_range(http_tcp_range, uri_port) || (conv && conversation_get_dissector(conv, pinfo->fd->num) == http_handle)) { + if (value_is_in_range(http_tcp_range, uri_port) || (conv && conversation_get_dissector(conv, pinfo->num) == http_handle)) { call_dissector(data_handle, tvb, pinfo, tree); } else { /* set pinfo->{src/dst port} and call the TCP sub-dissector lookup */ @@ -3019,23 +3019,23 @@ dissect_http(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data) * Check if this is proxied connection and if so, hand of dissection to the * payload-dissector. * Response code 200 means "OK" and strncmp() == 0 means the strings match exactly */ - if(pinfo->fd->num >= conv_data->startframe && + if(pinfo->num >= conv_data->startframe && conv_data->response_code == 200 && conv_data->request_method && strncmp(conv_data->request_method, "CONNECT", 7) == 0 && conv_data->request_uri) { if(conv_data->startframe == 0 && !pinfo->fd->flags.visited) - conv_data->startframe = pinfo->fd->num; + conv_data->startframe = pinfo->num; http_payload_subdissector(tvb, tree, pinfo, conv_data, data); } else { while (tvb_reported_length_remaining(tvb, offset) > 0) { - if (conv_data->upgrade == UPGRADE_WEBSOCKET && pinfo->fd->num >= conv_data->startframe) { + if (conv_data->upgrade == UPGRADE_WEBSOCKET && pinfo->num >= conv_data->startframe) { next_handle = websocket_handle; } - if (conv_data->upgrade == UPGRADE_HTTP2 && pinfo->fd->num >= conv_data->startframe) { + if (conv_data->upgrade == UPGRADE_HTTP2 && pinfo->num >= conv_data->startframe) { next_handle = http2_handle; } - if (conv_data->upgrade == UPGRADE_SSTP && conv_data->response_code == 200 && pinfo->fd->num >= conv_data->startframe) { + if (conv_data->upgrade == UPGRADE_SSTP && conv_data->response_code == 200 && pinfo->num >= conv_data->startframe) { next_handle = sstp_handle; } if (next_handle) { diff --git a/epan/dissectors/packet-iax2.c b/epan/dissectors/packet-iax2.c index 34c2491256..e36e054cfc 100644 --- a/epan/dissectors/packet-iax2.c +++ b/epan/dissectors/packet-iax2.c @@ -922,7 +922,7 @@ static iax_call_data *iax_lookup_call( packet_info *pinfo, srcstr = address_to_str(NULL, &pinfo->src); dststr = address_to_str(NULL, &pinfo->dst); g_debug("++ iax_lookup_circuit_details: Looking up circuit for frame %u, " - "from {%s:%u:%u} to {%s:%u:%u}", pinfo->fd->num, + "from {%s:%u:%u} to {%s:%u:%u}", pinfo->num, srcstr, pinfo->srcport, scallno, dststr, pinfo->destport, dcallno); wmem_free(NULL, srcstr); @@ -946,7 +946,7 @@ static iax_call_data *iax_lookup_call( packet_info *pinfo, pinfo->destport, dcallno); iax_call = iax_lookup_call_from_dest(pinfo, NULL, src_circuit_id, dst_circuit_id, - pinfo->fd->num, &reversed); + pinfo->num, &reversed); } else { circuit_t *src_circuit; @@ -957,7 +957,7 @@ static iax_call_data *iax_lookup_call( packet_info *pinfo, src_circuit = find_circuit(CT_IAX2, src_circuit_id, - pinfo->fd->num); + pinfo->num); if (src_circuit) { iax_call = (iax_call_data *)circuit_get_proto_data(src_circuit, proto_iax2); @@ -1013,7 +1013,7 @@ static iax_call_data *iax_new_call( packet_info *pinfo, static const nstime_t millisecond = {0, 1000000}; #ifdef DEBUG_HASHING - g_debug("+ new_circuit: Handling NEW packet, frame %u", pinfo->fd->num); + g_debug("+ new_circuit: Handling NEW packet, frame %u", pinfo->num); #endif circuit_id = iax_circuit_lookup(&pinfo->src, pinfo->ptype, @@ -1031,7 +1031,7 @@ static iax_call_data *iax_new_call( packet_info *pinfo, init_dir_data(&call->dirdata[0]); init_dir_data(&call->dirdata[1]); - iax2_new_circuit_for_call(pinfo, NULL, circuit_id, pinfo->fd->num, call, FALSE); + iax2_new_circuit_for_call(pinfo, NULL, circuit_id, pinfo->num, call, FALSE); return call; } @@ -1558,7 +1558,7 @@ static guint32 dissect_iax2_command(tvbuff_t *tvb, guint32 offset, ie_data.peer_port, ie_data.peer_callno); - iax2_new_circuit_for_call(pinfo, NULL, tx_circuit, pinfo->fd->num, iax_call, iax_packet->reversed); + iax2_new_circuit_for_call(pinfo, NULL, tx_circuit, pinfo->num, iax_call, iax_packet->reversed); } } @@ -2204,13 +2204,13 @@ static void desegment_iax(tvbuff_t *tvb, packet_info *pinfo, proto_tree *iax2_tr pinfo->desegment_len = 0; #ifdef DEBUG_DESEGMENT - g_debug("dissecting packet %u", pinfo->fd->num); + g_debug("dissecting packet %u", pinfo->num); #endif dirdata = &(iax_call->dirdata[!!(iax_packet->reversed)]); if ((!pinfo->fd->flags.visited && (dirdata->current_frag_bytes > 0)) || - ((value = g_hash_table_lookup(iax_fid_table, GUINT_TO_POINTER(pinfo->fd->num))) != NULL)) { + ((value = g_hash_table_lookup(iax_fid_table, GUINT_TO_POINTER(pinfo->num))) != NULL)) { /* then we are continuing an already-started pdu */ guint32 fid; @@ -2219,21 +2219,21 @@ static void desegment_iax(tvbuff_t *tvb, packet_info *pinfo, proto_tree *iax2_tr #ifdef DEBUG_DESEGMENT g_debug("visited: %i; c_f_b: %u; hash: %u->%u", pinfo->fd->flags.visited?1:0, - dirdata->current_frag_bytes, pinfo->fd->num, dirdata->current_frag_id); + dirdata->current_frag_bytes, pinfo->num, dirdata->current_frag_id); #endif if (!pinfo->fd->flags.visited) { guint32 tot_len; fid = dirdata->current_frag_id; tot_len = dirdata->current_frag_minlen; - DISSECTOR_ASSERT(g_hash_table_lookup(iax_fid_table, GUINT_TO_POINTER(pinfo->fd->num)) == NULL); - g_hash_table_insert(iax_fid_table, GUINT_TO_POINTER(pinfo->fd->num), GUINT_TO_POINTER(fid)); + DISSECTOR_ASSERT(g_hash_table_lookup(iax_fid_table, GUINT_TO_POINTER(pinfo->num)) == NULL); + g_hash_table_insert(iax_fid_table, GUINT_TO_POINTER(pinfo->num), GUINT_TO_POINTER(fid)); frag_offset = dirdata->current_frag_bytes; dirdata->current_frag_bytes += frag_len; complete = dirdata->current_frag_bytes > tot_len; #ifdef DEBUG_DESEGMENT g_debug("hash: %u->%u; frag_offset: %u; c_f_b: %u; totlen: %u", - pinfo->fd->num, fid, frag_offset, dirdata->current_frag_bytes, tot_len); + pinfo->num, fid, frag_offset, dirdata->current_frag_bytes, tot_len); #endif } else { fid = GPOINTER_TO_UINT(value); @@ -2247,7 +2247,7 @@ static void desegment_iax(tvbuff_t *tvb, packet_info *pinfo, proto_tree *iax2_tr frag_offset, frag_len, !complete); - if (fd_head && (pinfo->fd->num == fd_head->reassembled_in)) { + if (fd_head && (pinfo->num == fd_head->reassembled_in)) { gint32 old_len; tvbuff_t *next_tvb = tvb_new_chain(tvb, fd_head->tvb_data); add_new_data_source(pinfo, next_tvb, "Reassembled IAX2"); @@ -2317,7 +2317,7 @@ static void desegment_iax(tvbuff_t *tvb, packet_info *pinfo, proto_tree *iax2_tr * contained the start of a higher-level PDU; we must add whatever is left of * this segment (after pinfo->desegment_offset) to a fragment table for disassembly. */ if (must_desegment) { - guint32 fid = pinfo->fd->num; /* a new fragment id */ + guint32 fid = pinfo->num; /* a new fragment id */ guint32 deseg_offset = pinfo->desegment_offset; guint32 frag_len = tvb_reported_length_remaining(tvb, deseg_offset); dirdata->current_frag_id = fid; diff --git a/epan/dissectors/packet-icmp.c b/epan/dissectors/packet-icmp.c index daca0d94cb..890e011e93 100644 --- a/epan/dissectors/packet-icmp.c +++ b/epan/dissectors/packet-icmp.c @@ -356,12 +356,12 @@ static conversation_t *_find_or_create_conversation(packet_info * pinfo) /* Have we seen this conversation before? */ conv = - find_conversation(pinfo->fd->num, &pinfo->src, &pinfo->dst, + find_conversation(pinfo->num, &pinfo->src, &pinfo->dst, pinfo->ptype, 0, 0, 0); if (conv == NULL) { /* No, this is a new conversation. */ conv = - conversation_new(pinfo->fd->num, &pinfo->src, + conversation_new(pinfo->num, &pinfo->src, &pinfo->dst, pinfo->ptype, 0, 0, 0); } return conv; @@ -955,7 +955,7 @@ static icmp_transaction_t *transaction_start(packet_info * pinfo, icmp_key[1].key = NULL; icmp_trans = wmem_new(wmem_file_scope(), icmp_transaction_t); - icmp_trans->rqst_frame = PINFO_FD_NUM(pinfo); + icmp_trans->rqst_frame = pinfo->num; icmp_trans->resp_frame = 0; icmp_trans->rqst_time = pinfo->abs_ts; nstime_set_zero(&icmp_trans->resp_time); @@ -963,7 +963,7 @@ static icmp_transaction_t *transaction_start(packet_info * pinfo, (void *) icmp_trans); } else { /* Already visited this frame */ - guint32 frame_num = pinfo->fd->num; + guint32 frame_num = pinfo->num; icmp_key[0].length = 2; icmp_key[0].key = key; @@ -1022,7 +1022,7 @@ static icmp_transaction_t *transaction_end(packet_info * pinfo, double resp_time; conversation = - find_conversation(pinfo->fd->num, &pinfo->src, &pinfo->dst, + find_conversation(pinfo->num, &pinfo->src, &pinfo->dst, pinfo->ptype, 0, 0, 0); if (conversation == NULL) { return NULL; @@ -1052,7 +1052,7 @@ static icmp_transaction_t *transaction_end(packet_info * pinfo, return NULL; } - icmp_trans->resp_frame = PINFO_FD_NUM(pinfo); + icmp_trans->resp_frame = pinfo->num; /* we found a match. Add entries to the matched table for both request and reply frames */ @@ -1072,7 +1072,7 @@ static icmp_transaction_t *transaction_end(packet_info * pinfo, (void *) icmp_trans); } else { /* Already visited this frame */ - guint32 frame_num = pinfo->fd->num; + guint32 frame_num = pinfo->num; icmp_key[0].length = 2; icmp_key[0].key = key; diff --git a/epan/dissectors/packet-icmpv6.c b/epan/dissectors/packet-icmpv6.c index 6b63bde48e..bbb0bc3c47 100644 --- a/epan/dissectors/packet-icmpv6.c +++ b/epan/dissectors/packet-icmpv6.c @@ -1199,11 +1199,11 @@ static conversation_t *_find_or_create_conversation(packet_info *pinfo) conversation_t *conv = NULL; /* Have we seen this conversation before? */ - conv = find_conversation(pinfo->fd->num, &pinfo->src, &pinfo->dst, + conv = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst, pinfo->ptype, 0, 0, 0); if (conv == NULL) { /* No, this is a new conversation. */ - conv = conversation_new(pinfo->fd->num, &pinfo->src, &pinfo->dst, + conv = conversation_new(pinfo->num, &pinfo->src, &pinfo->dst, pinfo->ptype, 0, 0, 0); } return conv; @@ -1239,14 +1239,14 @@ static icmp_transaction_t *transaction_start(packet_info *pinfo, proto_tree *tre icmpv6_key[1].key = NULL; icmpv6_trans = wmem_new(wmem_file_scope(), icmp_transaction_t); - icmpv6_trans->rqst_frame = PINFO_FD_NUM(pinfo); + icmpv6_trans->rqst_frame = pinfo->num; icmpv6_trans->resp_frame = 0; icmpv6_trans->rqst_time = pinfo->abs_ts; nstime_set_zero(&icmpv6_trans->resp_time); wmem_tree_insert32_array(icmpv6_info->unmatched_pdus, icmpv6_key, (void *)icmpv6_trans); } else { /* Already visited this frame */ - guint32 frame_num = pinfo->fd->num; + guint32 frame_num = pinfo->num; icmpv6_key[0].length = 2; icmpv6_key[0].key = key; @@ -1271,7 +1271,7 @@ static icmp_transaction_t *transaction_start(packet_info *pinfo, proto_tree *tre so can report here (and in taps) */ expert_add_info_format(pinfo, it, &ei_icmpv6_resp_not_found, "No response seen to ICMPv6 request in frame %u", - pinfo->fd->num); + pinfo->num); } return NULL; @@ -1302,7 +1302,7 @@ static icmp_transaction_t *transaction_end(packet_info *pinfo, proto_tree *tree, nstime_t ns; double resp_time; - conversation = find_conversation(pinfo->fd->num, &pinfo->src, &pinfo->dst, + conversation = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst, pinfo->ptype, 0, 0, 0); if (conversation == NULL) return NULL; @@ -1327,7 +1327,7 @@ static icmp_transaction_t *transaction_end(packet_info *pinfo, proto_tree *tree, if (icmpv6_trans->resp_frame != 0) return NULL; - icmpv6_trans->resp_frame = PINFO_FD_NUM(pinfo); + icmpv6_trans->resp_frame = pinfo->num; /* * we found a match. Add entries to the matched table for both @@ -1347,7 +1347,7 @@ static icmp_transaction_t *transaction_end(packet_info *pinfo, proto_tree *tree, wmem_tree_insert32_array(icmpv6_info->matched_pdus, icmpv6_key, (void *)icmpv6_trans); } else { /* Already visited this frame */ - guint32 frame_num = pinfo->fd->num; + guint32 frame_num = pinfo->num; icmpv6_key[0].length = 2; icmpv6_key[0].key = key; @@ -2266,7 +2266,7 @@ dissect_icmpv6_nd_opt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree hints = (ieee802154_hints_t *)p_get_proto_data(wmem_file_scope(), pinfo, proto_get_id_by_filter_name(IEEE802154_PROTOABBREV_WPAN), 0); if ((opt_len <= 24) && hints) { - lowpan_context_insert(context_id, hints->src_pan, context_len, &context_prefix, pinfo->fd->num); + lowpan_context_insert(context_id, hints->src_pan, context_len, &context_prefix, pinfo->num); } } break; diff --git a/epan/dissectors/packet-idmp.c b/epan/dissectors/packet-idmp.c index 15a327b2c9..3a949f1f7e 100644 --- a/epan/dissectors/packet-idmp.c +++ b/epan/dissectors/packet-idmp.c @@ -646,7 +646,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 */ @@ -691,7 +691,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); diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c index c5e0f03abf..bf14a8667e 100644 --- a/epan/dissectors/packet-ieee80211.c +++ b/epan/dissectors/packet-ieee80211.c @@ -17785,7 +17785,7 @@ dissect_ieee80211_common (tvbuff_t *tvb, packet_info *pinfo, if (result && (result->seq_control == seq_control)) { /* keep a pointer to the first seen frame, could be done with proto data? */ fnum = result->fnum; - g_hash_table_insert(fc_first_frame_table, GINT_TO_POINTER(pinfo->fd->num), + g_hash_table_insert(fc_first_frame_table, GINT_TO_POINTER(pinfo->num), GINT_TO_POINTER(fnum)); retransmitted = TRUE; } else { @@ -17796,10 +17796,10 @@ dissect_ieee80211_common (tvbuff_t *tvb, packet_info *pinfo, g_hash_table_insert(fc_analyse_retransmit_table, result, result); } result->seq_control = seq_control; - result->fnum = pinfo->fd->num; + result->fnum = pinfo->num; } } - else if ((fnum = GPOINTER_TO_UINT(g_hash_table_lookup(fc_first_frame_table, GINT_TO_POINTER(pinfo->fd->num))))) { + else if ((fnum = GPOINTER_TO_UINT(g_hash_table_lookup(fc_first_frame_table, GINT_TO_POINTER(pinfo->num))))) { retransmitted = TRUE; } diff --git a/epan/dissectors/packet-ieee802154.c b/epan/dissectors/packet-ieee802154.c index 75bd8fb2ff..c3f3688f64 100644 --- a/epan/dissectors/packet-ieee802154.c +++ b/epan/dissectors/packet-ieee802154.c @@ -1770,7 +1770,7 @@ dissect_ieee802154_assoc_rsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree /* Update the address table. */ if ((status == IEEE802154_CMD_ASRSP_AS_SUCCESS) && (short_addr != IEEE802154_NO_ADDR16)) { ieee802154_addr_update(&ieee802154_map, short_addr, packet->dst_pan, packet->dst64, - pinfo->current_proto, pinfo->fd->num); + pinfo->current_proto, pinfo->num); } /* Call the data dissector for any leftover bytes. */ @@ -1820,9 +1820,9 @@ dissect_ieee802154_disassoc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (!pinfo->fd->flags.visited) { /* Update the address tables */ if ( packet->dst_addr_mode == IEEE802154_FCF_ADDR_EXT ) { - ieee802154_long_addr_invalidate(packet->dst64, pinfo->fd->num); + ieee802154_long_addr_invalidate(packet->dst64, pinfo->num); } else if ( packet->dst_addr_mode == IEEE802154_FCF_ADDR_SHORT ) { - ieee802154_short_addr_invalidate(packet->dst16, packet->dst_pan, pinfo->fd->num); + ieee802154_short_addr_invalidate(packet->dst16, packet->dst_pan, pinfo->num); } } @@ -1884,7 +1884,7 @@ dissect_ieee802154_realign(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, /* Update the address table. */ if ((short_addr != IEEE802154_NO_ADDR16) && (packet->dst_addr_mode == IEEE802154_FCF_ADDR_EXT)) { ieee802154_addr_update(&ieee802154_map, short_addr, packet->dst_pan, packet->dst64, - pinfo->current_proto, pinfo->fd->num); + pinfo->current_proto, pinfo->num); } /* Get and display the channel page, if it exists. Added in IEEE802.15.4-2006 */ diff --git a/epan/dissectors/packet-infiniband.c b/epan/dissectors/packet-infiniband.c index 0c2f535629..2159e15c30 100644 --- a/epan/dissectors/packet-infiniband.c +++ b/epan/dissectors/packet-infiniband.c @@ -3022,7 +3022,7 @@ static void parse_COM_MGT(proto_tree *parentTree, packet_info *pinfo, tvbuff_t * proto_data = wmem_new(wmem_file_scope(), conversation_infiniband_data); proto_data->service_id = connection->service_id; - conv = conversation_new(pinfo->fd->num, &pinfo->src, &pinfo->dst, + conv = conversation_new(pinfo->num, &pinfo->src, &pinfo->dst, PT_IBQP, pinfo->srcport, pinfo->destport, 0); conversation_add_proto_data(conv, proto_infiniband, proto_data); } @@ -3094,10 +3094,10 @@ static void parse_COM_MGT(proto_tree *parentTree, packet_info *pinfo, tvbuff_t * set_address(&req_addr, AT_IB, GID_SIZE, connection->req_gid); set_address(&resp_addr, AT_IB, GID_SIZE, connection->resp_gid); - conv = conversation_new(pinfo->fd->num, &req_addr, &req_addr, + conv = conversation_new(pinfo->num, &req_addr, &req_addr, PT_IBQP, connection->req_qp, connection->req_qp, NO_ADDR2|NO_PORT2); conversation_add_proto_data(conv, proto_infiniband, proto_data); - conv = conversation_new(pinfo->fd->num, &resp_addr, &resp_addr, + conv = conversation_new(pinfo->num, &resp_addr, &resp_addr, PT_IBQP, connection->resp_qp, connection->resp_qp, NO_ADDR2|NO_PORT2); conversation_add_proto_data(conv, proto_infiniband, proto_data); @@ -3105,10 +3105,10 @@ static void parse_COM_MGT(proto_tree *parentTree, packet_info *pinfo, tvbuff_t * set_address(&req_addr, AT_IB, sizeof(guint16), &(connection->req_lid)); set_address(&resp_addr, AT_IB, sizeof(guint16), &(connection->resp_lid)); - conv = conversation_new(pinfo->fd->num, &req_addr, &req_addr, + conv = conversation_new(pinfo->num, &req_addr, &req_addr, PT_IBQP, connection->req_qp, connection->req_qp, NO_ADDR2|NO_PORT2); conversation_add_proto_data(conv, proto_infiniband, proto_data); - conv = conversation_new(pinfo->fd->num, &resp_addr, &resp_addr, + conv = conversation_new(pinfo->num, &resp_addr, &resp_addr, PT_IBQP, connection->resp_qp, connection->resp_qp, NO_ADDR2|NO_PORT2); conversation_add_proto_data(conv, proto_infiniband, proto_data); diff --git a/epan/dissectors/packet-infiniband_sdp.c b/epan/dissectors/packet-infiniband_sdp.c index cd6fb65548..014e0ea970 100644 --- a/epan/dissectors/packet-infiniband_sdp.c +++ b/epan/dissectors/packet-infiniband_sdp.c @@ -190,14 +190,14 @@ dissect_ib_sdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _ /* first try to find a conversation between the two current hosts. in most cases this will not work since we do not have the source QP. this WILL succeed when we're still in the process of CM negotiations */ - conv = find_conversation(pinfo->fd->num, &pinfo->src, &pinfo->dst, + conv = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst, PT_IBQP, pinfo->srcport, pinfo->destport, 0); if (!conv) { /* if not, try to find an established RC channel. recall Infiniband conversations are registered with one side of the channel. since the packet is only guaranteed to contain the qpn of the destination, we'll use this */ - conv = find_conversation(pinfo->fd->num, &pinfo->dst, &pinfo->dst, + conv = find_conversation(pinfo->num, &pinfo->dst, &pinfo->dst, PT_IBQP, pinfo->destport, pinfo->destport, NO_ADDR_B|NO_PORT_B); if (!conv) diff --git a/epan/dissectors/packet-ip.c b/epan/dissectors/packet-ip.c index 476e094ad1..229a927105 100644 --- a/epan/dissectors/packet-ip.c +++ b/epan/dissectors/packet-ip.c @@ -2446,7 +2446,7 @@ dissect_ip_v4(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* "Fragmented IP protocol (proto=%s %u, off=%u, ID=%04x)", ipprotostr(iph->ip_p), iph->ip_p, (iph->ip_off & IP_OFFSET) * 8, iph->ip_id); - if ( ipfd_head && ipfd_head->reassembled_in != pinfo->fd->num ) { + if ( ipfd_head && ipfd_head->reassembled_in != pinfo->num ) { col_append_fstr(pinfo->cinfo, COL_INFO, " [Reassembled in #%u]", ipfd_head->reassembled_in); } diff --git a/epan/dissectors/packet-ipmi.c b/epan/dissectors/packet-ipmi.c index 9c18177dc0..fc1822f6da 100644 --- a/epan/dissectors/packet-ipmi.c +++ b/epan/dissectors/packet-ipmi.c @@ -196,7 +196,7 @@ get_packet_data(packet_info * pinfo) } /* check if packet has changed */ - if (pinfo->fd->num != data->curr_frame_num) { + if (pinfo->num != data->curr_frame_num) { data->curr_level = 0; data->next_level = 0; } @@ -487,8 +487,8 @@ dissect_ipmi_cmd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, /* check for the first invocation */ if (!data->curr_level) { /* get current frame data */ - data->curr_frame = get_frame_data(data, pinfo->fd->num); - data->curr_frame_num = pinfo->fd->num; + data->curr_frame = get_frame_data(data, pinfo->num); + data->curr_frame_num = pinfo->num; /* copy frame timestamp */ memcpy(&data->curr_frame->ts, &pinfo->abs_ts, sizeof(nstime_t)); diff --git a/epan/dissectors/packet-ipsec.c b/epan/dissectors/packet-ipsec.c index 6e180210af..7bd18c59ef 100644 --- a/epan/dissectors/packet-ipsec.c +++ b/epan/dissectors/packet-ipsec.c @@ -522,7 +522,7 @@ static void check_esp_sequence_info(guint32 spi, guint32 sequence_number, packet /* Create an entry for this SPI */ status = wmem_new0(wmem_file_scope(), spi_status); status->previousSequenceNumber = sequence_number; - status->previousFrameNum = pinfo->fd->num; + status->previousFrameNum = pinfo->num; /* And add it to the table */ g_hash_table_insert(esp_sequence_analysis_hash, GUINT_TO_POINTER((guint)spi), status); @@ -537,11 +537,11 @@ static void check_esp_sequence_info(guint32 spi, guint32 sequence_number, packet /* Copy what was expected */ *frame_status = *status; /* And add it into the report table */ - g_hash_table_insert(esp_sequence_analysis_report_hash, GUINT_TO_POINTER(pinfo->fd->num), frame_status); + g_hash_table_insert(esp_sequence_analysis_report_hash, GUINT_TO_POINTER(pinfo->num), frame_status); } /* Adopt this setting as 'current' regardless of whether expected */ status->previousSequenceNumber = sequence_number; - status->previousFrameNum = pinfo->fd->num; + status->previousFrameNum = pinfo->num; } } @@ -552,7 +552,7 @@ static void show_esp_sequence_info(guint32 spi, guint32 sequence_number, { /* Look up this frame in the report table. */ spi_status *status = (spi_status*)g_hash_table_lookup(esp_sequence_analysis_report_hash, - GUINT_TO_POINTER(pinfo->fd->num)); + GUINT_TO_POINTER(pinfo->num)); if (status != NULL) { proto_item *sn_ti, *frame_ti; diff --git a/epan/dissectors/packet-ipx.c b/epan/dissectors/packet-ipx.c index e1c5ebb193..7c684f8174 100644 --- a/epan/dissectors/packet-ipx.c +++ b/epan/dissectors/packet-ipx.c @@ -728,7 +728,7 @@ dissect_spx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) * Not a system packet - check for retransmissions. */ if (!pinfo->fd->flags.visited) { - conversation = find_conversation(pinfo->fd->num, &pinfo->src, + conversation = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst, PT_NCP, pinfo->srcport, pinfo->srcport, 0); if (conversation == NULL) { @@ -736,7 +736,7 @@ dissect_spx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) * It's not part of any conversation - create * a new one. */ - conversation = conversation_new(pinfo->fd->num, &pinfo->src, + conversation = conversation_new(pinfo->num, &pinfo->src, &pinfo->dst, PT_NCP, pinfo->srcport, pinfo->srcport, 0); } @@ -766,7 +766,7 @@ dissect_spx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) spx_seq); pkt_value->spx_ack = tvb_get_ntohs(tvb, 8); pkt_value->spx_all = tvb_get_ntohs(tvb, 10); - pkt_value->num = pinfo->fd->num; + pkt_value->num = pinfo->num; /* * This is not a retransmission, so we shouldn't diff --git a/epan/dissectors/packet-isakmp.c b/epan/dissectors/packet-isakmp.c index 8bfb80ea53..ed97e4c655 100644 --- a/epan/dissectors/packet-isakmp.c +++ b/epan/dissectors/packet-isakmp.c @@ -1846,7 +1846,7 @@ decrypt_payload(tvbuff_t *tvb, packet_info *pinfo, const guint8 *buf, guint buf_ for (ivl = g_list_first(decr->iv_list); ivl != NULL; ivl = g_list_next(ivl)) { ivd = (iv_data_t *) ivl->data; - if (ivd->frame_num == pinfo->fd->num) { + if (ivd->frame_num == pinfo->num) { iv_len = ivd->iv_len; memcpy(iv, ivd->iv, iv_len); } @@ -1866,7 +1866,7 @@ decrypt_payload(tvbuff_t *tvb, packet_info *pinfo, const guint8 *buf, guint buf_ if (decr->iv_list == NULL) { /* First packet */ ivd = (iv_data_t *)g_malloc(sizeof(iv_data_t)); - ivd->frame_num = pinfo->fd->num; + ivd->frame_num = pinfo->num; ivd->iv_len = digest_size; decr->last_message_id = hdr->message_id; gcry_md_reset(md_ctx); @@ -1879,7 +1879,7 @@ decrypt_payload(tvbuff_t *tvb, packet_info *pinfo, const guint8 *buf, guint buf_ memcpy(iv, ivd->iv, iv_len); } else if (decr->last_cbc_len >= cbc_block_size) { ivd = (iv_data_t *)g_malloc(sizeof(iv_data_t)); - ivd->frame_num = pinfo->fd->num; + ivd->frame_num = pinfo->num; if (hdr->message_id != decr->last_message_id) { if (decr->last_p1_cbc_len == 0) { memcpy(decr->last_p1_cbc, decr->last_cbc, cbc_block_size); @@ -4051,7 +4051,7 @@ dissect_ikev2_fragmentation(tvbuff_t *tvb, int offset, proto_tree *tree, if (fragment_number == total_fragments) { if (!pinfo->fd->flags.visited) { /* On first pass, get it from the conversation info */ - conversation_t *p_conv = find_conversation(pinfo->fd->num, &pinfo->src, &pinfo->dst, + conversation_t *p_conv = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst, pinfo->ptype, pinfo->srcport, pinfo->destport, 0); if (p_conv != NULL) { @@ -4062,14 +4062,14 @@ dissect_ikev2_fragmentation(tvbuff_t *tvb, int offset, proto_tree *tree, message_next_payload_set = TRUE; /* Store in table for this frame for future passes */ - g_hash_table_insert(defrag_next_payload_hash, GUINT_TO_POINTER(pinfo->fd->num), GUINT_TO_POINTER((guint)message_next_payload)); + g_hash_table_insert(defrag_next_payload_hash, GUINT_TO_POINTER(pinfo->num), GUINT_TO_POINTER((guint)message_next_payload)); } } } } else { /* On later passes, look up in hash table by frame number */ - message_next_payload = (guint8)GPOINTER_TO_UINT(g_hash_table_lookup(defrag_next_payload_hash, GUINT_TO_POINTER(pinfo->fd->num))); + message_next_payload = (guint8)GPOINTER_TO_UINT(g_hash_table_lookup(defrag_next_payload_hash, GUINT_TO_POINTER(pinfo->num))); if (message_next_payload != 0) { message_next_payload_set = TRUE; } diff --git a/epan/dissectors/packet-iscsi.c b/epan/dissectors/packet-iscsi.c index 1989923ac4..e62b7b796a 100644 --- a/epan/dissectors/packet-iscsi.c +++ b/epan/dissectors/packet-iscsi.c @@ -580,7 +580,7 @@ iscsi_dissect_TargetAddress(packet_info *pinfo, proto_tree *tree _U_,char *val) if (addr && !pinfo->fd->flags.visited) { conversation_t *conv; - conv = conversation_new(pinfo->fd->num, addr, addr, PT_TCP, port, port, NO_ADDR2|NO_PORT2); + conv = conversation_new(pinfo->num, addr, addr, PT_TCP, port, port, NO_ADDR2|NO_PORT2); if (conv == NULL) { return; } @@ -745,7 +745,7 @@ dissect_iscsi_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint off key[0].length = 1; key[0].key = &itt; key[1].length = 1; - key[1].key = &pinfo->fd->num; + key[1].key = &pinfo->num; key[2].length = 0; key[2].key = NULL; @@ -810,17 +810,17 @@ dissect_iscsi_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint off /* first time we see this packet. check if we can find the request */ switch(opcode){ case ISCSI_OPCODE_SCSI_RESPONSE: - cdata->itlq.last_exchange_frame=pinfo->fd->num; + cdata->itlq.last_exchange_frame=pinfo->num; break; case ISCSI_OPCODE_SCSI_DATA_IN: /* a bit ugly but we need to check the S bit here */ if(tvb_get_guint8(tvb, offset+1)&ISCSI_SCSI_DATA_FLAG_S){ - cdata->itlq.last_exchange_frame=pinfo->fd->num; + cdata->itlq.last_exchange_frame=pinfo->num; } - cdata->data_in_frame=pinfo->fd->num; + cdata->data_in_frame=pinfo->num; break; case ISCSI_OPCODE_SCSI_DATA_OUT: - cdata->data_out_frame=pinfo->fd->num; + cdata->data_out_frame=pinfo->num; break; } @@ -847,7 +847,7 @@ dissect_iscsi_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint off } cdata->itlq.lun=lun; - cdata->itlq.first_exchange_frame=pinfo->fd->num; + cdata->itlq.first_exchange_frame=pinfo->num; itl=(itl_nexus_t *)wmem_map_lookup(iscsi_session->itl, GUINT_TO_POINTER((gulong)lun)); if(!itl){ diff --git a/epan/dissectors/packet-isdn.c b/epan/dissectors/packet-isdn.c index a6782eecdd..b793c20230 100644 --- a/epan/dissectors/packet-isdn.c +++ b/epan/dissectors/packet-isdn.c @@ -124,9 +124,9 @@ dissect_isdn(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ /* * Set up a circuit for this channel, and assign it a dissector. */ - circuit = find_circuit(CT_ISDN, pinfo->pseudo_header->isdn.channel, pinfo->fd->num); + circuit = find_circuit(CT_ISDN, pinfo->pseudo_header->isdn.channel, pinfo->num); if (circuit == NULL) - circuit = circuit_new(CT_ISDN, pinfo->pseudo_header->isdn.channel, pinfo->fd->num); + circuit = circuit_new(CT_ISDN, pinfo->pseudo_header->isdn.channel, pinfo->num); if (circuit_get_dissector(circuit) == NULL) { /* @@ -198,7 +198,7 @@ dissect_isdn(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ } if (!try_circuit_dissector(CT_ISDN, pinfo->pseudo_header->isdn.channel, - pinfo->fd->num, tvb, pinfo, tree, NULL)) + pinfo->num, tvb, pinfo, tree, NULL)) call_dissector(data_handle, tvb, pinfo, tree); return tvb_captured_length(tvb); diff --git a/epan/dissectors/packet-iser.c b/epan/dissectors/packet-iser.c index eee5be583e..5dc88df529 100644 --- a/epan/dissectors/packet-iser.c +++ b/epan/dissectors/packet-iser.c @@ -258,14 +258,14 @@ dissect_iser(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, /* first try to find a conversation between the two current hosts. in most cases this will not work since we do not have the source QP. this WILL succeed when we're still in the process of CM negotiations */ - conv = find_conversation(pinfo->fd->num, &pinfo->src, &pinfo->dst, + conv = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst, PT_IBQP, pinfo->srcport, pinfo->destport, 0); if (!conv) { /* if not, try to find an established RC channel. recall Infiniband conversations are registered with one side of the channel. since the packet is only guaranteed to contain the qpn of the destination, we'll use this */ - conv = find_conversation(pinfo->fd->num, &pinfo->dst, &pinfo->dst, + conv = find_conversation(pinfo->num, &pinfo->dst, &pinfo->dst, PT_IBQP, pinfo->destport, pinfo->destport, NO_ADDR_B|NO_PORT_B); if (!conv) diff --git a/epan/dissectors/packet-isns.c b/epan/dissectors/packet-isns.c index c0ce1bab44..f4d88aa6a7 100644 --- a/epan/dissectors/packet-isns.c +++ b/epan/dissectors/packet-isns.c @@ -783,10 +783,10 @@ dissect_isns_attr_port(tvbuff_t *tvb, guint offset, proto_tree *tree, int hf_ind handle = isns_tcp_handle; } - conversation = find_conversation(pinfo->fd->num, + conversation = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst, pt, port, 0, NO_PORT_B); if (conversation == NULL) { - conversation = conversation_new(pinfo->fd->num, + conversation = conversation_new(pinfo->num, &pinfo->src, &pinfo->dst, pt, port, 0, NO_PORT2_FORCE); conversation_set_dissector(conversation, handle); } diff --git a/epan/dissectors/packet-iso14443.c b/epan/dissectors/packet-iso14443.c index 07b0444f9d..18c1736f74 100644 --- a/epan/dissectors/packet-iso14443.c +++ b/epan/dissectors/packet-iso14443.c @@ -850,8 +850,8 @@ iso14443_get_transaction(packet_info *pinfo, proto_tree *tree) if (pinfo->p2p_dir == P2P_DIR_SENT) { if (PINFO_FD_VISITED(pinfo)) { iso14443_trans = (iso14443_transaction_t *)wmem_tree_lookup32( - transactions, PINFO_FD_NUM(pinfo)); - if (iso14443_trans && iso14443_trans->rqst_frame==PINFO_FD_NUM(pinfo) && + transactions, pinfo->num); + if (iso14443_trans && iso14443_trans->rqst_frame==pinfo->num && iso14443_trans->resp_frame!=0) { it = proto_tree_add_uint(tree, hf_iso14443_resp_in, NULL, 0, 0, iso14443_trans->resp_frame); @@ -860,7 +860,7 @@ iso14443_get_transaction(packet_info *pinfo, proto_tree *tree) } else { iso14443_trans = wmem_new(wmem_file_scope(), iso14443_transaction_t); - iso14443_trans->rqst_frame = PINFO_FD_NUM(pinfo); + iso14443_trans->rqst_frame = pinfo->num; iso14443_trans->resp_frame = 0; /* iso14443_trans->ctrl = ctrl; */ wmem_tree_insert32(transactions, @@ -869,13 +869,13 @@ iso14443_get_transaction(packet_info *pinfo, proto_tree *tree) } else if (pinfo->p2p_dir == P2P_DIR_RECV) { iso14443_trans = (iso14443_transaction_t *)wmem_tree_lookup32_le( - transactions, PINFO_FD_NUM(pinfo)); + transactions, pinfo->num); if (iso14443_trans && iso14443_trans->resp_frame==0) { /* there's a pending request, this packet is the response */ - iso14443_trans->resp_frame = PINFO_FD_NUM(pinfo); + iso14443_trans->resp_frame = pinfo->num; } - if (iso14443_trans && iso14443_trans->resp_frame == PINFO_FD_NUM(pinfo)) { + if (iso14443_trans && iso14443_trans->resp_frame == pinfo->num) { it = proto_tree_add_uint(tree, hf_iso14443_resp_to, NULL, 0, 0, iso14443_trans->rqst_frame); PROTO_ITEM_SET_GENERATED(it); diff --git a/epan/dissectors/packet-iso7816.c b/epan/dissectors/packet-iso7816.c index 2d88c9b00d..ce9362e735 100644 --- a/epan/dissectors/packet-iso7816.c +++ b/epan/dissectors/packet-iso7816.c @@ -569,8 +569,8 @@ dissect_iso7816_cmd_apdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (PINFO_FD_VISITED(pinfo)) { iso7816_trans = (iso7816_transaction_t *)wmem_tree_lookup32( - transactions, PINFO_FD_NUM(pinfo)); - if (iso7816_trans && iso7816_trans->cmd_frame==PINFO_FD_NUM(pinfo) && + transactions, pinfo->num); + if (iso7816_trans && iso7816_trans->cmd_frame==pinfo->num && iso7816_trans->resp_frame!=0) { trans_ti = proto_tree_add_uint_format(tree, hf_iso7816_resp_in, NULL, 0, 0, iso7816_trans->resp_frame, @@ -581,7 +581,7 @@ dissect_iso7816_cmd_apdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) else { if (transactions) { iso7816_trans = wmem_new(wmem_file_scope(), iso7816_transaction_t); - iso7816_trans->cmd_frame = PINFO_FD_NUM(pinfo); + iso7816_trans->cmd_frame = pinfo->num; iso7816_trans->resp_frame = 0; iso7816_trans->cmd_ins = INS_INVALID; @@ -654,14 +654,14 @@ dissect_iso7816_resp_apdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* receive the largest key that is less than or equal to our frame number */ iso7816_trans = (iso7816_transaction_t *)wmem_tree_lookup32_le( - transactions, PINFO_FD_NUM(pinfo)); + transactions, pinfo->num); if (iso7816_trans) { if (iso7816_trans->resp_frame==0) { /* there's a pending request, this packet is the response */ - iso7816_trans->resp_frame = PINFO_FD_NUM(pinfo); + iso7816_trans->resp_frame = pinfo->num; } - if (iso7816_trans->resp_frame== PINFO_FD_NUM(pinfo)) { + if (iso7816_trans->resp_frame== pinfo->num) { /* we found the request that corresponds to our response */ cmd_ins_str = val_to_str_const(iso7816_trans->cmd_ins, iso7816_ins, "Unknown instruction"); diff --git a/epan/dissectors/packet-isup.c b/epan/dissectors/packet-isup.c index 37345b3d95..4e7499ae22 100644 --- a/epan/dissectors/packet-isup.c +++ b/epan/dissectors/packet-isup.c @@ -5078,7 +5078,7 @@ dissect_isup_application_transport_parameter(tvbuff_t *parameter_tvb, packet_inf */ if (isup_apm_desegment) { if ((si_and_apm_seg_ind != 0xc0) && ((si_and_apm_seg_ind & H_8BIT_MASK)!=0x80)) { - /* debug g_warning("got here Frame %u", pinfo->fd->num); */ + /* debug g_warning("got here Frame %u", pinfo->num); */ /* Segmented message */ save_fragmented = pinfo->fragmented; pinfo->fragmented = TRUE; diff --git a/epan/dissectors/packet-iwarp-mpa.c b/epan/dissectors/packet-iwarp-mpa.c index a81c708c7a..1a0f23e76f 100644 --- a/epan/dissectors/packet-iwarp-mpa.c +++ b/epan/dissectors/packet-iwarp-mpa.c @@ -355,7 +355,7 @@ is_mpa_req(tvbuff_t *tvb, packet_info *pinfo) state->ini_exp_m_res = mcrres & MPA_MARKER_FLAG; state->crc = mcrres & MPA_CRC_FLAG; state->revision = tvb_get_guint8(tvb, 17); - state->req_frame_num = pinfo->fd->num; + state->req_frame_num = pinfo->num; state->minfo[MPA_INITIATOR].port = pinfo->srcport; state->minfo[MPA_RESPONDER].port = pinfo->destport; @@ -384,7 +384,7 @@ is_mpa_rep(tvbuff_t *tvb, packet_info *pinfo) return FALSE; } - conversation = find_conversation(pinfo->fd->num, &pinfo->src, + conversation = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst, pinfo->ptype, pinfo->srcport, pinfo->destport, 0); @@ -402,7 +402,7 @@ is_mpa_rep(tvbuff_t *tvb, packet_info *pinfo) mcrres = tvb_get_guint8(tvb, 16); state->res_exp_m_ini = mcrres & MPA_MARKER_FLAG; state->crc = state->crc | (mcrres & MPA_CRC_FLAG); - state->rep_frame_num = pinfo->fd->num; + state->rep_frame_num = pinfo->num; /* enter Full Operation Phase only if the Reject bit is not set */ if (!(mcrres & MPA_REJECT_FLAG)) @@ -420,7 +420,7 @@ is_mpa_fpdu(packet_info *pinfo) conversation_t *conversation = NULL; mpa_state_t *state = NULL; - conversation = find_conversation(pinfo->fd->num, &pinfo->src, + conversation = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst, pinfo->ptype, pinfo->srcport, pinfo->destport, 0); @@ -438,8 +438,8 @@ is_mpa_fpdu(packet_info *pinfo) return FALSE; } - if (pinfo->fd->num == state->req_frame_num - || pinfo->fd->num == state->rep_frame_num) { + if (pinfo->num == state->req_frame_num + || pinfo->num == state->rep_frame_num) { return FALSE; } else { return TRUE; @@ -795,7 +795,7 @@ dissect_iwarp_mpa(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat /* FPDU */ if (tvb_captured_length(tvb) >= MPA_SMALLEST_FPDU_LEN && is_mpa_fpdu(pinfo)) { - conversation = find_conversation(pinfo->fd->num, &pinfo->src, + conversation = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst, pinfo->ptype, pinfo->srcport, pinfo->destport, 0); state = get_mpa_state(conversation); diff --git a/epan/dissectors/packet-ixveriwave.c b/epan/dissectors/packet-ixveriwave.c index 566b78aa6a..7fb247c7ce 100644 --- a/epan/dissectors/packet-ixveriwave.c +++ b/epan/dissectors/packet-ixveriwave.c @@ -464,7 +464,7 @@ dissect_ixveriwave(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* da p_ifg_info = wmem_new0(wmem_file_scope(), struct ifg_info); /* Doesn't exist, so we need to calculate the value */ - if (previous_frame_data.previous_frame_num !=0 && (pinfo->fd->num - previous_frame_data.previous_frame_num == 1)) + if (previous_frame_data.previous_frame_num !=0 && (pinfo->num - previous_frame_data.previous_frame_num == 1)) { p_ifg_info->ifg = (guint32)(vw_startt - previous_frame_data.previous_end_time); p_ifg_info->previous_end_time = previous_frame_data.previous_end_time; @@ -477,7 +477,7 @@ dissect_ixveriwave(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* da /* Store current data into the static structure */ previous_frame_data.previous_end_time = vw_endt; - previous_frame_data.previous_frame_num = pinfo->fd->num; + previous_frame_data.previous_frame_num = pinfo->num; /* Record the current start time */ p_ifg_info->current_start_time = vw_startt; diff --git a/epan/dissectors/packet-jxta.c b/epan/dissectors/packet-jxta.c index d40f7207aa..fb98d01d77 100644 --- a/epan/dissectors/packet-jxta.c +++ b/epan/dissectors/packet-jxta.c @@ -307,7 +307,7 @@ static gboolean dissect_jxta_UDP_heur(tvbuff_t * tvb, packet_info * pinfo, proto save_desegment_len = pinfo->desegment_len; ret = dissect_jxta_udp(tvb, pinfo, tree, NULL); - /* g_message( "%d Heuristic UDP Dissection : %d", pinfo->fd->num, ret ); */ + /* g_message( "%d Heuristic UDP Dissection : %d", pinfo->num, ret ); */ if (ret < 0) { /* @@ -357,7 +357,7 @@ static gboolean dissect_jxta_TCP_heur(tvbuff_t * tvb, packet_info * pinfo, proto save_desegment_len = pinfo->desegment_len; ret = dissect_jxta_stream(tvb, pinfo, tree, NULL); - /* g_message( "%d Heuristic TCP Dissection : %d", pinfo->fd->num, ret ); */ + /* g_message( "%d Heuristic TCP Dissection : %d", pinfo->num, ret ); */ if (ret < 0) { /* @@ -417,7 +417,7 @@ static gboolean dissect_jxta_SCTP_heur(tvbuff_t * tvb, packet_info * pinfo, prot save_desegment_len = pinfo->desegment_len; ret = dissect_jxta_stream(tvb, pinfo, tree, NULL); - /* g_message( "%d Heuristic SCTP Dissection : %d", pinfo->fd->num, ret ); */ + /* g_message( "%d Heuristic SCTP Dissection : %d", pinfo->num, ret ); */ if (ret < 0) { /* @@ -584,7 +584,7 @@ static int dissect_jxta_stream(tvbuff_t * tvb, packet_info * pinfo, proto_tree * proto_item *jxta_tree_item = NULL; proto_tree *jxta_tree = NULL; - /* g_message("Dissecting%s : %d", (NULL != tree) ? " for display" : "", pinfo->fd->num ); */ + /* g_message("Dissecting%s : %d", (NULL != tree) ? " for display" : "", pinfo->num ); */ if (available < sizeof(JXTA_WELCOME_MSG_SIG)) { needed = (gint) (sizeof(JXTA_WELCOME_MSG_SIG) - available); @@ -601,20 +601,20 @@ static int dissect_jxta_stream(tvbuff_t * tvb, packet_info * pinfo, proto_tree * if (0 == tpt_conv_data->initiator_welcome_frame) { /* The initiator welcome frame */ tpt_conv_data->tpt_ptype = pinfo->ptype; - tpt_conv_data->initiator_welcome_frame = pinfo->fd->num; + tpt_conv_data->initiator_welcome_frame = pinfo->num; copy_address_wmem(wmem_file_scope(), &tpt_conv_data->initiator_tpt_address, &pinfo->src); tpt_conv_data->initiator_tpt_port = pinfo->srcport; welcome_addr = &tpt_conv_data->initiator_address; initiator = TRUE; } else { - if (tpt_conv_data->initiator_welcome_frame >= pinfo->fd->num) { + if (tpt_conv_data->initiator_welcome_frame >= pinfo->num) { /* what we saw previously was the receiver welcome message */ tpt_conv_data->receiver_welcome_frame = tpt_conv_data->initiator_welcome_frame; tpt_conv_data->receiver_tpt_address = tpt_conv_data->initiator_tpt_address; tpt_conv_data->receiver_tpt_port = tpt_conv_data->initiator_tpt_port; tpt_conv_data->receiver_address = tpt_conv_data->initiator_address; - tpt_conv_data->initiator_welcome_frame = pinfo->fd->num; + tpt_conv_data->initiator_welcome_frame = pinfo->num; copy_address_wmem(wmem_file_scope(), &tpt_conv_data->initiator_tpt_address, &pinfo->src); tpt_conv_data->initiator_tpt_port = pinfo->srcport; @@ -623,7 +623,7 @@ static int dissect_jxta_stream(tvbuff_t * tvb, packet_info * pinfo, proto_tree * } else { /* The receiver welcome frame */ tpt_conv_data->tpt_ptype = pinfo->ptype; - tpt_conv_data->receiver_welcome_frame = pinfo->fd->num; + tpt_conv_data->receiver_welcome_frame = pinfo->num; copy_address_wmem(wmem_file_scope(), &tpt_conv_data->receiver_tpt_address, &pinfo->src); tpt_conv_data->receiver_tpt_port = pinfo->srcport; @@ -655,7 +655,7 @@ static int dissect_jxta_stream(tvbuff_t * tvb, packet_info * pinfo, proto_tree * return 0; } - /* g_message("%d Tpt %s:%d -> %s:%d tvb len=%d\n\t%s %d", pinfo->fd->num, + /* g_message("%d Tpt %s:%d -> %s:%d tvb len=%d\n\t%s %d", pinfo->num, address_to_str(wmem_packet_scope(), &pinfo->src), pinfo->srcport, address_to_str(wmem_packet_scope(), &pinfo->dst), pinfo->destport, tvb_reported_length_remaining(tvb, 0), @@ -683,13 +683,13 @@ static int dissect_jxta_stream(tvbuff_t * tvb, packet_info * pinfo, proto_tree * /* Use our source and destination addresses if we have them */ if (NULL != peer_conversation) { - /* g_message("%d Tpt %s:%d -> %s:%d", pinfo->fd->num, + /* g_message("%d Tpt %s:%d -> %s:%d", pinfo->num, address_to_str(wmem_packet_scope(), &tpt_conv_data->initiator_tpt_address), tpt_conv_data->initiator_tpt_port, address_to_str(wmem_packet_scope(), &tpt_conv_data->receiver_tpt_address), tpt_conv_data->receiver_tpt_port); */ if (addresses_equal(&pinfo->src, &tpt_conv_data->initiator_tpt_address) && tpt_conv_data->initiator_tpt_port == pinfo->srcport) { - /* g_message("%d From initiator : %s -> %s ", pinfo->fd->num, + /* g_message("%d From initiator : %s -> %s ", pinfo->num, address_to_str(wmem_packet_scope(), &tpt_conv_data->initiator_address), address_to_str(wmem_packet_scope(), &tpt_conv_data->receiver_address)); */ pinfo->src = tpt_conv_data->initiator_address; @@ -699,7 +699,7 @@ static int dissect_jxta_stream(tvbuff_t * tvb, packet_info * pinfo, proto_tree * pinfo->ptype = PT_NONE; } else if (addresses_equal(&pinfo->src, &tpt_conv_data->receiver_tpt_address) && tpt_conv_data->receiver_tpt_port == pinfo->srcport) { - /* g_message("%d From receiver : %s -> %s ", pinfo->fd->num, + /* g_message("%d From receiver : %s -> %s ", pinfo->num, address_to_str(wmem_packet_scope(), &tpt_conv_data->receiver_address), address_to_str(wmem_packet_scope(), &tpt_conv_data->initiator_address)); */ pinfo->src = tpt_conv_data->receiver_address; @@ -708,7 +708,7 @@ static int dissect_jxta_stream(tvbuff_t * tvb, packet_info * pinfo, proto_tree * pinfo->destport = 0; pinfo->ptype = PT_NONE; } else { - /* g_message("%d Nothing matches %s:%d -> %s:%d", pinfo->fd->num, + /* g_message("%d Nothing matches %s:%d -> %s:%d", pinfo->num, address_to_str(wmem_packet_scope(), &pinfo->src), pinfo->srcport, address_to_str(wmem_packet_scope(), &pinfo->dst), pinfo->destport); */ } @@ -746,7 +746,7 @@ Common_Exit: static jxta_stream_conversation_data *get_tpt_conversation(packet_info * pinfo) { conversation_t *tpt_conversation = - find_conversation(pinfo->fd->num, &pinfo->src, &pinfo->dst, pinfo->ptype, pinfo->srcport, pinfo->destport, 0); + find_conversation(pinfo->num, &pinfo->src, &pinfo->dst, pinfo->ptype, pinfo->srcport, pinfo->destport, 0); jxta_stream_conversation_data *tpt_conv_data; if (tpt_conversation == NULL) { @@ -754,7 +754,7 @@ static jxta_stream_conversation_data *get_tpt_conversation(packet_info * pinfo) * No conversation exists yet - create one. */ tpt_conversation = - conversation_new(pinfo->fd->num, &pinfo->src, &pinfo->dst, pinfo->ptype, pinfo->srcport, pinfo->destport, 0); + conversation_new(pinfo->num, &pinfo->src, &pinfo->dst, pinfo->ptype, pinfo->srcport, pinfo->destport, 0); } conversation_set_dissector(tpt_conversation, stream_jxta_handle); @@ -797,11 +797,11 @@ static conversation_t *get_peer_conversation(packet_info * pinfo, jxta_stream_co conversation_t * peer_conversation = NULL; if ((AT_NONE != tpt_conv_data->initiator_address.type) && (AT_NONE != tpt_conv_data->receiver_address.type)) { - peer_conversation = find_conversation(pinfo->fd->num, &tpt_conv_data->initiator_address, &tpt_conv_data->receiver_address, + peer_conversation = find_conversation(pinfo->num, &tpt_conv_data->initiator_address, &tpt_conv_data->receiver_address, PT_NONE, 0, 0, NO_PORT_B); if (create && (NULL == peer_conversation)) { - peer_conversation = conversation_new(pinfo->fd->num, &tpt_conv_data->initiator_address, + peer_conversation = conversation_new(pinfo->num, &tpt_conv_data->initiator_address, &tpt_conv_data->receiver_address, PT_NONE, 0, 0, NO_PORT_B); conversation_set_dissector(peer_conversation, stream_jxta_handle); } @@ -1320,7 +1320,7 @@ static int dissect_jxta_message(tvbuff_t * tvb, packet_info * pinfo, proto_tree * probably be expert info, not a g_warning. Pending confirmation * just comment it out since a g_warning is definitely the * wrong thing to do. - * g_warning( "Failure processing message element #%d of %d of frame %d", each_elem, elem_count, pinfo->fd->num ); + * g_warning( "Failure processing message element #%d of %d of frame %d", each_elem, elem_count, pinfo->num ); */ return 0; } @@ -1341,7 +1341,7 @@ static int dissect_jxta_message(tvbuff_t * tvb, packet_info * pinfo, proto_tree complete_messages++; - /* g_message( "%d Scanned message #%d: ", pinfo->fd->num, complete_messages ); */ + /* g_message( "%d Scanned message #%d: ", pinfo->num, complete_messages ); */ } if ((needed > 0) && gDESEGMENT && pinfo->can_desegment) { @@ -1487,7 +1487,7 @@ static int dissect_jxta_message(tvbuff_t * tvb, packet_info * pinfo, proto_tree } if( tree ) { - /* g_message( "%d tvb offset : %d tree offset : %d", pinfo->fd->num, offset, tree_offset ); */ + /* g_message( "%d tvb offset : %d tree offset : %d", pinfo->num, offset, tree_offset ); */ DISSECTOR_ASSERT(tree_offset == offset); } diff --git a/epan/dissectors/packet-kafka.c b/epan/dissectors/packet-kafka.c index 7f1b7527a3..9f8a29569f 100644 --- a/epan/dissectors/packet-kafka.c +++ b/epan/dissectors/packet-kafka.c @@ -890,7 +890,7 @@ dissect_kafka(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U matcher = wmem_new(wmem_file_scope(), kafka_query_response_t); matcher->api_key = tvb_get_ntohs(tvb, offset); - matcher->request_frame = PINFO_FD_NUM(pinfo); + matcher->request_frame = pinfo->num; matcher->response_found = FALSE; p_add_proto_data(wmem_file_scope(), pinfo, proto_kafka, 0, matcher); @@ -960,7 +960,7 @@ dissect_kafka(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U if (wmem_queue_count(match_queue) > 0) { matcher = (kafka_query_response_t *) wmem_queue_peek(match_queue); } - if (matcher == NULL || matcher->request_frame >= PINFO_FD_NUM(pinfo)) { + if (matcher == NULL || matcher->request_frame >= pinfo->num) { col_set_str(pinfo->cinfo, COL_INFO, "Kafka Response (Unknown API, Missing Request)"); /* TODO: expert info, don't have request, can't dissect */ return tvb_captured_length(tvb); @@ -968,7 +968,7 @@ dissect_kafka(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U wmem_queue_pop(match_queue); - matcher->response_frame = PINFO_FD_NUM(pinfo); + matcher->response_frame = pinfo->num; matcher->response_found = TRUE; p_add_proto_data(wmem_file_scope(), pinfo, proto_kafka, 0, matcher); diff --git a/epan/dissectors/packet-kerberos.c b/epan/dissectors/packet-kerberos.c index 3c4ac5b5bc..5dd2336dd6 100644 --- a/epan/dissectors/packet-kerberos.c +++ b/epan/dissectors/packet-kerberos.c @@ -537,8 +537,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; @@ -672,7 +672,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; @@ -824,7 +824,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 */ @@ -868,7 +868,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); } @@ -3279,10 +3279,10 @@ dissect_kerberos_KDC_REQ_BODY(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int * 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); } diff --git a/epan/dissectors/packet-l2tp.c b/epan/dissectors/packet-l2tp.c index cba790b530..19d4058f7e 100644 --- a/epan/dissectors/packet-l2tp.c +++ b/epan/dissectors/packet-l2tp.c @@ -2414,16 +2414,16 @@ dissect_l2tp_udp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data return 0; } - conv = find_conversation(pinfo->fd->num, &pinfo->src, &pinfo->dst, PT_UDP, + conv = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst, PT_UDP, pinfo->srcport, pinfo->destport, NO_PORT_B); if (conv == NULL) { - conv = find_conversation(pinfo->fd->num, &pinfo->src, &pinfo->dst, PT_UDP, + conv = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst, PT_UDP, pinfo->srcport, pinfo->destport, 0); } - if ((conv == NULL) || (conversation_get_dissector(conv, pinfo->fd->num) != l2tp_udp_handle)) { - conv = conversation_new(pinfo->fd->num, &pinfo->src, &pinfo->dst, PT_UDP, + if ((conv == NULL) || (conversation_get_dissector(conv, pinfo->num) != l2tp_udp_handle)) { + conv = conversation_new(pinfo->num, &pinfo->src, &pinfo->dst, PT_UDP, pinfo->srcport, 0, NO_PORT2); conversation_set_dissector(conv, l2tp_udp_handle); } diff --git a/epan/dissectors/packet-lapdm.c b/epan/dissectors/packet-lapdm.c index 7e17810ac7..03a89aacd0 100644 --- a/epan/dissectors/packet-lapdm.c +++ b/epan/dissectors/packet-lapdm.c @@ -321,7 +321,7 @@ dissect_lapdm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U /* Reassembled into this packet */ - if (fd_m && pinfo->fd->num == fd_m->reassembled_in) { + if (fd_m && pinfo->num == fd_m->reassembled_in) { if (!dissector_try_uint(lapdm_sapi_dissector_table, sapi, reassembled, pinfo, tree)) call_dissector(data_handle, reassembled, pinfo, tree); diff --git a/epan/dissectors/packet-lapsat.c b/epan/dissectors/packet-lapsat.c index 9e34572a10..1fac52be72 100644 --- a/epan/dissectors/packet-lapsat.c +++ b/epan/dissectors/packet-lapsat.c @@ -554,7 +554,7 @@ dissect_lapsat(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* dissec ); /* Reassembled into this packet ? */ - if (fd_m && pinfo->fd->num == fd_m->reassembled_in) { + if (fd_m && pinfo->num == fd_m->reassembled_in) { /* Yes, so handoff to upper layers */ if (!dissector_try_uint(lapsat_sapi_dissector_table, sapi, reassembled, pinfo, tree)) diff --git a/epan/dissectors/packet-lbmc.c b/epan/dissectors/packet-lbmc.c index 8a092fe432..f6c8078fb3 100644 --- a/epan/dissectors/packet-lbmc.c +++ b/epan/dissectors/packet-lbmc.c @@ -11092,7 +11092,7 @@ int lbmc_dissect_lbmc_packet(tvbuff_t * tvb, int offset, packet_info * pinfo, pr /* Note: it *is* possible for a TCP SID to appear in an LBTTCP non-transport (UIM) message. */ if ((pinfo->fd->flags.visited == 0) && (tcp_sid_info.set) && lbm_channel_is_unknown_transport_lbttcp(channel) && tcp_address_valid) { - lbttcp_transport_sid_add(&tcp_addr, tcp_port, pinfo->fd->num, tcp_sid_info.session_id); + lbttcp_transport_sid_add(&tcp_addr, tcp_port, pinfo->num, tcp_sid_info.session_id); } /* Try to determine the TCP transport channel. */ if (lbm_channel_type(channel) == LBM_CHANNEL_TRANSPORT_LBTTCP) @@ -11108,11 +11108,11 @@ int lbmc_dissect_lbmc_packet(tvbuff_t * tvb, int offset, packet_info * pinfo, pr { guint32 tcp_session_id = 0; - if (lbttcp_transport_sid_find(&tcp_addr, tcp_port, pinfo->fd->num, &tcp_session_id)) + if (lbttcp_transport_sid_find(&tcp_addr, tcp_port, pinfo->num, &tcp_session_id)) { lbttcp_transport_t * tcp_transport = NULL; - tcp_transport = lbttcp_transport_find(&tcp_addr, tcp_port, tcp_session_id, pinfo->fd->num); + tcp_transport = lbttcp_transport_find(&tcp_addr, tcp_port, tcp_session_id, pinfo->num); if (tcp_transport != NULL) { actual_channel = tcp_transport->channel; @@ -11157,7 +11157,7 @@ int lbmc_dissect_lbmc_packet(tvbuff_t * tvb, int offset, packet_info * pinfo, pr proto_item * pi = NULL; lbm_uim_stream_tap_info_t * stream_tap_info = NULL; - lbm_stream_istream_substream_update(inst_substream, msglen, pinfo->fd->num); + lbm_stream_istream_substream_update(inst_substream, msglen, pinfo->num); stream_item = proto_tree_add_item(subtree, hf_lbm_stream, tvb, 0, 0, ENC_NA); PROTO_ITEM_SET_GENERATED(stream_item); stream_tree = proto_item_add_subtree(stream_item, ett_lbm_stream); @@ -11207,7 +11207,7 @@ int lbmc_dissect_lbmc_packet(tvbuff_t * tvb, int offset, packet_info * pinfo, pr proto_item * pi = NULL; lbm_uim_stream_tap_info_t * stream_tap_info = NULL; - lbm_stream_dstream_substream_update(dom_substream, msglen, pinfo->fd->num); + lbm_stream_dstream_substream_update(dom_substream, msglen, pinfo->num); stream_item = proto_tree_add_item(subtree, hf_lbm_stream, tvb, 0, 0, ENC_NA); PROTO_ITEM_SET_GENERATED(stream_item); stream_tree = proto_item_add_subtree(stream_item, ett_lbm_stream); @@ -11316,7 +11316,7 @@ int lbmc_dissect_lbmc_packet(tvbuff_t * tvb, int offset, packet_info * pinfo, pr } else { - (void)lbmc_message_add_fragment(msg, lbmc_tvb, pkt_offset, &frag_info, pinfo->fd->num); + (void)lbmc_message_add_fragment(msg, lbmc_tvb, pkt_offset, &frag_info, pinfo->num); if (data_is_umq_cmd_resp) { msg->data_is_umq_cmd_resp = TRUE; @@ -11326,13 +11326,13 @@ int lbmc_dissect_lbmc_packet(tvbuff_t * tvb, int offset, packet_info * pinfo, pr if (msg->reassembled_frame == 0) { /* Store the frame number in which the message will be reassembled */ - msg->reassembled_frame = pinfo->fd->num; + msg->reassembled_frame = pinfo->num; } data_tvb = tvb_new_subset_remaining(lbmc_tvb, pkt_offset); msgprop_tvb = NULL; msg_reassembled = TRUE; msg_complete = TRUE; - if (msg->reassembled_frame == pinfo->fd->num) + if (msg->reassembled_frame == pinfo->num) { /* We can only call a subdissector if this is the frame in which the message is reassembled */ can_call_subdissector = TRUE; @@ -11358,7 +11358,7 @@ int lbmc_dissect_lbmc_packet(tvbuff_t * tvb, int offset, packet_info * pinfo, pr /* For reassembled messages, show the frame or reassembly information. */ if (msg_reassembled) { - if (msg->reassembled_frame == pinfo->fd->num) + if (msg->reassembled_frame == pinfo->num) { proto_tree * frag_tree = NULL; proto_item * frag_item = NULL; diff --git a/epan/dissectors/packet-lbmpdmtcp.c b/epan/dissectors/packet-lbmpdmtcp.c index b97b8f217d..e7101ef711 100644 --- a/epan/dissectors/packet-lbmpdmtcp.c +++ b/epan/dissectors/packet-lbmpdmtcp.c @@ -282,7 +282,7 @@ static int dissect_lbmpdm_tcp_pdu(tvbuff_t * tvb, packet_info * pinfo, proto_tre } lbmpdm_tcp_tree = proto_item_add_subtree(ti, ett_lbmpdm_tcp); - transport = lbmtcp_transport_add(&(pinfo->src), pinfo->srcport, &(pinfo->dst), pinfo->destport, pinfo->fd->num); + transport = lbmtcp_transport_add(&(pinfo->src), pinfo->srcport, &(pinfo->dst), pinfo->destport, pinfo->num); if (transport != NULL) { channel = transport->channel; diff --git a/epan/dissectors/packet-lbmr.c b/epan/dissectors/packet-lbmr.c index 0eb3e38a72..b8820fcc88 100644 --- a/epan/dissectors/packet-lbmr.c +++ b/epan/dissectors/packet-lbmr.c @@ -3937,7 +3937,7 @@ static int dissect_lbmr_tir_transport(tvbuff_t * tvb, int offset, lbm_uint8_t tr session_id = 0; len += L_LBMR_TIR_TCP_T; } - lbttcp_transport = lbttcp_transport_add(&(pinfo->src), port, session_id, pinfo->fd->num); + lbttcp_transport = lbttcp_transport_add(&(pinfo->src), port, session_id, pinfo->num); channel = lbttcp_transport->channel; add_contents_tir(contents, topic_name, lbttcp_transport_source_string(&(pinfo->src), port, session_id), topic_index); } @@ -3963,7 +3963,7 @@ static int dissect_lbmr_tir_transport(tvbuff_t * tvb, int offset, lbm_uint8_t tr proto_tree_add_item(lbtrm_tree, hf_lbmr_tir_lbtrm_session_id, tvb, offset + O_LBMR_TIR_LBTRM_T_SESSION_ID, L_LBMR_TIR_LBTRM_T_SESSION_ID, ENC_BIG_ENDIAN); proto_tree_add_item(lbtrm_tree, hf_lbmr_tir_lbtrm_udp_dest_port, tvb, offset + O_LBMR_TIR_LBTRM_T_UDP_DEST_PORT, L_LBMR_TIR_LBTRM_T_UDP_DEST_PORT, ENC_BIG_ENDIAN); proto_tree_add_item(lbtrm_tree, hf_lbmr_tir_lbtrm_src_ucast_port, tvb, offset + O_LBMR_TIR_LBTRM_T_SRC_UCAST_PORT, L_LBMR_TIR_LBTRM_T_SRC_UCAST_PORT, ENC_BIG_ENDIAN); - lbtrm_transport = lbtrm_transport_add(&(pinfo->src), src_ucast_port, session_id, &multicast_group, udp_dest_port, pinfo->fd->num); + lbtrm_transport = lbtrm_transport_add(&(pinfo->src), src_ucast_port, session_id, &multicast_group, udp_dest_port, pinfo->num); channel = lbtrm_transport->channel; add_contents_tir(contents, topic_name, lbtrm_transport_source_string(&(pinfo->src), src_ucast_port, session_id, &multicast_group, udp_dest_port), topic_index); len += L_LBMR_TIR_LBTRM_T; @@ -4005,7 +4005,7 @@ static int dissect_lbmr_tir_transport(tvbuff_t * tvb, int offset, lbm_uint8_t tr proto_tree_add_item(lbtru_tree, hf_lbmr_tir_lbtru_port, tvb, offset + O_LBMR_TIR_LBTRU_T_PORT, L_LBMR_TIR_LBTRU_T_PORT, ENC_BIG_ENDIAN); len += L_LBMR_TIR_LBTRU_T; } - lbtru_transport = lbtru_transport_add(&(pinfo->src), port, session_id, pinfo->fd->num); + lbtru_transport = lbtru_transport_add(&(pinfo->src), port, session_id, pinfo->num); channel = lbtru_transport->channel; add_contents_tir(contents, topic_name, lbtru_transport_source_string(&(pinfo->src), port, session_id), topic_index); } diff --git a/epan/dissectors/packet-lbtrm.c b/epan/dissectors/packet-lbtrm.c index a2e3f0f1d6..9d4bf35fe3 100644 --- a/epan/dissectors/packet-lbtrm.c +++ b/epan/dissectors/packet-lbtrm.c @@ -1181,22 +1181,22 @@ static int dissect_lbtrm(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, /* Note that this won't handle the case when a NAK occurs in the capture before any other packets for that transport. Oh well. */ if (packet_type == LBTRM_PACKET_TYPE_NAK) { - transport = lbtrm_transport_unicast_find(&(pinfo->dst), src_port, session_id, pinfo->fd->num); + transport = lbtrm_transport_unicast_find(&(pinfo->dst), src_port, session_id, pinfo->num); } else { - transport = lbtrm_transport_add(&(pinfo->src), src_port, session_id, &(pinfo->dst), dest_port, pinfo->fd->num); + transport = lbtrm_transport_add(&(pinfo->src), src_port, session_id, &(pinfo->dst), dest_port, pinfo->num); } } else { if (packet_type == LBTRM_PACKET_TYPE_NAK) { - transport = lbtrm_transport_unicast_find(&(pinfo->dst), src_port, session_id, pinfo->fd->num); + transport = lbtrm_transport_unicast_find(&(pinfo->dst), src_port, session_id, pinfo->num); } else { - transport = lbtrm_transport_find(&(pinfo->src), src_port, session_id, &(pinfo->dst), dest_port, pinfo->fd->num); + transport = lbtrm_transport_find(&(pinfo->src), src_port, session_id, &(pinfo->dst), dest_port, pinfo->num); } } if (transport != NULL) @@ -1303,7 +1303,7 @@ static int dissect_lbtrm(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, { if (transport != NULL) { - lbtrm_transport_frame_add(transport, packet_type, pinfo->fd->num, sequence, retransmission); + lbtrm_transport_frame_add(transport, packet_type, pinfo->num, sequence, retransmission); } } else @@ -1316,7 +1316,7 @@ static int dissect_lbtrm(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, transport_item = proto_tree_add_item(lbtrm_tree, hf_lbtrm_analysis, tvb, 0, 0, ENC_NA); PROTO_ITEM_SET_GENERATED(transport_item); transport_tree = proto_item_add_subtree(transport_item, ett_lbtrm_transport); - frame = lbtrm_transport_frame_find(transport, pinfo->fd->num); + frame = lbtrm_transport_frame_find(transport, pinfo->num); if (frame != NULL) { lbm_transport_sqn_t * sqn = NULL; @@ -1358,7 +1358,7 @@ static int dissect_lbtrm(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, frame_tree = proto_item_add_subtree(frame_tree_item, ett_lbtrm_transport_sqn); cb_data.tree = frame_tree; cb_data.tvb = tvb; - cb_data.current_frame = pinfo->fd->num; + cb_data.current_frame = pinfo->num; wmem_tree_foreach(sqn->frame, dissect_lbtrm_sqn_frame_list_callback, (void *) &cb_data); } } @@ -1412,7 +1412,7 @@ static int dissect_lbtrm(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, frame_tree = proto_item_add_subtree(frame_tree_item, ett_lbtrm_transport_sqn); cb_data.tree = frame_tree; cb_data.tvb = tvb; - cb_data.current_frame = pinfo->fd->num; + cb_data.current_frame = pinfo->num; wmem_tree_foreach(sqn->frame, dissect_lbtrm_sqn_frame_list_callback, (void *) &cb_data); } } diff --git a/epan/dissectors/packet-lbtru.c b/epan/dissectors/packet-lbtru.c index e435e702fe..162c198eaa 100644 --- a/epan/dissectors/packet-lbtru.c +++ b/epan/dissectors/packet-lbtru.c @@ -1420,28 +1420,28 @@ static int dissect_lbtru(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, } if (pinfo->fd->flags.visited == 0) { - transport = lbtru_transport_add(&source_address, source_port, session_id, pinfo->fd->num); + transport = lbtru_transport_add(&source_address, source_port, session_id, pinfo->num); } else { - transport = lbtru_transport_find(&source_address, source_port, session_id, pinfo->fd->num); + transport = lbtru_transport_find(&source_address, source_port, session_id, pinfo->num); } if (transport != NULL) { if (pinfo->fd->flags.visited == 0) { - client = lbtru_client_transport_add(transport, &receiver_address, receiver_port, pinfo->fd->num); + client = lbtru_client_transport_add(transport, &receiver_address, receiver_port, pinfo->num); if (client != NULL) { if (lbtru_sequence_analysis) { - lbtru_client_transport_frame_add(client, packet_type, pinfo->fd->num, packet_sqn, retransmission); + lbtru_client_transport_frame_add(client, packet_type, pinfo->num, packet_sqn, retransmission); } } } else { - client = lbtru_client_transport_find(transport, &receiver_address, receiver_port, pinfo->fd->num); + client = lbtru_client_transport_find(transport, &receiver_address, receiver_port, pinfo->num); } tapinfo->transport = lbtru_transport_source_string_transport(transport); channel = transport->channel; @@ -1465,7 +1465,7 @@ static int dissect_lbtru(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, lbm_transport_frame_t * frame = NULL; /* Fill in the tree */ - frame = lbtru_client_transport_frame_find(client, pinfo->fd->num); + frame = lbtru_client_transport_frame_find(client, pinfo->num); if (frame != NULL) { lbm_transport_sqn_t * sqn = NULL; @@ -1507,7 +1507,7 @@ static int dissect_lbtru(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, frame_tree = proto_item_add_subtree(frame_tree_item, ett_lbtru_transport_sqn); cb_data.tree = frame_tree; cb_data.tvb = tvb; - cb_data.current_frame = pinfo->fd->num; + cb_data.current_frame = pinfo->num; wmem_tree_foreach(sqn->frame, dissect_lbtru_sqn_frame_list_callback, (void *) &cb_data); } } @@ -1562,7 +1562,7 @@ static int dissect_lbtru(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, frame_tree = proto_item_add_subtree(frame_tree_item, ett_lbtru_transport_sqn); cb_data.tree = frame_tree; cb_data.tvb = tvb; - cb_data.current_frame = pinfo->fd->num; + cb_data.current_frame = pinfo->num; wmem_tree_foreach(sqn->frame, dissect_lbtru_sqn_frame_list_callback, (void *) &cb_data); } } diff --git a/epan/dissectors/packet-lbttcp.c b/epan/dissectors/packet-lbttcp.c index de4610fa6a..9b1bd98be5 100644 --- a/epan/dissectors/packet-lbttcp.c +++ b/epan/dissectors/packet-lbttcp.c @@ -546,24 +546,24 @@ static int dissect_lbttcp_pdu(tvbuff_t * tvb, packet_info * pinfo, proto_tree * clntport = pinfo->srcport; } /* See if we have a matching transport with no session ID. */ - transport = lbttcp_transport_find(&source_address, srcport, sid, pinfo->fd->num); + transport = lbttcp_transport_find(&source_address, srcport, sid, pinfo->num); if (transport == NULL) { /* See if we know about a SID */ - if (lbttcp_transport_sid_find(&source_address, srcport, pinfo->fd->num, &sid)) + if (lbttcp_transport_sid_find(&source_address, srcport, pinfo->num, &sid)) { - transport = lbttcp_transport_find(&source_address, srcport, sid, pinfo->fd->num); + transport = lbttcp_transport_find(&source_address, srcport, sid, pinfo->num); } } if (transport != NULL) { channel = transport->channel; /* See if we already know about this client */ - client = lbttcp_client_transport_find(transport, &client_address, clntport, pinfo->fd->num); + client = lbttcp_client_transport_find(transport, &client_address, clntport, pinfo->num); if (client == NULL) { /* No - add it. */ - client = lbttcp_client_transport_add(transport, &client_address, clntport, pinfo->fd->num); + client = lbttcp_client_transport_add(transport, &client_address, clntport, pinfo->num); } if (client != NULL) { @@ -575,11 +575,11 @@ static int dissect_lbttcp_pdu(tvbuff_t * tvb, packet_info * pinfo, proto_tree * if (PINFO_FD_VISITED(pinfo)) { /* No TIR and no session ID seen, so create the transport */ - transport = lbttcp_transport_add(&source_address, srcport, 0, pinfo->fd->num); + transport = lbttcp_transport_add(&source_address, srcport, 0, pinfo->num); if (transport != NULL) { channel = transport->channel; - client = lbttcp_client_transport_add(transport, &client_address, clntport, pinfo->fd->num); + client = lbttcp_client_transport_add(transport, &client_address, clntport, pinfo->num); if (client != NULL) { client_id = client->id; diff --git a/epan/dissectors/packet-ldap.c b/epan/dissectors/packet-ldap.c index 369d98d218..dc1c9541b0 100644 --- a/epan/dissectors/packet-ldap.c +++ b/epan/dissectors/packet-ldap.c @@ -1014,7 +1014,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: @@ -1030,7 +1030,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; @@ -1070,7 +1070,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; @@ -1099,7 +1099,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); } @@ -1695,7 +1695,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 @@ -4016,7 +4016,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 */ } } @@ -4032,7 +4032,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; } @@ -4696,7 +4696,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); diff --git a/epan/dissectors/packet-ldss.c b/epan/dissectors/packet-ldss.c index 916d4c1e6d..ba5ebfccf3 100644 --- a/epan/dissectors/packet-ldss.c +++ b/epan/dissectors/packet-ldss.c @@ -402,13 +402,13 @@ dissect_ldss_broadcast(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) * being frame zero. */ if (messageDetail != INFERRED_PEERSHUTDOWN && (highest_num_seen == 0 || - highest_num_seen < pinfo->fd->num)) { + highest_num_seen < pinfo->num)) { ldss_broadcast_t *data; /* Populate data from the broadcast */ data = wmem_new0(wmem_file_scope(), ldss_broadcast_t); - data->num = pinfo->fd->num; + data->num = pinfo->num; data->ts = pinfo->abs_ts; data->message_id = messageID; data->message_detail = messageDetail; @@ -431,7 +431,7 @@ dissect_ldss_broadcast(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } /* Record that the frame was processed */ - highest_num_seen = pinfo->fd->num; + highest_num_seen = pinfo->num; } return tvb_captured_length(tvb); @@ -467,7 +467,7 @@ dissect_ldss_transfer (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void /* Look for the transfer conversation; this was created during * earlier broadcast dissection (see prepare_ldss_transfer_conv) */ - transfer_conv = find_conversation (pinfo->fd->num, &pinfo->src, &pinfo->dst, + transfer_conv = find_conversation (pinfo->num, &pinfo->src, &pinfo->dst, PT_TCP, pinfo->srcport, pinfo->destport, 0); transfer_info = (ldss_transfer_info_t *)conversation_get_proto_data(transfer_conv, proto_ldss); @@ -491,12 +491,12 @@ dissect_ldss_transfer (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void col_set_str(pinfo->cinfo, COL_INFO, "LDSS File Transfer (Requesting file - pull)"); if (highest_num_seen == 0 || - highest_num_seen < pinfo->fd->num) { + highest_num_seen < pinfo->num) { already_dissected = FALSE; transfer_info->req = wmem_new0(wmem_file_scope(), ldss_file_request_t); transfer_info->req->file = wmem_new0(wmem_file_scope(), ldss_file_t); - highest_num_seen = pinfo->fd->num; + highest_num_seen = pinfo->num; } if (tree) { @@ -627,7 +627,7 @@ dissect_ldss_transfer (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void PROTO_ITEM_SET_GENERATED(ti); } - transfer_info->req->num = pinfo->fd->num; + transfer_info->req->num = pinfo->num; transfer_info->req->ts = pinfo->abs_ts; } /* Remaining packets are the file response */ @@ -667,7 +667,7 @@ dissect_ldss_transfer (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void } /* OK. Now we have the whole file that was transferred. */ - transfer_info->resp_num = pinfo->fd->num; + transfer_info->resp_num = pinfo->num; transfer_info->resp_ts = pinfo->abs_ts; col_add_fstr(pinfo->cinfo, COL_INFO, "LDSS File Transfer (Sending file - %s)", diff --git a/epan/dissectors/packet-lte-rrc.c b/epan/dissectors/packet-lte-rrc.c index f6f95e481b..61a129f127 100644 --- a/epan/dissectors/packet-lte-rrc.c +++ b/epan/dissectors/packet-lte-rrc.c @@ -21827,7 +21827,7 @@ dissect_lte_rrc_SecurityAlgorithmConfig(tvbuff_t *tvb _U_, int offset _U_, asn1_ ett_lte_rrc_SecurityAlgorithmConfig, SecurityAlgorithmConfig_sequence); 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; @@ -22373,7 +22373,7 @@ dissect_lte_rrc_T_systemInfoValueTag(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx 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; @@ -22381,7 +22381,7 @@ dissect_lte_rrc_T_systemInfoValueTag(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx } 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; diff --git a/epan/dissectors/packet-m3ua.c b/epan/dissectors/packet-m3ua.c index d7a60b4eec..a29fb16912 100644 --- a/epan/dissectors/packet-m3ua.c +++ b/epan/dissectors/packet-m3ua.c @@ -1116,22 +1116,22 @@ m3ua_heur_mtp3_standard(tvbuff_t *tvb, packet_info *pinfo, guint32 opc, guint32 case MTP_SI_SCCP: { if (opc < ITU_PC_MASK && dpc < ITU_PC_MASK && - looks_like_valid_sccp(PINFO_FD_NUM(pinfo), tvb, ITU_STANDARD)) { + looks_like_valid_sccp(pinfo->num, tvb, ITU_STANDARD)) { return ITU_STANDARD; } /* Network 0 is reserved in ANSI */ /* Could also check that cluster!=0 for small networks (networks 1-5) */ if ((opc & ANSI_NETWORK_MASK) > 0 && (dpc & ANSI_NETWORK_MASK) > 0 && - looks_like_valid_sccp(PINFO_FD_NUM(pinfo), tvb, ANSI_STANDARD)) { + looks_like_valid_sccp(pinfo->num, tvb, ANSI_STANDARD)) { return ANSI_STANDARD; } - if (looks_like_valid_sccp(PINFO_FD_NUM(pinfo), tvb, CHINESE_ITU_STANDARD)) { + if (looks_like_valid_sccp(pinfo->num, tvb, CHINESE_ITU_STANDARD)) { return CHINESE_ITU_STANDARD; } if (opc < JAPAN_PC_MASK && dpc < JAPAN_PC_MASK && - looks_like_valid_sccp(PINFO_FD_NUM(pinfo), tvb, JAPAN_STANDARD)) { + looks_like_valid_sccp(pinfo->num, tvb, JAPAN_STANDARD)) { return JAPAN_STANDARD; } diff --git a/epan/dissectors/packet-mac-lte.c b/epan/dissectors/packet-mac-lte.c index 887b38e017..be2993e52f 100644 --- a/epan/dissectors/packet-mac-lte.c +++ b/epan/dissectors/packet-mac-lte.c @@ -1811,12 +1811,12 @@ static void set_drx_info(packet_info *pinfo, mac_lte_info *p_mac_lte_info, gbool *frame_result = ue_params->drx_state; /* And store in table */ - g_hash_table_insert(mac_lte_drx_frame_result, get_drx_result_hash_key(pinfo->fd->num, pdu_instance, TRUE), frame_result); + g_hash_table_insert(mac_lte_drx_frame_result, get_drx_result_hash_key(pinfo->num, pdu_instance, TRUE), frame_result); } else { /* After update, so just copy ue_state 'state' info after part of frame */ frame_result = (drx_state_t*)g_hash_table_lookup(mac_lte_drx_frame_result, - get_drx_result_hash_key(pinfo->fd->num, pdu_instance, FALSE)); + get_drx_result_hash_key(pinfo->num, pdu_instance, FALSE)); if (frame_result != NULL) { /* Deep-copy updated state from UE */ frame_result->state_after = ue_params->drx_state.state_before; @@ -1836,7 +1836,7 @@ static void show_drx_info(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, /* Look up entry by frame number in result table */ frame_state = (drx_state_t *)g_hash_table_lookup(mac_lte_drx_frame_result, - get_drx_result_hash_key(pinfo->fd->num, pdu_instance, FALSE)); + get_drx_result_hash_key(pinfo->num, pdu_instance, FALSE)); /* Show available information */ if (frame_state != NULL) { @@ -1858,7 +1858,7 @@ static void show_drx_info(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, PROTO_ITEM_SET_GENERATED(ti); /* Link back to any previous config frame (only from current config frame) */ - if ((frame_state->config.frameNum == pinfo->fd->num) && + if ((frame_state->config.frameNum == pinfo->num) && (frame_state->config.previousFrameNum != 0)) { ti = proto_tree_add_uint(drx_config_tree, hf_mac_lte_drx_config_previous_frame_num, tvb, 0, 0, frame_state->config.previousFrameNum); @@ -3044,7 +3044,7 @@ static void TrackReportedDLHARQResend(packet_info *pinfo, tvbuff_t *tvb, int len result->previousSet = TRUE; result->previousFrameNum = lastData->framenum; result->timeSincePreviousFrame = total_gap; - g_hash_table_insert(mac_lte_dl_harq_result_hash, GUINT_TO_POINTER(pinfo->fd->num), result); + g_hash_table_insert(mac_lte_dl_harq_result_hash, GUINT_TO_POINTER(pinfo->num), result); /* Now make previous frame point forward to here */ original_result = (DLHARQResult *)g_hash_table_lookup(mac_lte_dl_harq_result_hash, GUINT_TO_POINTER(lastData->framenum)); @@ -3053,7 +3053,7 @@ static void TrackReportedDLHARQResend(packet_info *pinfo, tvbuff_t *tvb, int len g_hash_table_insert(mac_lte_dl_harq_result_hash, GUINT_TO_POINTER(lastData->framenum), original_result); } original_result->nextSet = TRUE; - original_result->nextFrameNum = pinfo->fd->num; + original_result->nextFrameNum = pinfo->num; original_result->timeToNextFrame = total_gap; } } @@ -3071,12 +3071,12 @@ static void TrackReportedDLHARQResend(packet_info *pinfo, tvbuff_t *tvb, int len thisData->length = length; tvb_memcpy(tvb, thisData->data, 0, MIN(thisData->length, MAX_EXPECTED_PDU_LENGTH)); thisData->ndi = p_mac_lte_info->detailed_phy_info.dl_info.ndi; - thisData->framenum = pinfo->fd->num; + thisData->framenum = pinfo->num; thisData->received_time = pinfo->abs_ts; } else { /* Not first time, so just set what's already stored in result */ - result = (DLHARQResult *)g_hash_table_lookup(mac_lte_dl_harq_result_hash, GUINT_TO_POINTER(pinfo->fd->num)); + result = (DLHARQResult *)g_hash_table_lookup(mac_lte_dl_harq_result_hash, GUINT_TO_POINTER(pinfo->num)); } @@ -3129,7 +3129,7 @@ int is_mac_lte_frame_retx(packet_info *pinfo, guint8 direction) } else { /* Otherwise look up in table */ - DLHARQResult *result = (DLHARQResult *)g_hash_table_lookup(mac_lte_dl_harq_result_hash, GUINT_TO_POINTER(pinfo->fd->num)); + DLHARQResult *result = (DLHARQResult *)g_hash_table_lookup(mac_lte_dl_harq_result_hash, GUINT_TO_POINTER(pinfo->num)); return ((result != NULL) && result->previousSet); } } @@ -3194,7 +3194,7 @@ static void TrackReportedULHARQResend(packet_info *pinfo, tvbuff_t *tvb, int off result->previousSet = TRUE; result->previousFrameNum = lastData->framenum; result->timeSincePreviousFrame = total_gap; - g_hash_table_insert(mac_lte_ul_harq_result_hash, GUINT_TO_POINTER(pinfo->fd->num), result); + g_hash_table_insert(mac_lte_ul_harq_result_hash, GUINT_TO_POINTER(pinfo->num), result); /* Now make previous frame point forward to here */ original_result = (ULHARQResult *)g_hash_table_lookup(mac_lte_ul_harq_result_hash, GUINT_TO_POINTER(lastData->framenum)); @@ -3203,7 +3203,7 @@ static void TrackReportedULHARQResend(packet_info *pinfo, tvbuff_t *tvb, int off g_hash_table_insert(mac_lte_ul_harq_result_hash, GUINT_TO_POINTER(lastData->framenum), original_result); } original_result->nextSet = TRUE; - original_result->nextFrameNum = pinfo->fd->num; + original_result->nextFrameNum = pinfo->num; original_result->timeToNextFrame = total_gap; } } @@ -3222,12 +3222,12 @@ static void TrackReportedULHARQResend(packet_info *pinfo, tvbuff_t *tvb, int off thisData->length = tvb_reported_length_remaining(tvb, offset); tvb_memcpy(tvb, thisData->data, offset, MIN(thisData->length, MAX_EXPECTED_PDU_LENGTH)); thisData->ndi = p_mac_lte_info->detailed_phy_info.ul_info.ndi; - thisData->framenum = pinfo->fd->num; + thisData->framenum = pinfo->num; thisData->received_time = pinfo->abs_ts; } else { /* Not first time, so just get what's already stored in result */ - result = (ULHARQResult *)g_hash_table_lookup(mac_lte_ul_harq_result_hash, GUINT_TO_POINTER(pinfo->fd->num)); + result = (ULHARQResult *)g_hash_table_lookup(mac_lte_ul_harq_result_hash, GUINT_TO_POINTER(pinfo->num)); } /* Show any link back to previous Tx */ @@ -3332,7 +3332,7 @@ static void TrackSRInfo(SREvent event, packet_info *pinfo, proto_tree *tree, /* Got another grant - fine */ /* update state */ - state->lastGrantFramenum = pinfo->fd->num; + state->lastGrantFramenum = pinfo->num; break; case SR_Request: @@ -3340,12 +3340,12 @@ static void TrackSRInfo(SREvent event, packet_info *pinfo, proto_tree *tree, /* Update state */ state->status = SR_Outstanding; - state->lastSRFramenum = pinfo->fd->num; + state->lastSRFramenum = pinfo->num; break; case SR_Failure: /* This is an error, since we hadn't send an SR... */ - result = GetSRResult(pinfo->fd->num, TRUE); + result = GetSRResult(pinfo->num, TRUE); result->type = InvalidSREvent; result->status = None; result->event = SR_Failure; @@ -3365,7 +3365,7 @@ static void TrackSRInfo(SREvent event, packet_info *pinfo, proto_tree *tree, state->status = None; /* Set result info */ - result = GetSRResult(pinfo->fd->num, TRUE); + result = GetSRResult(pinfo->num, TRUE); result->type = GrantAnsweringSR; result->frameNum = state->lastSRFramenum; result->timeDifference = timeSinceRequest; @@ -3373,13 +3373,13 @@ static void TrackSRInfo(SREvent event, packet_info *pinfo, proto_tree *tree, /* Also set forward link for SR */ resultForSRFrame = GetSRResult(state->lastSRFramenum, TRUE); resultForSRFrame->type = SRLeadingToGrant; - resultForSRFrame->frameNum = pinfo->fd->num; + resultForSRFrame->frameNum = pinfo->num; resultForSRFrame->timeDifference = timeSinceRequest; break; case SR_Request: /* Another request when already have one pending */ - result = GetSRResult(pinfo->fd->num, TRUE); + result = GetSRResult(pinfo->num, TRUE); result->type = InvalidSREvent; result->status = SR_Outstanding; result->event = SR_Request; @@ -3392,7 +3392,7 @@ static void TrackSRInfo(SREvent event, packet_info *pinfo, proto_tree *tree, state->status = SR_Failed; /* Set result info for failure frame */ - result = GetSRResult(pinfo->fd->num, TRUE); + result = GetSRResult(pinfo->num, TRUE); result->type = FailureAnsweringSR; result->frameNum = state->lastSRFramenum; result->timeDifference = timeSinceRequest; @@ -3400,7 +3400,7 @@ static void TrackSRInfo(SREvent event, packet_info *pinfo, proto_tree *tree, /* Also set forward link for SR */ resultForSRFrame = GetSRResult(state->lastSRFramenum, TRUE); resultForSRFrame->type = SRLeadingToFailure; - resultForSRFrame->frameNum = pinfo->fd->num; + resultForSRFrame->frameNum = pinfo->num; resultForSRFrame->timeDifference = timeSinceRequest; break; } @@ -3421,14 +3421,14 @@ static void TrackSRInfo(SREvent event, packet_info *pinfo, proto_tree *tree, state->status = SR_Outstanding; - result = GetSRResult(pinfo->fd->num, TRUE); + result = GetSRResult(pinfo->num, TRUE); result->status = SR_Outstanding; result->event = SR_Request; break; case SR_Failure: /* 2 failures in a row.... */ - result = GetSRResult(pinfo->fd->num, TRUE); + result = GetSRResult(pinfo->num, TRUE); result->type = InvalidSREvent; result->status = SR_Failed; result->event = SR_Failure; @@ -3439,7 +3439,7 @@ static void TrackSRInfo(SREvent event, packet_info *pinfo, proto_tree *tree, } /* Get stored result for this frame */ - result = GetSRResult(pinfo->fd->num, FALSE); + result = GetSRResult(pinfo->num, FALSE); if (result == NULL) { /* For an SR frame, there should always be either a PDCCH grant or indication that the SR has failed */ @@ -3533,7 +3533,7 @@ static guint16 count_ues_tti(mac_lte_info *p_mac_lte_info, packet_info *pinfo) tti_info_t *tti_info; /* Just return any previous result */ - TTIInfoResult_t *result = (TTIInfoResult_t *)g_hash_table_lookup(mac_lte_tti_info_result_hash, GUINT_TO_POINTER(pinfo->fd->num)); + TTIInfoResult_t *result = (TTIInfoResult_t *)g_hash_table_lookup(mac_lte_tti_info_result_hash, GUINT_TO_POINTER(pinfo->num)); if (result != NULL) { return result->ues_in_tti; } @@ -3576,7 +3576,7 @@ static guint16 count_ues_tti(mac_lte_info *p_mac_lte_info, packet_info *pinfo) result = wmem_new(wmem_file_scope(), TTIInfoResult_t); result->ues_in_tti = tti_info->ues_in_tti; g_hash_table_insert(mac_lte_tti_info_result_hash, - GUINT_TO_POINTER(pinfo->fd->num), result); + GUINT_TO_POINTER(pinfo->num), result); return tti_info->ues_in_tti; } @@ -3586,7 +3586,7 @@ static guint16 count_ues_tti(mac_lte_info *p_mac_lte_info, packet_info *pinfo) static void show_ues_tti(packet_info *pinfo, mac_lte_info *p_mac_lte_info, tvbuff_t *tvb, proto_tree *context_tree) { /* Look up result */ - TTIInfoResult_t *result = (TTIInfoResult_t *)g_hash_table_lookup(mac_lte_tti_info_result_hash, GUINT_TO_POINTER(pinfo->fd->num)); + TTIInfoResult_t *result = (TTIInfoResult_t *)g_hash_table_lookup(mac_lte_tti_info_result_hash, GUINT_TO_POINTER(pinfo->num)); if (result != NULL) { proto_item *ti = proto_tree_add_uint(context_tree, (p_mac_lte_info->direction == DIRECTION_UPLINK) ? @@ -4157,7 +4157,7 @@ static void dissect_ulsch_or_dlsch(tvbuff_t *tvb, packet_info *pinfo, proto_tree } /* Get pointer to result struct for this frame */ - crResult = (ContentionResolutionResult *)g_hash_table_lookup(mac_lte_cr_result_hash, GUINT_TO_POINTER(pinfo->fd->num)); + crResult = (ContentionResolutionResult *)g_hash_table_lookup(mac_lte_cr_result_hash, GUINT_TO_POINTER(pinfo->num)); if (crResult == NULL) { /* Need to set result by looking for and comparing with Msg3 */ @@ -4166,7 +4166,7 @@ static void dissect_ulsch_or_dlsch(tvbuff_t *tvb, packet_info *pinfo, proto_tree /* Allocate result and add it to the table */ crResult = wmem_new(wmem_file_scope(), ContentionResolutionResult); - g_hash_table_insert(mac_lte_cr_result_hash, GUINT_TO_POINTER(pinfo->fd->num), crResult); + g_hash_table_insert(mac_lte_cr_result_hash, GUINT_TO_POINTER(pinfo->num), crResult); /* Look for Msg3 */ msg3Data = (Msg3Data *)g_hash_table_lookup(mac_lte_msg3_hash, GUINT_TO_POINTER(msg3Key)); @@ -5041,7 +5041,7 @@ static void dissect_ulsch_or_dlsch(tvbuff_t *tvb, packet_info *pinfo, proto_tree } /* Fill in data details */ - data->framenum = pinfo->fd->num; + data->framenum = pinfo->num; tvb_memcpy(tvb, data->data, offset, data_length); data->msg3Time = pinfo->abs_ts; } @@ -6666,7 +6666,7 @@ void set_mac_lte_drx_config(guint16 ueid, drx_config_t *drx_config, packet_info /* Copy in new config */ ue_params->drx_state.config = *drx_config; /* Remember frame when current settings set */ - ue_params->drx_state.config.frameNum = pinfo->fd->num; + ue_params->drx_state.config.frameNum = pinfo->num; /* Also remember any previous config frame number */ ue_params->drx_state.config.previousFrameNum = previousFrameNum; } diff --git a/epan/dissectors/packet-mbim.c b/epan/dissectors/packet-mbim.c index 7c988a2f7e..5d72ec3b27 100644 --- a/epan/dissectors/packet-mbim.c +++ b/epan/dissectors/packet-mbim.c @@ -3802,7 +3802,7 @@ dissect_mbim_control(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void * mbim_conv->open = wmem_tree_new(wmem_file_scope()); mbim_conv->cellular_class = 0; mbim_conv->open_count = 0; - wmem_tree_insert32(mbim_conv->open, PINFO_FD_NUM(pinfo), GUINT_TO_POINTER(mbim_conv->open_count)); + wmem_tree_insert32(mbim_conv->open, pinfo->num, GUINT_TO_POINTER(mbim_conv->open_count)); conversation_add_proto_data(conversation, proto_mbim, mbim_conv); } @@ -3827,7 +3827,7 @@ dissect_mbim_control(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void * if (!PINFO_FD_VISITED(pinfo)) { mbim_conv->open_count++; - wmem_tree_insert32(mbim_conv->open, PINFO_FD_NUM(pinfo), GUINT_TO_POINTER(mbim_conv->open_count)); + wmem_tree_insert32(mbim_conv->open, pinfo->num, GUINT_TO_POINTER(mbim_conv->open_count)); } max_ctrl_transfer = tvb_get_letohl(tvb, offset); if (max_ctrl_transfer == 8) { @@ -3873,13 +3873,13 @@ dissect_mbim_control(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void * frag_tvb = tvb; } - open_count = GPOINTER_TO_UINT(wmem_tree_lookup32_le(mbim_conv->open, PINFO_FD_NUM(pinfo))); + open_count = GPOINTER_TO_UINT(wmem_tree_lookup32_le(mbim_conv->open, pinfo->num)); trans_id_key = ((guint64)open_count << 32) | trans_id; if (!PINFO_FD_VISITED(pinfo)) { p_trans_id_key = wmem_new(wmem_file_scope(), guint64); *p_trans_id_key = trans_id_key; mbim_info = wmem_new(wmem_file_scope(), struct mbim_info); - mbim_info->req_frame = PINFO_FD_NUM(pinfo); + mbim_info->req_frame = pinfo->num; mbim_info->resp_frame = 0; wmem_map_insert(mbim_conv->trans, p_trans_id_key, mbim_info); } else { @@ -4334,12 +4334,12 @@ dissect_mbim_control(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void * } break; case MBIM_FUNCTION_ERROR_MSG: - open_count = GPOINTER_TO_UINT(wmem_tree_lookup32_le(mbim_conv->open, PINFO_FD_NUM(pinfo))); + open_count = GPOINTER_TO_UINT(wmem_tree_lookup32_le(mbim_conv->open, pinfo->num)); trans_id_key = ((guint64)open_count << 32) | trans_id; mbim_info = (struct mbim_info *)wmem_map_lookup(mbim_conv->trans, &trans_id_key); if (!PINFO_FD_VISITED(pinfo)) { if (mbim_info) { - mbim_info->resp_frame = PINFO_FD_NUM(pinfo); + mbim_info->resp_frame = pinfo->num; } } else { if (mbim_info && mbim_info->req_frame) { @@ -4390,12 +4390,12 @@ dissect_mbim_control(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void * } if (msg_type == MBIM_COMMAND_DONE) { - open_count = GPOINTER_TO_UINT(wmem_tree_lookup32_le(mbim_conv->open, PINFO_FD_NUM(pinfo))); + open_count = GPOINTER_TO_UINT(wmem_tree_lookup32_le(mbim_conv->open, pinfo->num)); trans_id_key = ((guint64)open_count << 32) | trans_id; mbim_info = (struct mbim_info *)wmem_map_lookup(mbim_conv->trans, &trans_id_key); if (!PINFO_FD_VISITED(pinfo)) { if (mbim_info) { - mbim_info->resp_frame = PINFO_FD_NUM(pinfo); + mbim_info->resp_frame = pinfo->num; } } else { if (mbim_info && mbim_info->req_frame) { diff --git a/epan/dissectors/packet-mbtcp.c b/epan/dissectors/packet-mbtcp.c index 2316ea4f82..8b2f3a423d 100644 --- a/epan/dissectors/packet-mbtcp.c +++ b/epan/dissectors/packet-mbtcp.c @@ -1126,7 +1126,7 @@ dissect_modbus_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *modbus_tr request_data = (modbus_request_info_t *)wmem_list_frame_data(frame); req_frame_num = request_data->fnum; req_function_code = request_data->function_code; - if ((pinfo->fd->num > req_frame_num) && (req_function_code == function_code)) { + if ((pinfo->num > req_frame_num) && (req_function_code == function_code)) { request_frame_item = proto_tree_add_uint(modbus_tree, hf_modbus_request_frame, tvb, 0, 0, req_frame_num); reg_base = request_data->base_address; PROTO_ITEM_SET_GENERATED(request_frame_item); @@ -1481,7 +1481,7 @@ dissect_modbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) modbus_request_info_t *frame_ptr = wmem_new(wmem_file_scope(), modbus_request_info_t); /* load information into the modbus request frame */ - frame_ptr->fnum = pinfo->fd->num; + frame_ptr->fnum = pinfo->num; frame_ptr->function_code = function_code; frame_ptr->base_address = tvb_get_ntohs(tvb, 1); frame_ptr->num_reg = tvb_get_ntohs(tvb, 3); diff --git a/epan/dissectors/packet-mgcp.c b/epan/dissectors/packet-mgcp.c index 798b4321ae..126558db57 100644 --- a/epan/dissectors/packet-mgcp.c +++ b/epan/dissectors/packet-mgcp.c @@ -1271,7 +1271,7 @@ static void dissect_mgcp_firstline(tvbuff_t *tvb, packet_info *pinfo, proto_tree to which the call was sent. */ if (pinfo->ptype == PT_TCP) { - conversation = find_conversation(pinfo->fd->num, &pinfo->src, + conversation = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst, pinfo->ptype, pinfo->srcport, pinfo->destport, 0); } @@ -1282,7 +1282,7 @@ static void dissect_mgcp_firstline(tvbuff_t *tvb, packet_info *pinfo, proto_tree * pointer for the second address argument even * if you do that. */ - conversation = find_conversation(pinfo->fd->num, &null_address, + conversation = find_conversation(pinfo->num, &null_address, &pinfo->dst, pinfo->ptype, pinfo->srcport, pinfo->destport, 0); } @@ -1318,13 +1318,13 @@ static void dissect_mgcp_firstline(tvbuff_t *tvb, packet_info *pinfo, proto_tree /* We have not yet seen a response to that call, so this must be the first response; remember its frame number. */ - mgcp_call->rsp_num = pinfo->fd->num; + mgcp_call->rsp_num = pinfo->num; } else { /* We have seen a response to this call - but was it *this* response? (disregard provisional responses) */ - if ((mgcp_call->rsp_num != pinfo->fd->num) && + if ((mgcp_call->rsp_num != pinfo->num) && (mi->rspcode >= 200) && (mi->rspcode == mgcp_call->rspcode)) { @@ -1374,7 +1374,7 @@ static void dissect_mgcp_firstline(tvbuff_t *tvb, packet_info *pinfo, proto_tree */ if (pinfo->ptype == PT_TCP) { - conversation = find_conversation(pinfo->fd->num, &pinfo->src, + conversation = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst, pinfo->ptype, pinfo->srcport, pinfo->destport, 0); } @@ -1386,7 +1386,7 @@ static void dissect_mgcp_firstline(tvbuff_t *tvb, packet_info *pinfo, proto_tree * pointer for the second address argument even * if you do that. */ - conversation = find_conversation(pinfo->fd->num, &pinfo->src, + conversation = find_conversation(pinfo->num, &pinfo->src, &null_address, pinfo->ptype, pinfo->srcport, pinfo->destport, 0); } @@ -1395,13 +1395,13 @@ static void dissect_mgcp_firstline(tvbuff_t *tvb, packet_info *pinfo, proto_tree /* It's not part of any conversation - create a new one. */ if (pinfo->ptype == PT_TCP) { - conversation = conversation_new(pinfo->fd->num, &pinfo->src, + conversation = conversation_new(pinfo->num, &pinfo->src, &pinfo->dst, pinfo->ptype, pinfo->srcport, pinfo->destport, 0); } else { - conversation = conversation_new(pinfo->fd->num, &pinfo->src, + conversation = conversation_new(pinfo->num, &pinfo->src, &null_address, pinfo->ptype, pinfo->srcport, pinfo->destport, 0); } @@ -1418,7 +1418,7 @@ static void dissect_mgcp_firstline(tvbuff_t *tvb, packet_info *pinfo, proto_tree /* We've seen a request with this TRANSID, with the same source and destination, before - but was it *this* request? */ - if (pinfo->fd->num != mgcp_call->req_num) + if (pinfo->num != mgcp_call->req_num) { /* No, so it's a duplicate request. Mark it as such. */ mi->is_duplicate = TRUE; @@ -1448,7 +1448,7 @@ static void dissect_mgcp_firstline(tvbuff_t *tvb, packet_info *pinfo, proto_tree new_mgcp_call_key = (mgcp_call_info_key *)wmem_alloc(wmem_file_scope(), sizeof(*new_mgcp_call_key)); *new_mgcp_call_key = mgcp_call_key; mgcp_call = (mgcp_call_t *)wmem_alloc(wmem_file_scope(), sizeof(*mgcp_call)); - mgcp_call->req_num = pinfo->fd->num; + mgcp_call->req_num = pinfo->num; mgcp_call->rsp_num = 0; mgcp_call->transid = mi->transid; mgcp_call->responded = FALSE; diff --git a/epan/dissectors/packet-mmse.c b/epan/dissectors/packet-mmse.c index 1c3e62b752..9f392ddcf0 100644 --- a/epan/dissectors/packet-mmse.c +++ b/epan/dissectors/packet-mmse.c @@ -659,7 +659,7 @@ dissect_mmse_standalone(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi const char *message_type; DebugLog(("dissect_mmse_standalone() - START (Packet %u)\n", - pinfo->fd->num)); + pinfo->num)); pdut = tvb_get_guint8(tvb, 1); message_type = val_to_str(pdut, vals_message_type, "Unknown type %u"); @@ -680,7 +680,7 @@ dissect_mmse_encapsulated(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, v const char *message_type; DebugLog(("dissect_mmse_encapsulated() - START (Packet %u)\n", - pinfo->fd->num)); + pinfo->num)); pdut = tvb_get_guint8(tvb, 1); message_type = val_to_str(pdut, vals_message_type, "Unknown type %u"); @@ -708,7 +708,7 @@ dissect_mmse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint8 pdut, proto_item *ti = NULL; proto_tree *mmse_tree = NULL; - DebugLog(("dissect_mmse() - START (Packet %u)\n", pinfo->fd->num)); + DebugLog(("dissect_mmse() - START (Packet %u)\n", pinfo->num)); /* If tree == NULL then we are only interested in protocol dissection * up to reassembly and handoff to subdissectors if applicable; the diff --git a/epan/dissectors/packet-mp2t.c b/epan/dissectors/packet-mp2t.c index 0ffc5ab119..10cf9b126b 100644 --- a/epan/dissectors/packet-mp2t.c +++ b/epan/dissectors/packet-mp2t.c @@ -267,7 +267,7 @@ static const fragment_items mp2t_msg_frag_items = { * | +-> pid_analysis_data * | +-> pid_analysis_data * | - * +-> frame_table (RB tree) (key: pinfo->fd->num) + * +-> frame_table (RB tree) (key: pinfo->num) * | * +-> frame_analysis_data (only created if drop detected) * | @@ -391,7 +391,7 @@ init_frame_analysis_data(mp2t_analysis_data_t *mp2t_data, packet_info *pinfo) frame_analysis_data_p = wmem_new0(wmem_file_scope(), struct frame_analysis_data); frame_analysis_data_p->ts_table = wmem_tree_new(wmem_file_scope()); /* Insert into mp2t tree */ - wmem_tree_insert32(mp2t_data->frame_table, pinfo->fd->num, + wmem_tree_insert32(mp2t_data->frame_table, pinfo->num, (void *)frame_analysis_data_p); return frame_analysis_data_p; @@ -402,7 +402,7 @@ static frame_analysis_data_t * get_frame_analysis_data(mp2t_analysis_data_t *mp2t_data, packet_info *pinfo) { frame_analysis_data_t *frame_analysis_data_p; - frame_analysis_data_p = (frame_analysis_data_t *)wmem_tree_lookup32(mp2t_data->frame_table, pinfo->fd->num); + frame_analysis_data_p = (frame_analysis_data_t *)wmem_tree_lookup32(mp2t_data->frame_table, pinfo->num); return frame_analysis_data_p; } diff --git a/epan/dissectors/packet-mq.c b/epan/dissectors/packet-mq.c index 5fcb53962a..bf351d03ab 100644 --- a/epan/dissectors/packet-mq.c +++ b/epan/dissectors/packet-mq.c @@ -3969,7 +3969,7 @@ static int reassemble_mq(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, vo mq_tree = tree; } - if (fd_head != NULL && pinfo->fd->num == fd_head->reassembled_in) + if (fd_head != NULL && pinfo->num == fd_head->reassembled_in) { tvbuff_t *next_tvb; diff --git a/epan/dissectors/packet-ms-mms.c b/epan/dissectors/packet-ms-mms.c index 8db8a81044..f4498a16a9 100644 --- a/epan/dissectors/packet-ms-mms.c +++ b/epan/dissectors/packet-ms-mms.c @@ -1131,13 +1131,13 @@ static void msmms_data_add_address(packet_info *pinfo, address *addr, port_type /* Check if the ip address and port combination is not * already registered as a conversation. */ - p_conv = find_conversation(pinfo->fd->num, addr, &null_addr, pt, port, 0, + p_conv = find_conversation(pinfo->num, addr, &null_addr, pt, port, 0, NO_ADDR_B | NO_PORT_B); /* If not, create a new conversation. */ if (!p_conv) { - p_conv = conversation_new(pinfo->fd->num, addr, &null_addr, pt, + p_conv = conversation_new(pinfo->num, addr, &null_addr, pt, (guint32)port, 0, NO_ADDR2 | NO_PORT2); } diff --git a/epan/dissectors/packet-msproxy.c b/epan/dissectors/packet-msproxy.c index 7c2094839f..1dfd049548 100644 --- a/epan/dissectors/packet-msproxy.c +++ b/epan/dissectors/packet-msproxy.c @@ -204,7 +204,7 @@ static int msproxy_sub_dissector( tvbuff_t *tvb, packet_info *pinfo, proto_tree *msp_tree; proto_item *ti; - 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); DISSECTOR_ASSERT( conversation); /* should always find a conversation */ @@ -279,12 +279,12 @@ static void add_msproxy_conversation( packet_info *pinfo, return; } - conversation = find_conversation( pinfo->fd->num, &pinfo->src, + conversation = find_conversation( pinfo->num, &pinfo->src, &pinfo->dst, (port_type)hash_info->proto, hash_info->server_int_port, hash_info->clnt_port, 0); if ( !conversation) { - conversation = conversation_new( pinfo->fd->num, &pinfo->src, &pinfo->dst, + conversation = conversation_new( pinfo->num, &pinfo->src, &pinfo->dst, (port_type)hash_info->proto, hash_info->server_int_port, hash_info->clnt_port, 0); } diff --git a/epan/dissectors/packet-msrp.c b/epan/dissectors/packet-msrp.c index 9a6508c587..274218a2a4 100644 --- a/epan/dissectors/packet-msrp.c +++ b/epan/dissectors/packet-msrp.c @@ -171,14 +171,14 @@ msrp_add_address( packet_info *pinfo, * Check if the ip address and port combination is not * already registered as a conversation. */ - p_conv = find_conversation( pinfo->fd->num, addr, &null_addr, PT_TCP, port, 0, + p_conv = find_conversation( pinfo->num, addr, &null_addr, PT_TCP, port, 0, NO_ADDR_B | NO_PORT_B); /* * If not, create a new conversation. */ if (!p_conv) { - p_conv = conversation_new( pinfo->fd->num, addr, &null_addr, PT_TCP, + p_conv = conversation_new( pinfo->num, addr, &null_addr, PT_TCP, (guint32)port, 0, NO_ADDR2 | NO_PORT2); } @@ -224,7 +224,7 @@ show_setup_info(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (!p_conv_data) { /* First time, get info from conversation */ - 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, PT_TCP, pinfo->destport, pinfo->srcport, 0); @@ -420,11 +420,11 @@ dissect_msrp_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat */ if (pinfo->fd->flags.visited){ /* Look for existing conversation */ - conversation = find_conversation(pinfo->fd->num, &pinfo->src, &pinfo->dst, pinfo->ptype, + conversation = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst, pinfo->ptype, pinfo->srcport, pinfo->destport, 0); /* Create new one if not found */ if (conversation == NULL){ - conversation = conversation_new(pinfo->fd->num, &pinfo->src, &pinfo->dst, + conversation = conversation_new(pinfo->num, &pinfo->src, &pinfo->dst, pinfo->ptype, pinfo->srcport, pinfo->destport, 0); /* Set dissector */ conversation_set_dissector(conversation, msrp_handle); diff --git a/epan/dissectors/packet-mswsp.c b/epan/dissectors/packet-mswsp.c index b2a240f2e1..e38a3f36b1 100644 --- a/epan/dissectors/packet-mswsp.c +++ b/epan/dissectors/packet-mswsp.c @@ -692,7 +692,7 @@ static gboolean get_fid_and_frame(packet_info *pinfo, guint32 *fid, guint *frame if (!p_smb_level) { return FALSE; } - *frame = pinfo->fd->num; + *frame = pinfo->num; if (*p_smb_level == SMB1) { smb_info_t *si = (smb_info_t*)data; smb_fid_info_t *info; @@ -706,7 +706,7 @@ static gboolean get_fid_and_frame(packet_info *pinfo, guint32 *fid, guint *frame guint32 open_frame = 0, close_frame = 0; char *fid_name = NULL; if (si2->saved) { - dcerpc_fetch_polhnd_data(&si2->saved->policy_hnd, &fid_name, NULL, &open_frame, &close_frame, pinfo->fd->num); + dcerpc_fetch_polhnd_data(&si2->saved->policy_hnd, &fid_name, NULL, &open_frame, &close_frame, pinfo->num); *fid = open_frame; } else { result = FALSE; @@ -8090,7 +8090,7 @@ static int dissect_mswsp_smb2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre } if (si->saved) { - dcerpc_fetch_polhnd_data(&si->saved->policy_hnd, &fid_name, NULL, &open_frame, &close_frame, pinfo->fd->num); + dcerpc_fetch_polhnd_data(&si->saved->policy_hnd, &fid_name, NULL, &open_frame, &close_frame, pinfo->num); } if (!fid_name || strcmp(fid_name, "File: MsFteWds") != 0) { diff --git a/epan/dissectors/packet-mtp3.c b/epan/dissectors/packet-mtp3.c index 40d1dfb9c1..f047786318 100644 --- a/epan/dissectors/packet-mtp3.c +++ b/epan/dissectors/packet-mtp3.c @@ -657,19 +657,19 @@ heur_mtp3_standard(tvbuff_t *tvb, packet_info *pinfo, guint8 si) case MTP_SI_SCCP: { payload = tvb_new_subset_remaining(tvb, ITU_HEADER_LENGTH); - if (looks_like_valid_sccp(PINFO_FD_NUM(pinfo), payload, ITU_STANDARD)) { + if (looks_like_valid_sccp(pinfo->num, payload, ITU_STANDARD)) { return ITU_STANDARD; } payload = tvb_new_subset_remaining(tvb, ANSI_HEADER_LENGTH); - if (looks_like_valid_sccp(PINFO_FD_NUM(pinfo), payload, ANSI_STANDARD)) { + if (looks_like_valid_sccp(pinfo->num, payload, ANSI_STANDARD)) { return ANSI_STANDARD; } payload = tvb_new_subset_remaining(tvb, ANSI_HEADER_LENGTH); - if (looks_like_valid_sccp(PINFO_FD_NUM(pinfo), payload, CHINESE_ITU_STANDARD)) { + if (looks_like_valid_sccp(pinfo->num, payload, CHINESE_ITU_STANDARD)) { return CHINESE_ITU_STANDARD; } payload = tvb_new_subset_remaining(tvb, JAPAN_HEADER_LENGTH); - if (looks_like_valid_sccp(PINFO_FD_NUM(pinfo), payload, JAPAN_STANDARD)) { + if (looks_like_valid_sccp(pinfo->num, payload, JAPAN_STANDARD)) { return JAPAN_STANDARD; } diff --git a/epan/dissectors/packet-mysql.c b/epan/dissectors/packet-mysql.c index 158dc0b160..fe79babaab 100644 --- a/epan/dissectors/packet-mysql.c +++ b/epan/dissectors/packet-mysql.c @@ -1004,7 +1004,7 @@ mysql_dissect_login(tvbuff_t *tvb, packet_info *pinfo, int offset, if (!(conn_data->frame_start_ssl) && conn_data->clnt_caps & MYSQL_CAPS_SL) /* Next packet will be use SSL */ { col_set_str(pinfo->cinfo, COL_INFO, "Response: SSL Handshake"); - conn_data->frame_start_ssl = pinfo->fd->num; + conn_data->frame_start_ssl = pinfo->num; ssl_starttls_ack(ssl_handle, pinfo, mysql_handle); } if (conn_data->clnt_caps & MYSQL_CAPS_CU) /* 4.1 protocol */ diff --git a/epan/dissectors/packet-nbap.c b/epan/dissectors/packet-nbap.c index 8c1a9f6b8e..ec34e0d838 100644 --- a/epan/dissectors/packet-nbap.c +++ b/epan/dissectors/packet-nbap.c @@ -10296,7 +10296,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){ @@ -18226,7 +18226,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) @@ -18486,7 +18486,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*/ @@ -18521,7 +18521,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) @@ -18636,24 +18636,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); @@ -18672,7 +18672,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; @@ -23344,12 +23344,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); @@ -23364,7 +23364,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; @@ -23789,19 +23789,19 @@ dissect_nbap_HSDSCH_FDD_Information(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_ 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); @@ -23816,7 +23816,7 @@ dissect_nbap_HSDSCH_FDD_Information(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_ 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; @@ -24122,7 +24122,7 @@ dissect_nbap_HSDSCH_Information_to_Modify(tvbuff_t *tvb _U_, int offset _U_, asn 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){ @@ -24130,7 +24130,7 @@ dissect_nbap_HSDSCH_Information_to_Modify(tvbuff_t *tvb _U_, int offset _U_, asn 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); @@ -24139,7 +24139,7 @@ dissect_nbap_HSDSCH_Information_to_Modify(tvbuff_t *tvb _U_, int offset _U_, asn /* 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); @@ -24154,7 +24154,7 @@ dissect_nbap_HSDSCH_Information_to_Modify(tvbuff_t *tvb _U_, int offset _U_, asn 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; @@ -24190,7 +24190,7 @@ dissect_nbap_HSDSCH_Information_to_Modify(tvbuff_t *tvb _U_, int offset _U_, asn } } nbap_debug("Frame %u HSDSCH-MACdFlows-Information End", - actx->pinfo->fd->num); + actx->pinfo->num); } @@ -28067,7 +28067,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; } @@ -28664,13 +28664,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); @@ -28684,7 +28684,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; @@ -28741,9 +28741,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); } @@ -28802,7 +28802,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) { @@ -28817,7 +28817,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); @@ -28830,7 +28830,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; @@ -28862,7 +28862,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, @@ -28889,7 +28889,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); } } @@ -32371,13 +32371,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); @@ -32390,7 +32390,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; @@ -32536,13 +32536,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); @@ -32555,7 +32555,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; @@ -32567,7 +32567,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++) { @@ -32616,7 +32616,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); } @@ -32679,13 +32679,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); @@ -32698,7 +32698,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; @@ -55208,14 +55208,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); @@ -55230,7 +55230,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; diff --git a/epan/dissectors/packet-nbd.c b/epan/dissectors/packet-nbd.c index 456a28bc0c..c89c62545a 100644 --- a/epan/dissectors/packet-nbd.c +++ b/epan/dissectors/packet-nbd.c @@ -103,7 +103,7 @@ get_nbd_tcp_pdu_len(packet_info *pinfo, tvbuff_t *tvb, int offset, void *data _U /* * Do we have a conversation for this connection? */ - conversation = find_conversation(pinfo->fd->num, + conversation = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst, pinfo->ptype, pinfo->srcport, pinfo->destport, 0); @@ -139,7 +139,7 @@ get_nbd_tcp_pdu_len(packet_info *pinfo, tvbuff_t *tvb, int offset, void *data _U */ handle[0]=tvb_get_ntohl(tvb, offset+8); handle[1]=tvb_get_ntohl(tvb, offset+12); - packet=pinfo->fd->num; + packet=pinfo->num; hkey[0].length=1; hkey[0].key=&packet; hkey[1].length=2; @@ -225,7 +225,7 @@ dissect_nbd_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, if(magic==NBD_REQUEST_MAGIC){ /* This is a request */ nbd_trans=wmem_new(wmem_file_scope(), nbd_transaction_t); - nbd_trans->req_frame=pinfo->fd->num; + nbd_trans->req_frame=pinfo->num; nbd_trans->rep_frame=0; nbd_trans->req_time=pinfo->abs_ts; nbd_trans->type=tvb_get_ntohl(tvb, offset); @@ -243,7 +243,7 @@ dissect_nbd_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, nbd_trans=(nbd_transaction_t *)wmem_tree_lookup32_array(nbd_info->unacked_pdus, hkey); if(nbd_trans){ - nbd_trans->rep_frame=pinfo->fd->num; + nbd_trans->rep_frame=pinfo->num; hkey[0].length=1; hkey[0].key=&nbd_trans->rep_frame; @@ -260,7 +260,7 @@ dissect_nbd_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, } } } else { - packet=pinfo->fd->num; + packet=pinfo->num; hkey[0].length=1; hkey[0].key=&packet; hkey[1].length=2; @@ -274,7 +274,7 @@ dissect_nbd_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, */ if( (magic==NBD_RESPONSE_MAGIC) && (nbd_trans) - && (pinfo->fd->num<nbd_trans->req_frame) ){ + && (pinfo->num<nbd_trans->req_frame) ){ /* must have been the wrong one */ nbd_trans=NULL; } diff --git a/epan/dissectors/packet-ncp.c b/epan/dissectors/packet-ncp.c index f74714caf9..40d50b9720 100644 --- a/epan/dissectors/packet-ncp.c +++ b/epan/dissectors/packet-ncp.c @@ -698,7 +698,7 @@ mncp_hash_insert(conversation_t *conversation, guint32 nwconnection, guint8 nwta if (ncp_echo_conn && nwconnection != 65535) { expert_add_info_format(pinfo, NULL, &ei_ncp_new_server_session, "Detected New Server Session. Connection %d, Task %d", nwconnection, nwtask); - value->session_start_packet_num = pinfo->fd->num; + value->session_start_packet_num = pinfo->num; } return value; @@ -846,7 +846,7 @@ dissect_ncp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, * determine if a new server session is occuring for this * connection. */ - conversation = find_conversation(pinfo->fd->num, &pinfo->src, &pinfo->dst, + conversation = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst, PT_NCP, (guint32) pinfo->srcport, (guint32) pinfo->destport, 0); if ((ncpiph.length & 0x80000000) || ncpiph.signature == NCPIP_RPLY) { @@ -870,7 +870,7 @@ dissect_ncp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, /* It's not part of any conversation * - create a new one. */ - conversation = conversation_new(pinfo->fd->num, &pinfo->src, + conversation = conversation_new(pinfo->num, &pinfo->src, &pinfo->dst, PT_NCP, (guint32) pinfo->srcport, (guint32) pinfo->destport, 0); mncp_hash_insert(conversation, nw_connection, header.task, pinfo); } @@ -889,7 +889,7 @@ dissect_ncp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, /* Get request value data */ request_value = mncp_hash_lookup(conversation, nw_connection, header.task); if (request_value) { - if ((request_value->session_start_packet_num == pinfo->fd->num) && ncp_echo_conn) { + if ((request_value->session_start_packet_num == pinfo->num) && ncp_echo_conn) { expert_add_info_format(pinfo, NULL, &ei_ncp_new_server_session, "Detected New Server Session. Connection %d, Task %d", nw_connection, header.task); } } @@ -912,7 +912,7 @@ dissect_ncp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, /* It's not part of any conversation * - create a new one. */ - conversation = conversation_new(pinfo->fd->num, &pinfo->src, + conversation = conversation_new(pinfo->num, &pinfo->src, &pinfo->dst, PT_NCP, (guint32) pinfo->srcport, (guint32) pinfo->destport, 0); mncp_hash_insert(conversation, nw_connection, header.task, pinfo); } @@ -922,7 +922,7 @@ dissect_ncp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, } else { request_value = mncp_hash_lookup(conversation, nw_connection, header.task); if (request_value) { - if ((request_value->session_start_packet_num == pinfo->fd->num) && ncp_echo_conn) { + if ((request_value->session_start_packet_num == pinfo->num) && ncp_echo_conn) { expert_add_info_format(pinfo, NULL, &ei_ncp_new_server_session, "Detected New Server Session. Connection %d, Task %d", nw_connection, header.task); } } diff --git a/epan/dissectors/packet-ndmp.c b/epan/dissectors/packet-ndmp.c index f06c269b10..1fe64719d2 100644 --- a/epan/dissectors/packet-ndmp.c +++ b/epan/dissectors/packet-ndmp.c @@ -338,11 +338,11 @@ get_itl_nexus(packet_info *pinfo, gboolean create_new) { itl_nexus_t *itl; - if(create_new || !(itl=(itl_nexus_t *)wmem_tree_lookup32_le(ndmp_conv_data->itl, pinfo->fd->num))){ + if(create_new || !(itl=(itl_nexus_t *)wmem_tree_lookup32_le(ndmp_conv_data->itl, pinfo->num))){ itl=wmem_new(wmem_file_scope(), itl_nexus_t); itl->cmdset=0xff; itl->conversation=ndmp_conv_data->conversation; - wmem_tree_insert32(ndmp_conv_data->itl, pinfo->fd->num, itl); + wmem_tree_insert32(ndmp_conv_data->itl, pinfo->num, itl); } return itl; } @@ -1369,7 +1369,7 @@ dissect_execute_cdb_cdb(tvbuff_t *tvb, int offset, packet_info *pinfo, if(ndmp_conv_data->task && !ndmp_conv_data->task->itlq){ ndmp_conv_data->task->itlq=wmem_new(wmem_file_scope(), itlq_nexus_t); ndmp_conv_data->task->itlq->lun=0xffff; - ndmp_conv_data->task->itlq->first_exchange_frame=pinfo->fd->num; + ndmp_conv_data->task->itlq->first_exchange_frame=pinfo->num; ndmp_conv_data->task->itlq->last_exchange_frame=0; ndmp_conv_data->task->itlq->scsi_opcode=0xffff; ndmp_conv_data->task->itlq->task_flags=0; @@ -3236,7 +3236,7 @@ dissect_ndmp_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* case NDMP_MESSAGE_REQUEST: if(!pinfo->fd->flags.visited){ ndmp_conv_data->task=wmem_new(wmem_file_scope(), ndmp_task_data_t); - ndmp_conv_data->task->request_frame=pinfo->fd->num; + ndmp_conv_data->task->request_frame=pinfo->num; ndmp_conv_data->task->response_frame=0; ndmp_conv_data->task->ndmp_time=pinfo->abs_ts; ndmp_conv_data->task->itlq=NULL; @@ -3255,9 +3255,9 @@ dissect_ndmp_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* ndmp_conv_data->task=(ndmp_task_data_t *)wmem_map_lookup(ndmp_conv_data->tasks, GUINT_TO_POINTER(nh.rep_seq)); if(ndmp_conv_data->task && !pinfo->fd->flags.visited){ - ndmp_conv_data->task->response_frame=pinfo->fd->num; + ndmp_conv_data->task->response_frame=pinfo->num; if(ndmp_conv_data->task->itlq){ - ndmp_conv_data->task->itlq->last_exchange_frame=pinfo->fd->num; + ndmp_conv_data->task->itlq->last_exchange_frame=pinfo->num; } } if(ndmp_conv_data->task && ndmp_conv_data->task->request_frame){ diff --git a/epan/dissectors/packet-ndps.c b/epan/dissectors/packet-ndps.c index 5883fd5ae4..ba80dfc0a3 100644 --- a/epan/dissectors/packet-ndps.c +++ b/epan/dissectors/packet-ndps.c @@ -4321,13 +4321,13 @@ ndps_defrag(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, spx_info *spx_i if (!pinfo->fd->flags.visited) { /* Lets see if this is a new conversation */ - conversation = find_conversation(pinfo->fd->num, &pinfo->src, &pinfo->dst, + conversation = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst, PT_NCP, (guint32) pinfo->srcport, (guint32) pinfo->srcport, 0); if (conversation == NULL) { /* It's not part of any conversation - create a new one. */ - conversation = conversation_new(pinfo->fd->num, &pinfo->src, &pinfo->dst, + conversation = conversation_new(pinfo->num, &pinfo->src, &pinfo->dst, PT_NCP, (guint32) pinfo->srcport, (guint32) pinfo->srcport, 0); } @@ -4357,7 +4357,7 @@ ndps_defrag(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, spx_info *spx_i request_value->ndps_frag = TRUE; } /* Now we process the fragments */ - if (request_value->ndps_frag || (request_value->ndps_end_frag == pinfo->fd->num)) + if (request_value->ndps_frag || (request_value->ndps_end_frag == pinfo->num)) { /* * Fragment @@ -4388,7 +4388,7 @@ ndps_defrag(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, spx_info *spx_i tid++; } /* Remember this fragment number so we can dissect again */ - request_value->ndps_end_frag = pinfo->fd->num; + request_value->ndps_end_frag = pinfo->num; } else @@ -4513,20 +4513,20 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g as being part of a single conversation so that we can let the user select that conversation to be displayed.) */ - conversation = find_conversation(pinfo->fd->num, &pinfo->src, &pinfo->dst, + conversation = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst, PT_NCP, (guint32) pinfo->srcport, (guint32) pinfo->srcport, 0); if (conversation == NULL) { /* It's not part of any conversation - create a new one. */ - conversation = conversation_new(pinfo->fd->num, &pinfo->src, &pinfo->dst, + conversation = conversation_new(pinfo->num, &pinfo->src, &pinfo->dst, PT_NCP, (guint32) pinfo->srcport, (guint32) pinfo->srcport, 0); } request_value = ndps_hash_insert(conversation, (guint32) pinfo->srcport); request_value->ndps_prog = ndps_prog; request_value->ndps_func = ndps_func; - request_value->ndps_frame_num = pinfo->fd->num; + request_value->ndps_frame_num = pinfo->num; } switch(ndps_prog) { @@ -6769,7 +6769,7 @@ dissect_ndps_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, int if (!pinfo->fd->flags.visited) { /* Find the conversation whence the request would have come. */ - conversation = find_conversation(pinfo->fd->num, &pinfo->src, &pinfo->dst, + conversation = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst, PT_NCP, (guint32) pinfo->destport, (guint32) pinfo->destport, 0); if (conversation != NULL) { /* find the record telling us the request made that caused diff --git a/epan/dissectors/packet-netflow.c b/epan/dissectors/packet-netflow.c index 7dd531ed15..57bb4adc84 100644 --- a/epan/dissectors/packet-netflow.c +++ b/epan/dissectors/packet-netflow.c @@ -2350,14 +2350,14 @@ static void store_sequence_analysis_info(guint32 domain_id, guint32 seqnum, unsi *result_state = *domain_state; /* Add into result table for current frame number */ - g_hash_table_insert(netflow_sequence_analysis_result_hash, GUINT_TO_POINTER(pinfo->fd->num), result_state); + g_hash_table_insert(netflow_sequence_analysis_result_hash, GUINT_TO_POINTER(pinfo->num), result_state); } /* Update domain info for the next frame to consult. Add flows(data records) for all protocol versions except for 9, which just counts exported frames */ domain_state->current_sequence_number = seqnum + ((version == 9) ? 1 : new_flows); domain_state->sequence_number_set = TRUE; - domain_state->current_frame_number = pinfo->fd->num; + domain_state->current_frame_number = pinfo->num; } /* Check for result stored indicating that sequence number wasn't as expected, and show in tree */ @@ -2367,7 +2367,7 @@ static void show_sequence_analysis_info(guint32 domain_id, guint32 seqnum, { /* Look for info stored for this frame */ netflow_domain_state_t *state = (netflow_domain_state_t *)g_hash_table_lookup(netflow_sequence_analysis_result_hash, - GUINT_TO_POINTER(pinfo->fd->num)); + GUINT_TO_POINTER(pinfo->num)); if (state != NULL) { proto_item *ti; @@ -3091,7 +3091,7 @@ dissect_v9_v10_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree, int /* Provide a link back to template frame */ ti = proto_tree_add_uint(pdutree, hf_template_frame, tvb, 0, 0, tmplt_p->template_frame_number); - if (tmplt_p->template_frame_number > pinfo->fd->num) { + if (tmplt_p->template_frame_number > pinfo->num) { proto_item_append_text(ti, " (received after this frame)"); } PROTO_ITEM_SET_GENERATED(ti); @@ -7076,10 +7076,10 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree, /* XXX - These IDs are currently hard-coded in procflow.py. */ if (got_flags == GOT_TCP_UDP && (tmplt_p->tmplt_id == 256 || tmplt_p->tmplt_id == 258)) { - add_tcp_process_info(pinfo->fd->num, &local_addr, &remote_addr, local_port, remote_port, uid, pid, uname_str, cmd_str); + add_tcp_process_info(pinfo->num, &local_addr, &remote_addr, local_port, remote_port, uid, pid, uname_str, cmd_str); } if (got_flags == GOT_TCP_UDP && (tmplt_p->tmplt_id == 257 || tmplt_p->tmplt_id == 259)) { - add_udp_process_info(pinfo->fd->num, &local_addr, &remote_addr, local_port, remote_port, uid, pid, uname_str, cmd_str); + add_udp_process_info(pinfo->num, &local_addr, &remote_addr, local_port, remote_port, uid, pid, uname_str, cmd_str); } return (guint) (offset - orig_offset); @@ -7362,7 +7362,7 @@ dissect_v9_v10_options_template(tvbuff_t *tvb, packet_info *pinfo, proto_tree *p copy_address_wmem(wmem_file_scope(), &tmplt_p->src_addr, &pinfo->net_src); copy_address_wmem(wmem_file_scope(), &tmplt_p->dst_addr, &pinfo->net_dst); /* Remember when we saw this template */ - tmplt_p->template_frame_number = pinfo->fd->num; + tmplt_p->template_frame_number = pinfo->num; /* Add completed entry into table */ g_hash_table_insert(v9_v10_tmplt_table, tmplt_p, tmplt_p); } @@ -7462,7 +7462,7 @@ dissect_v9_v10_data_template(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdut copy_address_wmem(wmem_file_scope(), &tmplt_p->src_addr, &pinfo->net_src); copy_address_wmem(wmem_file_scope(), &tmplt_p->dst_addr, &pinfo->net_dst); /* Remember when we saw this template */ - tmplt_p->template_frame_number = pinfo->fd->num; + tmplt_p->template_frame_number = pinfo->num; g_hash_table_insert(v9_v10_tmplt_table, tmplt_p, tmplt_p); /* Create if necessary observation domain entry (for use with sequence analysis) */ diff --git a/epan/dissectors/packet-nfs.c b/epan/dissectors/packet-nfs.c index e2a2a3755e..cdd9eeee18 100644 --- a/epan/dissectors/packet-nfs.c +++ b/epan/dissectors/packet-nfs.c @@ -2197,7 +2197,7 @@ dissect_fhandle_data(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree * nfs calls. For now, we don't handle this and those calls will not work properly with this feature */ - wmem_tree_insert32(nfs_fhandle_frame_table, pinfo->fd->num, old_fhd); + wmem_tree_insert32(nfs_fhandle_frame_table, pinfo->num, old_fhd); } } diff --git a/epan/dissectors/packet-nlm.c b/epan/dissectors/packet-nlm.c index cefd561afe..3230ba9555 100644 --- a/epan/dissectors/packet-nlm.c +++ b/epan/dissectors/packet-nlm.c @@ -186,7 +186,7 @@ nlm_print_msgres_reply(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb) { nlm_msg_res_matched_data *md; - md=(nlm_msg_res_matched_data *)g_hash_table_lookup(nlm_msg_res_matched, GINT_TO_POINTER(pinfo->fd->num)); + md=(nlm_msg_res_matched_data *)g_hash_table_lookup(nlm_msg_res_matched, GINT_TO_POINTER(pinfo->num)); if(md){ nstime_t ns; proto_tree_add_uint(tree, hf_nlm_request_in, tvb, 0, 0, md->req_frame); @@ -200,7 +200,7 @@ nlm_print_msgres_request(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb) { nlm_msg_res_matched_data *md; - md=(nlm_msg_res_matched_data *)g_hash_table_lookup(nlm_msg_res_matched, GINT_TO_POINTER(pinfo->fd->num)); + md=(nlm_msg_res_matched_data *)g_hash_table_lookup(nlm_msg_res_matched, GINT_TO_POINTER(pinfo->num)); if(md){ proto_tree_add_uint(tree, hf_nlm_reply_in, tvb, 0, 0, md->rep_frame); } @@ -210,7 +210,7 @@ nlm_match_fhandle_reply(packet_info *pinfo, proto_tree *tree) { nlm_msg_res_matched_data *md; - md=(nlm_msg_res_matched_data *)g_hash_table_lookup(nlm_msg_res_matched, GINT_TO_POINTER(pinfo->fd->num)); + md=(nlm_msg_res_matched_data *)g_hash_table_lookup(nlm_msg_res_matched, GINT_TO_POINTER(pinfo->num)); if(md && md->rep_frame){ dissect_fhandle_hidden(pinfo, tree, md->req_frame); @@ -221,7 +221,7 @@ nlm_match_fhandle_request(packet_info *pinfo, proto_tree *tree) { nlm_msg_res_matched_data *md; - md=(nlm_msg_res_matched_data *)g_hash_table_lookup(nlm_msg_res_matched, GINT_TO_POINTER(pinfo->fd->num)); + md=(nlm_msg_res_matched_data *)g_hash_table_lookup(nlm_msg_res_matched, GINT_TO_POINTER(pinfo->num)); if(md && md->rep_frame){ dissect_fhandle_hidden(pinfo, tree, md->rep_frame); @@ -244,7 +244,7 @@ nlm_register_unmatched_res(packet_info *pinfo, tvbuff_t *tvb, int offset) md_req=(nlm_msg_res_matched_data *)g_malloc(sizeof(nlm_msg_res_matched_data)); md_req->req_frame=old_umd->req_frame; - md_req->rep_frame=pinfo->fd->num; + md_req->rep_frame=pinfo->num; md_req->ns=old_umd->ns; md_rep=(nlm_msg_res_matched_data *)g_memdup(md_req, sizeof(nlm_msg_res_matched_data)); g_hash_table_insert(nlm_msg_res_matched, GINT_TO_POINTER(md_req->req_frame), (gpointer)md_req); @@ -262,7 +262,7 @@ nlm_register_unmatched_msg(packet_info *pinfo, tvbuff_t *tvb, int offset) /* allocate and build the unmatched structure for this request */ umd=(nlm_msg_res_unmatched_data *)g_malloc(sizeof(nlm_msg_res_unmatched_data)); - umd->req_frame=pinfo->fd->num; + umd->req_frame=pinfo->num; umd->ns=pinfo->abs_ts; umd->cookie_len=tvb_get_ntohl(tvb, offset); umd->cookie=(const guint8 *)tvb_memdup(NULL, tvb, offset+4, umd->cookie_len); diff --git a/epan/dissectors/packet-ntlmssp.c b/epan/dissectors/packet-ntlmssp.c index 4c029bf5dd..1a9df88865 100644 --- a/epan/dissectors/packet-ntlmssp.c +++ b/epan/dissectors/packet-ntlmssp.c @@ -1818,7 +1818,7 @@ get_sign_key(packet_info *pinfo, int cryptpeer) conversation_t *conversation; ntlmssp_info *conv_ntlmssp_info; - 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 == NULL) { @@ -1858,7 +1858,7 @@ get_encrypted_state(packet_info *pinfo, int cryptpeer) conversation_t *conversation; ntlmssp_info *conv_ntlmssp_info; - 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 == NULL) { @@ -1994,7 +1994,7 @@ decrypt_data_payload(tvbuff_t *tvb, int offset, guint32 encrypted_block_length, ntlmssp_info *conv_ntlmssp_info; /* Pull the challenge info from the conversation */ - conversation = find_conversation(pinfo->fd->num, &pinfo->src, &pinfo->dst, + conversation = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst, pinfo->ptype, pinfo->srcport, pinfo->destport, 0); if (conversation == NULL) { @@ -2202,7 +2202,7 @@ decrypt_verifier(tvbuff_t *tvb, int offset, guint32 encrypted_block_length, /* We don't have data for this packet */ return; } - conversation = find_conversation(pinfo->fd->num, &pinfo->src, &pinfo->dst, + conversation = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst, pinfo->ptype, pinfo->srcport, pinfo->destport, 0); if (conversation == NULL) { @@ -2507,7 +2507,7 @@ dissect_ntlmssp_encrypted_payload(tvbuff_t *data_tvb, if (!packet_ntlmssp_info->payload_decrypted) { /* Pull the challenge info from the conversation */ - 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 == NULL) { diff --git a/epan/dissectors/packet-opensafety.c b/epan/dissectors/packet-opensafety.c index f5a3c52267..271ae0250c 100644 --- a/epan/dissectors/packet-opensafety.c +++ b/epan/dissectors/packet-opensafety.c @@ -2356,10 +2356,10 @@ dissect_opensafety_udpdata(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree /* More than one openSAFETY package could be transported in the same frame, * in such a case, we need to establish the number of packages inside the frame */ - if ( pinfo->fd->num != frameNum ) + if ( pinfo->num != frameNum ) { frameIdx = 0; - frameNum = pinfo->fd->num; + frameNum = pinfo->num; } result = opensafety_package_dissector("openSAFETY/UDP", "", global_udp_frame2_first, diff --git a/epan/dissectors/packet-openvpn.c b/epan/dissectors/packet-openvpn.c index c937968eed..efc0fec8e7 100644 --- a/epan/dissectors/packet-openvpn.c +++ b/epan/dissectors/packet-openvpn.c @@ -368,7 +368,7 @@ dissect_openvpn_msg_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *openvp } else { /* Not last packet of reassembled Short Message */ col_append_fstr(pinfo->cinfo, COL_INFO, " (Message fragment %d) ", msg_mpid); - if (pinfo->fd->num != frag_msg->reassembled_in) { + if (pinfo->num != frag_msg->reassembled_in) { /* Add a "Reassembled in" link if not reassembled in this frame */ proto_tree_add_uint(openvpn_tree, hf_openvpn_reassembled_in, tvb, 0, 0, frag_msg->reassembled_in); diff --git a/epan/dissectors/packet-ositp.c b/epan/dissectors/packet-ositp.c index 84ddab0f5c..9f6a8d6287 100644 --- a/epan/dissectors/packet-ositp.c +++ b/epan/dissectors/packet-ositp.c @@ -978,7 +978,7 @@ static int ositp_decode_DT(tvbuff_t *tvb, int offset, guint8 li, guint8 tpdu, cotp_frame_reset = FALSE; cotp_last_fragment = fragment; dst_ref = cotp_dst_ref; - conv = find_conversation(pinfo->fd->num, &pinfo->src, &pinfo->dst, + conv = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst, pinfo->ptype, pinfo->srcport, pinfo->destport, 0); if (conv) { @@ -1170,7 +1170,7 @@ static int ositp_decode_DT(tvbuff_t *tvb, int offset, guint8 li, guint8 tpdu, next_tvb = process_reassembled_data (next_tvb, offset, pinfo, "Reassembled COTP", fd_head, &cotp_frag_items, NULL, tree); - } 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(cotp_tree, *(cotp_frag_items.hf_reassembled_in), next_tvb, 0, 0, fd_head->reassembled_in); diff --git a/epan/dissectors/packet-p_mul.c b/epan/dissectors/packet-p_mul.c index 2e7b3f048e..b0f7da9181 100644 --- a/epan/dissectors/packet-p_mul.c +++ b/epan/dissectors/packet-p_mul.c @@ -408,7 +408,7 @@ static p_mul_seq_val *register_p_mul_id (packet_info *pinfo, address *addr, guin addr_time = p_mul_data->pdu_time; /* Save data for last found PDU */ - p_mul_data->prev_pdu_id = pinfo->fd->num; + p_mul_data->prev_pdu_id = pinfo->num; p_mul_data->prev_pdu_time = pinfo->abs_ts; if (pdu_type == Data_PDU && p_mul_data->msg_resend_count == 0 && last_found_pdu != seq_no - 1) { @@ -432,7 +432,7 @@ static p_mul_seq_val *register_p_mul_id (packet_info *pinfo, address *addr, guin prev_time = p_mul_data->pdu_time; } } else if (pdu_type == Address_PDU) { - addr_id = pinfo->fd->num; + addr_id = pinfo->num; addr_time = pinfo->abs_ts; } } @@ -461,7 +461,7 @@ static p_mul_seq_val *register_p_mul_id (packet_info *pinfo, address *addr, guin if (!ack_data) { /* Only save reference to first ACK */ ack_data = wmem_new0(wmem_file_scope(), p_mul_ack_data); - ack_data->ack_id = pinfo->fd->num; + ack_data->ack_id = pinfo->num; g_hash_table_insert (p_mul_data->ack_data, GUINT_TO_POINTER(dstIP), ack_data); } else { /* Only count when resending */ @@ -471,7 +471,7 @@ static p_mul_seq_val *register_p_mul_id (packet_info *pinfo, address *addr, guin } else { /* Message resent */ p_mul_data->msg_resend_count++; - p_mul_data->prev_msg_id = pinfo->fd->num; + p_mul_data->prev_msg_id = pinfo->num; p_mul_data->prev_msg_time = p_mul_data->pdu_time; p_mul_data->pdu_time = pinfo->abs_ts; @@ -495,10 +495,10 @@ static p_mul_seq_val *register_p_mul_id (packet_info *pinfo, address *addr, guin if (pdu_type == Ack_PDU) { /* No matching message for this ack */ ack_data = wmem_new0(wmem_file_scope(), p_mul_ack_data); - ack_data->ack_id = pinfo->fd->num; + ack_data->ack_id = pinfo->num; g_hash_table_insert (p_mul_data->ack_data, GUINT_TO_POINTER(dstIP), ack_data); } else { - p_mul_data->pdu_id = pinfo->fd->num; + p_mul_data->pdu_id = pinfo->num; p_mul_data->pdu_time = pinfo->abs_ts; p_mul_data->addr_id = addr_id; p_mul_data->addr_time = addr_time; diff --git a/epan/dissectors/packet-pana.c b/epan/dissectors/packet-pana.c index e00a4ae558..b17f3d5af2 100644 --- a/epan/dissectors/packet-pana.c +++ b/epan/dissectors/packet-pana.c @@ -517,14 +517,14 @@ dissect_pana_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if(flags&PANA_FLAG_R){ /* This is a request */ pana_trans=wmem_new(wmem_file_scope(), pana_transaction_t); - pana_trans->req_frame=pinfo->fd->num; + pana_trans->req_frame=pinfo->num; pana_trans->rep_frame=0; pana_trans->req_time=pinfo->abs_ts; wmem_map_insert(pana_info->pdus, GUINT_TO_POINTER(seq_num), (void *)pana_trans); } else { pana_trans=(pana_transaction_t *)wmem_map_lookup(pana_info->pdus, GUINT_TO_POINTER(seq_num)); if(pana_trans){ - pana_trans->rep_frame=pinfo->fd->num; + pana_trans->rep_frame=pinfo->num; } } } else { diff --git a/epan/dissectors/packet-pcp.c b/epan/dissectors/packet-pcp.c index f28ec7fb15..e1d9d6ff1c 100644 --- a/epan/dissectors/packet-pcp.c +++ b/epan/dissectors/packet-pcp.c @@ -506,8 +506,8 @@ static void mark_this_frame_as_last_pmns_names_frame(packet_info *pinfo) { pcp_conv_info_t *pcp_conv_info; pcp_conv_info = get_pcp_conversation_info(pinfo); - if(pinfo->fd->num > pcp_conv_info->last_pmns_names_frame) { - pcp_conv_info->last_pmns_names_frame = pinfo->fd->num; + if(pinfo->num > pcp_conv_info->last_pmns_names_frame) { + pcp_conv_info->last_pmns_names_frame = pinfo->num; } } @@ -569,7 +569,7 @@ static pcp_conv_info_t* get_pcp_conversation_info(packet_info *pinfo) { conversation_t *conversation; pcp_conv_info_t *pcp_conv_info; - conversation = find_conversation(pinfo->fd->num, &pinfo->src, &pinfo->dst, + conversation = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst, pinfo->ptype, pinfo->srcport, pinfo->destport, 0); @@ -601,7 +601,7 @@ static int is_unvisited_pmns_names_frame(packet_info *pinfo) { pcp_conv_info = get_pcp_conversation_info(pinfo); - return pinfo->fd->num > pcp_conv_info->last_processed_pmns_names_frame && pinfo->fd->num > pcp_conv_info->last_pmns_names_frame; + return pinfo->num > pcp_conv_info->last_processed_pmns_names_frame && pinfo->num > pcp_conv_info->last_pmns_names_frame; } static void populate_pmids_to_names(packet_info *pinfo, tvbuff_t *tvb, int offset, guint32 num_ids) { diff --git a/epan/dissectors/packet-pdcp-lte.c b/epan/dissectors/packet-pdcp-lte.c index 5c4356a89b..23f04134f2 100644 --- a/epan/dissectors/packet-pdcp-lte.c +++ b/epan/dissectors/packet-pdcp-lte.c @@ -836,7 +836,7 @@ static void checkChannelSequenceInfo(packet_info *pinfo, tvbuff_t *tvb, p_report_in_frame = (pdcp_sequence_report_in_frame*)g_hash_table_lookup(pdcp_lte_sequence_analysis_report_hash, get_report_hash_key(sequenceNumber, - pinfo->fd->num, + pinfo->num, p_pdcp_lte_info, FALSE)); if (p_report_in_frame != NULL) { addChannelSequenceInfo(p_report_in_frame, p_pdcp_lte_info, @@ -923,7 +923,7 @@ static void checkChannelSequenceInfo(packet_info *pinfo, tvbuff_t *tvb, p_report_in_frame->previousFrameNum = p_channel_status->previousFrameNum; /* Update channel status to remember *this* frame */ - p_channel_status->previousFrameNum = pinfo->fd->num; + p_channel_status->previousFrameNum = pinfo->num; p_channel_status->previousSequenceNumber = sequenceNumber; } else { @@ -948,7 +948,7 @@ static void checkChannelSequenceInfo(packet_info *pinfo, tvbuff_t *tvb, } /* Update channel status to remember *this* frame */ - p_channel_status->previousFrameNum = pinfo->fd->num; + p_channel_status->previousFrameNum = pinfo->num; p_channel_status->previousSequenceNumber = sequenceNumber; if (p_report_in_frame->previousFrameNum != 0) { @@ -962,14 +962,14 @@ static void checkChannelSequenceInfo(packet_info *pinfo, tvbuff_t *tvb, /* It really shouldn't be NULL... */ if (p_previous_report != NULL) { /* Point it forward to this one */ - p_previous_report->nextFrameNum = pinfo->fd->num; + p_previous_report->nextFrameNum = pinfo->num; } } } /* Associate with this frame number */ g_hash_table_insert(pdcp_lte_sequence_analysis_report_hash, - get_report_hash_key(sequenceNumber, pinfo->fd->num, + get_report_hash_key(sequenceNumber, pinfo->num, p_pdcp_lte_info, TRUE), p_report_in_frame); @@ -1758,7 +1758,7 @@ static int dissect_pdcp_lte(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, /* Take a deep copy of the settings */ *security_to_store = *current_security; g_hash_table_insert(pdcp_security_result_hash, - get_ueid_frame_hash_key(p_pdcp_info->ueid, pinfo->fd->num, TRUE), + get_ueid_frame_hash_key(p_pdcp_info->ueid, pinfo->num, TRUE), security_to_store); } else { @@ -1771,14 +1771,14 @@ static int dissect_pdcp_lte(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, security_to_store->integrity = global_default_integrity_algorithm; security_to_store->seen_next_ul_pdu = TRUE; g_hash_table_insert(pdcp_security_result_hash, - get_ueid_frame_hash_key(p_pdcp_info->ueid, pinfo->fd->num, TRUE), + get_ueid_frame_hash_key(p_pdcp_info->ueid, pinfo->num, TRUE), security_to_store); } } } /* Show security settings for this PDU */ - pdu_security = (pdcp_security_info_t*)g_hash_table_lookup(pdcp_security_result_hash, get_ueid_frame_hash_key(p_pdcp_info->ueid, pinfo->fd->num, FALSE)); + pdu_security = (pdcp_security_info_t*)g_hash_table_lookup(pdcp_security_result_hash, get_ueid_frame_hash_key(p_pdcp_info->ueid, pinfo->num, FALSE)); if (pdu_security != NULL) { proto_item *ti; diff --git a/epan/dissectors/packet-per.c b/epan/dissectors/packet-per.c index 5730abdac8..eed095eb6d 100644 --- a/epan/dissectors/packet-per.c +++ b/epan/dissectors/packet-per.c @@ -97,7 +97,7 @@ static dissector_table_t per_oid_dissector_table = NULL; /* #define DEBUG_ENTRY(x) \ -printf("#%u %s tvb:0x%08x\n",actx->pinfo->fd->num,x,(int)tvb); +printf("#%u %s tvb:0x%08x\n",actx->pinfo->num,x,(int)tvb); */ #define DEBUG_ENTRY(x) \ ; diff --git a/epan/dissectors/packet-pmproxy.c b/epan/dissectors/packet-pmproxy.c index 0792102b95..3d956714e6 100644 --- a/epan/dissectors/packet-pmproxy.c +++ b/epan/dissectors/packet-pmproxy.c @@ -153,7 +153,7 @@ static void mark_pmproxy_exchange_complete(packet_info *pinfo) { if(pmproxy_conversation == NULL) { pmproxy_conversation = wmem_new(wmem_file_scope(), pmproxy_conversation_info_t); } - pmproxy_conversation->last_proxy_frame = pinfo->fd->num; + pmproxy_conversation->last_proxy_frame = pinfo->num; conversation_add_proto_data(conversation, proto_pmproxy, pmproxy_conversation); } @@ -168,7 +168,7 @@ static int is_pmproxy_exchange_complete(packet_info *pinfo) { return FALSE; } - return pinfo->fd->num >= pmproxy_conversation->last_proxy_frame; + return pinfo->num >= pmproxy_conversation->last_proxy_frame; } static int dissect_through_pcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { diff --git a/epan/dissectors/packet-portmap.c b/epan/dissectors/packet-portmap.c index 4dc4bc3ca3..1e578bde2f 100644 --- a/epan/dissectors/packet-portmap.c +++ b/epan/dissectors/packet-portmap.c @@ -140,9 +140,9 @@ dissect_getport_reply(tvbuff_t *tvb, packet_info *pinfo _U_, port=tvb_get_ntohl(tvb, offset); if(port){ conversation_t *conv; - conv=find_conversation(pinfo->fd->num, &pinfo->src, &pinfo->dst, (port_type)rpc_call->private_data, port, 0, NO_ADDR_B|NO_PORT_B); + conv=find_conversation(pinfo->num, &pinfo->src, &pinfo->dst, (port_type)rpc_call->private_data, port, 0, NO_ADDR_B|NO_PORT_B); if(!conv){ - conv=conversation_new(pinfo->fd->num, &pinfo->src, &pinfo->dst, (port_type)rpc_call->private_data, port, 0, NO_ADDR2|NO_PORT2); + conv=conversation_new(pinfo->num, &pinfo->src, &pinfo->dst, (port_type)rpc_call->private_data, port, 0, NO_ADDR2|NO_PORT2); } conversation_set_dissector(conv, rpc_handle); } diff --git a/epan/dissectors/packet-ppi.c b/epan/dissectors/packet-ppi.c index d5aa474e90..d5c5515457 100644 --- a/epan/dissectors/packet-ppi.c +++ b/epan/dissectors/packet-ppi.c @@ -1061,7 +1061,7 @@ dissect_ppi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) } ft_fdh = ft_fdh->next; } - if (last_frame && last_frame != pinfo->fd->num) + if (last_frame && last_frame != pinfo->num) proto_tree_add_uint(seg_tree, hf_ampdu_reassembled_in, tvb, 0, 0, last_frame); } diff --git a/epan/dissectors/packet-pres.c b/epan/dissectors/packet-pres.c index c35c60def6..6a9a7d0eb2 100644 --- a/epan/dissectors/packet-pres.c +++ b/epan/dissectors/packet-pres.c @@ -274,7 +274,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; @@ -316,7 +316,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; diff --git a/epan/dissectors/packet-pvfs2.c b/epan/dissectors/packet-pvfs2.c index 71cbdfc3d9..ff4a29a069 100644 --- a/epan/dissectors/packet-pvfs2.c +++ b/epan/dissectors/packet-pvfs2.c @@ -2991,7 +2991,7 @@ dissect_pvfs_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, { /* Add entry to tracking table for PVFS_SERV_IO request */ if ((server_op == PVFS_SERV_IO) && !pinfo->fd->flags.visited) - val = pvfs2_io_tracking_new_with_tag(tag, pinfo->fd->num); + val = pvfs2_io_tracking_new_with_tag(tag, pinfo->num); } else { @@ -3007,17 +3007,17 @@ dissect_pvfs_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, { /* If response HAS NOT been seen, mark this frame as response */ if (val->response_frame_num == 0) - val->response_frame_num = pinfo->fd->num; + val->response_frame_num = pinfo->num; else { /* If response HAS been seen, this frame is flow data */ if (val->flow_frame_num == 0) - val->flow_frame_num = pinfo->fd->num; + val->flow_frame_num = pinfo->num; } } } - if (val && (val->flow_frame_num == pinfo->fd->num)) + if (val && (val->flow_frame_num == pinfo->num)) { /* This frame is marked as being flow data */ col_set_str(pinfo->cinfo, COL_INFO, "PVFS flow data"); diff --git a/epan/dissectors/packet-q931.c b/epan/dissectors/packet-q931.c index 70ae5fcf01..7a48dfc443 100644 --- a/epan/dissectors/packet-q931.c +++ b/epan/dissectors/packet-q931.c @@ -2587,7 +2587,7 @@ dissect_q931_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, tvb, offset, pinfo, call_ref_val, NULL, frag_len, more_frags); if (fd_head) { - if (pinfo->fd->num == fd_head->reassembled_in) { /* last fragment */ + if (pinfo->num == fd_head->reassembled_in) { /* last fragment */ if (fd_head->next != NULL) { /* 2 or more segments */ next_tvb = tvb_new_chain(tvb, fd_head->tvb_data); add_new_data_source(pinfo, next_tvb, "Reassembled Q.931 IEs"); diff --git a/epan/dissectors/packet-radius.c b/epan/dissectors/packet-radius.c index 2050c30640..fb14bcb161 100644 --- a/epan/dissectors/packet-radius.c +++ b/epan/dissectors/packet-radius.c @@ -1802,13 +1802,13 @@ dissect_radius(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _ * pointer for the second address argument even * if you do that. */ - conversation = find_conversation(pinfo->fd->num, &pinfo->src, + conversation = find_conversation(pinfo->num, &pinfo->src, &null_address, pinfo->ptype, pinfo->srcport, pinfo->destport, 0); if (conversation == NULL) { /* It's not part of any conversation - create a new one. */ - conversation = conversation_new(pinfo->fd->num, &pinfo->src, + conversation = conversation_new(pinfo->num, &pinfo->src, &null_address, pinfo->ptype, pinfo->srcport, pinfo->destport, 0); } @@ -1825,7 +1825,7 @@ dissect_radius(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _ { /* We've seen a request with this ID, with the same destination, before - but was it *this* request? */ - if (pinfo->fd->num != radius_call->req_num) + if (pinfo->num != radius_call->req_num) { /* No, so it's a duplicate request. Mark it as such. FIXME: This is way too simple, as the request number @@ -1855,7 +1855,7 @@ dissect_radius(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _ new_radius_call_key = wmem_new(wmem_file_scope(), radius_call_info_key); *new_radius_call_key = radius_call_key; radius_call = wmem_new(wmem_file_scope(), radius_call_t); - radius_call->req_num = pinfo->fd->num; + radius_call->req_num = pinfo->num; radius_call->rsp_num = 0; radius_call->ident = rh.rh_ident; radius_call->code = rh.rh_code; @@ -1924,7 +1924,7 @@ dissect_radius(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _ * pointer for the second address argument even * if you do that. */ - conversation = find_conversation(pinfo->fd->num, &null_address, + conversation = find_conversation(pinfo->num, &null_address, &pinfo->dst, pinfo->ptype, pinfo->srcport, pinfo->destport, 0); if (conversation != NULL) { @@ -1987,13 +1987,13 @@ dissect_radius(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _ /* We have not yet seen a response to that call, so this must be the first response; remember its frame number. */ - radius_call->rsp_num = pinfo->fd->num; + radius_call->rsp_num = pinfo->num; } else { /* We have seen a response to this call - but was it *this* response? (disregard provisional responses) */ - if ( (radius_call->rsp_num != pinfo->fd->num) && (radius_call->rspcode == rh.rh_code) ) + if ( (radius_call->rsp_num != pinfo->num) && (radius_call->rspcode == rh.rh_code) ) { /* No, so it's a duplicate response. Mark it as such. */ rad_info->is_duplicate = TRUE; diff --git a/epan/dissectors/packet-rdp.c b/epan/dissectors/packet-rdp.c index f359770398..4ca94747ca 100644 --- a/epan/dissectors/packet-rdp.c +++ b/epan/dissectors/packet-rdp.c @@ -1495,7 +1495,7 @@ dissect_rdp_SendData(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* if (rdp_info && ((rdp_info->licenseAgreed == 0) || - (pinfo->fd->num <= rdp_info->licenseAgreed))) { + (pinfo->num <= rdp_info->licenseAgreed))) { /* licensing stage hasn't been completed */ proto_tree *next_tree; @@ -1553,7 +1553,7 @@ dissect_rdp_SendData(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* break; case ERROR_ALERT: /*offset =*/ dissect_rdp_fields(tvb, offset, pinfo, next_tree, error_fields, 0); - rdp_info->licenseAgreed = pinfo->fd->num; + rdp_info->licenseAgreed = pinfo->num; break; default: /* Unknown msgType */ @@ -1563,7 +1563,7 @@ dissect_rdp_SendData(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* /*offset =*/ dissect_rdp_encrypted(tvb, offset, pinfo, next_tree, NULL); /* XXX: we assume the license is agreed in this exchange */ - rdp_info->licenseAgreed = pinfo->fd->num; + rdp_info->licenseAgreed = pinfo->num; } break; diff --git a/epan/dissectors/packet-rdt.c b/epan/dissectors/packet-rdt.c index adac41b8fc..d35bd137d7 100644 --- a/epan/dissectors/packet-rdt.c +++ b/epan/dissectors/packet-rdt.c @@ -245,13 +245,13 @@ void rdt_add_address(packet_info *pinfo, /* Check if the ip address and port combination is not already registered as a conversation. */ - p_conv = find_conversation(pinfo->fd->num, addr, &null_addr, PT_UDP, port, other_port, + p_conv = find_conversation(pinfo->num, addr, &null_addr, PT_UDP, port, other_port, NO_ADDR_B | (!other_port ? NO_PORT_B : 0)); /* If not, create a new conversation. */ - if ( !p_conv || p_conv->setup_frame != pinfo->fd->num) + if ( !p_conv || p_conv->setup_frame != pinfo->num) { - p_conv = conversation_new(pinfo->fd->num, addr, &null_addr, PT_UDP, + p_conv = conversation_new(pinfo->num, addr, &null_addr, PT_UDP, (guint32)port, (guint32)other_port, NO_ADDR2 | (!other_port ? NO_PORT2 : 0)); } @@ -272,7 +272,7 @@ void rdt_add_address(packet_info *pinfo, /* Update the conversation data. */ g_strlcpy(p_conv_data->method, setup_method, MAX_RDT_SETUP_METHOD_SIZE); - p_conv_data->frame_number = pinfo->fd->num; + p_conv_data->frame_number = pinfo->num; p_conv_data->feature_level = rdt_feature_level; } @@ -1233,7 +1233,7 @@ static void show_setup_info(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (!p_conv_data) { /* First time, get info from conversation */ - 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); if (p_conv) diff --git a/epan/dissectors/packet-reload-framing.c b/epan/dissectors/packet-reload-framing.c index ef5b553883..ca8d7a129c 100644 --- a/epan/dissectors/packet-reload-framing.c +++ b/epan/dissectors/packet-reload-framing.c @@ -135,7 +135,7 @@ dissect_reload_framing_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr if (effective_length < MIN_HDR_LENGTH) return 0; - conversation = find_conversation(pinfo->fd->num, &pinfo->src, &pinfo->dst, + conversation = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst, pinfo->ptype, pinfo->srcport, pinfo->destport, 0); if (conversation) reload_framing_info = (reload_conv_info_t *)conversation_get_proto_data(conversation, proto_reload_framing); @@ -225,7 +225,7 @@ dissect_reload_framing_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr len_save = transaction_id_key[2].length; if (!conversation) { - 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); } @@ -260,13 +260,13 @@ dissect_reload_framing_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr if (type == DATA) { /* This is a data */ if (reload_frame->data_frame == 0) { - reload_frame->data_frame = pinfo->fd->num; + reload_frame->data_frame = pinfo->num; } } else { /* This is a catch-all for all non-request messages */ if (reload_frame->ack_frame == 0) { - reload_frame->ack_frame = pinfo->fd->num; + reload_frame->ack_frame = pinfo->num; } } } @@ -280,8 +280,8 @@ dissect_reload_framing_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr if (!reload_frame) { /* create a "fake" pana_trans structure */ reload_frame = wmem_new(wmem_packet_scope(), reload_frame_t); - reload_frame->data_frame = (type==DATA) ? pinfo->fd->num : 0; - reload_frame->ack_frame = (type!=DATA) ? pinfo->fd->num : 0; + reload_frame->data_frame = (type==DATA) ? pinfo->num : 0; + reload_frame->ack_frame = (type!=DATA) ? pinfo->num : 0; reload_frame->req_time = pinfo->abs_ts; } @@ -294,7 +294,7 @@ dissect_reload_framing_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr /* Retransmission control */ if (type == DATA) { - if (reload_frame->data_frame != pinfo->fd->num) { + if (reload_frame->data_frame != pinfo->num) { proto_item *it; it = proto_tree_add_uint(reload_framing_tree, hf_reload_framing_duplicate, tvb, 0, 0, reload_frame->data_frame); PROTO_ITEM_SET_GENERATED(it); @@ -307,7 +307,7 @@ dissect_reload_framing_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr } else { /* This is a response */ - if (reload_frame->ack_frame != pinfo->fd->num) { + if (reload_frame->ack_frame != pinfo->num) { proto_item *it; it = proto_tree_add_uint(reload_framing_tree, hf_reload_framing_duplicate, tvb, 0, 0, reload_frame->ack_frame); PROTO_ITEM_SET_GENERATED(it); diff --git a/epan/dissectors/packet-reload.c b/epan/dissectors/packet-reload.c index a9a8ee1a4e..fba66de830 100644 --- a/epan/dissectors/packet-reload.c +++ b/epan/dissectors/packet-reload.c @@ -4145,7 +4145,7 @@ dissect_reload_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void /* Just show this as a fragment. */ col_add_fstr(pinfo->cinfo, COL_INFO, "Fragmented RELOAD protocol (trans id=%x%x off=%u", transaction_id[0],transaction_id[1], fragment); - if (reload_fd_head && reload_fd_head->reassembled_in != pinfo->fd->num) { + if (reload_fd_head && reload_fd_head->reassembled_in != pinfo->num) { col_append_fstr(pinfo->cinfo, COL_INFO, " [Reassembled in #%u]", reload_fd_head->reassembled_in); } @@ -4187,13 +4187,13 @@ dissect_reload_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void if (IS_REQUEST(message_code) && (message_code != RELOAD_ERROR)) { /* This is a request */ if (reload_trans->req_frame == 0) { - reload_trans->req_frame = pinfo->fd->num; + reload_trans->req_frame = pinfo->num; } } else { /* This is a catch-all for all non-request messages */ if (reload_trans->rep_frame == 0) { - reload_trans->rep_frame = pinfo->fd->num; + reload_trans->rep_frame = pinfo->num; } } } @@ -4211,7 +4211,7 @@ dissect_reload_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void /* Retransmission control */ if (IS_REQUEST(message_code) && (message_code != RELOAD_ERROR)) { - if (reload_trans->req_frame != pinfo->fd->num) { + if (reload_trans->req_frame != pinfo->num) { proto_item *it; it = proto_tree_add_uint(reload_tree, hf_reload_duplicate, tvb, 0, 0, reload_trans->req_frame); PROTO_ITEM_SET_GENERATED(it); @@ -4224,7 +4224,7 @@ dissect_reload_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void } else { /* This is a response */ - if (reload_trans->rep_frame != pinfo->fd->num) { + if (reload_trans->rep_frame != pinfo->num) { proto_item *it; it = proto_tree_add_uint(reload_tree, hf_reload_duplicate, tvb, 0, 0, reload_trans->rep_frame); PROTO_ITEM_SET_GENERATED(it); diff --git a/epan/dissectors/packet-rfid-pn532.c b/epan/dissectors/packet-rfid-pn532.c index 41d1dd13a7..0b9c004c1c 100644 --- a/epan/dissectors/packet-rfid-pn532.c +++ b/epan/dissectors/packet-rfid-pn532.c @@ -662,7 +662,7 @@ dissect_pn532(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; @@ -682,7 +682,7 @@ dissect_pn532(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) command_data->endpoint = endpoint; command_data->command = cmd; - 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); @@ -690,7 +690,7 @@ dissect_pn532(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; @@ -712,13 +712,13 @@ dissect_pn532(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)) { 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; } } diff --git a/epan/dissectors/packet-rlc-lte.c b/epan/dissectors/packet-rlc-lte.c index 6a010e6a3d..50f4411dcb 100644 --- a/epan/dissectors/packet-rlc-lte.c +++ b/epan/dissectors/packet-rlc-lte.c @@ -498,7 +498,7 @@ static void reassembly_record(channel_sequence_analysis_status *status, packet_i { /* Just store existing info in hash table */ g_hash_table_insert(reassembly_report_hash, - get_report_hash_key(SN, pinfo->fd->num, p_rlc_lte_info, TRUE), + get_report_hash_key(SN, pinfo->num, p_rlc_lte_info, TRUE), status->reassembly_info); } @@ -851,7 +851,7 @@ static void show_PDU_in_tree(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb key[0].length = 1; key[0].key = &id; key[1].length = 1; - key[1].key = &PINFO_FD_NUM(pinfo); + key[1].key = &pinfo->num; key[2].length = 0; key[2].key = NULL; @@ -1401,7 +1401,7 @@ static sequence_analysis_state checkChannelSequenceInfo(packet_info *pinfo, tvbu if (pinfo->fd->flags.visited) { p_report_in_frame = (sequence_analysis_report*)g_hash_table_lookup(sequence_analysis_report_hash, get_report_hash_key(sequenceNumber, - pinfo->fd->num, + pinfo->num, p_rlc_lte_info, FALSE)); if (p_report_in_frame != NULL) { @@ -1503,7 +1503,7 @@ static sequence_analysis_state checkChannelSequenceInfo(packet_info *pinfo, tvbu p_report_in_frame->previousSegmentIncomplete = p_channel_status->previousSegmentIncomplete; /* Update channel status to remember *this* frame */ - p_channel_status->previousFrameNum = pinfo->fd->num; + p_channel_status->previousFrameNum = pinfo->num; p_channel_status->previousSequenceNumber = sequenceNumber; p_channel_status->previousSegmentIncomplete = !last_includes_end; } @@ -1523,13 +1523,13 @@ static sequence_analysis_state checkChannelSequenceInfo(packet_info *pinfo, tvbu p_report_in_frame->previousSegmentIncomplete = p_channel_status->previousSegmentIncomplete; /* Update channel status to remember *this* frame */ - p_channel_status->previousFrameNum = pinfo->fd->num; + p_channel_status->previousFrameNum = pinfo->num; p_channel_status->previousSequenceNumber = sequenceNumber; p_channel_status->previousSegmentIncomplete = !last_includes_end; if (p_channel_status->reassembly_info) { /* Add next segment to reassembly info */ - reassembly_add_segment(p_channel_status, sequenceNumber, pinfo->fd->num, + reassembly_add_segment(p_channel_status, sequenceNumber, pinfo->num, tvb, firstSegmentOffset, firstSegmentLength); /* The end of existing reassembly? */ @@ -1550,7 +1550,7 @@ static sequence_analysis_state checkChannelSequenceInfo(packet_info *pinfo, tvbu if (global_rlc_lte_reassembly) { reassembly_reset(p_channel_status); reassembly_add_segment(p_channel_status, sequenceNumber, - pinfo->fd->num, + pinfo->num, tvb, lastSegmentOffset, lastSegmentLength); } } @@ -1574,7 +1574,7 @@ static sequence_analysis_state checkChannelSequenceInfo(packet_info *pinfo, tvbu /* It really shouldn't be NULL... */ if (p_previous_report != NULL) { /* Point it forward to this one */ - p_previous_report->nextFrameNum = pinfo->fd->num; + p_previous_report->nextFrameNum = pinfo->num; } } } @@ -1627,14 +1627,14 @@ static sequence_analysis_state checkChannelSequenceInfo(packet_info *pinfo, tvbu /* Update channel status */ p_channel_status->previousSequenceNumber = sequenceNumber; - p_channel_status->previousFrameNum = pinfo->fd->num; + p_channel_status->previousFrameNum = pinfo->num; p_channel_status->previousSegmentIncomplete = !last_includes_end; if (p_channel_status->reassembly_info) { /* Add next segment to reassembly info */ - reassembly_add_segment(p_channel_status, sequenceNumber, pinfo->fd->num, + reassembly_add_segment(p_channel_status, sequenceNumber, pinfo->num, tvb, firstSegmentOffset, firstSegmentLength); /* The end of existing reassembly? */ @@ -1655,7 +1655,7 @@ static sequence_analysis_state checkChannelSequenceInfo(packet_info *pinfo, tvbu if (global_rlc_lte_reassembly) { reassembly_reset(p_channel_status); reassembly_add_segment(p_channel_status, sequenceNumber, - pinfo->fd->num, + pinfo->num, tvb, lastSegmentOffset, lastSegmentLength); } } @@ -1671,7 +1671,7 @@ static sequence_analysis_state checkChannelSequenceInfo(packet_info *pinfo, tvbu /* It really shouldn't be NULL... */ if (p_previous_report != NULL) { /* Point it forward to this one */ - p_previous_report->nextFrameNum = pinfo->fd->num; + p_previous_report->nextFrameNum = pinfo->num; } } @@ -1691,7 +1691,7 @@ static sequence_analysis_state checkChannelSequenceInfo(packet_info *pinfo, tvbu /* Really should be nothing to update... */ p_channel_status->previousSequenceNumber = sequenceNumber; - p_channel_status->previousFrameNum = pinfo->fd->num; + p_channel_status->previousFrameNum = pinfo->num; p_channel_status->previousSegmentIncomplete = !last_includes_end; } @@ -1718,7 +1718,7 @@ static sequence_analysis_state checkChannelSequenceInfo(packet_info *pinfo, tvbu /* Update channel state - forget about missed SNs */ p_report_in_frame->sequenceExpected = expectedSequenceNumber; p_channel_status->previousSequenceNumber = sequenceNumber; - p_channel_status->previousFrameNum = pinfo->fd->num; + p_channel_status->previousFrameNum = pinfo->num; p_channel_status->previousSegmentIncomplete = !last_includes_end; } } @@ -1731,7 +1731,7 @@ static sequence_analysis_state checkChannelSequenceInfo(packet_info *pinfo, tvbu /* Associate with this frame number */ g_hash_table_insert(sequence_analysis_report_hash, - get_report_hash_key(sequenceNumber, pinfo->fd->num, p_rlc_lte_info, TRUE), + get_report_hash_key(sequenceNumber, pinfo->num, p_rlc_lte_info, TRUE), p_report_in_frame); /* Add state report for this frame into tree */ @@ -1811,7 +1811,7 @@ static void checkChannelRepeatedNACKInfo(packet_info *pinfo, /* If find state_report_in_frame already, use that and get out */ if (pinfo->fd->flags.visited) { p_report_in_frame = (channel_repeated_nack_report*)g_hash_table_lookup(repeated_nack_report_hash, - get_report_hash_key(0, pinfo->fd->num, + get_report_hash_key(0, pinfo->num, p_rlc_lte_info, FALSE)); if (p_report_in_frame != NULL) { addChannelRepeatedNACKInfo(p_report_in_frame, p_rlc_lte_info, @@ -1885,7 +1885,7 @@ static void checkChannelRepeatedNACKInfo(packet_info *pinfo, /* Associate with this frame number */ g_hash_table_insert(repeated_nack_report_hash, - get_report_hash_key(0, pinfo->fd->num, + get_report_hash_key(0, pinfo->num, p_rlc_lte_info, TRUE), p_report_in_frame); @@ -1895,7 +1895,7 @@ static void checkChannelRepeatedNACKInfo(packet_info *pinfo, } /* Save frame number for next comparison */ - p_channel_status->frameNum = pinfo->fd->num; + p_channel_status->frameNum = pinfo->num; } /* Check that the ACK is consistent with data the expected sequence number @@ -1914,7 +1914,7 @@ static void checkChannelACKWindow(guint16 ack_sn, /* If find stat_report_in_frame already, use that and get out */ if (pinfo->fd->flags.visited) { p_report_in_frame = (sequence_analysis_report*)g_hash_table_lookup(sequence_analysis_report_hash, - get_report_hash_key(0, pinfo->fd->num, + get_report_hash_key(0, pinfo->num, p_rlc_lte_info, FALSE)); if (p_report_in_frame != NULL) { @@ -1959,7 +1959,7 @@ static void checkChannelACKWindow(guint16 ack_sn, /* Associate with this frame number */ g_hash_table_insert(sequence_analysis_report_hash, - get_report_hash_key(0, pinfo->fd->num, + get_report_hash_key(0, pinfo->num, p_rlc_lte_info, TRUE), p_report_in_frame); @@ -2226,7 +2226,7 @@ static void dissect_rlc_lte_um(tvbuff_t *tvb, packet_info *pinfo, /* Data */ reassembly_info = (rlc_channel_reassembly_info *)g_hash_table_lookup(reassembly_report_hash, - get_report_hash_key((guint16)sn, pinfo->fd->num, + get_report_hash_key((guint16)sn, pinfo->num, p_rlc_lte_info, FALSE)); if (s_number_of_extensions > 0) { @@ -2548,7 +2548,7 @@ static void dissect_rlc_lte_am(tvbuff_t *tvb, packet_info *pinfo, key[0].length = 1; key[0].key = &id; key[1].length = 1; - key[1].key = &PINFO_FD_NUM(pinfo); + key[1].key = &pinfo->num; key[2].length = 0; key[2].key = NULL; params = (rlc_ue_parameters *)wmem_tree_lookup32_array_le(ue_parameters_tree, key); @@ -2637,7 +2637,7 @@ static void dissect_rlc_lte_am(tvbuff_t *tvb, packet_info *pinfo, if (!first_includes_start) { reassembly_info = (rlc_channel_reassembly_info *)g_hash_table_lookup(reassembly_report_hash, get_report_hash_key((guint16)sn, - pinfo->fd->num, + pinfo->num, p_rlc_lte_info, FALSE)); } @@ -3004,7 +3004,7 @@ void set_rlc_lte_drb_pdcp_seqnum_length(packet_info *pinfo, guint16 ueid, guint8 key[0].length = 1; key[0].key = &id; key[1].length = 1; - key[1].key = &PINFO_FD_NUM(pinfo); + key[1].key = &pinfo->num; key[2].length = 0; key[2].key = NULL; @@ -3037,7 +3037,7 @@ void set_rlc_lte_drb_li_field(packet_info *pinfo, guint16 ueid, guint8 drbid, key[0].length = 1; key[0].key = &id; key[1].length = 1; - key[1].key = &PINFO_FD_NUM(pinfo); + key[1].key = &pinfo->num; key[2].length = 0; key[2].key = NULL; diff --git a/epan/dissectors/packet-rlc.c b/epan/dissectors/packet-rlc.c index 6af395ff10..d29ecff8be 100644 --- a/epan/dissectors/packet-rlc.c +++ b/epan/dissectors/packet-rlc.c @@ -457,7 +457,7 @@ static int rlc_frag_assign(struct rlc_frag *frag, enum rlc_mode mode, packet_info *pinfo, guint16 seq, guint16 li, struct atm_phdr *atm) { - frag->frame_num = pinfo->fd->num; + frag->frame_num = pinfo->num; frag->seq = seq; frag->li = li; frag->len = 0; @@ -1001,7 +1001,7 @@ add_fragment(enum rlc_mode mode, tvbuff_t *tvb, packet_info *pinfo, } rlc_frag_assign(&frag_lookup, mode, pinfo, seq, num_li, atm); #if RLC_ADD_FRAGMENT_DEBUG_PRINT - g_print("packet: %d, channel (%d %d %d) seq: %u, num_li: %u, offset: %u, \n", pinfo->fd->num, ch_lookup.dir, ch_lookup.rbid, ch_lookup.urnti, seq, num_li, offset); + g_print("packet: %d, channel (%d %d %d) seq: %u, num_li: %u, offset: %u, \n", pinfo->num, ch_lookup.dir, ch_lookup.rbid, ch_lookup.urnti, seq, num_li, offset); #endif snmod = getChannelSNModulus(&ch_lookup); @@ -1053,7 +1053,7 @@ add_fragment(enum rlc_mode mode, tvbuff_t *tvb, packet_info *pinfo, } } } else if (endlist->list) { - if (endlist->fail_packet != 0 && endlist->fail_packet <= pinfo->fd->num) { + if (endlist->fail_packet != 0 && endlist->fail_packet <= pinfo->num) { proto_tree_add_expert_format(tree, pinfo, &ei_rlc_reassembly_fail_flag_set, tvb, 0, 0, "Did not perform reassembly because fail flag was set in packet %u.", endlist->fail_packet); } else { gint16 end = GPOINTER_TO_INT(endlist->list->data); @@ -1086,7 +1086,7 @@ add_fragment(enum rlc_mode mode, tvbuff_t *tvb, packet_info *pinfo, tempfrag = tempfrag->next; tempfrag->next = frag; } else { /* This should never happen */ - endlist->fail_packet = pinfo->fd->num; + endlist->fail_packet = pinfo->num; return NULL; } } else { @@ -1118,9 +1118,9 @@ add_fragment(enum rlc_mode mode, tvbuff_t *tvb, packet_info *pinfo, gint16 end = GPOINTER_TO_INT(endlist->list->next->data); if (frags[end] == NULL) { #if RLC_ADD_FRAGMENT_FAIL_PRINT - g_warning("frag[end] is null, this is probably because end was a startpoint but because of some error ended up being treated as an endpoint, setting fail flag, start %d, end %d, packet %u\n", start, end, pinfo->fd->num); + g_warning("frag[end] is null, this is probably because end was a startpoint but because of some error ended up being treated as an endpoint, setting fail flag, start %d, end %d, packet %u\n", start, end, pinfo->num); #endif - endlist->fail_packet = pinfo->fd->num; + endlist->fail_packet = pinfo->num; return NULL; } @@ -1155,9 +1155,9 @@ add_fragment(enum rlc_mode mode, tvbuff_t *tvb, packet_info *pinfo, g_warning( "Packet %u. Setting fail flag because RLC fragment with sequence number %u was \ too far away from an unfinished sequence (%u->%u). The missing sequence number \ -is %u. The most recently complete sequence ended in packet %u.", pinfo->fd->num, seq, 0, end, start, 0); +is %u. The most recently complete sequence ended in packet %u.", pinfo->num, seq, 0, end, start, 0); #endif - endlist->fail_packet = pinfo->fd->num; /* If it has gone too far, give up */ + endlist->fail_packet = pinfo->num; /* If it has gone too far, give up */ return NULL; } return frag; @@ -1173,9 +1173,9 @@ is %u. The most recently complete sequence ended in packet %u.", pinfo->fd->num, #if RLC_ADD_FRAGMENT_FAIL_PRINT g_warning( "Packet %u. Setting fail flag because RLC fragment with sequence number %u was \ -too far away from an unfinished sequence with start %u and without end.", pinfo->fd->num, seq, first); +too far away from an unfinished sequence with start %u and without end.", pinfo->num, seq, first); #endif - endlist->fail_packet = pinfo->fd->num; /* Give up if things have gone too far. */ + endlist->fail_packet = pinfo->num; /* Give up if things have gone too far. */ return NULL; } } @@ -1251,7 +1251,7 @@ rlc_is_duplicate(enum rlc_mode mode, packet_info *pinfo, guint16 seq, g_hash_table_insert(sequence_table, &list->ch, list); } seq_item.seq = seq; - seq_item.frame_num = pinfo->fd->num; + seq_item.frame_num = pinfo->num; /* When seq is 12 bit (in RLC protocol), it will wrap around after 4096. */ /* Window size is at most 4095 so we remove packets further away than that */ @@ -1498,14 +1498,14 @@ rlc_decipher(tvbuff_t *tvb, packet_info * pinfo, proto_tree * tree, fp_info * fp /*TODO: This doesn't really work for all packets..*/ /*Check if we have ciphering info and that this frame is ciphered*/ - if(c_inf!=NULL && ( (c_inf->setup_frame > 0 && c_inf->setup_frame < pinfo->fd->num && c_inf->seq_no[rlcinf->rbid[pos]][indx] == -1) || - (c_inf->setup_frame < pinfo->fd->num && c_inf->seq_no[rlcinf->rbid[pos]][indx] >= 0 && c_inf->seq_no[rlcinf->rbid[pos]][indx] <= seq) )){ + if(c_inf!=NULL && ( (c_inf->setup_frame > 0 && c_inf->setup_frame < pinfo->num && c_inf->seq_no[rlcinf->rbid[pos]][indx] == -1) || + (c_inf->setup_frame < pinfo->num && c_inf->seq_no[rlcinf->rbid[pos]][indx] >= 0 && c_inf->seq_no[rlcinf->rbid[pos]][indx] <= seq) )){ tvbuff_t *t; /*Check if this counter has been initialized*/ if(!counter_init[rlcinf->rbid[pos]][indx] ){ - guint32 frame_num = pinfo->fd->num; + guint32 frame_num = pinfo->num; /*Initializes counter*/ counter_init[rlcinf->rbid[pos]][0] = TRUE; @@ -1528,7 +1528,7 @@ rlc_decipher(tvbuff_t *tvb, packet_info * pinfo, proto_tree * tree, fp_info * fp ciph = (guint32 *)g_malloc(sizeof(guint32)*2); ciph[0] = ps_counter[rlcinf->rbid[pos]][0]; ciph[1] = ps_counter[rlcinf->rbid[pos]][1]; - g_tree_insert(counter_map, GINT_TO_POINTER((gint)pinfo->fd->num), ciph); + g_tree_insert(counter_map, GINT_TO_POINTER((gint)pinfo->num), ciph); } } @@ -1540,7 +1540,7 @@ rlc_decipher(tvbuff_t *tvb, packet_info * pinfo, proto_tree * tree, fp_info * fp if(tree){ guint32 frame_num[3]; /*Set frame num we will be "searching" around*/ - frame_num[0] = pinfo->fd->num; + frame_num[0] = pinfo->num; /*Find the correct counter value*/ g_tree_foreach(counter_map, (GTraverseFunc)rlc_find_old_counter, &frame_num[0]); t = rlc_decipher_tvb(tvb, pinfo, (frame_num[indx+1] | seq),16,!fpinf->is_uplink,header_size); @@ -1551,7 +1551,7 @@ rlc_decipher(tvbuff_t *tvb, packet_info * pinfo, proto_tree * tree, fp_info * fp if(tree){ /*We need to find the original counter value for second dissection pass*/ guint32 frame_num[3]; - frame_num[0] = pinfo->fd->num; + frame_num[0] = pinfo->num; g_tree_foreach(counter_map, (GTraverseFunc)rlc_find_old_counter, &frame_num[0]); t = rlc_decipher_tvb(tvb, pinfo, (frame_num[indx+1] | seq),rlcinf->rbid[pos],!fpinf->is_uplink,header_size); }else @@ -1568,7 +1568,7 @@ rlc_decipher(tvbuff_t *tvb, packet_info * pinfo, proto_tree * tree, fp_info * fp ciph = (guint32 *)g_malloc(sizeof(guint32)*2); ciph[0] = ps_counter[rlcinf->rbid[pos]][0]; ciph[1] = ps_counter[rlcinf->rbid[pos]][1]; - g_tree_insert(counter_map, GINT_TO_POINTER((gint)pinfo->fd->num+1), ciph); + g_tree_insert(counter_map, GINT_TO_POINTER((gint)pinfo->num+1), ciph); } } @@ -1900,7 +1900,7 @@ dissect_rlc_um(enum rlc_channel_type channel, tvbuff_t *tvb, packet_info *pinfo, } /* do not detect duplicates or reassemble, if prefiltering is done */ - if (pinfo->fd->num == 0) return; + if (pinfo->num == 0) return; /* check for duplicates */ if (rlc_is_duplicate(RLC_UM, pinfo, seq, &orig_num, atm) == TRUE) { col_add_fstr(pinfo->cinfo, COL_INFO, "[RLC UM Fragment] [Duplicate] SN=%u", seq); @@ -2321,13 +2321,13 @@ dissect_rlc_am(enum rlc_channel_type channel, tvbuff_t *tvb, packet_info *pinfo, } /* do not detect duplicates or reassemble, if prefiltering is done */ - if (pinfo->fd->num == 0) return; + if (pinfo->num == 0) return; /* check for duplicates, but not if already visited */ if (pinfo->fd->flags.visited == FALSE && rlc_is_duplicate(RLC_AM, pinfo, seq, &orig_num, atm) == TRUE) { - g_hash_table_insert(duplicate_table, GUINT_TO_POINTER(pinfo->fd->num), GUINT_TO_POINTER(orig_num)); + g_hash_table_insert(duplicate_table, GUINT_TO_POINTER(pinfo->num), GUINT_TO_POINTER(orig_num)); return; } else if (pinfo->fd->flags.visited == TRUE && tree) { - gpointer value = g_hash_table_lookup(duplicate_table, GUINT_TO_POINTER(pinfo->fd->num)); + gpointer value = g_hash_table_lookup(duplicate_table, GUINT_TO_POINTER(pinfo->num)); if (value != NULL) { col_add_fstr(pinfo->cinfo, COL_INFO, "[RLC AM Fragment] [Duplicate] SN=%u %s", seq, (polling != 0) ? "(P)" : ""); proto_tree_add_uint(tree, hf_rlc_duplicate_of, tvb, 0, 0, GPOINTER_TO_UINT(value)); diff --git a/epan/dissectors/packet-rlogin.c b/epan/dissectors/packet-rlogin.c index feebee70ff..e2c6e0a8ae 100644 --- a/epan/dissectors/packet-rlogin.c +++ b/epan/dissectors/packet-rlogin.c @@ -143,7 +143,7 @@ rlogin_state_machine(rlogin_hash_entry_t *hash_info, tvbuff_t *tvb, packet_info { /* Have info, store frame number */ hash_info->state = DONE; - hash_info->info_framenum = pinfo->fd->num; + hash_info->info_framenum = pinfo->num; } } } @@ -154,7 +154,7 @@ rlogin_state_machine(rlogin_hash_entry_t *hash_info, tvbuff_t *tvb, packet_info { /* Store frame number here */ hash_info->state = DONE; - hash_info->info_framenum = pinfo->fd->num; + hash_info->info_framenum = pinfo->num; /* Work out length of string to copy */ stringlen = tvb_strnlen(tvb, 0, NAME_LEN); @@ -249,7 +249,7 @@ static void rlogin_display(rlogin_hash_entry_t *hash_info, return; } - if (hash_info->info_framenum == pinfo->fd->num) + if (hash_info->info_framenum == pinfo->num) { gint info_len; gint slash_offset; diff --git a/epan/dissectors/packet-rohc.c b/epan/dissectors/packet-rohc.c index c1fbc20342..f0eecaa8ec 100644 --- a/epan/dissectors/packet-rohc.c +++ b/epan/dissectors/packet-rohc.c @@ -1864,7 +1864,7 @@ dissect_rohc_ir_packet(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, rohc_cid_context = wmem_new(wmem_file_scope(), rohc_cid_context_t); rohc_cid_context->profile = profile; rohc_cid_context->prev_ir_frame_number = tmp_prev_ir_frame_number; - rohc_cid_context->ir_frame_number = pinfo->fd->num; + rohc_cid_context->ir_frame_number = pinfo->num; rohc_cid_context->rohc_ip_version = tmp_prev_rohc_ip_version; rohc_cid_context->mode = (enum rohc_mode)tmp_prev_mode; rohc_cid_context->rnd = tmp_prev_rnd; @@ -1882,7 +1882,7 @@ dissect_rohc_ir_packet(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, rohc_cid_context->udp_checksum_present = FALSE; rohc_cid_context->profile = profile; rohc_cid_context->prev_ir_frame_number = -1; - rohc_cid_context->ir_frame_number = pinfo->fd->num; + rohc_cid_context->ir_frame_number = pinfo->num; rohc_cid_context->rohc_ip_version = p_rohc_info->rohc_ip_version; rohc_cid_context->mode = p_rohc_info->mode; @@ -1985,7 +1985,7 @@ dissect_rohc_ir_dyn_packet(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, rohc_cid_context = wmem_new(wmem_file_scope(), rohc_cid_context_t); rohc_cid_context->profile = profile; rohc_cid_context->prev_ir_frame_number = tmp_prev_ir_frame_number; - rohc_cid_context->ir_frame_number = pinfo->fd->num; + rohc_cid_context->ir_frame_number = pinfo->num; rohc_cid_context->rohc_ip_version = tmp_prev_rohc_ip_version; rohc_cid_context->mode = (enum rohc_mode)tmp_prev_mode; rohc_cid_context->rnd = tmp_prev_rnd; @@ -2004,7 +2004,7 @@ dissect_rohc_ir_dyn_packet(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, rohc_cid_context->udp_checksum_present = FALSE; rohc_cid_context->profile = profile; rohc_cid_context->prev_ir_frame_number = -1; - rohc_cid_context->ir_frame_number = pinfo->fd->num; + rohc_cid_context->ir_frame_number = pinfo->num; rohc_cid_context->mode = p_rohc_info->mode; /*g_warning("IR pkt New CID %u",cid);*/ diff --git a/epan/dissectors/packet-ros.c b/epan/dissectors/packet-ros.c index 64355fc6f1..3b8dd27e3a 100644 --- a/epan/dissectors/packet-ros.c +++ b/epan/dissectors/packet-ros.c @@ -342,11 +342,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); @@ -378,7 +378,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; @@ -396,7 +396,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); } diff --git a/epan/dissectors/packet-rpc.c b/epan/dissectors/packet-rpc.c index 0f3c0aeca6..bd7cfe0e3f 100644 --- a/epan/dissectors/packet-rpc.c +++ b/epan/dissectors/packet-rpc.c @@ -1092,10 +1092,10 @@ dissect_rpc_authgss_context(proto_tree *tree, tvbuff_t *tvb, int offset, wmem_tree_insert32_array(authgss_contexts, &tkey[0], context_info); } if (is_create) { - context_info->create_frame = pinfo->fd->num; + context_info->create_frame = pinfo->num; } if (is_destroy) { - context_info->destroy_frame = pinfo->fd->num; + context_info->destroy_frame = pinfo->num; } if (context_info->create_frame) { @@ -1314,7 +1314,7 @@ dissect_rpc_opaque_auth(tvbuff_t* tvb, proto_tree* tree, int offset, rpc_conv_info_t *conv_info = NULL; if (pinfo->ptype == PT_TCP) - conv = find_conversation(pinfo->fd->num, &pinfo->src, + conv = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst, pinfo->ptype, pinfo->srcport, pinfo->destport, 0); @@ -1662,7 +1662,7 @@ get_conversation_for_call(packet_info *pinfo) * the original request. */ if (pinfo->ptype == PT_TCP || pinfo->ptype == PT_IBQP) { - conversation = find_conversation(pinfo->fd->num, + conversation = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst, pinfo->ptype, pinfo->srcport, pinfo->destport, 0); } else { @@ -1671,18 +1671,18 @@ get_conversation_for_call(packet_info *pinfo) * pointer for the second address argument even * if you use NO_ADDR_B. */ - conversation = find_conversation(pinfo->fd->num, + conversation = find_conversation(pinfo->num, &pinfo->src, &null_address, pinfo->ptype, pinfo->destport, 0, NO_ADDR_B|NO_PORT_B); } if (conversation == NULL) { if (pinfo->ptype == PT_TCP || pinfo->ptype == PT_IBQP) { - conversation = conversation_new(pinfo->fd->num, + conversation = conversation_new(pinfo->num, &pinfo->src, &pinfo->dst, pinfo->ptype, pinfo->srcport, pinfo->destport, 0); } else { - conversation = conversation_new(pinfo->fd->num, + conversation = conversation_new(pinfo->num, &pinfo->src, &null_address, pinfo->ptype, pinfo->destport, 0, NO_ADDR2|NO_PORT2); } @@ -1716,7 +1716,7 @@ find_conversation_for_reply(packet_info *pinfo) * might be sent to different ports. */ if (pinfo->ptype == PT_TCP || pinfo->ptype == PT_IBQP) { - conversation = find_conversation(pinfo->fd->num, + conversation = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst, pinfo->ptype, pinfo->srcport, pinfo->destport, 0); } else { @@ -1725,7 +1725,7 @@ find_conversation_for_reply(packet_info *pinfo) * pointer for the second address argument even * if you use NO_ADDR_B. */ - conversation = find_conversation(pinfo->fd->num, + conversation = find_conversation(pinfo->num, &pinfo->dst, &null_address, pinfo->ptype, pinfo->srcport, 0, NO_ADDR_B|NO_PORT_B); } @@ -1738,11 +1738,11 @@ new_conversation_for_reply(packet_info *pinfo) conversation_t *conversation; if (pinfo->ptype == PT_TCP || pinfo->ptype == PT_IBQP) { - conversation = conversation_new(pinfo->fd->num, + conversation = conversation_new(pinfo->num, &pinfo->src, &pinfo->dst, pinfo->ptype, pinfo->srcport, pinfo->destport, 0); } else { - conversation = conversation_new(pinfo->fd->num, + conversation = conversation_new(pinfo->num, &pinfo->dst, &null_address, pinfo->ptype, pinfo->srcport, 0, NO_ADDR2|NO_PORT2); } @@ -1759,14 +1759,14 @@ get_conversation_for_tcp(packet_info *pinfo) * not wildcard either address or port, regardless of whether * this is a call or reply. */ - conversation = find_conversation(pinfo->fd->num, + conversation = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst, pinfo->ptype, pinfo->srcport, pinfo->destport, 0); if (conversation == NULL) { /* * It's not part of any conversation - create a new one. */ - conversation = conversation_new(pinfo->fd->num, + conversation = conversation_new(pinfo->num, &pinfo->src, &pinfo->dst, pinfo->ptype, pinfo->srcport, pinfo->destport, 0); } @@ -2191,7 +2191,7 @@ looks_like_rpc_reply(tvbuff_t *tvb, packet_info *pinfo, int offset) * Define a dummy call for this reply. */ rpc_call = wmem_new0(wmem_file_scope(), rpc_call_info_value); - rpc_call->rep_num = pinfo->fd->num; + rpc_call->rep_num = pinfo->num; rpc_call->xid = xid; rpc_call->flavor = FLAVOR_NOT_GSSAPI; /* total punt */ rpc_call->req_time = pinfo->abs_ts; @@ -2487,7 +2487,7 @@ dissect_rpc_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, /* We've seen a request with this XID, with the same source and destination, before - but was it *this* request? */ - if (pinfo->fd->num != rpc_call->req_num) { + if (pinfo->num != rpc_call->req_num) { /* No, so it's a duplicate request. Mark it as such. */ col_prepend_fstr(pinfo->cinfo, COL_INFO, @@ -2508,7 +2508,7 @@ dissect_rpc_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, to mean "we don't yet know in which frame the reply for this call appears". */ rpc_call = wmem_new(wmem_file_scope(), rpc_call_info_value); - rpc_call->req_num = pinfo->fd->num; + rpc_call->req_num = pinfo->num; rpc_call->rep_num = 0; rpc_call->prog = prog; rpc_call->vers = vers; @@ -2660,11 +2660,11 @@ dissect_rpc_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, /* We have not yet seen a reply to that call, so this must be the first reply; remember its frame number. */ - rpc_call->rep_num = pinfo->fd->num; + rpc_call->rep_num = pinfo->num; } else { /* We have seen a reply to this call - but was it *this* reply? */ - if (rpc_call->rep_num != pinfo->fd->num) { + if (rpc_call->rep_num != pinfo->num) { proto_item *tmp_item; /* No, so it's a duplicate reply. diff --git a/epan/dissectors/packet-rpcrdma.c b/epan/dissectors/packet-rpcrdma.c index 7d37a6af69..b26f8910bd 100644 --- a/epan/dissectors/packet-rpcrdma.c +++ b/epan/dissectors/packet-rpcrdma.c @@ -413,14 +413,14 @@ dissect_rpcordma_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, /* first try to find a conversation between the two current hosts. in most cases this will not work since we do not have the source QP. this WILL succeed when we're still in the process of CM negotiations */ - conv = find_conversation(pinfo->fd->num, &pinfo->src, &pinfo->dst, + conv = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst, PT_IBQP, pinfo->srcport, pinfo->destport, 0); if (!conv) { /* if not, try to find an established RC channel. recall Infiniband conversations are registered with one side of the channel. since the packet is only guaranteed to contain the qpn of the destination, we'll use this */ - conv = find_conversation(pinfo->fd->num, &pinfo->dst, &pinfo->dst, + conv = find_conversation(pinfo->num, &pinfo->dst, &pinfo->dst, PT_IBQP, pinfo->destport, pinfo->destport, NO_ADDR_B|NO_PORT_B); if (!conv) diff --git a/epan/dissectors/packet-rrc.c b/epan/dissectors/packet-rrc.c index 5db3aea94b..54b44488fa 100644 --- a/epan/dissectors/packet-rrc.c +++ b/epan/dissectors/packet-rrc.c @@ -97866,7 +97866,7 @@ dissect_rrc_START_Value(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, *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: @@ -108973,7 +108973,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; } diff --git a/epan/dissectors/packet-rsh.c b/epan/dissectors/packet-rsh.c index 8e1fa37f3d..34ed9460f5 100644 --- a/epan/dissectors/packet-rsh.c +++ b/epan/dissectors/packet-rsh.c @@ -123,7 +123,7 @@ dissect_rsh(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) if(!hash_info){ hash_info = wmem_new(wmem_file_scope(), rsh_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; @@ -150,25 +150,25 @@ dissect_rsh(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 { @@ -176,7 +176,7 @@ dissect_rsh(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 { @@ -184,7 +184,7 @@ dissect_rsh(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 { @@ -192,7 +192,7 @@ dissect_rsh(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 { diff --git a/epan/dissectors/packet-rsl.c b/epan/dissectors/packet-rsl.c index 000d7bf375..d1f53f3062 100644 --- a/epan/dissectors/packet-rsl.c +++ b/epan/dissectors/packet-rsl.c @@ -3160,9 +3160,9 @@ dissct_rsl_ipaccess_msg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int src_addr.len = 4; src_addr.data = (guint8 *)&local_addr; rtp_add_address(pinfo, &src_addr, local_port, 0, - "GSM A-bis/IP", pinfo->fd->num, 0, NULL); + "GSM A-bis/IP", pinfo->num, 0, NULL); rtcp_add_address(pinfo, &src_addr, local_port+1, 0, - "GSM A-bis/IP", pinfo->fd->num); + "GSM A-bis/IP", pinfo->num); break; } return offset; diff --git a/epan/dissectors/packet-rsvd.c b/epan/dissectors/packet-rsvd.c index d68d3c6e4c..05115c2d6e 100644 --- a/epan/dissectors/packet-rsvd.c +++ b/epan/dissectors/packet-rsvd.c @@ -139,11 +139,11 @@ get_itl_nexus(packet_info *pinfo) { itl_nexus_t *itl = NULL; - if (!(itl = (itl_nexus_t *)wmem_tree_lookup32_le(rsvd_conv_data->itl, pinfo->fd->num))) { + if (!(itl = (itl_nexus_t *)wmem_tree_lookup32_le(rsvd_conv_data->itl, pinfo->num))) { itl = wmem_new(wmem_file_scope(), itl_nexus_t); itl->cmdset = 0xff; itl->conversation = rsvd_conv_data->conversation; - wmem_tree_insert32(rsvd_conv_data->itl, pinfo->fd->num, itl); + wmem_tree_insert32(rsvd_conv_data->itl, pinfo->num, itl); } return itl; @@ -210,7 +210,7 @@ dissect_RSVD_TUNNEL_SCSI(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *pare *key_copy = request_id; rsvd_conv_data->task = wmem_new(wmem_file_scope(), rsvd_task_data_t); - rsvd_conv_data->task->request_frame=pinfo->fd->num; + rsvd_conv_data->task->request_frame=pinfo->num; rsvd_conv_data->task->response_frame=0; rsvd_conv_data->task->itlq = NULL; wmem_map_insert(rsvd_conv_data->tasks, (const void *)key_copy, @@ -282,7 +282,7 @@ dissect_RSVD_TUNNEL_SCSI(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *pare if (rsvd_conv_data->task && !rsvd_conv_data->task->itlq) { rsvd_conv_data->task->itlq = wmem_new(wmem_file_scope(), itlq_nexus_t); - rsvd_conv_data->task->itlq->first_exchange_frame = pinfo->fd->num; + rsvd_conv_data->task->itlq->first_exchange_frame = pinfo->num; rsvd_conv_data->task->itlq->last_exchange_frame = 0; rsvd_conv_data->task->itlq->lun = 0xffff; rsvd_conv_data->task->itlq->scsi_opcode = 0xffff; diff --git a/epan/dissectors/packet-rtcp.c b/epan/dissectors/packet-rtcp.c index 23fbc1bd41..eb1e6fb5bf 100644 --- a/epan/dissectors/packet-rtcp.c +++ b/epan/dissectors/packet-rtcp.c @@ -749,14 +749,14 @@ void srtcp_add_address( packet_info *pinfo, * Check if the ip address and port combination is not * already registered as a conversation. */ - p_conv = find_conversation( pinfo->fd->num, addr, &null_addr, PT_UDP, port, other_port, + p_conv = find_conversation( pinfo->num, addr, &null_addr, PT_UDP, port, other_port, NO_ADDR_B | (!other_port ? NO_PORT_B : 0)); /* * If not, create a new conversation. */ if ( ! p_conv ) { - p_conv = conversation_new( pinfo->fd->num, addr, &null_addr, PT_UDP, + p_conv = conversation_new( pinfo->num, addr, &null_addr, PT_UDP, (guint32)port, (guint32)other_port, NO_ADDR2 | (!other_port ? NO_PORT2 : 0)); } @@ -2995,7 +2995,7 @@ void show_setup_info(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { conversation_t *p_conv; /* First time, get info from conversation */ - 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); @@ -3060,7 +3060,7 @@ static void remember_outgoing_sr(packet_info *pinfo, guint32 lsr) /* Look first in packet info */ p_packet_data = (struct _rtcp_conversation_info *)p_get_proto_data(wmem_file_scope(), pinfo, proto_rtcp, 0); if (p_packet_data && p_packet_data->last_received_set && - (p_packet_data->last_received_frame_number >= pinfo->fd->num)) + (p_packet_data->last_received_frame_number >= pinfo->num)) { /* We already did this, OK */ return; @@ -3073,14 +3073,14 @@ static void remember_outgoing_sr(packet_info *pinfo, guint32 lsr) /* First time, get info from conversation. Even though we think of this as an outgoing packet being sent, we store the time as being received by the destination. */ - 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); /* If the conversation doesn't exist, create it now. */ if (!p_conv) { - p_conv = conversation_new(pinfo->fd->num, &pinfo->net_dst, &pinfo->net_src, PT_UDP, + p_conv = conversation_new(pinfo->num, &pinfo->net_dst, &pinfo->net_src, PT_UDP, pinfo->destport, pinfo->srcport, NO_ADDR2); if (!p_conv) @@ -3106,7 +3106,7 @@ static void remember_outgoing_sr(packet_info *pinfo, guint32 lsr) /*******************************************************/ /* Update conversation data */ p_conv_data->last_received_set = TRUE; - p_conv_data->last_received_frame_number = pinfo->fd->num; + p_conv_data->last_received_frame_number = pinfo->num; p_conv_data->last_received_timestamp = pinfo->abs_ts; p_conv_data->last_received_ts = lsr; @@ -3165,7 +3165,7 @@ static void calculate_roundtrip_delay(tvbuff_t *tvb, packet_info *pinfo, /********************************************************************/ /* Look for captured timestamp of last SR in conversation of sender */ /* of this packet */ - p_conv = find_conversation(pinfo->fd->num, &pinfo->net_src, &pinfo->net_dst, + p_conv = find_conversation(pinfo->num, &pinfo->net_src, &pinfo->net_dst, pinfo->ptype, pinfo->srcport, pinfo->destport, NO_ADDR_B); if (!p_conv) @@ -3193,7 +3193,7 @@ static void calculate_roundtrip_delay(tvbuff_t *tvb, packet_info *pinfo, } /* Don't allow match seemingly calculated from same (or later!) frame */ - if (pinfo->fd->num <= p_conv_data->last_received_frame_number) + if (pinfo->num <= p_conv_data->last_received_frame_number) { return; } @@ -3319,7 +3319,7 @@ dissect_rtcp( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U guint32 srtcp_index = 0; /* first see if this conversation is encrypted SRTP, and if so do not try to dissect the payload(s) */ - p_conv = find_conversation(pinfo->fd->num, &pinfo->net_src, &pinfo->net_dst, + p_conv = find_conversation(pinfo->num, &pinfo->net_src, &pinfo->net_dst, pinfo->ptype, pinfo->srcport, pinfo->destport, NO_ADDR_B); if (p_conv) diff --git a/epan/dissectors/packet-rtitcp.c b/epan/dissectors/packet-rtitcp.c index 5233a95b40..4e6866d5bb 100755 --- a/epan/dissectors/packet-rtitcp.c +++ b/epan/dissectors/packet-rtitcp.c @@ -547,7 +547,7 @@ static guint16 dissect_control_message(proto_tree *rtitcp_tree, tvbuff_t *tvb, p if (!(control_message_kind & RTITCP_FLAG_NOT_REQUEST)) { /* This is a request */ rtitcp_trans=wmem_new(wmem_file_scope(), rtitcp_transaction_t); - rtitcp_trans->req_frame = pinfo->fd->num; + rtitcp_trans->req_frame = pinfo->num; rtitcp_trans->rep_frame = 0; rtitcp_trans->req_time = pinfo->abs_ts; conversation_info_key = (guint64*)wmem_alloc0(wmem_file_scope(), sizeof(guint64)); @@ -557,7 +557,7 @@ static guint16 dissect_control_message(proto_tree *rtitcp_tree, tvbuff_t *tvb, p conversation_info_key = &seq_num; rtitcp_trans=(rtitcp_transaction_t *)wmem_map_lookup(rtitcp_info->pdus, conversation_info_key); if (rtitcp_trans) { - rtitcp_trans->rep_frame = pinfo->fd->num; + rtitcp_trans->rep_frame = pinfo->num; } } } else { diff --git a/epan/dissectors/packet-rtmpt.c b/epan/dissectors/packet-rtmpt.c index 3812418135..813a53a660 100644 --- a/epan/dissectors/packet-rtmpt.c +++ b/epan/dissectors/packet-rtmpt.c @@ -1685,7 +1685,7 @@ dissect_rtmpt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, rtmpt_conv_t col_set_str(pinfo->cinfo, COL_PROTOCOL, "RTMP"); RTMPT_DEBUG("Dissect: frame=%u visited=%d len=%d tree=%p\n", - pinfo->fd->num, pinfo->fd->flags.visited, + pinfo->num, pinfo->fd->flags.visited, tvb_reported_length_remaining(tvb, offset), tree); /* Clear any previous data in Info column (RTMP packets are protected by a "fence") */ @@ -1720,7 +1720,7 @@ dissect_rtmpt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, rtmpt_conv_t tp->txid = rtmpt_get_amf_txid(tvb, iBodyOffset+soff); if (tp->txid != 0) { RTMPT_DEBUG("got txid=%d\n", tp->txid); - wmem_tree_insert32(rconv->txids[cdir], tp->txid, GINT_TO_POINTER(pinfo->fd->num)); + wmem_tree_insert32(rconv->txids[cdir], tp->txid, GINT_TO_POINTER(pinfo->num)); } } } @@ -2295,9 +2295,9 @@ dissect_rtmpt_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* dat } tcpinfo = (struct tcpinfo*)data; - conv = find_conversation(pinfo->fd->num, &pinfo->src, &pinfo->dst, pinfo->ptype, pinfo->srcport, pinfo->destport, 0); + conv = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst, pinfo->ptype, pinfo->srcport, pinfo->destport, 0); if (!conv) { - conv = conversation_new(pinfo->fd->num, &pinfo->src, &pinfo->dst, pinfo->ptype, pinfo->srcport, pinfo->destport, 0); + conv = conversation_new(pinfo->num, &pinfo->src, &pinfo->dst, pinfo->ptype, pinfo->srcport, pinfo->destport, 0); } rconv = (rtmpt_conv_t*)conversation_get_proto_data(conv, proto_rtmpt); @@ -2365,16 +2365,16 @@ dissect_rtmpt_http(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* da cdir = pinfo->srcport == pinfo->match_uint; if (cdir) { - conv = find_conversation(pinfo->fd->num, &pinfo->dst, &pinfo->src, pinfo->ptype, 0, pinfo->srcport, 0); + conv = find_conversation(pinfo->num, &pinfo->dst, &pinfo->src, pinfo->ptype, 0, pinfo->srcport, 0); if (!conv) { RTMPT_DEBUG("RTMPT new conversation\n"); - conv = conversation_new(pinfo->fd->num, &pinfo->dst, &pinfo->src, pinfo->ptype, 0, pinfo->srcport, 0); + conv = conversation_new(pinfo->num, &pinfo->dst, &pinfo->src, pinfo->ptype, 0, pinfo->srcport, 0); } } else { - conv = find_conversation(pinfo->fd->num, &pinfo->src, &pinfo->dst, pinfo->ptype, 0, pinfo->destport, 0); + conv = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst, pinfo->ptype, 0, pinfo->destport, 0); if (!conv) { RTMPT_DEBUG("RTMPT new conversation\n"); - conv = conversation_new(pinfo->fd->num, &pinfo->src, &pinfo->dst, pinfo->ptype, 0, pinfo->destport, 0); + conv = conversation_new(pinfo->num, &pinfo->src, &pinfo->dst, pinfo->ptype, 0, pinfo->destport, 0); } } @@ -2391,7 +2391,7 @@ dissect_rtmpt_http(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* da * plus one. If there is no previous frame then we must be at seq=1! * (This is per-conversation and per-direction, of course.) */ - lastackseq = GPOINTER_TO_INT(wmem_tree_lookup32_le(rconv->seqs[cdir ^ 1], pinfo->fd->num))+1; + lastackseq = GPOINTER_TO_INT(wmem_tree_lookup32_le(rconv->seqs[cdir ^ 1], pinfo->num))+1; if (cdir == 1 && lastackseq < 2 && remain == 17) { /* Session startup: the client makes an /open/ request and @@ -2408,17 +2408,17 @@ dissect_rtmpt_http(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* da remain--; } - seq = GPOINTER_TO_INT(wmem_tree_lookup32(rconv->seqs[cdir], pinfo->fd->num)); + seq = GPOINTER_TO_INT(wmem_tree_lookup32(rconv->seqs[cdir], pinfo->num)); if (seq == 0) { - seq = GPOINTER_TO_INT(wmem_tree_lookup32_le(rconv->seqs[cdir], pinfo->fd->num)); + seq = GPOINTER_TO_INT(wmem_tree_lookup32_le(rconv->seqs[cdir], pinfo->num)); seq += remain; - wmem_tree_insert32(rconv->seqs[cdir], pinfo->fd->num, GINT_TO_POINTER(seq)); + wmem_tree_insert32(rconv->seqs[cdir], pinfo->num, GINT_TO_POINTER(seq)); } seq -= remain-1; - RTMPT_DEBUG("RTMPT f=%d cdir=%d seq=%d lastackseq=%d len=%d\n", pinfo->fd->num, cdir, seq, lastackseq, remain); + RTMPT_DEBUG("RTMPT f=%d cdir=%d seq=%d lastackseq=%d len=%d\n", pinfo->num, cdir, seq, lastackseq, remain); if (remain < 1) return offset; @@ -2448,10 +2448,10 @@ dissect_rtmpt_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *da { /* Register this dissector for this conversation */ conversation = NULL; - conversation = find_conversation(pinfo->fd->num, &pinfo->src, &pinfo->dst, pinfo->ptype, pinfo->srcport, pinfo->destport, 0); + conversation = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst, pinfo->ptype, pinfo->srcport, pinfo->destport, 0); if (conversation == NULL) { - conversation = conversation_new(pinfo->fd->num, &pinfo->src, &pinfo->dst, pinfo->ptype, pinfo->srcport, pinfo->destport, 0); + conversation = conversation_new(pinfo->num, &pinfo->src, &pinfo->dst, pinfo->ptype, pinfo->srcport, pinfo->destport, 0); } conversation_set_dissector(conversation, rtmpt_tcp_handle); diff --git a/epan/dissectors/packet-rtp.c b/epan/dissectors/packet-rtp.c index 543fa33bea..91f84bd990 100644 --- a/epan/dissectors/packet-rtp.c +++ b/epan/dissectors/packet-rtp.c @@ -1238,7 +1238,7 @@ srtp_add_address(packet_info *pinfo, address *addr, int port, int other_port, } DPRINT(("#%u: %srtp_add_address(%s, %u, %u, %s, %u)", - pinfo->fd->num, (srtp_info)?"s":"", address_to_str(wmem_packet_scope(), addr), port, + pinfo->num, (srtp_info)?"s":"", address_to_str(wmem_packet_scope(), addr), port, other_port, setup_method, setup_frame_number)); DINDENT(); @@ -1374,11 +1374,11 @@ dissect_rtp_heur_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi } /* Create a conversation in case none exists so as to allow reassembly code to work */ - if (!find_conversation(pinfo->fd->num, &pinfo->net_dst, &pinfo->net_src, pinfo->ptype, + if (!find_conversation(pinfo->num, &pinfo->net_dst, &pinfo->net_src, pinfo->ptype, pinfo->destport, pinfo->srcport, NO_ADDR2)) { conversation_t *p_conv; struct _rtp_conversation_info *p_conv_data; - p_conv = conversation_new(pinfo->fd->num, &pinfo->net_dst, &pinfo->net_src, pinfo->ptype, + p_conv = conversation_new(pinfo->num, &pinfo->net_dst, &pinfo->net_src, pinfo->ptype, pinfo->destport, pinfo->srcport, NO_ADDR2); p_conv_data = (struct _rtp_conversation_info *)conversation_get_proto_data(p_conv, proto_rtp); if (! p_conv_data) { @@ -1391,7 +1391,7 @@ dissect_rtp_heur_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi conversation_add_proto_data(p_conv, proto_rtp, p_conv_data); } g_strlcpy(p_conv_data->method, "HEUR RTP", MAX_RTP_SETUP_METHOD_SIZE+1); - p_conv_data->frame_number = pinfo->fd->num; + p_conv_data->frame_number = pinfo->num; p_conv_data->is_video = FALSE; p_conv_data->srtp_info = NULL; p_conv_data->bta2dp_info = NULL; @@ -1567,7 +1567,7 @@ dissect_rtp_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, #ifdef DEBUG_FRAGMENTS g_debug("%d: RTP Part of convo %d(%p); seqno %d", - pinfo->fd->num, + pinfo->num, p_conv_data->frame_number, p_conv_data, seqno ); @@ -2628,7 +2628,7 @@ get_conv_info(packet_info *pinfo, struct _rtp_info *rtp_info) conversation_t *p_conv; /* First time, get info from conversation */ - 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); if (p_conv) diff --git a/epan/dissectors/packet-rtpproxy.c b/epan/dissectors/packet-rtpproxy.c index 2466a36141..e782a78129 100644 --- a/epan/dissectors/packet-rtpproxy.c +++ b/epan/dissectors/packet-rtpproxy.c @@ -445,13 +445,13 @@ rtpproxy_add_tid(gboolean is_request, tvbuff_t *tvb, packet_info *pinfo, proto_t if (!PINFO_FD_VISITED(pinfo)) { if (is_request){ rtpproxy_info = wmem_new0(wmem_file_scope(), rtpproxy_info_t); - rtpproxy_info->req_frame = PINFO_FD_NUM(pinfo); + rtpproxy_info->req_frame = pinfo->num; rtpproxy_info->req_time = pinfo->abs_ts; wmem_tree_insert_string(rtpproxy_conv->trans, cookie, rtpproxy_info, 0); } else { rtpproxy_info = (rtpproxy_info_t *)wmem_tree_lookup_string(rtpproxy_conv->trans, cookie, 0); if (rtpproxy_info) { - rtpproxy_info->resp_frame = PINFO_FD_NUM(pinfo); + rtpproxy_info->resp_frame = pinfo->num; } } } else { @@ -884,11 +884,11 @@ dissect_rtpproxy(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data if (rtp_handle) { /* FIXME tell if isn't a video stream, and setup codec mapping */ if (addr.len) - rtp_add_address(pinfo, &addr, port, 0, "RTPproxy", pinfo->fd->num, 0, NULL); + rtp_add_address(pinfo, &addr, port, 0, "RTPproxy", pinfo->num, 0, NULL); } if (rtcp_handle) { if (addr.len) - rtcp_add_address(pinfo, &addr, port+1, 0, "RTPproxy", pinfo->fd->num); + rtcp_add_address(pinfo, &addr, port+1, 0, "RTPproxy", pinfo->num); } } break; diff --git a/epan/dissectors/packet-rtse.c b/epan/dissectors/packet-rtse.c index fcecfa587d..18625113cc 100644 --- a/epan/dissectors/packet-rtse.c +++ b/epan/dissectors/packet-rtse.c @@ -778,7 +778,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) { @@ -808,7 +808,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); diff --git a/epan/dissectors/packet-rtsp.c b/epan/dissectors/packet-rtsp.c index dd71c6850e..ba06a48ca3 100644 --- a/epan/dissectors/packet-rtsp.c +++ b/epan/dissectors/packet-rtsp.c @@ -384,7 +384,7 @@ dissect_rtspinterleaved(tvbuff_t *tvb, int offset, packet_info *pinfo, length_remaining = rf_len; next_tvb = tvb_new_subset(tvb, offset, length_remaining, rf_len); - 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 && @@ -637,13 +637,13 @@ rtsp_create_conversation(packet_info *pinfo, proto_item *ti, { /* There is always data for RTP */ rtp_add_address(pinfo, &pinfo->dst, c_data_port, s_data_port, - "RTSP", pinfo->fd->num, is_video, NULL); + "RTSP", pinfo->num, is_video, NULL); /* RTCP only if indicated */ if (c_mon_port) { rtcp_add_address(pinfo, &pinfo->dst, c_mon_port, s_mon_port, - "RTSP", pinfo->fd->num); + "RTSP", pinfo->num); } } else @@ -724,7 +724,7 @@ dissect_rtspmessage(tvbuff_t *tvb, int offset, packet_info *pinfo, voip_packet_info_t *stat_info = NULL; rtsp_stat_info = wmem_new(wmem_packet_scope(), rtsp_info_value_t); - rtsp_stat_info->framenum = pinfo->fd->num; + rtsp_stat_info->framenum = pinfo->num; rtsp_stat_info->response_code = 0; rtsp_stat_info->request_method = NULL; rtsp_stat_info->request_uri = NULL; diff --git a/epan/dissectors/packet-sbus.c b/epan/dissectors/packet-sbus.c index 6c34695cb7..abdf9b7ab1 100644 --- a/epan/dissectors/packet-sbus.c +++ b/epan/dissectors/packet-sbus.c @@ -708,18 +708,18 @@ dissect_sbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_ *also in case this is no retry*/ sbus_attribut = tvb_get_guint8(tvb,8); if (request_val && sbus_attribut == SBUS_REQUEST) { - if (request_val->req_frame < pinfo->fd->num){ /*a retry; req_frame smaller this frame*/ + if (request_val->req_frame < pinfo->num){ /*a retry; req_frame smaller this frame*/ request_val->retry_count +=1; } else { /*we have a conversation but this is not a retry so we store the packet info*/ request_val->retry_count = 0; - request_val->req_frame = pinfo->fd->num; /*store actual frame nr.*/ + request_val->req_frame = pinfo->num; /*store actual frame nr.*/ request_val->req_time = pinfo->abs_ts; } } if (request_val && (sbus_attribut == SBUS_RESPONSE || sbus_attribut == SBUS_ACKNAK)) { /*a response*/ - request_val->resp_frame = pinfo->fd->num; /*so store this frame nr.*/ + request_val->resp_frame = pinfo->num; /*so store this frame nr.*/ } /* Only allocate a new hash element when it's a request*/ sbus_attribut = tvb_get_guint8(tvb,8); @@ -731,7 +731,7 @@ dissect_sbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_ request_val = wmem_new(wmem_file_scope(), sbus_request_val); request_val->cmd_code=tvb_get_guint8(tvb,10); request_val->retry_count=0; - request_val->req_frame = pinfo->fd->num; /*store actual frame nr.*/ + request_val->req_frame = pinfo->num; /*store actual frame nr.*/ request_val->req_time = pinfo->abs_ts; request_val->resp_frame = 0; /*response frame is not known yet*/ @@ -946,7 +946,7 @@ dissect_sbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_ proto_tree_add_uint(sbus_tree, hf_sbus_request_in, tvb, 0, 0, request_val->req_frame); } - if (request_val && request_val->resp_frame > pinfo->fd->num){ + if (request_val && request_val->resp_frame > pinfo->num){ proto_tree_add_uint(sbus_tree, hf_sbus_response_in, tvb, 0, 0, request_val->resp_frame); } diff --git a/epan/dissectors/packet-sccp.c b/epan/dissectors/packet-sccp.c index 6fc8b3e3e2..1b92f1842e 100644 --- a/epan/dissectors/packet-sccp.c +++ b/epan/dissectors/packet-sccp.c @@ -1329,7 +1329,7 @@ get_sccp_assoc(packet_info *pinfo, guint offset, sccp_decode_context_t* value) guint32 opck, dpck; address *opc = &(pinfo->src); address *dpc = &(pinfo->dst); - guint framenum = PINFO_FD_NUM(pinfo); + guint framenum = pinfo->num; if (value->assoc) return value->assoc; @@ -2675,7 +2675,7 @@ static sccp_msg_info_t * new_ud_msg(packet_info *pinfo, guint32 msg_type _U_) { sccp_msg_info_t *m = wmem_new0(wmem_packet_scope(), sccp_msg_info_t); - m->framenum = PINFO_FD_NUM(pinfo); + m->framenum = pinfo->num; m->data.ud.calling_gt = NULL; m->data.ud.called_gt = NULL; @@ -3317,7 +3317,7 @@ dissect_sccp_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *sccp_tree, if (m->data.co.label) proto_item_append_text(pi," %s", m->data.co.label); - if ((m->framenum == PINFO_FD_NUM(pinfo)) && (m->offset == msg_offset) ) { + if ((m->framenum == pinfo->num) && (m->offset == msg_offset) ) { tap_queue_packet(sccp_tap, pinfo, m); proto_item_append_text(pi," (current)"); } diff --git a/epan/dissectors/packet-scsi-osd.c b/epan/dissectors/packet-scsi-osd.c index 211831a53d..fd8775243d 100644 --- a/epan/dissectors/packet-scsi-osd.c +++ b/epan/dissectors/packet-scsi-osd.c @@ -1294,10 +1294,10 @@ dissect_osd_partition_id(packet_info *pinfo, tvbuff_t *tvb, int offset, wmem_tree_insert32_array(lun_info->partitions, &pikey[0], part_info); } if (is_created) { - part_info->created_in = pinfo->fd->num; + part_info->created_in = pinfo->num; } if (is_removed) { - part_info->removed_in = pinfo->fd->num; + part_info->removed_in = pinfo->num; } if (item) { partition_tree = proto_item_add_subtree(item, ett_osd_partition); diff --git a/epan/dissectors/packet-scsi.c b/epan/dissectors/packet-scsi.c index 48e4411358..41631d2423 100644 --- a/epan/dissectors/packet-scsi.c +++ b/epan/dissectors/packet-scsi.c @@ -6404,7 +6404,7 @@ dissect_scsi_payload(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, more_frags); next_tvb = process_reassembled_data(tvb, offset, pinfo, "Reassembled SCSI DATA", ipfd_head, &scsi_frag_items, &update_col_info, tree); - if ( ipfd_head && (ipfd_head->reassembled_in != pinfo->fd->num) ) { + if ( ipfd_head && (ipfd_head->reassembled_in != pinfo->num) ) { col_prepend_fstr(pinfo->cinfo, COL_INFO, "[Reassembled in #%u] ", ipfd_head->reassembled_in); } diff --git a/epan/dissectors/packet-sctp.c b/epan/dissectors/packet-sctp.c index 1cd86dcbc4..1a0380093e 100644 --- a/epan/dissectors/packet-sctp.c +++ b/epan/dissectors/packet-sctp.c @@ -1165,7 +1165,7 @@ sctp_tsn(packet_info *pinfo, tvbuff_t *tvb, proto_item *tsn_item, return(is_retransmission); - framenum = PINFO_FD_NUM(pinfo); + framenum = pinfo->num; /* If we're dissecting for a read filter in the GUI [tshark assigns * frame numbers before running the read filter], don't do the TSN @@ -1235,7 +1235,7 @@ ack_tree(sctp_tsn_t *t, proto_tree *acks_tree, proto_item *pi; proto_tree *pt; nstime_t rtt; - guint framenum = pinfo->fd->num; + guint framenum = pinfo->num; if ( t->ack.framenum == framenum ) { nstime_delta( &rtt, &(t->ack.ts), &(t->first_transmit.ts) ); @@ -1264,7 +1264,7 @@ sctp_ack(packet_info *pinfo, tvbuff_t *tvb, proto_tree *acks_tree, if (!h || !h->peer) return; - framenum = PINFO_FD_NUM(pinfo); + framenum = pinfo->num; /* printf("%.6d ACK: %p->%p [%u] \n",framenum,h,h->peer,reltsn); */ @@ -1310,7 +1310,7 @@ sctp_ack_block(packet_info *pinfo, sctp_half_assoc_t *h, tvbuff_t *tvb, if ( !h || !h->peer || ! h->peer->started ) return; - framenum = PINFO_FD_NUM(pinfo); + framenum = pinfo->num; rel_end = RELTSNACK(tsn_end); if (tsn_start_ptr) { @@ -2743,7 +2743,7 @@ add_fragment(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint32 tsn, /* this fragment is already known. * compare frame number to check if it's a duplicate */ - if (fragment->frame_num == pinfo->fd->num) { + if (fragment->frame_num == pinfo->num) { return fragment; } else { /* There already is a fragment having the same ports, v_tag, @@ -2767,7 +2767,7 @@ add_fragment(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint32 tsn, /* create new fragment */ fragment = (sctp_fragment *)g_malloc (sizeof (sctp_fragment)); - fragment->frame_num = pinfo->fd->num; + fragment->frame_num = pinfo->num; fragment->tsn = tsn; fragment->len = tvb_captured_length(tvb); fragment->ppi = msg->ppi; diff --git a/epan/dissectors/packet-sdp.c b/epan/dissectors/packet-sdp.c index a389e30bb5..664083fe95 100644 --- a/epan/dissectors/packet-sdp.c +++ b/epan/dissectors/packet-sdp.c @@ -1950,7 +1950,7 @@ setup_sdp_transport(tvbuff_t *tvb, packet_info *pinfo, enum sdp_exchange_type ex #endif if (exchange_type != SDP_EXCHANGE_OFFER) - wmem_tree_insert32(sdp_transport_rsps, pinfo->fd->num, (void *)transport_info); + wmem_tree_insert32(sdp_transport_rsps, pinfo->num, (void *)transport_info); /* Offer has already been answered or rejected and hash tables freed, so * don't try to add to it @@ -2089,7 +2089,7 @@ setup_sdp_transport(tvbuff_t *tvb, packet_info *pinfo, enum sdp_exchange_type ex /* If no request_frame number has been found use this frame's number */ if (request_frame == 0) { - establish_frame = pinfo->fd->num; + establish_frame = pinfo->num; } else { establish_frame = request_frame; } @@ -2157,9 +2157,9 @@ setup_sdp_transport(tvbuff_t *tvb, packet_info *pinfo, enum sdp_exchange_type ex if (transport_info->media_port[n] == 0 && current_rtp_port) { sprt_add_address(pinfo, &transport_info->src_addr[n], current_rtp_port, - 0, "SDP", pinfo->fd->num); /* will use same port as RTP */ + 0, "SDP", pinfo->num); /* will use same port as RTP */ } else { - sprt_add_address(pinfo, &transport_info->src_addr[n], transport_info->media_port[n], 0, "SDP", pinfo->fd->num); + sprt_add_address(pinfo, &transport_info->src_addr[n], transport_info->media_port[n], 0, "SDP", pinfo->num); } } @@ -2168,7 +2168,7 @@ setup_sdp_transport(tvbuff_t *tvb, packet_info *pinfo, enum sdp_exchange_type ex !transport_info->media[n].set_rtp && (transport_info->proto_bitmask[n] & SDP_T38_PROTO) && (transport_info->proto_bitmask[n] & SDP_IPv4)) { - t38_add_address(pinfo, &transport_info->src_addr[n], transport_info->media_port[n], 0, "SDP", pinfo->fd->num); + t38_add_address(pinfo, &transport_info->src_addr[n], transport_info->media_port[n], 0, "SDP", pinfo->num); } /* Add MSRP conversation. Uses addresses discovered in attribute @@ -2177,7 +2177,7 @@ setup_sdp_transport(tvbuff_t *tvb, packet_info *pinfo, enum sdp_exchange_type ex if ((transport_info->proto_bitmask[n] & SDP_MSRP_PROTO) && (transport_info->proto_bitmask[n] & SDP_MSRP_IPv4) && msrp_handle) { - msrp_add_address(pinfo, &transport_info->src_addr[n], transport_info->media_port[n], "SDP", pinfo->fd->num); + msrp_add_address(pinfo, &transport_info->src_addr[n], transport_info->media_port[n], "SDP", pinfo->num); } /* Free the hash table if we did't assigned it to a conv use it */ @@ -2278,11 +2278,11 @@ dissect_sdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) sdp_pi->summary_str[0] = '\0'; if (!pinfo->fd->flags.visited) { - transport_info = (transport_info_t*)wmem_tree_lookup32( sdp_transport_reqs, pinfo->fd->num ); + transport_info = (transport_info_t*)wmem_tree_lookup32( sdp_transport_reqs, pinfo->num ); if (transport_info == NULL) { /* Can't find it in the requests, make sure it's not a response */ - transport_info = (transport_info_t*)wmem_tree_lookup32( sdp_transport_rsps, pinfo->fd->num ); + transport_info = (transport_info_t*)wmem_tree_lookup32( sdp_transport_rsps, pinfo->num ); } } @@ -2501,7 +2501,7 @@ dissect_sdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) DPRINT(("calling srtp_add_address for media_port=%d, for channel=%d", transport_info->media_port[n],n)); DINDENT(); - srtp_add_address(pinfo, &transport_info->src_addr[n], transport_info->media_port[n], 0, "SDP", pinfo->fd->num, + srtp_add_address(pinfo, &transport_info->src_addr[n], transport_info->media_port[n], 0, "SDP", pinfo->num, (transport_info->proto_bitmask[n] & SDP_VIDEO) ? TRUE : FALSE, transport_info->media[n].rtp_dyn_payload, srtp_info); DENDENT(); @@ -2509,7 +2509,7 @@ dissect_sdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) DPRINT(("calling rtp_add_address for media_port=%d, for channel=%d", transport_info->media_port[n],n)); DINDENT(); - rtp_add_address(pinfo, &transport_info->src_addr[n], transport_info->media_port[n], 0, "SDP", pinfo->fd->num, + rtp_add_address(pinfo, &transport_info->src_addr[n], transport_info->media_port[n], 0, "SDP", pinfo->num, (transport_info->proto_bitmask[n] & SDP_VIDEO) ? TRUE : FALSE, transport_info->media[n].rtp_dyn_payload); DENDENT(); @@ -2523,13 +2523,13 @@ dissect_sdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) DPRINT(("calling srtcp_add_address for media_port=%d, for channel=%d", transport_info->media_port[n],n)); DINDENT(); - srtcp_add_address(pinfo, &transport_info->src_addr[n], transport_info->media_port[n]+1, 0, "SDP", pinfo->fd->num, srtp_info); + srtcp_add_address(pinfo, &transport_info->src_addr[n], transport_info->media_port[n]+1, 0, "SDP", pinfo->num, srtp_info); DENDENT(); } else { DPRINT(("calling rtcp_add_address for media_port=%d, for channel=%d", transport_info->media_port[n],n)); DINDENT(); - rtcp_add_address(pinfo, &transport_info->src_addr[n], transport_info->media_port[n]+1, 0, "SDP", pinfo->fd->num); + rtcp_add_address(pinfo, &transport_info->src_addr[n], transport_info->media_port[n]+1, 0, "SDP", pinfo->num); DENDENT(); } } @@ -2544,9 +2544,9 @@ dissect_sdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) if (transport_info->media_port[n] == 0 && current_rtp_port) { sprt_add_address(pinfo, &transport_info->src_addr[n], current_rtp_port, - 0, "SDP", pinfo->fd->num); /* will use same port as RTP */ + 0, "SDP", pinfo->num); /* will use same port as RTP */ } else { - sprt_add_address(pinfo, &transport_info->src_addr[n], transport_info->media_port[n], 0, "SDP", pinfo->fd->num); + sprt_add_address(pinfo, &transport_info->src_addr[n], transport_info->media_port[n], 0, "SDP", pinfo->num); } } @@ -2557,7 +2557,7 @@ dissect_sdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) !transport_info->media[n].set_rtp && (transport_info->proto_bitmask[n] & SDP_T38_PROTO) && (transport_info->proto_bitmask[n] & SDP_IPv4)) { - t38_add_address(pinfo, &transport_info->src_addr[n], transport_info->media_port[n], 0, "SDP", pinfo->fd->num); + t38_add_address(pinfo, &transport_info->src_addr[n], transport_info->media_port[n], 0, "SDP", pinfo->num); } /* Add MSRP conversation. Uses addresses discovered in attribute @@ -2567,7 +2567,7 @@ dissect_sdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) (transport_info->proto_bitmask[n] & SDP_MSRP_PROTO) && (transport_info->proto_bitmask[n] & SDP_MSRP_IPv4) && msrp_handle) { - msrp_add_address(pinfo, &transport_info->src_addr[n], transport_info->media_port[n], "SDP", pinfo->fd->num); + msrp_add_address(pinfo, &transport_info->src_addr[n], transport_info->media_port[n], "SDP", pinfo->num); } if (local_transport_info.media_port[n] != 0) { diff --git a/epan/dissectors/packet-selfm.c b/epan/dissectors/packet-selfm.c index 4342721bf0..7bf58b039a 100644 --- a/epan/dissectors/packet-selfm.c +++ b/epan/dissectors/packet-selfm.c @@ -2416,7 +2416,7 @@ dissect_selfm(tvbuff_t *selfm_tvb, packet_info *pinfo, proto_tree *tree, void* d if ((CMD_FM_CONFIG == msg_type) || (CMD_DFM_CONFIG == msg_type) || (CMD_PDFM_CONFIG == msg_type)) { /* Fill the fm_config_frame */ fm_config_frame *frame_ptr = fmconfig_frame_fast(selfm_tvb); - frame_ptr->fnum = pinfo->fd->num; + frame_ptr->fnum = pinfo->num; wmem_list_prepend(fm_conv_data->fm_config_frames, frame_ptr); } @@ -2445,7 +2445,7 @@ dissect_selfm(tvbuff_t *selfm_tvb, packet_info *pinfo, proto_tree *tree, void* d /* Enter the single frame multiple times, retrieving a single dataitem per entry */ for (cnt = 1; (cnt <= num_items); cnt++) { fastmsg_dataitem *dataitem_ptr = fastmsg_dataitem_save(selfm_tvb, offset); - dataitem_ptr->fnum = pinfo->fd->num; + dataitem_ptr->fnum = pinfo->num; dataitem_ptr->base_address = base_addr; dataitem_ptr->index_pos = cnt; diff --git a/epan/dissectors/packet-ses.c b/epan/dissectors/packet-ses.c index 0de341d06f..1882b892f3 100644 --- a/epan/dissectors/packet-ses.c +++ b/epan/dissectors/packet-ses.c @@ -1005,7 +1005,7 @@ dissect_spdu(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, guint32 ses_id = 0; /* Use conversation index as segment id */ - conversation = find_conversation (pinfo->fd->num, + conversation = find_conversation (pinfo->num, &pinfo->src, &pinfo->dst, pinfo->ptype, pinfo->srcport, pinfo->destport, 0); if (conversation != NULL) { diff --git a/epan/dissectors/packet-sip.c b/epan/dissectors/packet-sip.c index a78e91889b..5281bd45b0 100644 --- a/epan/dissectors/packet-sip.c +++ b/epan/dissectors/packet-sip.c @@ -3881,15 +3881,15 @@ dissect_sip_common(tvbuff_t *tvb, int offset, int remaining_length, packet_info if (resend_for_packet == 0) { if (line_type == REQUEST_LINE) { DPRINT(("calling setup_sdp_transport() SDP_EXCHANGE_OFFER frame=%d", - pinfo->fd->num)); + pinfo->num)); DINDENT(); - setup_sdp_transport(next_tvb, pinfo, SDP_EXCHANGE_OFFER, pinfo->fd->num, sip_delay_sdp_changes); + setup_sdp_transport(next_tvb, pinfo, SDP_EXCHANGE_OFFER, pinfo->num, sip_delay_sdp_changes); DENDENT(); } else if (line_type == STATUS_LINE) { if (stat_info->response_code >= 400) { DPRINT(("calling setup_sdp_transport() SDP_EXCHANGE_ANSWER_REJECT " "request_frame=%d, this=%d", - request_for_response, pinfo->fd->num)); + request_for_response, pinfo->num)); DINDENT(); /* SIP client request failed, so SDP offer should fail */ setup_sdp_transport(next_tvb, pinfo, SDP_EXCHANGE_ANSWER_REJECT, request_for_response, sip_delay_sdp_changes); @@ -3898,7 +3898,7 @@ dissect_sip_common(tvbuff_t *tvb, int offset, int remaining_length, packet_info else if ((stat_info->response_code >= 200) && (stat_info->response_code <= 299)) { DPRINT(("calling setup_sdp_transport() SDP_EXCHANGE_ANSWER_ACCEPT " "request_frame=%d, this=%d", - request_for_response, pinfo->fd->num)); + request_for_response, pinfo->num)); DINDENT(); /* SIP success request, so SDP offer should be accepted */ setup_sdp_transport(next_tvb, pinfo, SDP_EXCHANGE_ANSWER_ACCEPT, request_for_response, sip_delay_sdp_changes); @@ -3908,9 +3908,9 @@ dissect_sip_common(tvbuff_t *tvb, int offset, int remaining_length, packet_info } else { DPRINT(("calling setup_sdp_transport() resend_for_packet " "request_frame=%d, this=%d", - request_for_response, pinfo->fd->num)); + request_for_response, pinfo->num)); DINDENT(); - setup_sdp_transport_resend(pinfo->fd->num, resend_for_packet); + setup_sdp_transport_resend(pinfo->num, resend_for_packet); DENDENT(); } } @@ -4451,7 +4451,7 @@ guint sip_is_packet_resend(packet_info *pinfo, if (!result) { /* This frame is the original request */ - p_val->frame_number = pinfo->fd->num; + p_val->frame_number = pinfo->num; } break; case STATUS_LINE: @@ -4462,7 +4462,7 @@ guint sip_is_packet_resend(packet_info *pinfo, if (!result) { /* This frame is the original response */ - p_val->frame_number = pinfo->fd->num; + p_val->frame_number = pinfo->num; } } else diff --git a/epan/dissectors/packet-skinny.c b/epan/dissectors/packet-skinny.c index 475621b759..23784d4411 100644 --- a/epan/dissectors/packet-skinny.c +++ b/epan/dissectors/packet-skinny.c @@ -2265,7 +2265,7 @@ dissect_skinny_ipv4or6(ptvcursor_t *cursor, int hfindex_ipv4, int hfindex_ipv6, src_addr.len = 4; src_addr.data = (guint8 *)&ip_address; ip_address = tvb_get_ipv4(tvb, offset); - rtp_add_address(pinfo, &src_addr, tvb_get_letohl(tvb, offset), 0, "Skinny", pinfo->fd->num, is_video, NULL); + rtp_add_address(pinfo, &src_addr, tvb_get_letohl(tvb, offset), 0, "Skinny", pinfo->num, is_video, NULL); ptvcursor_add(cursor, hfindex_ipv4, 4, ENC_BIG_ENDIAN); if (hdr_version >= V17_MSG_TYPE) { /* skip over the extra room for ipv6 addresses */ @@ -2277,7 +2277,7 @@ dissect_skinny_ipv4or6(ptvcursor_t *cursor, int hfindex_ipv4, int hfindex_ipv6, src_addr.len = 16; src_addr.data = (guint8 *)&IPv6; tvb_get_ipv6(tvb, offset, &IPv6); - rtp_add_address(pinfo, &src_addr, tvb_get_letohl(tvb, offset), 0, "Skinny", pinfo->fd->num, is_video, NULL); + rtp_add_address(pinfo, &src_addr, tvb_get_letohl(tvb, offset), 0, "Skinny", pinfo->num, is_video, NULL); ptvcursor_add(cursor, hfindex_ipv6, 16, ENC_NA); } else { /* Invalid : skip over ipv6 space completely */ diff --git a/epan/dissectors/packet-smb-pipe.c b/epan/dissectors/packet-smb-pipe.c index 4951c801e7..6f32f91f64 100644 --- a/epan/dissectors/packet-smb-pipe.c +++ b/epan/dissectors/packet-smb-pipe.c @@ -3405,7 +3405,7 @@ dissect_pipe_dcerpc(tvbuff_t *d_tvb, packet_info *pinfo, proto_tree *parent_tree } /* it is reassembled but it was reassembled in a different frame */ - if(pinfo->fd->num!=fd_head->reassembled_in){ + if(pinfo->num!=fd_head->reassembled_in){ proto_tree_add_uint(parent_tree, hf_smb_pipe_reassembled_in, d_tvb, 0, 0, fd_head->reassembled_in); goto clean_up_and_exit; } diff --git a/epan/dissectors/packet-smb-sidsnooping.c b/epan/dissectors/packet-smb-sidsnooping.c index 3ce7499b11..3a2ff1628c 100644 --- a/epan/dissectors/packet-smb-sidsnooping.c +++ b/epan/dissectors/packet-smb-sidsnooping.c @@ -122,14 +122,14 @@ samr_query_dispinfo(void *dummy _U_, packet_info *pinfo, epan_dissect_t *edt, co } fi=(field_info *)gp->pdata[0]; - old_ctx=g_hash_table_lookup(ctx_handle_table, GINT_TO_POINTER(pinfo->fd->num)); + old_ctx=g_hash_table_lookup(ctx_handle_table, GINT_TO_POINTER(pinfo->num)); if(old_ctx){ - g_hash_table_remove(ctx_handle_table, GINT_TO_POINTER(pinfo->fd->num)); + g_hash_table_remove(ctx_handle_table, GINT_TO_POINTER(pinfo->num)); } if(!old_ctx){ old_ctx=wmem_memdup(wmem_file_scope(), fi->value.value.bytes->data, 20); } - g_hash_table_insert(ctx_handle_table, GINT_TO_POINTER(pinfo->fd->num), old_ctx); + g_hash_table_insert(ctx_handle_table, GINT_TO_POINTER(pinfo->num), old_ctx); return 0; } diff --git a/epan/dissectors/packet-smb.c b/epan/dissectors/packet-smb.c index f5c2b2c900..47f13e71b6 100644 --- a/epan/dissectors/packet-smb.c +++ b/epan/dissectors/packet-smb.c @@ -1099,7 +1099,7 @@ feed_eo_smb(guint16 cmd, guint16 fid, tvbuff_t * tvb, packet_info *pinfo, guint1 GSL_iterator = si->ct->GSL_fid_info; while (GSL_iterator) { suspect_fid_info = (smb_fid_info_t *)GSL_iterator->data; - if (suspect_fid_info->opened_in > pinfo->fd->num) break; + if (suspect_fid_info->opened_in > pinfo->num) break; if ((suspect_fid_info->tid == si->tid) && (suspect_fid_info->fid == fid)) fid_info = suspect_fid_info; GSL_iterator = g_slist_next(GSL_iterator); @@ -2890,7 +2890,7 @@ dissect_smb_tid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset, if ((!pinfo->fd->flags.visited) && is_created) { tid_info = wmem_new(wmem_file_scope(), smb_tid_info_t); - tid_info->opened_in = pinfo->fd->num; + tid_info->opened_in = pinfo->num; tid_info->closed_in = 0; tid_info->type = SMB_FID_TYPE_UNKNOWN; if (si->sip && (si->sip->extra_info_type == SMB_EI_TIDNAME)) { @@ -2909,7 +2909,7 @@ dissect_smb_tid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset, } if ((!pinfo->fd->flags.visited) && is_closed) { - tid_info->closed_in = pinfo->fd->num; + tid_info->closed_in = pinfo->num; } if (tid_info->opened_in) { @@ -3479,7 +3479,7 @@ dissect_smb_fid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset, if ((!pinfo->fd->flags.visited) && is_created) { fid_info = wmem_new(wmem_file_scope(), smb_fid_info_t); - fid_info->opened_in = pinfo->fd->num; + fid_info->opened_in = pinfo->num; fid_info->closed_in = 0; fid_info->type = SMB_FID_TYPE_UNKNOWN; fid_info->fid = fid; @@ -3508,7 +3508,7 @@ dissect_smb_fid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset, GSL_iterator = si->ct->GSL_fid_info; while (GSL_iterator) { suspect_fid_info = (smb_fid_info_t *)GSL_iterator->data; - if (suspect_fid_info->opened_in > pinfo->fd->num) break; + if (suspect_fid_info->opened_in > pinfo->num) break; if ((suspect_fid_info->tid == si->tid) && (suspect_fid_info->fid == fid)) fid_info = (smb_fid_info_t *)suspect_fid_info; GSL_iterator = g_slist_next(GSL_iterator); @@ -3531,7 +3531,7 @@ dissect_smb_fid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset, } if ((!pinfo->fd->flags.visited) && is_closed) { - fid_info->closed_in = pinfo->fd->num; + fid_info->closed_in = pinfo->num; } if (fid_info->opened_in) { @@ -7238,7 +7238,7 @@ dissect_session_setup_andx_response(tvbuff_t *tvb, packet_info *pinfo, proto_tre smb_uid_t *smb_uid; smb_uid = (smb_uid_t *)si->sip->extra_info; - smb_uid->logged_in = pinfo->fd->num; + smb_uid->logged_in = pinfo->num; wmem_tree_insert32(si->ct->uid_tree, si->uid, smb_uid); } @@ -17257,7 +17257,7 @@ dissect_smb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* da sip = (smb_saved_info_t *)g_hash_table_lookup(si->ct->unmatched, GUINT_TO_POINTER(pid_mid)); if (sip != NULL) { new_key = (smb_saved_info_key_t *)wmem_alloc(wmem_file_scope(), sizeof(smb_saved_info_key_t)); - new_key->frame = pinfo->fd->num; + new_key->frame = pinfo->num; new_key->pid_mid = pid_mid; g_hash_table_insert(si->ct->matched, new_key, sip); @@ -17272,7 +17272,7 @@ dissect_smb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* da /* we have seen this packet before; check the matching table */ - key.frame = pinfo->fd->num; + key.frame = pinfo->num; key.pid_mid = pid_mid; sip = (smb_saved_info_t *)g_hash_table_lookup(si->ct->matched, &key); if (sip == NULL) { @@ -17382,7 +17382,7 @@ dissect_smb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* da we have seen to this packet, or it's a continuation of a response we've seen. */ - sip->frame_res = pinfo->fd->num; + sip->frame_res = pinfo->num; new_key = (smb_saved_info_key_t *)wmem_alloc(wmem_file_scope(), sizeof(smb_saved_info_key_t)); new_key->frame = sip->frame_res; new_key->pid_mid = pid_mid; @@ -17419,7 +17419,7 @@ dissect_smb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* da } if (si->request) { sip = (smb_saved_info_t *)wmem_alloc(wmem_file_scope(), sizeof(smb_saved_info_t)); - sip->frame_req = pinfo->fd->num; + sip->frame_req = pinfo->num; sip->frame_res = 0; sip->req_time = pinfo->abs_ts; sip->flags = 0; @@ -17454,7 +17454,7 @@ dissect_smb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* da we've seen this packet before, we've already saved the information. */ - key.frame = pinfo->fd->num; + key.frame = pinfo->num; key.pid_mid = pid_mid; sip = (smb_saved_info_t *)g_hash_table_lookup(si->ct->matched, &key); } diff --git a/epan/dissectors/packet-smb2.c b/epan/dissectors/packet-smb2.c index 0fdbab580c..0262328b8a 100644 --- a/epan/dissectors/packet-smb2.c +++ b/epan/dissectors/packet-smb2.c @@ -697,7 +697,7 @@ smb2stat_packet(void *pss, packet_info *pinfo, epan_dissect_t *edt _U_, const vo * retransmissions triggered by the expiry of the rexmit timer (RTOs). Only calculating SRT * for the last received response accomplishes this goal without requiring the TCP pref * "Do not call subdissectors for error packets" to be set. */ - if ((si->saved->frame_req == 0) || (si->saved->frame_res != pinfo->fd->num)) + if ((si->saved->frame_req == 0) || (si->saved->frame_res != pinfo->num)) return 0; smb2_srt_table = g_array_index(data->srt_array, srt_stat_table*, i); @@ -970,7 +970,7 @@ feed_eo_smb2(tvbuff_t * tvb,packet_info *pinfo,smb2_info_t * si, guint16 dataoff /* Try to get file id and filename */ file_id=policy_hnd_to_file_id(&si->saved->policy_hnd); - dcerpc_fetch_polhnd_data(&si->saved->policy_hnd, &fid_name, NULL, &open_frame, &close_frame, pinfo->fd->num); + dcerpc_fetch_polhnd_data(&si->saved->policy_hnd, &fid_name, NULL, &open_frame, &close_frame, pinfo->num); if (fid_name && g_strcmp0(fid_name,"File: ")!=0) { auxstring=fid_name; /* Remove "File: " from filename */ @@ -1012,7 +1012,7 @@ feed_eo_smb2(tvbuff_t * tvb,packet_info *pinfo,smb2_info_t * si, guint16 dataoff } /* packet number */ - eo_info->pkt_num = pinfo->fd->num; + eo_info->pkt_num = pinfo->num; /* fid type */ if (si->eo_file_info->attr_mask & SMB2_FLAGS_ATTR_DIRECTORY) { @@ -1713,7 +1713,7 @@ dissect_smb2_fid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset } else { sfi->name = wmem_strdup_printf(wmem_file_scope(), "[unknown]"); } - sfi->open_frame = pinfo->fd->num; + sfi->open_frame = pinfo->num; if (si->saved && si->saved->extra_info_type == SMB2_EI_FILENAME) { fid_name = wmem_strdup_printf(wmem_file_scope(), "File: %s", (char *)si->saved->extra_info); @@ -1768,7 +1768,7 @@ dissect_smb2_fid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset } } - if (dcerpc_fetch_polhnd_data(&policy_hnd, &fid_name, NULL, &open_frame, &close_frame, pinfo->fd->num)) { + if (dcerpc_fetch_polhnd_data(&policy_hnd, &fid_name, NULL, &open_frame, &close_frame, pinfo->num)) { /* look for the eo_file_info */ if (!si->eo_file_info) { if (si->saved) { si->saved->policy_hnd = policy_hnd; } @@ -2808,7 +2808,7 @@ dissect_smb2_session_setup_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree sizeof(sesid->client_decryption_key)); } sesid->server_port = pinfo->destport; - sesid->auth_frame = pinfo->fd->num; + sesid->auth_frame = pinfo->num; sesid->tids = g_hash_table_new(smb2_tid_info_hash, smb2_tid_info_equal); g_hash_table_insert(si->conv->sesids, sesid, sesid); } @@ -2893,7 +2893,7 @@ dissect_smb2_session_setup_response(tvbuff_t *tvb, packet_info *pinfo, proto_tre } for (ek=enc_key_list;ek;ek=ek->next) { - if (ek->fd_num == (int)pinfo->fd->num) { + if (ek->fd_num == (int)pinfo->num) { break; } } @@ -2919,7 +2919,7 @@ dissect_smb2_session_setup_response(tvbuff_t *tvb, packet_info *pinfo, proto_tre "ServerOut", 10, sesid->client_decryption_key); sesid->server_port = pinfo->srcport; - sesid->auth_frame = pinfo->fd->num; + sesid->auth_frame = pinfo->num; sesid->tids = g_hash_table_new(smb2_tid_info_hash, smb2_tid_info_equal); g_hash_table_insert(si->conv->sesids, sesid, sesid); } @@ -2992,7 +2992,7 @@ dissect_smb2_tree_connect_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree tid = wmem_new(wmem_file_scope(), smb2_tid_info_t); tid->tid = si->tid; tid->name = (char *)si->saved->extra_info; - tid->connect_frame = pinfo->fd->num; + tid->connect_frame = pinfo->num; tid->share_type = share_type; g_hash_table_insert(si->session->tids, tid, tid); @@ -4780,7 +4780,7 @@ dissect_file_data_smb2_pipe(tvbuff_t *raw_tvb, packet_info *pinfo, proto_tree *t } /* it is reassembled but it was reassembled in a different frame */ - if (pinfo->fd->num != fd_head->reassembled_in) { + if (pinfo->num != fd_head->reassembled_in) { proto_item *item; item = proto_tree_add_uint(top_tree, hf_smb2_pipe_reassembled_in, tvb, 0, 0, fd_head->reassembled_in); @@ -8075,7 +8075,7 @@ dissect_smb2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, gboolea */ ssi = wmem_new0(wmem_file_scope(), smb2_saved_info_t); ssi->msg_id = ssi_key.msg_id; - ssi->frame_req = pinfo->fd->num; + ssi->frame_req = pinfo->num; ssi->req_time = pinfo->abs_ts; ssi->extra_info_type = SMB2_EI_NONE; g_hash_table_insert(si->conv->unmatched, ssi, ssi); @@ -8086,7 +8086,7 @@ dissect_smb2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, gboolea && si->status == NT_STATUS_PENDING) && ssi) { /* just set the response frame and move it to the matched table */ - ssi->frame_res = pinfo->fd->num; + ssi->frame_res = pinfo->num; g_hash_table_remove(si->conv->unmatched, ssi); g_hash_table_insert(si->conv->matched, ssi, ssi); } @@ -8103,7 +8103,7 @@ dissect_smb2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, gboolea } if (ssi) { - if (dcerpc_fetch_polhnd_data(&ssi->policy_hnd, &fid_name, NULL, &open_frame, &close_frame, pinfo->fd->num)) { + if (dcerpc_fetch_polhnd_data(&ssi->policy_hnd, &fid_name, NULL, &open_frame, &close_frame, pinfo->num)) { /* If needed, create the file entry and save the policy hnd */ if (!si->eo_file_info) { if (si->conv) { diff --git a/epan/dissectors/packet-smtp.c b/epan/dissectors/packet-smtp.c index a9b5a7c430..0daaf0d2c6 100644 --- a/epan/dissectors/packet-smtp.c +++ b/epan/dissectors/packet-smtp.c @@ -556,8 +556,8 @@ dissect_smtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ * the putative command ends. */ if ((session_state->auth_state != SMTP_AUTH_STATE_NONE) && - (pinfo->fd->num >= session_state->first_auth_frame) && - ((session_state->last_auth_frame == 0) || (pinfo->fd->num <= session_state->last_auth_frame))) { + (pinfo->num >= session_state->first_auth_frame) && + ((session_state->last_auth_frame == 0) || (pinfo->num <= session_state->last_auth_frame))) { decrypt = tvb_get_string_enc(wmem_packet_scope(), tvb, loffset, linelen, ENC_ASCII); if ((smtp_auth_parameter_decoding_enabled) && ((decrypt_len = ws_base64_decode_inplace(decrypt)) > 0)) { @@ -631,7 +631,7 @@ dissect_smtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ spd_frame_data->pdu_type = SMTP_PDU_CMD; session_state->smtp_state = SMTP_STATE_READING_CMDS; session_state->auth_state = SMTP_AUTH_STATE_START; - session_state->first_auth_frame = pinfo->fd->num; + session_state->first_auth_frame = pinfo->num; } else if ((g_ascii_strncasecmp(line, "AUTH LOGIN", 10) == 0) && (linelen > 11)) { /* * AUTH LOGIN command. @@ -640,8 +640,8 @@ dissect_smtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ spd_frame_data->pdu_type = SMTP_PDU_CMD; session_state->smtp_state = SMTP_STATE_READING_CMDS; session_state->auth_state = SMTP_AUTH_STATE_USERNAME_RSP; - session_state->first_auth_frame = pinfo->fd->num; - session_state->username_cmd_frame = pinfo->fd->num; + session_state->first_auth_frame = pinfo->num; + session_state->username_cmd_frame = pinfo->num; } else if ((g_ascii_strncasecmp(line, "AUTH PLAIN", 10) == 0) && (linelen <= 11)) { /* * AUTH PLAIN command. @@ -650,7 +650,7 @@ dissect_smtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ spd_frame_data->pdu_type = SMTP_PDU_CMD; session_state->smtp_state = SMTP_STATE_READING_CMDS; session_state->auth_state = SMTP_AUTH_STATE_PLAIN_START_REQ; - session_state->first_auth_frame = pinfo->fd->num; + session_state->first_auth_frame = pinfo->num; } else if ((g_ascii_strncasecmp(line, "AUTH PLAIN", 10) == 0) && (linelen > 11)) { /* * AUTH PLAIN command. @@ -659,8 +659,8 @@ dissect_smtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ spd_frame_data->pdu_type = SMTP_PDU_CMD; session_state->smtp_state = SMTP_STATE_READING_CMDS; session_state->auth_state = SMTP_AUTH_STATE_PLAIN_CRED_REQ; - session_state->first_auth_frame = pinfo->fd->num; - session_state->user_pass_cmd_frame = pinfo->fd->num; + session_state->first_auth_frame = pinfo->num; + session_state->user_pass_cmd_frame = pinfo->num; } else if ((g_ascii_strncasecmp(line, "AUTH NTLM", 9) == 0) && (linelen > 10)) { /* * AUTH NTLM command with nlmssp request @@ -668,7 +668,7 @@ dissect_smtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ spd_frame_data->pdu_type = SMTP_PDU_CMD; session_state->smtp_state = SMTP_STATE_READING_CMDS; session_state->auth_state = SMTP_AUTH_STATE_NTLM_REQ; - session_state->ntlm_req_frame = pinfo->fd->num; + session_state->ntlm_req_frame = pinfo->num; } else if (g_ascii_strncasecmp(line, "STARTTLS", 8) == 0) { /* * STARTTLS command. @@ -685,16 +685,16 @@ dissect_smtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ } } else if (session_state->auth_state == SMTP_AUTH_STATE_USERNAME_REQ) { session_state->auth_state = SMTP_AUTH_STATE_USERNAME_RSP; - session_state->username_frame = pinfo->fd->num; + session_state->username_frame = pinfo->num; } else if (session_state->auth_state == SMTP_AUTH_STATE_PASSWORD_REQ) { session_state->auth_state = SMTP_AUTH_STATE_PASSWORD_RSP; - session_state->password_frame = pinfo->fd->num; + session_state->password_frame = pinfo->num; } else if (session_state->auth_state == SMTP_AUTH_STATE_PLAIN_REQ) { session_state->auth_state = SMTP_AUTH_STATE_PLAIN_RSP; - session_state->user_pass_frame = pinfo->fd->num; + session_state->user_pass_frame = pinfo->num; } else if (session_state->auth_state == SMTP_AUTH_STATE_NTLM_CHALLANGE) { session_state->auth_state = SMTP_AUTH_STATE_NTLM_RSP; - session_state->ntlm_rsp_frame = pinfo->fd->num; + session_state->ntlm_rsp_frame = pinfo->num; } else { @@ -816,7 +816,7 @@ dissect_smtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ 0, 0, TRUE); PROTO_ITEM_SET_HIDDEN(hidden_item); - if (session_state->username_frame == pinfo->fd->num) { + if (session_state->username_frame == pinfo->num) { if (decrypt == NULL) { /* This line wasn't already decrypted through the state machine */ decrypt = tvb_get_string_enc(wmem_packet_scope(), tvb, loffset, linelen, ENC_ASCII); @@ -832,7 +832,7 @@ dissect_smtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ proto_tree_add_string(smtp_tree, hf_smtp_username, tvb, loffset, linelen, decrypt); col_append_fstr(pinfo->cinfo, COL_INFO, "User: %s", format_text(decrypt, decrypt_len)); - } else if (session_state->password_frame == pinfo->fd->num) { + } else if (session_state->password_frame == pinfo->num) { if (decrypt == NULL) { /* This line wasn't already decrypted through the state machine */ decrypt = tvb_get_string_enc(wmem_packet_scope(), tvb, loffset, linelen, ENC_ASCII); @@ -848,7 +848,7 @@ dissect_smtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ proto_tree_add_string(smtp_tree, hf_smtp_password, tvb, loffset, linelen, decrypt); col_append_fstr(pinfo->cinfo, COL_INFO, "Pass: %s", format_text(decrypt, decrypt_len)); - } else if (session_state->ntlm_rsp_frame == pinfo->fd->num) { + } else if (session_state->ntlm_rsp_frame == pinfo->num) { decrypt = tvb_get_string_enc(wmem_packet_scope(), tvb, loffset, linelen, ENC_ASCII); decrypt_len = linelen; if (smtp_auth_parameter_decoding_enabled) { @@ -870,7 +870,7 @@ dissect_smtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ proto_tree_add_item(smtp_tree, hf_smtp_command_line, tvb, loffset, linelen, ENC_ASCII|ENC_NA); } - } else if (session_state->user_pass_frame == pinfo->fd->num) { + } else if (session_state->user_pass_frame == pinfo->num) { decode_plain_auth(tvb, pinfo, smtp_tree, loffset, linelen); } else { @@ -889,7 +889,7 @@ dissect_smtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ proto_tree_add_item(cmdresp_tree, hf_smtp_req_command, tvb, loffset, cmdlen, ENC_ASCII|ENC_NA); - if ((linelen > 5) && (session_state->username_cmd_frame == pinfo->fd->num) ) { + if ((linelen > 5) && (session_state->username_cmd_frame == pinfo->num) ) { proto_tree_add_item(cmdresp_tree, hf_smtp_req_parameter, tvb, loffset + 5, linelen - 5, ENC_ASCII|ENC_NA); @@ -912,7 +912,7 @@ dissect_smtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ col_append_fstr(pinfo->cinfo, COL_INFO, "User: %s", format_text(decrypt, decrypt_len)); } } - else if ((linelen > 5) && (session_state->ntlm_req_frame == pinfo->fd->num) ) { + else if ((linelen > 5) && (session_state->ntlm_req_frame == pinfo->num) ) { proto_tree_add_item(cmdresp_tree, hf_smtp_req_parameter, tvb, loffset + 5, linelen - 5, ENC_ASCII|ENC_NA); if (linelen >= 10) { @@ -941,7 +941,7 @@ dissect_smtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ } } } - else if ((linelen > 5) && (session_state->user_pass_cmd_frame == pinfo->fd->num) ) { + else if ((linelen > 5) && (session_state->user_pass_cmd_frame == pinfo->num) ) { proto_tree_add_item(cmdresp_tree, hf_smtp_req_parameter, tvb, loffset + 5, linelen - 5, ENC_ASCII|ENC_NA); col_append_str(pinfo->cinfo, COL_INFO, @@ -1089,7 +1089,7 @@ dissect_smtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ } else { session_state->auth_state = SMTP_AUTH_STATE_FAILED; } - session_state->last_auth_frame = pinfo->fd->num; + session_state->last_auth_frame = pinfo->num; } /* diff --git a/epan/dissectors/packet-sndcp.c b/epan/dissectors/packet-sndcp.c index 487222bbb4..3f1cd94bbb 100644 --- a/epan/dissectors/packet-sndcp.c +++ b/epan/dissectors/packet-sndcp.c @@ -341,7 +341,7 @@ dissect_sndcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U /* Reassembled */ reassembled_in = fd_npdu->reassembled_in; - if (pinfo->fd->num == reassembled_in) { + if (pinfo->num == reassembled_in) { /* Reassembled in this very packet: * We can safely hand the tvb to the IP dissector */ diff --git a/epan/dissectors/packet-snmp.c b/epan/dissectors/packet-snmp.c index 5d9a05d73e..dc09d5159b 100644 --- a/epan/dissectors/packet-snmp.c +++ b/epan/dissectors/packet-snmp.c @@ -3325,10 +3325,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); } diff --git a/epan/dissectors/packet-socks.c b/epan/dissectors/packet-socks.c index 5c6202bf9f..5556caaa1a 100644 --- a/epan/dissectors/packet-socks.c +++ b/epan/dissectors/packet-socks.c @@ -334,7 +334,7 @@ socks_udp_dissector(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* d proto_tree *socks_tree; proto_item *ti; - conversation = find_conversation( pinfo->fd->num, &pinfo->src, &pinfo->dst, pinfo->ptype, + conversation = find_conversation( pinfo->num, &pinfo->src, &pinfo->dst, pinfo->ptype, pinfo->srcport, pinfo->destport, 0); DISSECTOR_ASSERT( conversation); /* should always find a conversation */ @@ -387,7 +387,7 @@ socks_udp_dissector(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* d static void new_udp_conversation( socks_hash_entry_t *hash_info, packet_info *pinfo){ - conversation_t *conversation = conversation_new( pinfo->fd->num, &pinfo->src, &pinfo->dst, PT_UDP, + conversation_t *conversation = conversation_new( pinfo->num, &pinfo->src, &pinfo->dst, PT_UDP, hash_info->udp_port, hash_info->port, 0); DISSECTOR_ASSERT( conversation); @@ -1002,7 +1002,7 @@ dissect_socks(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) { if (state_info->in_socks_dissector_flag) return 0; - conversation = find_conversation(pinfo->fd->num, &pinfo->src, &pinfo->dst, + conversation = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst, pinfo->ptype, pinfo->srcport, pinfo->destport, 0); if (conversation == NULL) { /* If we don't already have a conversation, make sure the first @@ -1011,7 +1011,7 @@ dissect_socks(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) { if ((version != 4) && (version != 5)) return 0; - 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); } @@ -1080,7 +1080,7 @@ dissect_socks(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) { if ((hash_info->clientState == clientDone) && (hash_info->serverState == serverDone)) { /* if done now */ - hash_info->start_done_frame = pinfo->fd->num; + hash_info->start_done_frame = pinfo->num; } } @@ -1104,7 +1104,7 @@ dissect_socks(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) { } /* if past startup, add the faked stuff */ - if ( pinfo->fd->num > hash_info->start_done_frame){ + if ( pinfo->num > hash_info->start_done_frame){ /* add info to tree */ ti = proto_tree_add_uint( socks_tree, hf_socks_cmd, tvb, offset, 0, hash_info->command); PROTO_ITEM_SET_GENERATED(ti); @@ -1132,7 +1132,7 @@ dissect_socks(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) { /* call next dissector if ready */ - if ( pinfo->fd->num > hash_info->start_done_frame){ + if ( pinfo->num > hash_info->start_done_frame){ call_next_dissector(tvb, offset, pinfo, tree, socks_tree, hash_info, state_info, tcpinfo); } diff --git a/epan/dissectors/packet-soupbintcp.c b/epan/dissectors/packet-soupbintcp.c index 2690d004dc..dfc3a1b9b1 100644 --- a/epan/dissectors/packet-soupbintcp.c +++ b/epan/dissectors/packet-soupbintcp.c @@ -242,7 +242,7 @@ dissect_soupbintcp_common( next_seq = atoi(tmp_buf); /* Create new conversation for this session */ - conv = conversation_new(PINFO_FD_NUM(pinfo), + conv = conversation_new(pinfo->num, &pinfo->src, &pinfo->dst, pinfo->ptype, @@ -260,7 +260,7 @@ dissect_soupbintcp_common( if (pkt_type == 'S') { if (!PINFO_FD_VISITED(pinfo)) { /* Get next expected sequence number from conversation */ - conv = find_conversation(PINFO_FD_NUM(pinfo), + conv = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst, pinfo->ptype, diff --git a/epan/dissectors/packet-spdy.c b/epan/dissectors/packet-spdy.c index 1f358df203..b1863f2083 100644 --- a/epan/dissectors/packet-spdy.c +++ b/epan/dissectors/packet-spdy.c @@ -759,7 +759,7 @@ static int dissect_spdy_data_payload(tvbuff_t *tvb, if (!is_single_chunk) { if (spdy_assemble_entity_bodies) { copied_data = (guint8 *)tvb_memdup(wmem_file_scope(),next_tvb, 0, frame->length); - spdy_add_data_chunk(conv_data, stream_id, pinfo->fd->num, copied_data, frame->length); + spdy_add_data_chunk(conv_data, stream_id, pinfo->num, copied_data, frame->length); } else { spdy_increment_data_chunk_count(conv_data, stream_id); } diff --git a/epan/dissectors/packet-spnego.c b/epan/dissectors/packet-spnego.c index c77da81528..a23fa9813d 100644 --- a/epan/dissectors/packet-spnego.c +++ b/epan/dissectors/packet-spnego.c @@ -1060,7 +1060,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, @@ -1758,7 +1758,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); diff --git a/epan/dissectors/packet-sprt.c b/epan/dissectors/packet-sprt.c index caf9acc94a..b18e105a22 100644 --- a/epan/dissectors/packet-sprt.c +++ b/epan/dissectors/packet-sprt.c @@ -745,7 +745,7 @@ static struct _sprt_conversation_info* find_sprt_conversation_data(packet_info * conversation_t *p_conv = NULL; struct _sprt_conversation_info *p_conv_data = NULL; /* Use existing packet info if available */ - p_conv = find_conversation(pinfo->fd->num, + p_conv = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst, pinfo->ptype, @@ -1033,7 +1033,7 @@ dissect_sprt_data(tvbuff_t *tvb, /* have we previously seen a CONNECT msg in this conversation (i.e., do we know if DLCI is used w/I_OCTET?) */ if (p_conv_data->connect_frame_number == 0) { - p_conv_data->connect_frame_number = pinfo->fd->num; + p_conv_data->connect_frame_number = pinfo->num; if (word & 0x8000) { p_conv_data->i_octet_dlci_status = DLCI_PRESENT; @@ -1421,7 +1421,7 @@ dissect_sprt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_ &pinfo->src, pinfo->srcport, 0, "SPRT stream", - pinfo->fd->num); + pinfo->num); p_conv_data = find_sprt_conversation_data(pinfo); } diff --git a/epan/dissectors/packet-ssh.c b/epan/dissectors/packet-ssh.c index d0f6237be4..fefbd40169 100644 --- a/epan/dissectors/packet-ssh.c +++ b/epan/dissectors/packet-ssh.c @@ -371,9 +371,9 @@ dissect_ssh(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) while(tvb_reported_length_remaining(tvb, offset)> 0) { gboolean after_version_start = (peer_data->frame_version_start == 0 || - pinfo->fd->num >= peer_data->frame_version_start); + pinfo->num >= peer_data->frame_version_start); gboolean before_version_end = (peer_data->frame_version_end == 0 || - pinfo->fd->num <= peer_data->frame_version_end); + pinfo->num <= peer_data->frame_version_end); need_desegmentation = FALSE; last_offset = offset; @@ -383,7 +383,7 @@ dissect_ssh(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) if (after_version_start && before_version_end && (tvb_strncaseeql(tvb, offset, "SSH-", 4) == 0)) { if (peer_data->frame_version_start == 0) - peer_data->frame_version_start = pinfo->fd->num; + peer_data->frame_version_start = pinfo->num; offset = ssh_dissect_protocol(tvb, pinfo, global_data, @@ -391,7 +391,7 @@ dissect_ssh(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) &version, &need_desegmentation); if (!need_desegmentation) { - peer_data->frame_version_end = pinfo->fd->num; + peer_data->frame_version_end = pinfo->num; global_data->version = version; } } else { @@ -463,8 +463,8 @@ ssh_dissect_ssh2(tvbuff_t *tvb, packet_info *pinfo, } if ((peer_data->frame_key_start == 0) || - ((peer_data->frame_key_start <= pinfo->fd->num) && - ((peer_data->frame_key_end == 0) || (pinfo->fd->num <= peer_data->frame_key_end)))) { + ((peer_data->frame_key_start <= pinfo->num) && + ((peer_data->frame_key_end == 0) || (pinfo->num <= peer_data->frame_key_end)))) { offset = ssh_dissect_key_exchange(tvb, pinfo, global_data, offset, ssh2_tree, is_response, need_desegmentation); @@ -555,7 +555,7 @@ ssh_dissect_ssh1(tvbuff_t *tvb, packet_info *pinfo, /* msg_code */ if ((peer_data->frame_key_start == 0) || - ((peer_data->frame_key_start >= pinfo->fd->num) && (pinfo->fd->num <= peer_data->frame_key_end))) { + ((peer_data->frame_key_start >= pinfo->num) && (pinfo->num <= peer_data->frame_key_end))) { msg_code = tvb_get_guint8(tvb, offset); proto_tree_add_item(ssh1_tree, hf_ssh_msg_code, tvb, offset, 1, ENC_BIG_ENDIAN); @@ -565,8 +565,8 @@ ssh_dissect_ssh1(tvbuff_t *tvb, packet_info *pinfo, len = plen -1; if (!pinfo->fd->flags.visited) { if (peer_data->frame_key_start == 0) - peer_data->frame_key_start = pinfo->fd->num; - peer_data->frame_key_end = pinfo->fd->num; + peer_data->frame_key_start = pinfo->num; + peer_data->frame_key_end = pinfo->num; } } else { len = plen; @@ -700,14 +700,14 @@ ssh_dissect_key_exchange(tvbuff_t *tvb, packet_info *pinfo, switch(msg_code) { case SSH_MSG_KEXINIT: - if ((peer_data->frame_key_start == 0) || (peer_data->frame_key_start == pinfo->fd->num)) { + if ((peer_data->frame_key_start == 0) || (peer_data->frame_key_start == pinfo->num)) { offset = ssh_dissect_key_init(tvb, offset, key_ex_tree, is_response, global_data); - peer_data->frame_key_start = pinfo->fd->num; + peer_data->frame_key_start = pinfo->num; } break; case SSH_MSG_NEWKEYS: if (peer_data->frame_key_end == 0) { - peer_data->frame_key_end = pinfo->fd->num; + peer_data->frame_key_end = pinfo->num; ssh_choose_algo(global_data->peer_data[CLIENT_PEER_DATA].enc_proposals[is_response], global_data->peer_data[SERVER_PEER_DATA].enc_proposals[is_response], &peer_data->enc); diff --git a/epan/dissectors/packet-ssl-utils.c b/epan/dissectors/packet-ssl-utils.c index 15d675c248..1806da3cd2 100644 --- a/epan/dissectors/packet-ssl-utils.c +++ b/epan/dissectors/packet-ssl-utils.c @@ -4066,7 +4066,7 @@ ssl_starttls_ack(dissector_handle_t ssl_handle, packet_info *pinfo, (void *)session->app_handle, dissector_handle_get_dissector_name(session->app_handle)); ssl_debug_printf("%s: current frame %d, app_handle=%p (%s)\n", G_STRFUNC, - pinfo->fd->num, (void *)app_handle, + pinfo->num, (void *)app_handle, dissector_handle_get_dissector_name(app_handle)); /* Do not switch again if a dissector did it before. */ @@ -4079,7 +4079,7 @@ ssl_starttls_ack(dissector_handle_t ssl_handle, packet_info *pinfo, /* The SSL dissector should be called first for this conversation. */ conversation_set_dissector(conversation, ssl_handle); /* SSL starts after this frame. */ - session->last_nontls_frame = pinfo->fd->num; + session->last_nontls_frame = pinfo->num; return 0; } /* }}} */ diff --git a/epan/dissectors/packet-ssl.c b/epan/dissectors/packet-ssl.c index 7f2f255e35..b5956b47f6 100644 --- a/epan/dissectors/packet-ssl.c +++ b/epan/dissectors/packet-ssl.c @@ -664,7 +664,7 @@ dissect_ssl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) } } - ssl_debug_printf("\ndissect_ssl enter frame #%u (%s)\n", pinfo->fd->num, (pinfo->fd->flags.visited)?"already visited":"first time"); + ssl_debug_printf("\ndissect_ssl enter frame #%u (%s)\n", pinfo->num, (pinfo->fd->flags.visited)?"already visited":"first time"); /* Track the version using conversations to reduce the * chance that a packet that simply *looks* like a v2 or @@ -684,7 +684,7 @@ dissect_ssl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) is_from_server = ssl_packet_from_server(session, ssl_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; @@ -970,7 +970,7 @@ again: if ((msp = (struct tcp_multisegment_pdu *)wmem_tree_lookup32(flow->multisegment_pdus, seq))) { const char *prefix; - if (msp->first_frame == PINFO_FD_NUM(pinfo)) { + if (msp->first_frame == pinfo->num) { prefix = ""; col_set_str(pinfo->cinfo, COL_INFO, "[SSL segment of a reassembled PDU]"); } else { @@ -988,7 +988,7 @@ again: int len; if (!PINFO_FD_VISITED(pinfo)) { - msp->last_frame = pinfo->fd->num; + msp->last_frame = pinfo->num; msp->last_frame_time = pinfo->abs_ts; } @@ -1069,7 +1069,7 @@ again: * Note that the last segment may include more than what * we needed. */ - if (ipfd_head->reassembled_in == pinfo->fd->num && + if (ipfd_head->reassembled_in == pinfo->num && nxtseq < ipfd_head->datalen) { /* * This is *not* the last segment. It is part of a PDU in the same @@ -1082,7 +1082,7 @@ again: another_pdu_follows = 0; col_clear(pinfo->cinfo, COL_INFO); another_segment_in_frame = TRUE; - } else if (ipfd_head->reassembled_in == pinfo->fd->num) { + } else if (ipfd_head->reassembled_in == pinfo->num) { /* * OK, this is the last segment of the PDU and also the * last segment in this frame. diff --git a/epan/dissectors/packet-starteam.c b/epan/dissectors/packet-starteam.c index 2eb15f6eda..eae4a2b7ee 100644 --- a/epan/dissectors/packet-starteam.c +++ b/epan/dissectors/packet-starteam.c @@ -490,13 +490,13 @@ dissect_starteam(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data col_set_str(pinfo->cinfo, COL_PROTOCOL, "StarTeam"); /* This is a trick to know whether this is the first PDU in this packet or not */ - if(iPreviousFrameNumber != (gint) pinfo->fd->num){ + if(iPreviousFrameNumber != (gint) pinfo->num){ col_clear(pinfo->cinfo, COL_INFO); } else { col_append_str(pinfo->cinfo, COL_INFO, " | "); } - iPreviousFrameNumber = pinfo->fd->num; + iPreviousFrameNumber = pinfo->num; if(tvb_captured_length(tvb) >= 16){ guint32 iCommand = 0; gboolean bRequest = FALSE; diff --git a/epan/dissectors/packet-stun.c b/epan/dissectors/packet-stun.c index 2a03556886..a3e616bde9 100644 --- a/epan/dissectors/packet-stun.c +++ b/epan/dissectors/packet-stun.c @@ -694,13 +694,13 @@ dissect_stun_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboole if (msg_type_class == REQUEST) { /* This is a request */ if (stun_trans->req_frame == 0) { - stun_trans->req_frame=pinfo->fd->num; + stun_trans->req_frame=pinfo->num; } } else { /* This is a catch-all for all non-request messages */ if (stun_trans->rep_frame == 0) { - stun_trans->rep_frame=pinfo->fd->num; + stun_trans->rep_frame=pinfo->num; } } @@ -733,7 +733,7 @@ dissect_stun_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboole stun_tree = proto_item_add_subtree(ti, ett_stun); if (msg_type_class == REQUEST) { - if (stun_trans->req_frame != pinfo->fd->num) { + if (stun_trans->req_frame != pinfo->num) { proto_item *it; it=proto_tree_add_uint(stun_tree, hf_stun_duplicate, tvb, offset, 0, @@ -750,7 +750,7 @@ dissect_stun_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboole } else { /* Retransmission control */ - if (stun_trans->rep_frame != pinfo->fd->num) { + if (stun_trans->rep_frame != pinfo->num) { proto_item *it; it=proto_tree_add_uint(stun_tree, hf_stun_duplicate, tvb, offset, 0, @@ -1348,7 +1348,7 @@ dissect_stun_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboole /* RFC 6062: after the ConnectionBind exchange, the connection is no longer framed as TURN; instead, it is an unframed pass-through. Starting from next frame set conversation dissector to data */ - conversation_set_dissector_from_frame_number(conversation, pinfo->fd->num+1, data_handle); + conversation_set_dissector_from_frame_number(conversation, pinfo->num+1, data_handle); } return reported_length; } diff --git a/epan/dissectors/packet-synphasor.c b/epan/dissectors/packet-synphasor.c index be7694fdd9..0a1d92552b 100644 --- a/epan/dissectors/packet-synphasor.c +++ b/epan/dissectors/packet-synphasor.c @@ -495,7 +495,7 @@ static int dissect_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, v /* fill the config_frame */ config_frame *frame = config_frame_fast(tvb); - frame->fnum = pinfo->fd->num; + frame->fnum = pinfo->num; /* find a conversation, create a new one if none exists */ conversation = find_or_create_conversation(pinfo); @@ -508,7 +508,7 @@ static int dissect_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, v conversation_add_proto_data(conversation, proto_synphasor, frame); } else if (DATA == frame_type) { - conversation_t *conversation = find_conversation(pinfo->fd->num, + conversation_t *conversation = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst, pinfo->ptype, pinfo->srcport, pinfo->destport, diff --git a/epan/dissectors/packet-t38.c b/epan/dissectors/packet-t38.c index b3b6b19cd6..4b2155dbbd 100644 --- a/epan/dissectors/packet-t38.c +++ b/epan/dissectors/packet-t38.c @@ -423,7 +423,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); @@ -709,7 +709,7 @@ dissect_t38_T_field_data(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_ /* 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; @@ -1017,13 +1017,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 */ diff --git a/epan/dissectors/packet-tcap.c b/epan/dissectors/packet-tcap.c index d24baa2c6b..8559100507 100644 --- a/epan/dissectors/packet-tcap.c +++ b/epan/dissectors/packet-tcap.c @@ -1588,7 +1588,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; @@ -1616,7 +1616,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; @@ -1630,7 +1630,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; } @@ -1642,7 +1642,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; @@ -1670,7 +1670,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; @@ -1684,7 +1684,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; } @@ -1764,11 +1764,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 */ @@ -1810,8 +1810,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); @@ -1850,12 +1850,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 */ @@ -1913,7 +1913,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 @@ -2256,7 +2256,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); @@ -2269,7 +2269,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 "); @@ -2288,11 +2288,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) ) ) @@ -2301,7 +2301,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); @@ -2322,7 +2322,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); @@ -2376,7 +2376,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); } @@ -2430,7 +2430,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. */ @@ -2514,7 +2514,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); @@ -2535,7 +2535,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); @@ -2588,7 +2588,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; @@ -2724,7 +2724,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); @@ -2736,7 +2736,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 "); @@ -2747,7 +2747,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 "); @@ -2759,14 +2759,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; @@ -2810,11 +2810,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) ) ) @@ -2823,7 +2823,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); @@ -2842,7 +2842,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); @@ -2908,7 +2908,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); } @@ -2981,7 +2981,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; } @@ -3066,7 +3066,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; diff --git a/epan/dissectors/packet-tcp.c b/epan/dissectors/packet-tcp.c index ae4af08712..3a79a9ba15 100644 --- a/epan/dissectors/packet-tcp.c +++ b/epan/dissectors/packet-tcp.c @@ -753,7 +753,7 @@ gchar* tcp_follow_conv_filter(packet_info* pinfo, int* stream) if (((pinfo->net_src.type == AT_IPv4 && pinfo->net_dst.type == AT_IPv4) || (pinfo->net_src.type == AT_IPv6 && pinfo->net_dst.type == AT_IPv6)) - && (conv=find_conversation(pinfo->fd->num, &pinfo->src, &pinfo->dst, pinfo->ptype, + && (conv=find_conversation(pinfo->num, &pinfo->src, &pinfo->dst, pinfo->ptype, pinfo->srcport, pinfo->destport, 0)) != NULL ) { /* TCP over IPv4/6 */ @@ -1107,7 +1107,7 @@ scan_for_next_pdu(tvbuff_t *tvb, proto_tree *tcp_tree, packet_info *pinfo, int o * variables. */ if(seq>msp->seq && seq<msp->nxtpdu) { - msp->last_frame=pinfo->fd->num; + msp->last_frame=pinfo->num; msp->last_frame_time=pinfo->abs_ts; print_pdu_tracking_data(pinfo, tvb, tcp_tree, msp); } @@ -1137,7 +1137,7 @@ scan_for_next_pdu(tvbuff_t *tvb, proto_tree *tcp_tree, packet_info *pinfo, int o */ msp=(struct tcp_multisegment_pdu *)wmem_tree_lookup32_le(multisegment_pdus, nxtseq-1); if(msp) { - if(pinfo->fd->num==msp->first_frame) { + if(pinfo->num==msp->first_frame) { proto_item *item; nstime_t ns; @@ -1185,8 +1185,8 @@ pdu_store_sequencenumber_of_next_pdu(packet_info *pinfo, guint32 seq, guint32 nx msp=wmem_new(wmem_file_scope(), struct tcp_multisegment_pdu); msp->nxtpdu=nxtpdu; msp->seq=seq; - msp->first_frame=pinfo->fd->num; - msp->last_frame=pinfo->fd->num; + msp->first_frame=pinfo->num; + msp->last_frame=pinfo->num; msp->last_frame_time=pinfo->abs_ts; msp->flags=0; wmem_tree_insert32(multisegment_pdus, seq, (void *)msp); @@ -1286,7 +1286,7 @@ tcp_analyze_sequence_number(packet_info *pinfo, guint32 seq, guint32 ack, guint3 int ackcount; #if 0 - printf("\nanalyze_sequence numbers frame:%u\n",pinfo->fd->num); + printf("\nanalyze_sequence numbers frame:%u\n",pinfo->num); printf("FWD list lastflags:0x%04x base_seq:%u:\n",tcpd->fwd->lastsegmentflags,tcpd->fwd->base_seq); for(ual=tcpd->fwd->segments; ual; ual=ual->next) printf("Frame:%d Seq:%u Nextseq:%u\n",ual->frame,ual->seq,ual->nextseq); @@ -1343,7 +1343,7 @@ tcp_analyze_sequence_number(packet_info *pinfo, guint32 seq, guint32 ack, guint3 && seq==tcpd->fwd->nextseq && tcpd->rev->window==0 ) { if(!tcpd->ta) { - tcp_analyze_get_acked_struct(pinfo->fd->num, seq, ack, TRUE, tcpd); + tcp_analyze_get_acked_struct(pinfo->num, seq, ack, TRUE, tcpd); } tcpd->ta->flags|=TCP_A_ZERO_WINDOW_PROBE; goto finished_fwd; @@ -1356,7 +1356,7 @@ tcp_analyze_sequence_number(packet_info *pinfo, guint32 seq, guint32 ack, guint3 if( window==0 && (flags&(TH_RST|TH_FIN|TH_SYN))==0 ) { if(!tcpd->ta) { - tcp_analyze_get_acked_struct(pinfo->fd->num, seq, ack, TRUE, tcpd); + tcp_analyze_get_acked_struct(pinfo->num, seq, ack, TRUE, tcpd); } tcpd->ta->flags|=TCP_A_ZERO_WINDOW; } @@ -1374,7 +1374,7 @@ tcp_analyze_sequence_number(packet_info *pinfo, guint32 seq, guint32 ack, guint3 && GT_SEQ(seq, tcpd->fwd->nextseq) && (flags&(TH_RST))==0 ) { if(!tcpd->ta) { - tcp_analyze_get_acked_struct(pinfo->fd->num, seq, ack, TRUE, tcpd); + tcp_analyze_get_acked_struct(pinfo->num, seq, ack, TRUE, tcpd); } tcpd->ta->flags|=TCP_A_LOST_PACKET; @@ -1392,7 +1392,7 @@ tcp_analyze_sequence_number(packet_info *pinfo, guint32 seq, guint32 ack, guint3 && seq==(tcpd->fwd->nextseq-1) && (flags&(TH_SYN|TH_FIN|TH_RST))==0 ) { if(!tcpd->ta) { - tcp_analyze_get_acked_struct(pinfo->fd->num, seq, ack, TRUE, tcpd); + tcp_analyze_get_acked_struct(pinfo->num, seq, ack, TRUE, tcpd); } tcpd->ta->flags|=TCP_A_KEEP_ALIVE; } @@ -1408,7 +1408,7 @@ tcp_analyze_sequence_number(packet_info *pinfo, guint32 seq, guint32 ack, guint3 && ack==tcpd->fwd->lastack && (flags&(TH_SYN|TH_FIN|TH_RST))==0 ) { if(!tcpd->ta) { - tcp_analyze_get_acked_struct(pinfo->fd->num, seq, ack, TRUE, tcpd); + tcp_analyze_get_acked_struct(pinfo->num, seq, ack, TRUE, tcpd); } tcpd->ta->flags|=TCP_A_WINDOW_UPDATE; } @@ -1426,7 +1426,7 @@ tcp_analyze_sequence_number(packet_info *pinfo, guint32 seq, guint32 ack, guint3 && (seq+seglen)==(tcpd->rev->lastack+(tcpd->rev->window<<(tcpd->rev->win_scale==-2?0:tcpd->rev->win_scale))) && (flags&(TH_SYN|TH_FIN|TH_RST))==0 ) { if(!tcpd->ta) { - tcp_analyze_get_acked_struct(pinfo->fd->num, seq, ack, TRUE, tcpd); + tcp_analyze_get_acked_struct(pinfo->num, seq, ack, TRUE, tcpd); } tcpd->ta->flags|=TCP_A_WINDOW_FULL; } @@ -1444,7 +1444,7 @@ tcp_analyze_sequence_number(packet_info *pinfo, guint32 seq, guint32 ack, guint3 && (tcpd->rev->lastsegmentflags&TCP_A_KEEP_ALIVE) && (flags&(TH_SYN|TH_FIN|TH_RST))==0 ) { if(!tcpd->ta) { - tcp_analyze_get_acked_struct(pinfo->fd->num, seq, ack, TRUE, tcpd); + tcp_analyze_get_acked_struct(pinfo->num, seq, ack, TRUE, tcpd); } tcpd->ta->flags|=TCP_A_KEEP_ALIVE_ACK; goto finished_fwd; @@ -1464,7 +1464,7 @@ tcp_analyze_sequence_number(packet_info *pinfo, guint32 seq, guint32 ack, guint3 && (tcpd->rev->lastsegmentflags&TCP_A_ZERO_WINDOW_PROBE) && (flags&(TH_SYN|TH_FIN|TH_RST))==0 ) { if(!tcpd->ta) { - tcp_analyze_get_acked_struct(pinfo->fd->num, seq, ack, TRUE, tcpd); + tcp_analyze_get_acked_struct(pinfo->num, seq, ack, TRUE, tcpd); } tcpd->ta->flags|=TCP_A_ZERO_WINDOW_PROBE_ACK; goto finished_fwd; @@ -1483,7 +1483,7 @@ tcp_analyze_sequence_number(packet_info *pinfo, guint32 seq, guint32 ack, guint3 && (flags&(TH_SYN|TH_FIN|TH_RST))==0 ) { tcpd->fwd->dupacknum++; if(!tcpd->ta) { - tcp_analyze_get_acked_struct(pinfo->fd->num, seq, ack, TRUE, tcpd); + tcp_analyze_get_acked_struct(pinfo->num, seq, ack, TRUE, tcpd); } tcpd->ta->flags|=TCP_A_DUPLICATE_ACK; tcpd->ta->dupack_num=tcpd->fwd->dupacknum; @@ -1495,7 +1495,7 @@ tcp_analyze_sequence_number(packet_info *pinfo, guint32 seq, guint32 ack, guint3 finished_fwd: /* If the ack number changed we must reset the dupack counters */ if( ack != tcpd->fwd->lastack ) { - tcpd->fwd->lastnondupack=pinfo->fd->num; + tcpd->fwd->lastnondupack=pinfo->num; tcpd->fwd->dupacknum=0; } @@ -1512,7 +1512,7 @@ finished_fwd: && GT_SEQ(ack, tcpd->rev->maxseqtobeacked ) && (flags&(TH_ACK))!=0 ) { if(!tcpd->ta) { - tcp_analyze_get_acked_struct(pinfo->fd->num, seq, ack, TRUE, tcpd); + tcp_analyze_get_acked_struct(pinfo->num, seq, ack, TRUE, tcpd); } tcpd->ta->flags|=TCP_A_ACK_LOST_PACKET; /* update 'max seq to be acked' in the other direction so we don't get @@ -1558,7 +1558,7 @@ finished_fwd: && tcpd->rev->lastack==seq && t<20000000 ) { if(!tcpd->ta) { - tcp_analyze_get_acked_struct(pinfo->fd->num, seq, ack, TRUE, tcpd); + tcp_analyze_get_acked_struct(pinfo->num, seq, ack, TRUE, tcpd); } tcpd->ta->flags|=TCP_A_FAST_RETRANSMISSION; goto finished_checking_retransmission_type; @@ -1573,7 +1573,7 @@ finished_fwd: if( t < ooo_thres && tcpd->fwd->nextseq != seq + seglen ) { if(!tcpd->ta) { - tcp_analyze_get_acked_struct(pinfo->fd->num, seq, ack, TRUE, tcpd); + tcp_analyze_get_acked_struct(pinfo->num, seq, ack, TRUE, tcpd); } tcpd->ta->flags|=TCP_A_OUT_OF_ORDER; goto finished_checking_retransmission_type; @@ -1585,7 +1585,7 @@ finished_fwd: */ if ( seq + seglen < tcpd->rev->lastack ) { if(!tcpd->ta){ - tcp_analyze_get_acked_struct(pinfo->fd->num, seq, ack, TRUE, tcpd); + tcp_analyze_get_acked_struct(pinfo->num, seq, ack, TRUE, tcpd); } tcpd->ta->flags|=TCP_A_SPURIOUS_RETRANSMISSION; goto finished_checking_retransmission_type; @@ -1593,7 +1593,7 @@ finished_fwd: /* Then it has to be a generic retransmission */ if(!tcpd->ta) { - tcp_analyze_get_acked_struct(pinfo->fd->num, seq, ack, TRUE, tcpd); + tcp_analyze_get_acked_struct(pinfo->num, seq, ack, TRUE, tcpd); } tcpd->ta->flags|=TCP_A_RETRANSMISSION; nstime_delta(&tcpd->ta->rto_ts, &pinfo->abs_ts, &tcpd->fwd->nextseqtime); @@ -1611,7 +1611,7 @@ finished_checking_retransmission_type: ual->next=tcpd->fwd->segments; tcpd->fwd->segments=ual; tcpd->fwd->segment_count++; - ual->frame=pinfo->fd->num; + ual->frame=pinfo->num; ual->seq=seq; ual->ts=pinfo->abs_ts; @@ -1630,7 +1630,7 @@ finished_checking_retransmission_type: if(GT_SEQ(nextseq, tcpd->fwd->nextseq) || !tcpd->fwd->nextseq) { if( !tcpd->ta || !(tcpd->ta->flags&TCP_A_ZERO_WINDOW_PROBE) ) { tcpd->fwd->nextseq=nextseq; - tcpd->fwd->nextseqframe=pinfo->fd->num; + tcpd->fwd->nextseqframe=pinfo->num; tcpd->fwd->nextseqtime.secs=pinfo->abs_ts.secs; tcpd->fwd->nextseqtime.nsecs=pinfo->abs_ts.nsecs; } @@ -1673,7 +1673,7 @@ finished_checking_retransmission_type: /* If this ack matches the segment, process accordingly */ if(ack==ual->nextseq) { - tcp_analyze_get_acked_struct(pinfo->fd->num, seq, ack, TRUE, tcpd); + tcp_analyze_get_acked_struct(pinfo->num, seq, ack, TRUE, tcpd); tcpd->ta->frame_acked=ual->frame; nstime_delta(&tcpd->ta->ts, &pinfo->abs_ts, &ual->ts); } @@ -1733,7 +1733,7 @@ finished_checking_retransmission_type: if (in_flight>0 && in_flight<2000000000) { if(!tcpd->ta) { - tcp_analyze_get_acked_struct(pinfo->fd->num, seq, ack, TRUE, tcpd); + tcp_analyze_get_acked_struct(pinfo->num, seq, ack, TRUE, tcpd); } tcpd->ta->bytes_in_flight = in_flight; } @@ -2053,7 +2053,7 @@ tcp_print_sequence_number_analysis(packet_info *pinfo, tvbuff_t *tvb, proto_tree return; } if(!tcpd->ta) { - tcp_analyze_get_acked_struct(pinfo->fd->num, seq, ack, FALSE, tcpd); + tcp_analyze_get_acked_struct(pinfo->num, seq, ack, FALSE, tcpd); } ta=tcpd->ta; if(!ta) { @@ -2218,7 +2218,7 @@ again: * to the original transmission's entry). */ - if (msp->first_frame == PINFO_FD_NUM(pinfo)) { + if (msp->first_frame == pinfo->num) { str = ""; col_set_str(pinfo->cinfo, COL_INFO, "[TCP segment of a reassembled PDU]"); } else { @@ -2259,7 +2259,7 @@ again: int len; if (!PINFO_FD_VISITED(pinfo)) { - msp->last_frame=pinfo->fd->num; + msp->last_frame=pinfo->num; msp->last_frame_time=pinfo->abs_ts; } @@ -2356,7 +2356,7 @@ again: * Note that the last segment may include more than what * we needed. */ - if(ipfd_head->reassembled_in == pinfo->fd->num) { + if(ipfd_head->reassembled_in == pinfo->num) { /* * OK, this is the last segment. * Let's call the subdissector with the desegmented @@ -4355,28 +4355,28 @@ dissect_tcpopt_rvbd_trpy(const ip_tcp_opt *optp _U_, tvbuff_t *tvb, */ if (sport_handle != NULL) { conversation_t *conversation; - 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) { - conversation = conversation_new(pinfo->fd->num, + conversation = conversation_new(pinfo->num, &pinfo->src, &pinfo->dst, pinfo->ptype, pinfo->srcport, pinfo->destport, 0); } - if (conversation_get_dissector(conversation, pinfo->fd->num) != sport_handle) { + if (conversation_get_dissector(conversation, pinfo->num) != sport_handle) { conversation_set_dissector(conversation, sport_handle); } } else if (data_handle != NULL) { conversation_t *conversation; - conversation = find_conversation(pinfo->fd->num, + 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, + conversation = conversation_new(pinfo->num, &pinfo->src, &pinfo->dst, pinfo->ptype, pinfo->srcport, pinfo->destport, 0); } - if (conversation_get_dissector(conversation, pinfo->fd->num) != data_handle) { + if (conversation_get_dissector(conversation, pinfo->num) != data_handle) { conversation_set_dissector(conversation, data_handle); } } @@ -5013,17 +5013,17 @@ dissect_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) * in case a new conversation is found and the previous conversation needs * to be adjusted, */ - if((conv = find_conversation(pinfo->fd->num, &pinfo->src, &pinfo->dst, + if((conv = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst, pinfo->ptype, pinfo->srcport, pinfo->destport, 0)) != NULL) { /* Update how far the conversation reaches */ - if (pinfo->fd->num > conv->last_frame) { + if (pinfo->num > conv->last_frame) { save_last_frame = conv->last_frame; - conv->last_frame = pinfo->fd->num; + conv->last_frame = pinfo->num; } } else { - conv = conversation_new(pinfo->fd->num, &pinfo->src, + conv = conversation_new(pinfo->num, &pinfo->src, &pinfo->dst, pinfo->ptype, pinfo->srcport, pinfo->destport, 0); } @@ -5045,11 +5045,11 @@ dissect_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) if (save_last_frame > 0) conv->last_frame = save_last_frame; - conv=conversation_new(pinfo->fd->num, &pinfo->src, &pinfo->dst, pinfo->ptype, pinfo->srcport, pinfo->destport, 0); + conv=conversation_new(pinfo->num, &pinfo->src, &pinfo->dst, pinfo->ptype, pinfo->srcport, pinfo->destport, 0); tcpd=get_tcp_conversation_data(conv,pinfo); } if(!tcpd->ta) - tcp_analyze_get_acked_struct(pinfo->fd->num, tcph->th_seq, tcph->th_ack, TRUE, tcpd); + tcp_analyze_get_acked_struct(pinfo->num, tcph->th_seq, tcph->th_ack, TRUE, tcpd); tcpd->ta->flags|=TCP_A_REUSED_PORTS; } /* If this is a SYN/ACK packet, then check if its seq-nr is different @@ -5069,7 +5069,7 @@ dissect_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) conv->last_frame = save_last_frame; } - other_conv = find_conversation(pinfo->fd->num, &pinfo->dst, &pinfo->src, pinfo->ptype, pinfo->destport, pinfo->srcport, 0); + other_conv = find_conversation(pinfo->num, &pinfo->dst, &pinfo->src, pinfo->ptype, pinfo->destport, pinfo->srcport, 0); if (other_conv != NULL) { conv = other_conv; @@ -5077,7 +5077,7 @@ dissect_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) } if(!tcpd->ta) - tcp_analyze_get_acked_struct(pinfo->fd->num, tcph->th_seq, tcph->th_ack, TRUE, tcpd); + tcp_analyze_get_acked_struct(pinfo->num, tcph->th_seq, tcph->th_ack, TRUE, tcpd); tcpd->ta->flags|=TCP_A_REUSED_PORTS; } @@ -5620,12 +5620,12 @@ dissect_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) /* Is this the FIN that ended the data stream or is it a * retransmission of that FIN? */ - if (tcpd->fwd->fin == 0 || tcpd->fwd->fin == pinfo->fd->num) { + if (tcpd->fwd->fin == 0 || tcpd->fwd->fin == pinfo->num) { /* Either we haven't seen a FIN for this flow or we * have and it's this frame. Note that this is the FIN * for this flow, terminate reassembly and dissect the * results. */ - tcpd->fwd->fin = pinfo->fd->num; + tcpd->fwd->fin = pinfo->num; msp=(struct tcp_multisegment_pdu *)wmem_tree_lookup32_le(tcpd->fwd->multisegment_pdus, tcph->th_seq-1); if(msp) { fragment_head *ipfd_head; diff --git a/epan/dissectors/packet-telnet.c b/epan/dissectors/packet-telnet.c index 2b913820fb..9b3b2c4bd1 100644 --- a/epan/dissectors/packet-telnet.c +++ b/epan/dissectors/packet-telnet.c @@ -482,9 +482,9 @@ dissect_starttls_subopt(packet_info *pinfo _U_, const char *optname _U_, tvbuff_ if (session->starttls_requested_in == 0) { /* First sender (client or server) requesting to start TLS. */ - session->starttls_requested_in = pinfo->fd->num; + session->starttls_requested_in = pinfo->num; session->starttls_port = pinfo->srcport; - } else if (session->starttls_requested_in < pinfo->fd->num && + } else if (session->starttls_requested_in < pinfo->num && session->starttls_port != pinfo->srcport) { /* Other side confirms that following data is TLS. */ ssl_starttls_ack(ssl_handle, pinfo, telnet_handle); diff --git a/epan/dissectors/packet-tftp.c b/epan/dissectors/packet-tftp.c index 2fdcc364f1..ebe3a4695b 100644 --- a/epan/dissectors/packet-tftp.c +++ b/epan/dissectors/packet-tftp.c @@ -566,18 +566,18 @@ dissect_tftp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ */ if (value_is_in_range(global_tftp_port_range, pinfo->destport) || (pinfo->match_uint == pinfo->destport)) { - 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) != tftp_handle) ){ - conversation = conversation_new(pinfo->fd->num, &pinfo->src, &pinfo->dst, PT_UDP, + if( (conversation == NULL) || (conversation_get_dissector(conversation, pinfo->num) != tftp_handle) ){ + conversation = conversation_new(pinfo->num, &pinfo->src, &pinfo->dst, PT_UDP, pinfo->srcport, 0, NO_PORT2); conversation_set_dissector(conversation, tftp_handle); } } else { - 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 == NULL) || (conversation_get_dissector(conversation, pinfo->fd->num) != tftp_handle) ){ - conversation = conversation_new(pinfo->fd->num, &pinfo->src, &pinfo->dst, PT_UDP, + if( (conversation == NULL) || (conversation_get_dissector(conversation, pinfo->num) != tftp_handle) ){ + conversation = conversation_new(pinfo->num, &pinfo->src, &pinfo->dst, PT_UDP, pinfo->destport, pinfo->srcport, 0); conversation_set_dissector(conversation, tftp_handle); } else if (conversation->options & NO_PORT_B) { diff --git a/epan/dissectors/packet-tn3270.c b/epan/dissectors/packet-tn3270.c index 8d062df9c9..9c4e5986ae 100644 --- a/epan/dissectors/packet-tn3270.c +++ b/epan/dissectors/packet-tn3270.c @@ -5248,7 +5248,7 @@ dissect_tn3270(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _ pinfo->fd->flags.encoding = PACKET_CHAR_ENC_CHAR_EBCDIC; /* Do we have a conversation for this connection? */ - conversation = find_conversation(pinfo->fd->num, &pinfo->src, &pinfo->dst, + conversation = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst, pinfo->ptype, pinfo->srcport, pinfo->destport, 0); if (conversation != NULL) { @@ -5354,7 +5354,7 @@ find_tn3270_conversation(packet_info *pinfo) /* * 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 != NULL) { diff --git a/epan/dissectors/packet-tn5250.c b/epan/dissectors/packet-tn5250.c index 2c5d14feb9..647f8f7d47 100644 --- a/epan/dissectors/packet-tn5250.c +++ b/epan/dissectors/packet-tn5250.c @@ -5125,7 +5125,7 @@ dissect_tn5250(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _ int sna_flag; /* Do we have a conversation for this connection? */ - conversation = find_conversation(pinfo->fd->num, &pinfo->src, &pinfo->dst, + conversation = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst, pinfo->ptype, pinfo->srcport, pinfo->destport, 0); if (conversation != NULL) { @@ -5203,7 +5203,7 @@ find_tn5250_conversation(packet_info *pinfo) /* * 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); diff --git a/epan/dissectors/packet-ua.c b/epan/dissectors/packet-ua.c index 74ce58af65..df002bb428 100644 --- a/epan/dissectors/packet-ua.c +++ b/epan/dissectors/packet-ua.c @@ -227,9 +227,9 @@ static void _dissect_ua_msg(tvbuff_t *tvb, if ((remote_rtp_addr.data != NULL) && (remote_rtp_port != 0)) { rtp_add_address(pinfo, &remote_rtp_addr, remote_rtp_port, 0, - "UA", pinfo->fd->num, 0, NULL); + "UA", pinfo->num, 0, NULL); rtcp_add_address(pinfo, &remote_rtp_addr, remote_rtp_port+1, 0, - "UA", pinfo->fd->num); + "UA", pinfo->num); } } diff --git a/epan/dissectors/packet-ubertooth.c b/epan/dissectors/packet-ubertooth.c index c9420622e9..f7a0a61178 100644 --- a/epan/dissectors/packet-ubertooth.c +++ b/epan/dissectors/packet-ubertooth.c @@ -1424,7 +1424,7 @@ dissect_ubertooth(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat k_bus_id = bus_id; k_device_address = device_address; - k_frame_number = pinfo->fd->num; + k_frame_number = pinfo->num; key[0].length = 1; key[0].key = &k_bus_id; @@ -1712,7 +1712,7 @@ dissect_ubertooth(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat command_data->device_address = device_address; command_data->command = command; - command_data->command_frame_number = pinfo->fd->num; + command_data->command_frame_number = pinfo->num; command_data->register_id = register_id; wmem_tree_insert32_array(command_info, key, command_data); @@ -1729,7 +1729,7 @@ dissect_ubertooth(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat 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_response = command_data->command; register_id = command_data->register_id; diff --git a/epan/dissectors/packet-udp.c b/epan/dissectors/packet-udp.c index b241c43858..aaf8e4e536 100644 --- a/epan/dissectors/packet-udp.c +++ b/epan/dissectors/packet-udp.c @@ -408,7 +408,7 @@ static gchar* udp_follow_conv_filter(packet_info *pinfo, int* stream) if( ((pinfo->net_src.type == AT_IPv4 && pinfo->net_dst.type == AT_IPv4) || (pinfo->net_src.type == AT_IPv6 && pinfo->net_dst.type == AT_IPv6)) - && (conv=find_conversation(pinfo->fd->num, &pinfo->src, &pinfo->dst, pinfo->ptype, + && (conv=find_conversation(pinfo->num, &pinfo->src, &pinfo->dst, pinfo->ptype, pinfo->srcport, pinfo->destport, 0)) != NULL ) { /* UDP over IPv4/6 */ diff --git a/epan/dissectors/packet-uma.c b/epan/dissectors/packet-uma.c index 558d7bd8cc..87eb08c496 100644 --- a/epan/dissectors/packet-uma.c +++ b/epan/dissectors/packet-uma.c @@ -1483,13 +1483,13 @@ dissect_uma_IE(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset) set_address(&dst_addr, AT_IPv4, 4, &GPRS_user_data_ipv4_address); - conversation = find_conversation(pinfo->fd->num,&dst_addr, + conversation = find_conversation(pinfo->num,&dst_addr, &null_addr, PT_UDP, GPRS_user_data_transport_UDP_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(pinfo->fd->num, &dst_addr, + conversation = conversation_new(pinfo->num, &dst_addr, &null_addr, PT_UDP,GPRS_user_data_transport_UDP_port , 0, NO_ADDR2|NO_PORT2); @@ -1515,13 +1515,13 @@ dissect_uma_IE(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset) set_address(&dst_addr, AT_IPv4, 4, &unc_ipv4_address); - conversation = find_conversation(pinfo->fd->num,&dst_addr, + conversation = find_conversation(pinfo->num,&dst_addr, &null_addr, PT_TCP, UNC_tcp_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(pinfo->fd->num, &dst_addr, + conversation = conversation_new(pinfo->num, &dst_addr, &null_addr, PT_TCP,UNC_tcp_port , 0, NO_ADDR2|NO_PORT2); /* Set dissector */ @@ -1545,10 +1545,10 @@ dissect_uma_IE(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset) } if((!pinfo->fd->flags.visited) && RTP_UDP_port!=0){ - rtp_add_address(pinfo, &src_addr, RTP_UDP_port, 0, "UMA", pinfo->fd->num, FALSE, 0); + rtp_add_address(pinfo, &src_addr, RTP_UDP_port, 0, "UMA", pinfo->num, FALSE, 0); if ((RTP_UDP_port & 0x1) == 0){ /* Even number RTP port RTCP should follow on odd number */ RTCP_UDP_port = RTP_UDP_port + 1; - rtcp_add_address(pinfo, &src_addr, RTCP_UDP_port, 0, "UMA", pinfo->fd->num); + rtcp_add_address(pinfo, &src_addr, RTCP_UDP_port, 0, "UMA", pinfo->num); } } break; @@ -1559,7 +1559,7 @@ dissect_uma_IE(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset) if((!pinfo->fd->flags.visited) && rtcp_ipv4_address!=0 && RTCP_UDP_port!=0 && rtcp_handle){ set_address(&src_addr, AT_IPv4, 4, &rtcp_ipv4_address); - rtcp_add_address(pinfo, &src_addr, RTCP_UDP_port, 0, "UMA", pinfo->fd->num); + rtcp_add_address(pinfo, &src_addr, RTCP_UDP_port, 0, "UMA", pinfo->num); } break; case 106: diff --git a/epan/dissectors/packet-umts_fp.c b/epan/dissectors/packet-umts_fp.c index ae3ff612fb..50470e5cf4 100644 --- a/epan/dissectors/packet-umts_fp.c +++ b/epan/dissectors/packet-umts_fp.c @@ -4053,7 +4053,7 @@ fp_set_per_packet_inf_from_conv(umts_fp_conversation_info_t *p_conv_data, else if (p_conv_data->dchs_in_flow_list[chan] == 24 && tb_size != 340) { macinf->ctmux[j+chan] = FALSE;/*Set TRUE if this channel is multiplexed (ie. C/T flag exists)*/ - /*g_warning("settin this for %d", pinfo->fd->num);*/ + /*g_warning("settin this for %d", pinfo->num);*/ macinf->lchid[j+chan] = fake_lchid; macinf->fake_chid[j+chan] = TRUE; macinf->content[j+chan] = MAC_CONTENT_PS_DTCH; /*lchId_type_table[fake_lchid];*/ /*Base MAC content on logical channel id (Table is in packet-nbap.h)*/ @@ -4226,7 +4226,7 @@ dissect_fp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat p_fp_info = (struct fp_info *)p_get_proto_data(wmem_file_scope(), pinfo, proto_fp, 0); /* Check if we have conversation info */ - p_conv = (conversation_t *)find_conversation(pinfo->fd->num, &pinfo->net_dst, &pinfo->net_src, + p_conv = (conversation_t *)find_conversation(pinfo->num, &pinfo->net_dst, &pinfo->net_src, pinfo->ptype, pinfo->destport, pinfo->srcport, NO_ADDR_B); @@ -4234,7 +4234,7 @@ dissect_fp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat if (p_conv) { /*Find correct conversation, basically find the one that's closest to this frame*/ #if 0 - while (p_conv->next != NULL && p_conv->next->setup_frame < pinfo->fd->num) { + while (p_conv->next != NULL && p_conv->next->setup_frame < pinfo->num) { p_conv = p_conv->next; } #endif diff --git a/epan/dissectors/packet-umts_mac.c b/epan/dissectors/packet-umts_mac.c index 8f21d3070b..24c16757c8 100644 --- a/epan/dissectors/packet-umts_mac.c +++ b/epan/dissectors/packet-umts_mac.c @@ -713,7 +713,7 @@ static tvbuff_t * add_to_tree(tvbuff_t * tvb, packet_info * pinfo, proto_tree * { tvbuff_t * new_tvb = NULL; - if (sdu->frame_num == pinfo->fd->num) { + if (sdu->frame_num == pinfo->num) { mac_is_fragment * f = sdu->fragments; guint counter = 0; new_tvb = tvb_new_child_real_data(tvb, sdu->data, sdu->length, sdu->length); @@ -811,13 +811,13 @@ static tvbuff_t * mac_is_add_fragment(tvbuff_t * tvb _U_, packet_info *pinfo, pr /* Middle segment */ if (no_sdus == 1 && ss == 3) { guint head_length, tail_length; - init_frag(tvb, body_parts_array[tsn], maclength, offset, pinfo->fd->num, tsn, MAC_IS_MIDDLE); + init_frag(tvb, body_parts_array[tsn], maclength, offset, pinfo->num, tsn, MAC_IS_MIDDLE); tail_length = find_tail(body_parts_array, tsn); if (tail_length > 0) { head_length = find_head(body_parts_array, &tsn); if (head_length > 0) { /* tsn is now TSN of head */ - return reassemble(tvb, body_parts_array, tsn, tail_length+head_length+maclength, &ch, pinfo->fd->num); + return reassemble(tvb, body_parts_array, tsn, tail_length+head_length+maclength, &ch, pinfo->num); } } /* XXX: haven't confirmed if case when middle segment comes last @@ -826,20 +826,20 @@ static tvbuff_t * mac_is_add_fragment(tvbuff_t * tvb _U_, packet_info *pinfo, pr /* If first SDU is last segment of previous. A tail. */ else if (sdu_no == 0 && (ss & 1) == 1) { guint length = maclength; - init_frag(tvb, body_parts_array[tsn], maclength, offset, pinfo->fd->num, tsn, MAC_IS_TAIL); + init_frag(tvb, body_parts_array[tsn], maclength, offset, pinfo->num, tsn, MAC_IS_TAIL); length += find_head(body_parts_array, &tsn); if (length > maclength) { /* tsn is now TSN of head */ - return reassemble(tvb, body_parts_array, tsn, length, &ch, pinfo->fd->num); + return reassemble(tvb, body_parts_array, tsn, length, &ch, pinfo->num); } } /* If last SDU is first segment of next. A head. */ else if (sdu_no == no_sdus-1 && (ss & 2) == 2) { guint length = maclength; - init_frag(tvb, body_parts_array[tsn], maclength, offset, pinfo->fd->num, tsn, MAC_IS_HEAD); + init_frag(tvb, body_parts_array[tsn], maclength, offset, pinfo->num, tsn, MAC_IS_HEAD); length += find_tail(body_parts_array, tsn); if (length > maclength) { - return reassemble(tvb, body_parts_array, tsn, length, &ch, pinfo->fd->num); + return reassemble(tvb, body_parts_array, tsn, length, &ch, pinfo->num); } /* If our SDU is not fragmented. */ } else { @@ -851,21 +851,21 @@ static tvbuff_t * mac_is_add_fragment(tvbuff_t * tvb _U_, packet_info *pinfo, pr tvbuff_t * new_tvb = NULL; /* Middle segment */ if (no_sdus == 1 && ss == 3) { - mac_is_sdu * sdu = get_sdu(pinfo->fd->num, tsn, MAC_IS_MIDDLE, &ch); + mac_is_sdu * sdu = get_sdu(pinfo->num, tsn, MAC_IS_MIDDLE, &ch); if (sdu) { return add_to_tree(tvb, pinfo, tree, sdu, offset, maclength, MAC_IS_MIDDLE); } } /* If first SDU is last segment of previous. A tail. */ else if (sdu_no == 0 && (ss & 1) == 1) { - mac_is_sdu * sdu = get_sdu(pinfo->fd->num, tsn, MAC_IS_TAIL, &ch); + mac_is_sdu * sdu = get_sdu(pinfo->num, tsn, MAC_IS_TAIL, &ch); if (sdu) { return add_to_tree(tvb, pinfo, tree, sdu, offset, maclength, MAC_IS_TAIL); } } /* If last SDU is first segment of next. A head. */ else if (sdu_no == no_sdus-1 && (ss & 2) == 2) { - mac_is_sdu * sdu = get_sdu(pinfo->fd->num, tsn, MAC_IS_HEAD, &ch); + mac_is_sdu * sdu = get_sdu(pinfo->num, tsn, MAC_IS_HEAD, &ch); if (sdu) { return add_to_tree(tvb, pinfo, tree, sdu, offset, maclength, MAC_IS_HEAD); } diff --git a/epan/dissectors/packet-usb-dfu.c b/epan/dissectors/packet-usb-dfu.c index 4c7d90eb64..3e0b27288c 100644 --- a/epan/dissectors/packet-usb-dfu.c +++ b/epan/dissectors/packet-usb-dfu.c @@ -223,7 +223,7 @@ dissect_usb_dfu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) k_bus_id = bus_id; k_device_address = device_address; - k_frame_number = pinfo->fd->num; + k_frame_number = pinfo->num; key[0].length = 1; key[0].key = &k_bus_id; @@ -309,7 +309,7 @@ dissect_usb_dfu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) command_data->command = command; command_data->interface = interface; - command_data->command_frame_number = pinfo->fd->num; + command_data->command_frame_number = pinfo->num; command_data->block_number = block_number; wmem_tree_insert32_array(command_info, key, command_data); @@ -326,7 +326,7 @@ dissect_usb_dfu(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_response = command_data->command; block_number = command_data->block_number; diff --git a/epan/dissectors/packet-usb-hid.c b/epan/dissectors/packet-usb-hid.c index e2b66749f8..f418700c22 100644 --- a/epan/dissectors/packet-usb-hid.c +++ b/epan/dissectors/packet-usb-hid.c @@ -1336,7 +1336,7 @@ dissect_usb_hid_control_std_intf(tvbuff_t *tvb, packet_info *pinfo, /* we can't use usb_conv_info->is_request since usb_conv_info was replaced with the interface conversation */ - if (usb_trans_info->request_in == pinfo->fd->num) { + if (usb_trans_info->request_in == pinfo->num) { /* the tvb that we see here is the setup packet without the request type byte */ diff --git a/epan/dissectors/packet-usb-masstorage.c b/epan/dissectors/packet-usb-masstorage.c index a34ba9aa94..743775be72 100644 --- a/epan/dissectors/packet-usb-masstorage.c +++ b/epan/dissectors/packet-usb-masstorage.c @@ -52,7 +52,7 @@ static gint ett_usb_ms = -1; /* there is one such structure for each masstorage conversation */ typedef struct _usb_ms_conv_info_t { wmem_tree_t *itl; /* indexed by LUN */ - wmem_tree_t *itlq; /* pinfo->fd->num */ + wmem_tree_t *itlq; /* pinfo->num */ } usb_ms_conv_info_t; @@ -258,7 +258,7 @@ dissect_usb_ms_bulk(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, } /* make sure we have an ITLQ structure for this LUN/transaction */ - itlq=(itlq_nexus_t *)wmem_tree_lookup32(usb_ms_conv_info->itlq, pinfo->fd->num); + itlq=(itlq_nexus_t *)wmem_tree_lookup32(usb_ms_conv_info->itlq, pinfo->num); if(!itlq){ itlq=wmem_new(wmem_file_scope(), itlq_nexus_t); itlq->lun=lun; @@ -274,12 +274,12 @@ dissect_usb_ms_bulk(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, itlq->data_length=datalen; itlq->bidir_data_length=0; itlq->fc_time=pinfo->abs_ts; - itlq->first_exchange_frame=pinfo->fd->num; + itlq->first_exchange_frame=pinfo->num; itlq->last_exchange_frame=0; itlq->flags=0; itlq->alloc_len=0; itlq->extra_data=NULL; - wmem_tree_insert32(usb_ms_conv_info->itlq, pinfo->fd->num, itlq); + wmem_tree_insert32(usb_ms_conv_info->itlq, pinfo->num, itlq); } /* dCBWCBLength */ @@ -322,11 +322,11 @@ dissect_usb_ms_bulk(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, status=tvb_get_guint8(tvb, offset); /*offset+=1;*/ - itlq=(itlq_nexus_t *)wmem_tree_lookup32_le(usb_ms_conv_info->itlq, pinfo->fd->num); + itlq=(itlq_nexus_t *)wmem_tree_lookup32_le(usb_ms_conv_info->itlq, pinfo->num); if(!itlq){ return tvb_captured_length(tvb); } - itlq->last_exchange_frame=pinfo->fd->num; + itlq->last_exchange_frame=pinfo->num; itl=(itl_nexus_t *)wmem_tree_lookup32(usb_ms_conv_info->itl, itlq->lun); if(!itl){ @@ -345,7 +345,7 @@ dissect_usb_ms_bulk(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, /* * Ok it was neither CDB not STATUS so just assume it is either data in/out */ - itlq=(itlq_nexus_t *)wmem_tree_lookup32_le(usb_ms_conv_info->itlq, pinfo->fd->num); + itlq=(itlq_nexus_t *)wmem_tree_lookup32_le(usb_ms_conv_info->itlq, pinfo->num); if(!itlq){ return tvb_captured_length(tvb); } diff --git a/epan/dissectors/packet-usb.c b/epan/dissectors/packet-usb.c index ab112028fa..6daa47529f 100644 --- a/epan/dissectors/packet-usb.c +++ b/epan/dissectors/packet-usb.c @@ -1148,7 +1148,7 @@ get_usb_conversation(packet_info *pinfo, /* * Do we have a conversation for this connection? */ - conversation = find_conversation(pinfo->fd->num, + conversation = find_conversation(pinfo->num, src_addr, dst_addr, pinfo->ptype, src_endpoint, dst_endpoint, 0); @@ -1157,7 +1157,7 @@ get_usb_conversation(packet_info *pinfo, } /* We don't yet have a conversation, so create one. */ - conversation = conversation_new(pinfo->fd->num, + conversation = conversation_new(pinfo->num, src_addr, dst_addr, pinfo->ptype, src_endpoint, dst_endpoint, 0); @@ -1393,7 +1393,7 @@ dissect_usb_device_qualifier_descriptor(packet_info *pinfo _U_, proto_tree *pare wmem_tree_key_t key[4]; device_protocol_data_t *device_protocol_data; - k_frame_number = pinfo->fd->num; + k_frame_number = pinfo->num; k_device_address = usb_conv_info->device_address; k_bus_id = usb_conv_info->bus_id; @@ -1516,7 +1516,7 @@ dissect_usb_device_descriptor(packet_info *pinfo, proto_tree *parent_tree, device_product_data_t *device_product_data; device_protocol_data_t *device_protocol_data; - k_frame_number = pinfo->fd->num; + k_frame_number = pinfo->num; k_device_address = usb_conv_info->device_address; k_bus_id = usb_conv_info->bus_id; @@ -2736,7 +2736,7 @@ try_dissect_next_protocol(proto_tree *tree, tvbuff_t *next_tvb, packet_info *pin if (ret) return tvb_captured_length(next_tvb); - k_frame_number = pinfo->fd->num; + k_frame_number = pinfo->num; k_device_address = usb_conv_info->device_address; k_bus_id = usb_conv_info->bus_id; @@ -3283,7 +3283,7 @@ static usb_trans_info_t key[0].length = 2; key[0].key = (guint32 *)&usb_id; key[1].length = 1; - key[1].key = &PINFO_FD_NUM(pinfo); + key[1].key = &pinfo->num; key[2].length = 0; key[2].key = NULL; @@ -3292,7 +3292,7 @@ static usb_trans_info_t usb_trans_info = (usb_trans_info_t *)wmem_tree_lookup32_array(usb_conv_info->transactions, key); if (!usb_trans_info) { usb_trans_info = wmem_new0(wmem_file_scope(), usb_trans_info_t); - usb_trans_info->request_in = pinfo->fd->num; + usb_trans_info->request_in = pinfo->num; usb_trans_info->req_time = pinfo->abs_ts; usb_trans_info->header_type = header_type; usb_trans_info->usb_id = usb_id; @@ -3316,7 +3316,7 @@ static usb_trans_info_t if (usb_trans_info->usb_id == usb_id) { if (usb_trans_info->response_in == 0) { /* USBPcap generates 2 frames for response; store the first one */ - usb_trans_info->response_in = pinfo->fd->num; + usb_trans_info->response_in = pinfo->num; } wmem_tree_insert32_array(usb_conv_info->transactions, key, usb_trans_info); } else { @@ -3556,7 +3556,7 @@ dissect_usb_payload(tvbuff_t *tvb, packet_info *pinfo, device_protocol_data_t *device_protocol_data = NULL; tvbuff_t *next_tvb = NULL; - k_frame_number = pinfo->fd->num; + k_frame_number = pinfo->num; k_device_address = device_address; k_bus_id = usb_conv_info->bus_id; diff --git a/epan/dissectors/packet-vnc.c b/epan/dissectors/packet-vnc.c index 977edb51e5..79e1dd9a5e 100644 --- a/epan/dissectors/packet-vnc.c +++ b/epan/dissectors/packet-vnc.c @@ -1076,7 +1076,7 @@ static gboolean test_vnc_protocol(tvbuff_t *tvb, packet_info *pinfo, conversation_t *conversation; if (vnc_is_client_or_server_version_message(tvb, NULL, NULL)) { - conversation = conversation_new(pinfo->fd->num, &pinfo->src, + conversation = conversation_new(pinfo->num, &pinfo->src, &pinfo->dst, pinfo->ptype, pinfo->srcport, pinfo->destport, 0); diff --git a/epan/dissectors/packet-wbxml.c b/epan/dissectors/packet-wbxml.c index e24d0a7fc4..7b3989748e 100644 --- a/epan/dissectors/packet-wbxml.c +++ b/epan/dissectors/packet-wbxml.c @@ -7675,7 +7675,7 @@ dissect_wbxml_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint8 codepage_stag = 0; guint8 codepage_attr = 0; - DebugLog(("dissect_wbxml: Dissecting packet %u\n", pinfo->fd->num)); + DebugLog(("dissect_wbxml: Dissecting packet %u\n", pinfo->num)); /* WBXML format * * Version 1.0: version publicid strtbl BODY diff --git a/epan/dissectors/packet-wcp.c b/epan/dissectors/packet-wcp.c index d6e5b115d6..a0290012a2 100644 --- a/epan/dissectors/packet-wcp.c +++ b/epan/dissectors/packet-wcp.c @@ -437,10 +437,10 @@ wcp_window_t *get_wcp_window_ptr(packet_info *pinfo, circuit_type ctype, guint32 wcp_circuit_data_t *wcp_circuit_data; circuit = find_circuit( ctype, circuit_id, - pinfo->fd->num); + pinfo->num); if ( !circuit){ circuit = circuit_new( ctype, circuit_id, - pinfo->fd->num); + pinfo->num); } wcp_circuit_data = (wcp_circuit_data_t *)circuit_get_proto_data(circuit, proto_wcp); if ( !wcp_circuit_data){ diff --git a/epan/dissectors/packet-websocket.c b/epan/dissectors/packet-websocket.c index e856723595..4fcc76e36a 100644 --- a/epan/dissectors/packet-websocket.c +++ b/epan/dissectors/packet-websocket.c @@ -193,7 +193,7 @@ dissect_websocket_data_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree http_conv_t *http_conv = NULL; /* try to find a dissector which accepts the data. */ - conv = find_conversation(pinfo->fd->num, &pinfo->src, &pinfo->dst, pinfo->ptype, pinfo->srcport, pinfo->destport, 0); + conv = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst, pinfo->ptype, pinfo->srcport, pinfo->destport, 0); if (conv) { http_conv = (http_conv_t *)conversation_get_proto_data(conv, proto_http); diff --git a/epan/dissectors/packet-whois.c b/epan/dissectors/packet-whois.c index ee4d783a18..4913a820fa 100644 --- a/epan/dissectors/packet-whois.c +++ b/epan/dissectors/packet-whois.c @@ -85,7 +85,7 @@ dissect_whois(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, pinfo->desegment_offset = 0; return -1; } else { - whois_trans->req_frame = pinfo->fd->num; + whois_trans->req_frame = pinfo->num; whois_trans->req_time = pinfo->abs_ts; } } else { @@ -95,7 +95,7 @@ dissect_whois(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, } } } else if (is_query && (whois_trans->req_frame == 0)) { - whois_trans->req_frame = pinfo->fd->num; + whois_trans->req_frame = pinfo->num; whois_trans->req_time = pinfo->abs_ts; } @@ -105,10 +105,10 @@ dissect_whois(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, * number, and if reassembly is turned off, whois_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 > whois_trans->rep_frame) + * if (pinfo->num > whois_trans->rep_frame) * which will give us the same frame number either way. */ - whois_trans->rep_frame = pinfo->fd->num; + whois_trans->rep_frame = pinfo->num; } ti = proto_tree_add_protocol_format(tree, proto_whois, tvb, 0, -1, @@ -138,7 +138,7 @@ dissect_whois(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, tvb, 0, 0, whois_trans->req_frame); PROTO_ITEM_SET_GENERATED(ti); - if (pinfo->fd->num == whois_trans->rep_frame) { + if (pinfo->num == whois_trans->rep_frame) { nstime_delta(&ns, &pinfo->abs_ts, &whois_trans->req_time); ti = proto_tree_add_time(whois_tree, hf_whois_response_time, tvb, 0, 0, &ns); PROTO_ITEM_SET_GENERATED(ti); diff --git a/epan/dissectors/packet-wsp.c b/epan/dissectors/packet-wsp.c index 6ea68954f9..45ea866c7c 100644 --- a/epan/dissectors/packet-wsp.c +++ b/epan/dissectors/packet-wsp.c @@ -3993,10 +3993,10 @@ dissect_redirect(tvbuff_t *tvb, int offset, packet_info *pinfo, redir_address.len = 4; redir_address.data = (const guint8 *)&address_ipv4; /* Find a conversation based on redir_address and pinfo->dst */ - conv = find_conversation(pinfo->fd->num, &redir_address, &pinfo->dst, + conv = find_conversation(pinfo->num, &redir_address, &pinfo->dst, PT_UDP, port_num, 0, NO_PORT_B); if (conv == NULL) { /* This conversation does not exist yet */ - conv = conversation_new(pinfo->fd->num, &redir_address, + conv = conversation_new(pinfo->num, &redir_address, &pinfo->dst, PT_UDP, port_num, 0, NO_PORT2); } /* Apply WSP dissection to the conversation */ @@ -4029,10 +4029,10 @@ dissect_redirect(tvbuff_t *tvb, int offset, packet_info *pinfo, redir_address.len = 16; redir_address.data = (const guint8 *)&address_ipv6; /* Find a conversation based on redir_address and pinfo->dst */ - conv = find_conversation(pinfo->fd->num, &redir_address, &pinfo->dst, + conv = find_conversation(pinfo->num, &redir_address, &pinfo->dst, PT_UDP, port_num, 0, NO_PORT_B); if (conv == NULL) { /* This conversation does not exist yet */ - conv = conversation_new(pinfo->fd->num, &redir_address, + conv = conversation_new(pinfo->num, &redir_address, &pinfo->dst, PT_UDP, port_num, 0, NO_PORT2); } /* Apply WSP dissection to the conversation */ diff --git a/epan/dissectors/packet-wtp.c b/epan/dissectors/packet-wtp.c index 9051f6294b..edffc01353 100644 --- a/epan/dissectors/packet-wtp.c +++ b/epan/dissectors/packet-wtp.c @@ -404,7 +404,7 @@ dissect_wtp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) #ifdef DEBUG printf("WTP packet %u: tree = %p, pdu = %s (%u) length: %u\n", - pinfo->fd->num, tree, + pinfo->num, tree, val_to_str(pdut, vals_wtp_pdu_type, "Unknown PDU type 0x%x"), pdut, tvb_captured_length(tvb)); #endif @@ -722,7 +722,7 @@ dissect_wtp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) NULL, wtp_tree); #ifdef DEBUG printf("WTP: Packet %u %s -> %d: wsp_tvb = %p, fd_wtp = %p, frame = %u\n", - pinfo->fd->num, + pinfo->num, fd_wtp ? "Reassembled" : "Not reassembled", fd_wtp ? fd_wtp->reassembled_in : -1, wsp_tvb, @@ -732,7 +732,7 @@ dissect_wtp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (fd_wtp) { /* Reassembled */ reassembled_in = fd_wtp->reassembled_in; - if (pinfo->fd->num == reassembled_in) { + if (pinfo->num == reassembled_in) { /* Reassembled in this very packet: * We can safely hand the tvb to the WSP dissector */ call_dissector(wsp_handle, wsp_tvb, pinfo, tree); diff --git a/epan/dissectors/packet-x11.c b/epan/dissectors/packet-x11.c index a5aa07a3cf..30a2c83a5f 100644 --- a/epan/dissectors/packet-x11.c +++ b/epan/dissectors/packet-x11.c @@ -3106,7 +3106,7 @@ static void dissect_x11_initial_conn(tvbuff_t *tvb, packet_info *pinfo, /* * This is the initial connection request... */ - state->iconn_frame = pinfo->fd->num; + state->iconn_frame = pinfo->num; /* * ...and we're expecting a reply to it. @@ -3134,7 +3134,7 @@ static void dissect_x11_initial_reply(tvbuff_t *tvb, packet_info *pinfo, proto_item_append_text(ti, ", Reply, Initial connection reply"); t = proto_item_add_subtree(ti, ett_x11); - state->iconn_reply = pinfo->fd->num; + state->iconn_reply = pinfo->num; success = INT8(success); if (success) { UNUSED(1); @@ -4566,7 +4566,7 @@ static void dissect_x11_requests(tvbuff_t *tvb, packet_info *pinfo, return; } - if (state->iconn_frame == pinfo->fd->num || + if (state->iconn_frame == pinfo->num || (g_hash_table_lookup(state->seqtable, GINT_TO_POINTER(state->sequencenumber)) == (int *)NOTHING_SEEN && (opcode == 'B' || opcode == 'l') && @@ -4879,7 +4879,7 @@ dissect_x11_replies(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) */ if (g_hash_table_lookup(state->seqtable, GINT_TO_POINTER(state->sequencenumber)) == (int *)INITIAL_CONN - || (state->iconn_reply == pinfo->fd->num)) { + || (state->iconn_reply == pinfo->num)) { /* * Either the connection is in the "initial * connection" state, or this frame is known diff --git a/epan/dissectors/packet-x25.c b/epan/dissectors/packet-x25.c index 69bd4f438b..30c124592b 100644 --- a/epan/dissectors/packet-x25.c +++ b/epan/dissectors/packet-x25.c @@ -1484,7 +1484,7 @@ dissect_x25_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, case PRT_ID_ISO_8073: /* ISO 8073 COTP */ if (!pinfo->fd->flags.visited) - x25_hash_add_proto_start(vc, pinfo->fd->num, ositp_handle); + x25_hash_add_proto_start(vc, pinfo->num, ositp_handle); /* XXX - dissect the rest of the user data as COTP? That needs support for NCM TPDUs, etc. */ break; @@ -1492,7 +1492,7 @@ dissect_x25_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, case PRT_ID_ISO_8602: /* ISO 8602 CLTP */ if (!pinfo->fd->flags.visited) - x25_hash_add_proto_start(vc, pinfo->fd->num, ositp_handle); + x25_hash_add_proto_start(vc, pinfo->num, ositp_handle); break; } } else if (is_x_264 == 0) { @@ -1511,7 +1511,7 @@ dissect_x25_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, */ dissect = dissector_get_uint_handle(x25_subdissector_table, spi); if (dissect != NULL) - x25_hash_add_proto_start(vc, pinfo->fd->num, dissect); + x25_hash_add_proto_start(vc, pinfo->num, dissect); } /* @@ -1563,7 +1563,7 @@ dissect_x25_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, INCOMING CALL packet, it's COTP; */ if (call_request_nodata_is_cotp){ - x25_hash_add_proto_start(vc, pinfo->fd->num, ositp_handle); + x25_hash_add_proto_start(vc, pinfo->num, ositp_handle); } } break; @@ -1623,7 +1623,7 @@ dissect_x25_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, col_add_fstr(pinfo->cinfo, COL_INFO, "%s VC:%d %s - %s", short_name, vc, rval_to_str(tvb_get_guint8(tvb, 3), clear_code_rvals, "Unknown (0x%02x)"), val_to_str_ext(tvb_get_guint8(tvb, 4), &x25_clear_diag_vals_ext, "Unknown (0x%02x)")); - x25_hash_add_proto_end(vc, pinfo->fd->num); + x25_hash_add_proto_end(vc, pinfo->num); if (x25_tree) { proto_tree_add_uint(x25_tree, hf_x25_lcn, tvb, 0, 2, bytes0_1); proto_tree_add_uint_format_value(x25_tree, hf_x25_type, tvb, @@ -1702,7 +1702,7 @@ dissect_x25_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, col_add_fstr(pinfo->cinfo, COL_INFO, "%s VC:%d %s - Diag.:%d", short_name, vc, rval_to_str(tvb_get_guint8(tvb, 3), reset_code_rvals, "Unknown (0x%02x)"), (int)tvb_get_guint8(tvb, 4)); - x25_hash_add_proto_end(vc, pinfo->fd->num); + x25_hash_add_proto_end(vc, pinfo->num); if (x25_tree) { proto_tree_add_uint(x25_tree, hf_x25_lcn, tvb, 0, 2, bytes0_1); proto_tree_add_uint_format_value(x25_tree, hf_x25_type, tvb, 2, 1, @@ -1937,7 +1937,7 @@ dissect_x25_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, next_tvb = tvb_new_subset_remaining(tvb, localoffset); /* See if there's already a dissector for this circuit. */ - if (try_circuit_dissector(CT_X25, vc, pinfo->fd->num, next_tvb, pinfo, + if (try_circuit_dissector(CT_X25, vc, pinfo->num, next_tvb, pinfo, tree, &q_bit_set)) { return; /* found it and dissected it */ } @@ -1946,7 +1946,7 @@ dissect_x25_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (payload_is_qllc_sna) { /* Yes - dissect it as QLLC/SNA. */ if (!pinfo->fd->flags.visited) - x25_hash_add_proto_start(vc, pinfo->fd->num, qllc_handle); + x25_hash_add_proto_start(vc, pinfo->num, qllc_handle); call_dissector_with_data(qllc_handle, next_tvb, pinfo, tree, &q_bit_set); return; } @@ -1959,7 +1959,7 @@ dissect_x25_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if ((tvb_get_guint8(tvb, localoffset+1) & 0x0F) == 0) { /* Second byte contains a valid COTP TPDU */ if (!pinfo->fd->flags.visited) - x25_hash_add_proto_start(vc, pinfo->fd->num, ositp_handle); + x25_hash_add_proto_start(vc, pinfo->num, ositp_handle); call_dissector(ositp_handle, next_tvb, pinfo, tree); return; } @@ -1972,13 +1972,13 @@ dissect_x25_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, case 0x45: /* Looks like an IP header */ if (!pinfo->fd->flags.visited) - x25_hash_add_proto_start(vc, pinfo->fd->num, ip_handle); + x25_hash_add_proto_start(vc, pinfo->num, ip_handle); call_dissector(ip_handle, next_tvb, pinfo, tree); return; case NLPID_ISO8473_CLNP: if (!pinfo->fd->flags.visited) - x25_hash_add_proto_start(vc, pinfo->fd->num, clnp_handle); + x25_hash_add_proto_start(vc, pinfo->num, clnp_handle); call_dissector(clnp_handle, next_tvb, pinfo, tree); return; } diff --git a/epan/dissectors/packet-xmcp.c b/epan/dissectors/packet-xmcp.c index 3238cb4a53..79a8aa1fee 100644 --- a/epan/dissectors/packet-xmcp.c +++ b/epan/dissectors/packet-xmcp.c @@ -895,12 +895,12 @@ dissect_xmcp_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* if (!pinfo->fd->flags.visited) { if (xmcp_msg_type_class == XMCP_CLASS_REQUEST) { if (xmcp_trans->request_frame == 0) { - xmcp_trans->request_frame = pinfo->fd->num; + xmcp_trans->request_frame = pinfo->num; xmcp_trans->request_time = pinfo->abs_ts; } } else if (xmcp_msg_type_class != XMCP_CLASS_RESERVED) { if (xmcp_trans->response_frame == 0) { - xmcp_trans->response_frame = pinfo->fd->num; + xmcp_trans->response_frame = pinfo->num; } } } diff --git a/epan/dissectors/packet-xmpp-core.c b/epan/dissectors/packet-xmpp-core.c index 2e6073e6fd..0cbdeee467 100644 --- a/epan/dissectors/packet-xmpp-core.c +++ b/epan/dissectors/packet-xmpp-core.c @@ -180,7 +180,7 @@ xmpp_iq(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t *pac /*displays request/response field in each iq packet*/ if (reqresp_trans) { - if (reqresp_trans->req_frame == pinfo->fd->num) { + if (reqresp_trans->req_frame == pinfo->num) { if (reqresp_trans->resp_frame) { proto_item *it = proto_tree_add_uint(tree, hf_xmpp_response_in, tvb, 0, 0, reqresp_trans->resp_frame); PROTO_ITEM_SET_GENERATED(it); @@ -697,11 +697,11 @@ xmpp_starttls(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, tls_item = proto_tree_add_item(tree, hf_xmpp_starttls, tvb, packet->offset, packet->length, ENC_BIG_ENDIAN); tls_tree = proto_item_add_subtree(tls_item, ett_xmpp_starttls); - if (xmpp_info->ssl_start && xmpp_info->ssl_start != pinfo->fd->num) { + if (xmpp_info->ssl_start && xmpp_info->ssl_start != pinfo->num) { expert_add_info_format(pinfo, tls_item, &ei_xmpp_starttls_already_in_frame, "Already saw STARTTLS in frame %u", xmpp_info->ssl_start); } else { - xmpp_info->ssl_start = pinfo->fd->num; + xmpp_info->ssl_start = pinfo->num; } xmpp_display_attrs(tls_tree, packet, pinfo, tvb, attrs_info, array_length(attrs_info)); @@ -731,7 +731,7 @@ xmpp_proceed(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, ssl_proceed = ssl_starttls_ack(find_dissector("ssl"), pinfo, find_dissector("xmpp")); - if (ssl_proceed > 0 && ssl_proceed != pinfo->fd->num) { + if (ssl_proceed > 0 && ssl_proceed != pinfo->num) { expert_add_info_format(pinfo, proceed_item, &ei_xmpp_proceed_already_in_frame, "Already saw PROCEED in frame %u", ssl_proceed); } diff --git a/epan/dissectors/packet-xmpp-utils.c b/epan/dissectors/packet-xmpp-utils.c index 8be855c8b1..564471c752 100644 --- a/epan/dissectors/packet-xmpp-utils.c +++ b/epan/dissectors/packet-xmpp-utils.c @@ -51,13 +51,13 @@ xmpp_iq_reqresp_track(packet_info *pinfo, xmpp_element_t *packet, xmpp_conv_info if (!pinfo->fd->flags.visited) { xmpp_trans = (xmpp_transaction_t *)wmem_tree_lookup_string(xmpp_info->req_resp, id, WMEM_TREE_STRING_NOCASE); if (xmpp_trans) { - xmpp_trans->resp_frame = pinfo->fd->num; + xmpp_trans->resp_frame = pinfo->num; } else { char *se_id = wmem_strdup(wmem_file_scope(), id); xmpp_trans = wmem_new(wmem_file_scope(), xmpp_transaction_t); - xmpp_trans->req_frame = pinfo->fd->num; + xmpp_trans->req_frame = pinfo->num; xmpp_trans->resp_frame = 0; wmem_tree_insert_string(xmpp_info->req_resp, se_id, (void *) xmpp_trans, WMEM_TREE_STRING_NOCASE); diff --git a/epan/dissectors/packet-xyplex.c b/epan/dissectors/packet-xyplex.c index f39282a47d..6f0c49537f 100644 --- a/epan/dissectors/packet-xyplex.c +++ b/epan/dissectors/packet-xyplex.c @@ -110,10 +110,10 @@ dissect_xyplex(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _ * requesting server and the Xyplex host using the * return_port. */ - conversation = find_conversation(pinfo->fd->num, &pinfo->src, &pinfo->dst, + conversation = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst, PT_TCP, return_port, 0, NO_PORT_B); if (conversation == NULL) { - conversation = conversation_new(pinfo->fd->num, &pinfo->src, &pinfo->dst, + conversation = conversation_new(pinfo->num, &pinfo->src, &pinfo->dst, PT_TCP, return_port, 0, NO_PORT2); conversation_set_dissector(conversation, xyplex_handle); } diff --git a/epan/dissectors/packet-zbee-aps.c b/epan/dissectors/packet-zbee-aps.c index 9778046d66..aa3fed8737 100644 --- a/epan/dissectors/packet-zbee-aps.c +++ b/epan/dissectors/packet-zbee-aps.c @@ -1310,7 +1310,7 @@ dissect_zbee_aps_transport_key(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree memcmp( ((key_record_t *)((GSList *)(*nwk_keyring))->data)->key, &key, ZBEE_APS_CMD_KEY_LENGTH) ) { /* Store a new or different key in the key ring */ - key_record.frame_num = pinfo->fd->num; + key_record.frame_num = pinfo->num; key_record.label = NULL; memcpy(&key_record.key, &key, ZBEE_APS_CMD_KEY_LENGTH); *nwk_keyring = g_slist_prepend(*nwk_keyring, g_memdup(&key_record, sizeof(key_record_t))); diff --git a/epan/dissectors/packet-zbee-nwk.c b/epan/dissectors/packet-zbee-nwk.c index a7b1940166..b311215b94 100644 --- a/epan/dissectors/packet-zbee-nwk.c +++ b/epan/dissectors/packet-zbee-nwk.c @@ -551,7 +551,7 @@ dissect_zbee_nwk_full(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void /* Update nwk extended address hash table */ if ( unicast_src ) { nwk_hints->map_rec = ieee802154_addr_update(&zbee_nwk_map, - packet.src, addr16.pan, packet.src64, pinfo->current_proto, pinfo->fd->num); + packet.src, addr16.pan, packet.src64, pinfo->current_proto, pinfo->num); } } } diff --git a/epan/dissectors/packet-zbee-security.c b/epan/dissectors/packet-zbee-security.c index 61500d6528..c060c8ca3f 100644 --- a/epan/dissectors/packet-zbee-security.c +++ b/epan/dissectors/packet-zbee-security.c @@ -545,7 +545,7 @@ dissect_zbee_secure(tvbuff_t *tvb, packet_info *pinfo, proto_tree* tree, guint o if (nwk_hints && ieee_hints) { /* Map this long address with the nwk layer short address. */ nwk_hints->map_rec = ieee802154_addr_update(&zbee_nwk_map, nwk_hints->src, - ieee_hints->src_pan, packet.src64, pinfo->current_proto, pinfo->fd->num); + ieee_hints->src_pan, packet.src64, pinfo->current_proto, pinfo->num); } break; @@ -553,7 +553,7 @@ dissect_zbee_secure(tvbuff_t *tvb, packet_info *pinfo, proto_tree* tree, guint o if (ieee_hints) { /* Map this long address with the ieee short address. */ ieee_hints->map_rec = ieee802154_addr_update(&zbee_nwk_map, ieee_hints->src16, - ieee_hints->src_pan, packet.src64, pinfo->current_proto, pinfo->fd->num); + ieee_hints->src_pan, packet.src64, pinfo->current_proto, pinfo->num); } break; diff --git a/epan/dissectors/packet-zrtp.c b/epan/dissectors/packet-zrtp.c index 9a20a3d55e..d34ea79b44 100644 --- a/epan/dissectors/packet-zrtp.c +++ b/epan/dissectors/packet-zrtp.c @@ -467,16 +467,16 @@ dissect_Conf2ACK(packet_info *pinfo) { dummy_srtp_info->auth_tag_len = 4; srtp_add_address(pinfo, &pinfo->net_src, pinfo->srcport, pinfo->destport, - "ZRTP", PINFO_FD_NUM(pinfo), FALSE, NULL, dummy_srtp_info); + "ZRTP", pinfo->num, FALSE, NULL, dummy_srtp_info); srtp_add_address(pinfo, &pinfo->net_dst, pinfo->destport, pinfo->srcport, - "ZRTP", PINFO_FD_NUM(pinfo), FALSE, NULL, dummy_srtp_info); + "ZRTP", pinfo->num, FALSE, NULL, dummy_srtp_info); srtcp_add_address(pinfo, &pinfo->net_src, pinfo->srcport+1, pinfo->destport+1, - "ZRTP", PINFO_FD_NUM(pinfo), dummy_srtp_info); + "ZRTP", pinfo->num, dummy_srtp_info); srtcp_add_address(pinfo, &pinfo->net_dst, pinfo->destport+1, pinfo->srcport+1, - "ZRTP", PINFO_FD_NUM(pinfo), dummy_srtp_info); + "ZRTP", pinfo->num, dummy_srtp_info); col_set_str(pinfo->cinfo, COL_INFO, "Conf2ACK Packet"); } diff --git a/epan/dissectors/packet-zvt.c b/epan/dissectors/packet-zvt.c index 685c674946..76f9228666 100644 --- a/epan/dissectors/packet-zvt.c +++ b/epan/dissectors/packet-zvt.c @@ -493,10 +493,10 @@ zvt_set_addresses(packet_info *pinfo, zvt_transaction_t *zvt_trans) if (!ai) return; - if (zvt_trans->rqst_frame == PINFO_FD_NUM(pinfo)) { + if (zvt_trans->rqst_frame == pinfo->num) { dir = ai->direction; } - else if (zvt_trans->resp_frame == PINFO_FD_NUM(pinfo)) { + else if (zvt_trans->resp_frame == pinfo->num) { if (ai->direction == DIRECTION_ECR_TO_PT) dir = DIRECTION_PT_TO_ECR; else @@ -565,13 +565,13 @@ dissect_zvt_apdu(tvbuff_t *tvb, gint offset, packet_info *pinfo, proto_tree *tre offset++; zvt_trans = (zvt_transaction_t *)wmem_tree_lookup32_le( - transactions, PINFO_FD_NUM(pinfo)); + transactions, pinfo->num); if (zvt_trans && zvt_trans->resp_frame==0) { /* there's a pending request, this packet is the response */ - zvt_trans->resp_frame = PINFO_FD_NUM(pinfo); + zvt_trans->resp_frame = pinfo->num; } - if (zvt_trans && zvt_trans->resp_frame == PINFO_FD_NUM(pinfo)) { + if (zvt_trans && zvt_trans->resp_frame == pinfo->num) { it = proto_tree_add_uint(apdu_tree, hf_zvt_resp_to, NULL, 0, 0, zvt_trans->rqst_frame); PROTO_ITEM_SET_GENERATED(it); @@ -586,8 +586,8 @@ dissect_zvt_apdu(tvbuff_t *tvb, gint offset, packet_info *pinfo, proto_tree *tre if (PINFO_FD_VISITED(pinfo)) { zvt_trans = (zvt_transaction_t *)wmem_tree_lookup32( - transactions, PINFO_FD_NUM(pinfo)); - if (zvt_trans && zvt_trans->rqst_frame==PINFO_FD_NUM(pinfo) && + transactions, pinfo->num); + if (zvt_trans && zvt_trans->rqst_frame==pinfo->num && zvt_trans->resp_frame!=0) { it = proto_tree_add_uint(apdu_tree, hf_zvt_resp_in, NULL, 0, 0, zvt_trans->resp_frame); @@ -596,7 +596,7 @@ dissect_zvt_apdu(tvbuff_t *tvb, gint offset, packet_info *pinfo, proto_tree *tre } else { zvt_trans = wmem_new(wmem_file_scope(), zvt_transaction_t); - zvt_trans->rqst_frame = PINFO_FD_NUM(pinfo); + zvt_trans->rqst_frame = pinfo->num; zvt_trans->resp_frame = 0; zvt_trans->ctrl = ctrl; wmem_tree_insert32(transactions, diff --git a/epan/dissectors/pidl/lsa.cnf b/epan/dissectors/pidl/lsa.cnf index a55eb2bde7..2138ef8322 100644 --- a/epan/dissectors/pidl/lsa.cnf +++ b/epan/dissectors/pidl/lsa.cnf @@ -196,7 +196,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: diff --git a/epan/dissectors/pidl/samr.cnf b/epan/dissectors/pidl/samr.cnf index dc45d1809f..e24c2038d9 100644 --- a/epan/dissectors/pidl/samr.cnf +++ b/epan/dissectors/pidl/samr.cnf @@ -399,7 +399,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: diff --git a/epan/expert.c b/epan/expert.c index 6802997d32..7225f148a7 100644 --- a/epan/expert.c +++ b/epan/expert.c @@ -519,7 +519,7 @@ expert_set_info_vformat(packet_info *pinfo, proto_item *pi, int group, int sever } /* if this packet isn't loaded because of a read filter, don't output anything */ - if (pinfo == NULL || PINFO_FD_NUM(pinfo) == 0) { + if (pinfo == NULL || pinfo->num == 0) { return; } @@ -572,7 +572,7 @@ expert_set_info_vformat(packet_info *pinfo, proto_item *pi, int group, int sever ei = wmem_new(wmem_packet_scope(), expert_info_t); - ei->packet_num = PINFO_FD_NUM(pinfo); + ei->packet_num = pinfo->num; ei->group = group; ei->severity = severity; ei->hf_index = hf_index; diff --git a/epan/exported_pdu.c b/epan/exported_pdu.c index 84ac43ef41..840d9cbb8a 100644 --- a/epan/exported_pdu.c +++ b/epan/exported_pdu.c @@ -312,10 +312,10 @@ load_export_pdu_tags(packet_info *pinfo, guint tag_type, const char* proto_name, i++; exp_pdu_data->tlv_buffer[i] = EXP_PDU_TAG_ORIG_FNO_LEN; /* tag length */ i++; - exp_pdu_data->tlv_buffer[i] = (pinfo->fd->num & 0xff000000) >> 24; - exp_pdu_data->tlv_buffer[i+1] = (pinfo->fd->num & 0x00ff0000) >> 16; - exp_pdu_data->tlv_buffer[i+2] = (pinfo->fd->num & 0x0000ff00) >> 8; - exp_pdu_data->tlv_buffer[i+3] = (pinfo->fd->num & 0x000000ff); + exp_pdu_data->tlv_buffer[i] = (pinfo->num & 0xff000000) >> 24; + exp_pdu_data->tlv_buffer[i+1] = (pinfo->num & 0x00ff0000) >> 16; + exp_pdu_data->tlv_buffer[i+2] = (pinfo->num & 0x0000ff00) >> 8; + exp_pdu_data->tlv_buffer[i+3] = (pinfo->num & 0x000000ff); /*i = i +EXP_PDU_TAG_ORIG_FNO_LEN;*/ } } diff --git a/epan/frame_data.h b/epan/frame_data.h index 02442dfe00..6f10ff9ad3 100644 --- a/epan/frame_data.h +++ b/epan/frame_data.h @@ -36,7 +36,6 @@ struct _packet_info; struct epan_session; struct wtap_pkthdr; -#define PINFO_FD_NUM(pinfo) ((pinfo)->fd->num) #define PINFO_FD_VISITED(pinfo) ((pinfo)->fd->flags.visited) /** @file diff --git a/epan/gcp.c b/epan/gcp.c index a0ad66333b..bee194583d 100644 --- a/epan/gcp.c +++ b/epan/gcp.c @@ -85,7 +85,7 @@ void gcp_init(void) { gcp_msg_t* gcp_msg(packet_info* pinfo, int o, gboolean keep_persistent_data) { gcp_msg_t* m; - guint32 framenum = (guint32)pinfo->fd->num; + guint32 framenum = (guint32)pinfo->num; guint32 offset = (guint32)o; address* src = &(pinfo->src); address* dst = &(pinfo->dst); diff --git a/epan/packet.c b/epan/packet.c index fda35e95db..90f417006a 100644 --- a/epan/packet.c +++ b/epan/packet.c @@ -384,7 +384,7 @@ void mark_frame_as_depended_upon(packet_info *pinfo, guint32 frame_num) { /* Don't mark a frame as dependent on itself */ - if (frame_num != PINFO_FD_NUM(pinfo)) { + if (frame_num != pinfo->num) { pinfo->dependent_frames = g_slist_prepend(pinfo->dependent_frames, GUINT_TO_POINTER(frame_num)); } } @@ -462,6 +462,7 @@ dissect_record(epan_dissect_t *edt, int file_type_subtype, edt->pi.current_proto = "<Missing Protocol Name>"; edt->pi.cinfo = cinfo; edt->pi.presence_flags = 0; + edt->pi.num = fd->num; if (fd->flags.has_ts) { edt->pi.presence_flags |= PINFO_HAS_TS; edt->pi.abs_ts = fd->abs_ts; diff --git a/epan/packet_info.h b/epan/packet_info.h index f816d14459..f31ec9fc6e 100644 --- a/epan/packet_info.h +++ b/epan/packet_info.h @@ -55,7 +55,9 @@ typedef struct _packet_info { const char *current_proto; /**< name of protocol currently being dissected */ struct epan_column_info *cinfo; /**< Column formatting information */ guint32 presence_flags; /**< Presence flags for some items */ + guint32 num; /**< Frame number */ nstime_t abs_ts; /**< Packet absolute time stamp */ + nstime_t rel_ts; /**< Relative timestamp (yes, it can be negative) */ gint pkt_encap; /**< Per-packet encapsulation/data-link type */ frame_data *fd; union wtap_pseudo_header *pseudo_header; @@ -158,7 +160,6 @@ typedef struct _packet_info { wmem_allocator_t *pool; /**< Memory pool scoped to the pinfo struct */ struct epan_session *epan; - nstime_t rel_ts; /**< Relative timestamp (yes, it can be negative) */ const gchar *heur_list_name; /**< name of heur list if this packet is being heuristically dissected */ } packet_info; diff --git a/epan/reassemble.c b/epan/reassemble.c index ea0acc681c..8049b26281 100644 --- a/epan/reassemble.c +++ b/epan/reassemble.c @@ -642,7 +642,7 @@ fragment_get_reassembled_id(reassembly_table *table, const packet_info *pinfo, reassembled_key key; /* create key to search hash with */ - key.frame = pinfo->fd->num; + key.frame = pinfo->num; key.id = id; fd_head = (fragment_head *)g_hash_table_lookup(table->reassembled_table, &key); @@ -808,7 +808,7 @@ fragment_reassembled(reassembly_table *table, fragment_head *fd_head, * table; just hash it using the current frame number. */ new_key = g_slice_new(reassembled_key); - new_key->frame = pinfo->fd->num; + new_key->frame = pinfo->num; new_key->id = id; g_hash_table_insert(table->reassembled_table, new_key, fd_head); } else { @@ -824,7 +824,7 @@ fragment_reassembled(reassembly_table *table, fragment_head *fd_head, } } fd_head->flags |= FD_DEFRAGMENTED; - fd_head->reassembled_in = pinfo->fd->num; + fd_head->reassembled_in = pinfo->num; fd_head->reas_in_layer_num = pinfo->curr_layer_num; } @@ -878,7 +878,7 @@ fragment_add_work(fragment_head *fd_head, tvbuff_t *tvb, const int offset, fd = g_slice_new(fragment_item); fd->next = NULL; fd->flags = 0; - fd->frame = pinfo->fd->num; + fd->frame = pinfo->num; fd->offset = frag_offset; fd->fragment_nr_offset = 0; /* will only be used with sequence */ fd->len = frag_data_len; @@ -1196,7 +1196,7 @@ fragment_add_work(fragment_head *fd_head, tvbuff_t *tvb, const int offset, /* mark this packet as defragmented. allows us to skip any trailing fragments */ fd_head->flags |= FD_DEFRAGMENTED; - fd_head->reassembled_in=pinfo->fd->num; + fd_head->reassembled_in=pinfo->num; fd_head->reas_in_layer_num = pinfo->curr_layer_num; /* we don't throw until here to avoid leaking old_data and others */ @@ -1229,7 +1229,7 @@ fragment_add_common(reassembly_table *table, tvbuff_t *tvb, const int offset, /* leave it here for future debugging sessions */ if(strcmp(pinfo->current_proto, "DCERPC") == 0) { printf("proto:%s num:%u id:%u offset:%u len:%u more:%u visited:%u\n", - pinfo->current_proto, pinfo->fd->num, id, frag_offset, frag_data_len, more_frags, pinfo->fd->flags.visited); + pinfo->current_proto, pinfo->num, id, frag_offset, frag_data_len, more_frags, pinfo->fd->flags.visited); if(fd_head != NULL) { for(fd_item=fd_head->next;fd_item;fd_item=fd_item->next){ printf("fd_frame:%u fd_offset:%u len:%u datalen:%u\n", @@ -1264,7 +1264,7 @@ fragment_add_common(reassembly_table *table, tvbuff_t *tvb, const int offset, * reassembly; if this frame is later than that * frame, we know it hasn't been added yet. */ - if (pinfo->fd->num <= fd_head->frame) { + if (pinfo->num <= fd_head->frame) { already_added = FALSE; /* * The first item in the reassembly list @@ -1274,7 +1274,7 @@ fragment_add_common(reassembly_table *table, tvbuff_t *tvb, const int offset, */ for (fd_item = fd_head->next; fd_item; fd_item = fd_item->next) { - if (pinfo->fd->num == fd_item->frame && + if (pinfo->num == fd_item->frame && frag_offset == fd_item->offset) { already_added = TRUE; break; @@ -1323,7 +1323,7 @@ fragment_add_common(reassembly_table *table, tvbuff_t *tvb, const int offset, * Is it later in the capture than all of the * fragments in the reassembly? */ - if (pinfo->fd->num > fd_head->frame) { + if (pinfo->num > fd_head->frame) { /* * Yes, so report this as a problem, * possibly a retransmission. @@ -1431,7 +1431,7 @@ fragment_add_check(reassembly_table *table, tvbuff_t *tvb, const int offset, * of reassembled packets. */ if (pinfo->fd->flags.visited) { - reass_key.frame = pinfo->fd->num; + reass_key.frame = pinfo->num; reass_key.id = id; return (fragment_head *)g_hash_table_lookup(table->reassembled_table, &reass_key); } @@ -1548,7 +1548,7 @@ fragment_defragment_and_free (fragment_head *fd_head, const packet_info *pinfo) * allows us to skip any trailing fragments. */ fd_head->flags |= FD_DEFRAGMENTED; - fd_head->reassembled_in=pinfo->fd->num; + fd_head->reassembled_in=pinfo->num; fd_head->reas_in_layer_num = pinfo->curr_layer_num; } @@ -1615,7 +1615,7 @@ fragment_add_seq_work(fragment_head *fd_head, tvbuff_t *tvb, const int offset, fd = g_slice_new(fragment_item); fd->next = NULL; fd->flags = 0; - fd->frame = pinfo->fd->num; + fd->frame = pinfo->num; fd->offset = frag_number_work; fd->len = frag_data_len; fd->tvb_data = NULL; @@ -1855,7 +1855,7 @@ fragment_add_seq_common(reassembly_table *table, tvbuff_t *tvb, */ if (orig_keyp != NULL) *orig_keyp = NULL; - fd_head->reassembled_in=pinfo->fd->num; + fd_head->reassembled_in=pinfo->num; fd_head->reas_in_layer_num = pinfo->curr_layer_num; return fd_head; } @@ -1998,7 +1998,7 @@ fragment_add_seq_check_work(reassembly_table *table, tvbuff_t *tvb, * If so, look for it in the table of reassembled packets. */ if (pinfo->fd->flags.visited) { - reass_key.frame = pinfo->fd->num; + reass_key.frame = pinfo->num; reass_key.id = id; return (fragment_head *)g_hash_table_lookup(table->reassembled_table, &reass_key); } @@ -2123,7 +2123,7 @@ fragment_end_seq_next(reassembly_table *table, const packet_info *pinfo, * If so, look for it in the table of reassembled packets. */ if (pinfo->fd->flags.visited) { - reass_key.frame = pinfo->fd->num; + reass_key.frame = pinfo->num; reass_key.id = id; return (fragment_head *)g_hash_table_lookup(table->reassembled_table, &reass_key); } @@ -2153,7 +2153,7 @@ fragment_end_seq_next(reassembly_table *table, const packet_info *pinfo, fragment_reassembled(table, fd_head, pinfo, id); if (fd_head->next != NULL) { new_key = g_slice_new(reassembled_key); - new_key->frame = pinfo->fd->num; + new_key->frame = pinfo->num; new_key->id = id; g_hash_table_insert(table->reassembled_table, new_key, fd_head); } @@ -2182,7 +2182,7 @@ process_reassembled_data(tvbuff_t *tvb, const int offset, packet_info *pinfo, gboolean update_col_info; proto_item *frag_tree_item; - if (fd_head != NULL && pinfo->fd->num == fd_head->reassembled_in && pinfo->curr_layer_num == fd_head->reas_in_layer_num) { + if (fd_head != NULL && pinfo->num == fd_head->reassembled_in && pinfo->curr_layer_num == fd_head->reas_in_layer_num) { /* * OK, we've reassembled this. * Is this something that's been reassembled from more diff --git a/epan/reassemble_test.c b/epan/reassemble_test.c index 7034cd93e8..92c2e1127a 100644 --- a/epan/reassemble_test.c +++ b/epan/reassemble_test.c @@ -207,7 +207,7 @@ test_simple_fragment_add_seq(void) printf("Starting test test_simple_fragment_add_seq\n"); - pinfo.fd->num = 1; + pinfo.num = 1; fd_head=fragment_add_seq(&test_reassembly_table, tvb, 10, &pinfo, 12, NULL, 0, 50, TRUE, 0); @@ -224,14 +224,14 @@ test_simple_fragment_add_seq(void) /* start another pdu (just to confuse things) */ pinfo.fd->flags.visited = 0; - pinfo.fd->num = 2; + pinfo.num = 2; fd_head=fragment_add_seq(&test_reassembly_table, tvb, 15, &pinfo, 13, NULL, 0, 60, TRUE, 0); ASSERT_EQ(2,g_hash_table_size(test_reassembly_table.fragment_table)); ASSERT_EQ(NULL,fd_head); /* now we add the terminal fragment of the first datagram */ - pinfo.fd->num = 3; + pinfo.num = 3; fd_head=fragment_add_seq(&test_reassembly_table, tvb, 5, &pinfo, 12, NULL, 2, 60, FALSE, 0); @@ -240,7 +240,7 @@ test_simple_fragment_add_seq(void) ASSERT_EQ(NULL,fd_head); /* finally, add the missing fragment */ - pinfo.fd->num = 4; + pinfo.num = 4; fd_head=fragment_add_seq(&test_reassembly_table, tvb, 15, &pinfo, 12, NULL, 1, 60, TRUE, 0); @@ -290,7 +290,7 @@ test_simple_fragment_add_seq(void) /* what happens if we revisit the packets now? */ fdh0 = fd_head; pinfo.fd->flags.visited = 1; - pinfo.fd->num = 1; + pinfo.num = 1; fd_head=fragment_add_seq(&test_reassembly_table, tvb, 10, &pinfo, 12, NULL, 0, 50, TRUE, 0); /* @@ -300,12 +300,12 @@ test_simple_fragment_add_seq(void) */ ASSERT_EQ(fdh0,fd_head); - pinfo.fd->num = 3; + pinfo.num = 3; fd_head=fragment_add_seq(&test_reassembly_table, tvb, 5, &pinfo, 12, NULL, 2, 60, FALSE, 0); ASSERT_EQ(fdh0,fd_head); - pinfo.fd->num = 4; + pinfo.num = 4; fd_head=fragment_add_seq(&test_reassembly_table, tvb, 15, &pinfo, 12, NULL, 1, 60, TRUE, 0); ASSERT_EQ(fdh0,fd_head); @@ -340,7 +340,7 @@ test_fragment_add_seq_partial_reassembly(void) /* generally it's probably fair to assume that we will be called with * more_frags=FALSE. */ - pinfo.fd->num = 1; + pinfo.num = 1; fd_head=fragment_add_seq(&test_reassembly_table, tvb, 10, &pinfo, 12, NULL, 0, 50, FALSE, 0); @@ -374,7 +374,7 @@ test_fragment_add_seq_partial_reassembly(void) * check on the state of things), we're going to set the more_frags flag * here */ - pinfo.fd->num = 2; + pinfo.num = 2; fd_head=fragment_add_seq(&test_reassembly_table, tvb, 0, &pinfo, 12, NULL, 1, 40, TRUE, 0); @@ -412,7 +412,7 @@ test_fragment_add_seq_partial_reassembly(void) /* Another copy of the second segment. */ - pinfo.fd->num = 3; + pinfo.num = 3; fd_head=fragment_add_seq(&test_reassembly_table, tvb, 0, &pinfo, 12, NULL, 1, 40, TRUE, 0); @@ -456,7 +456,7 @@ test_fragment_add_seq_partial_reassembly(void) /* have another go at wrapping things up */ - pinfo.fd->num = 4; + pinfo.num = 4; fd_head=fragment_add_seq(&test_reassembly_table, tvb, 20, &pinfo, 12, NULL, 2, 100, FALSE, 0); @@ -516,7 +516,7 @@ test_fragment_add_seq_partial_reassembly(void) fragment_set_partial_reassembly(&test_reassembly_table, &pinfo, 12, NULL); - pinfo.fd->num = 5; + pinfo.num = 5; fd_head=fragment_add_seq(&test_reassembly_table, tvb, 0, &pinfo, 12, NULL, 3, 40, FALSE, 0); @@ -595,7 +595,7 @@ test_fragment_add_seq_duplicate_first(void) printf("Starting test test_fragment_add_seq_duplicate_first\n"); - pinfo.fd->num = 1; + pinfo.num = 1; fd_head=fragment_add_seq(&test_reassembly_table, tvb, 10, &pinfo, 12, NULL, 0, 50, TRUE, 0); @@ -603,7 +603,7 @@ test_fragment_add_seq_duplicate_first(void) ASSERT_EQ(NULL,fd_head); /* Add the 2nd segment */ - pinfo.fd->num = 2; + pinfo.num = 2; fd_head=fragment_add_seq(&test_reassembly_table, tvb, 5, &pinfo, 12, NULL, 1, 60, TRUE, 0); @@ -612,7 +612,7 @@ test_fragment_add_seq_duplicate_first(void) ASSERT_EQ(NULL,fd_head); /* Add the last fragment */ - pinfo.fd->num = 3; + pinfo.num = 3; fd_head=fragment_add_seq(&test_reassembly_table, tvb, 5, &pinfo, 12, NULL, 2, 40, FALSE, 0); @@ -620,7 +620,7 @@ test_fragment_add_seq_duplicate_first(void) ASSERT_NE(NULL,fd_head); /* Add the first fragment again */ - pinfo.fd->num = 4; + pinfo.num = 4; fd_head=fragment_add_seq(&test_reassembly_table, tvb, 10, &pinfo, 12, NULL, 0, 50, TRUE, 0); @@ -694,7 +694,7 @@ test_fragment_add_seq_duplicate_middle(void) printf("Starting test test_fragment_add_seq_duplicate_middle\n"); - pinfo.fd->num = 1; + pinfo.num = 1; fd_head=fragment_add_seq(&test_reassembly_table, tvb, 10, &pinfo, 12, NULL, 0, 50, TRUE, 0); @@ -702,7 +702,7 @@ test_fragment_add_seq_duplicate_middle(void) ASSERT_EQ(NULL,fd_head); /* Add the 2nd segment */ - pinfo.fd->num = 2; + pinfo.num = 2; fd_head=fragment_add_seq(&test_reassembly_table, tvb, 5, &pinfo, 12, NULL, 1, 60, TRUE, 0); @@ -711,7 +711,7 @@ test_fragment_add_seq_duplicate_middle(void) ASSERT_EQ(NULL,fd_head); /* Now, add the 2nd segment again (but in a different frame) */ - pinfo.fd->num = 3; + pinfo.num = 3; fd_head=fragment_add_seq(&test_reassembly_table, tvb, 5, &pinfo, 12, NULL, 1, 60, TRUE, 0); @@ -720,7 +720,7 @@ test_fragment_add_seq_duplicate_middle(void) ASSERT_EQ(NULL,fd_head); /* finally, add the last fragment */ - pinfo.fd->num = 4; + pinfo.num = 4; fd_head=fragment_add_seq(&test_reassembly_table, tvb, 5, &pinfo, 12, NULL, 2, 40, FALSE, 0); @@ -792,7 +792,7 @@ test_fragment_add_seq_duplicate_last(void) printf("Starting test test_fragment_add_seq_duplicate_last\n"); - pinfo.fd->num = 1; + pinfo.num = 1; fd_head=fragment_add_seq(&test_reassembly_table, tvb, 10, &pinfo, 12, NULL, 0, 50, TRUE, 0); @@ -800,7 +800,7 @@ test_fragment_add_seq_duplicate_last(void) ASSERT_EQ(NULL,fd_head); /* Add the 2nd segment */ - pinfo.fd->num = 2; + pinfo.num = 2; fd_head=fragment_add_seq(&test_reassembly_table, tvb, 5, &pinfo, 12, NULL, 1, 60, TRUE, 0); @@ -809,7 +809,7 @@ test_fragment_add_seq_duplicate_last(void) ASSERT_EQ(NULL,fd_head); /* Add the last fragment */ - pinfo.fd->num = 3; + pinfo.num = 3; fd_head=fragment_add_seq(&test_reassembly_table, tvb, 5, &pinfo, 12, NULL, 2, 40, FALSE, 0); @@ -817,7 +817,7 @@ test_fragment_add_seq_duplicate_last(void) ASSERT_NE(NULL,fd_head); /* Add the last fragment again */ - pinfo.fd->num = 4; + pinfo.num = 4; fd_head=fragment_add_seq(&test_reassembly_table, tvb, 5, &pinfo, 12, NULL, 2, 40, FALSE, 0); @@ -892,7 +892,7 @@ test_fragment_add_seq_duplicate_conflict(void) printf("Starting test test_fragment_add_seq_duplicate_conflict\n"); - pinfo.fd->num = 1; + pinfo.num = 1; fd_head=fragment_add_seq(&test_reassembly_table, tvb, 10, &pinfo, 12, NULL, 0, 50, TRUE, 0); @@ -900,7 +900,7 @@ test_fragment_add_seq_duplicate_conflict(void) ASSERT_EQ(NULL,fd_head); /* Add the 2nd segment */ - pinfo.fd->num = 2; + pinfo.num = 2; fd_head=fragment_add_seq(&test_reassembly_table, tvb, 5, &pinfo, 12, NULL, 1, 60, TRUE, 0); @@ -911,7 +911,7 @@ test_fragment_add_seq_duplicate_conflict(void) /* Now, add the 2nd segment again (but in a different frame and with * different data) */ - pinfo.fd->num = 3; + pinfo.num = 3; fd_head=fragment_add_seq(&test_reassembly_table, tvb, 15, &pinfo, 12, NULL, 1, 60, TRUE, 0); @@ -920,7 +920,7 @@ test_fragment_add_seq_duplicate_conflict(void) ASSERT_EQ(NULL,fd_head); /* finally, add the last fragment */ - pinfo.fd->num = 4; + pinfo.num = 4; fd_head=fragment_add_seq(&test_reassembly_table, tvb, 5, &pinfo, 12, NULL, 2, 40, FALSE, 0); @@ -1013,7 +1013,7 @@ test_fragment_add_seq_check_work(fragment_head *(*fn)(reassembly_table *, ASSERT_EQ(NULL,fd_head); /* start another pdu (just to confuse things) */ - pinfo.fd->num = 2; + pinfo.num = 2; fd_head=fn(&test_reassembly_table, tvb, 15, &pinfo, 13, NULL, 0, 60, TRUE); ASSERT_EQ(2,g_hash_table_size(test_reassembly_table.fragment_table)); @@ -1021,7 +1021,7 @@ test_fragment_add_seq_check_work(fragment_head *(*fn)(reassembly_table *, ASSERT_EQ(NULL,fd_head); /* add the terminal fragment of the first datagram */ - pinfo.fd->num = 3; + pinfo.num = 3; fd_head=fn(&test_reassembly_table, tvb, 5, &pinfo, 12, NULL, 2, 60, FALSE); @@ -1031,7 +1031,7 @@ test_fragment_add_seq_check_work(fragment_head *(*fn)(reassembly_table *, ASSERT_EQ(NULL,fd_head); /* finally, add the missing fragment */ - pinfo.fd->num = 4; + pinfo.num = 4; fd_head=fn(&test_reassembly_table, tvb, 15, &pinfo, 12, NULL, 1, 60, TRUE); @@ -1101,7 +1101,7 @@ test_fragment_add_seq_check_1(void) printf("Starting test test_fragment_add_seq_check_1\n"); - pinfo.fd->num = 1; + pinfo.num = 1; fd_head=fragment_add_seq_check(&test_reassembly_table, tvb, 10, &pinfo, 12, NULL, 1, 50, FALSE); @@ -1110,7 +1110,7 @@ test_fragment_add_seq_check_1(void) ASSERT_EQ(NULL,fd_head); /* Now add the missing segment */ - pinfo.fd->num = 2; + pinfo.num = 2; fd_head=fragment_add_seq_check(&test_reassembly_table, tvb, 5, &pinfo, 12, NULL, 0, 60, TRUE); @@ -1165,7 +1165,7 @@ test_fragment_add_seq_802_11_0(void) /* the 802.11 hack is that some non-fragmented datagrams have non-zero * fragment_number; test for this. */ - pinfo.fd->num = 1; + pinfo.num = 1; fd_head=fragment_add_seq_802_11(&test_reassembly_table, tvb, 10, &pinfo, 12, NULL, 10, 50, FALSE); @@ -1238,19 +1238,19 @@ test_fragment_add_seq_check_multiple(void) { 0, 50, TRUE); /* add the terminal fragment of the first datagram */ - pinfo.fd->num = 2; + pinfo.num = 2; fd_head=fragment_add_seq_check(&test_reassembly_table, tvb, 5, &pinfo, 12, NULL, 1, 20, FALSE); print_tables(); /* Now: start a second datagram with the first fragment in frame #2 */ - pinfo.fd->num = 2; + pinfo.num = 2; fd_head=fragment_add_seq_check(&test_reassembly_table, tvb, 25, &pinfo, 12, NULL, 0, 25, TRUE); /* add the terminal fragment of the second datagram */ - pinfo.fd->num = 3; + pinfo.num = 3; fd_head=fragment_add_seq_check(&test_reassembly_table, tvb, 0, &pinfo, 12, NULL, 1, 60, FALSE); @@ -1275,7 +1275,7 @@ test_simple_fragment_add_seq_next(void) printf("Starting test test_simple_fragment_add_seq_next\n"); - pinfo.fd->num = 1; + pinfo.num = 1; fd_head= fragment_add_seq_next(&test_reassembly_table, tvb, 10, &pinfo, 12, NULL, 50, TRUE); @@ -1294,7 +1294,7 @@ test_simple_fragment_add_seq_next(void) /* start another pdu (just to confuse things) */ pinfo.fd->flags.visited = 0; - pinfo.fd->num = 2; + pinfo.num = 2; fd_head=fragment_add_seq_next(&test_reassembly_table, tvb, 15, &pinfo, 13, NULL, 60, TRUE); ASSERT_EQ(2,g_hash_table_size(test_reassembly_table.fragment_table)); @@ -1303,7 +1303,7 @@ test_simple_fragment_add_seq_next(void) /* now we add the terminal fragment of the first datagram */ - pinfo.fd->num = 3; + pinfo.num = 3; fd_head=fragment_add_seq_next(&test_reassembly_table, tvb, 5, &pinfo, 12, NULL, 60, FALSE); @@ -1352,7 +1352,7 @@ test_missing_data_fragment_add_seq_next(void) printf("Starting test test_missing_data_fragment_add_seq_next\n"); /* attempt to add a fragment which is longer than the data available */ - pinfo.fd->num = 1; + pinfo.num = 1; fd_head=fragment_add_seq_next(&test_reassembly_table, tvb, 10, &pinfo, 12, NULL, DATA_LEN-9, TRUE); @@ -1372,7 +1372,7 @@ test_missing_data_fragment_add_seq_next(void) ASSERT_EQ(NULL,fd_head->next); /* add another fragment (with all data present) */ - pinfo.fd->num = 4; + pinfo.num = 4; fd_head=fragment_add_seq_next(&test_reassembly_table, tvb, 5, &pinfo, 12, NULL, 60, FALSE); @@ -1386,7 +1386,7 @@ test_missing_data_fragment_add_seq_next(void) /* check what happens when we revisit the packets */ pinfo.fd->flags.visited = TRUE; - pinfo.fd->num = 1; + pinfo.num = 1; fd_head=fragment_add_seq_next(&test_reassembly_table, tvb, 10, &pinfo, 12, NULL, DATA_LEN-9, TRUE); @@ -1403,7 +1403,7 @@ test_missing_data_fragment_add_seq_next(void) ASSERT_EQ(0,g_hash_table_size(test_reassembly_table.reassembled_table)); ASSERT_EQ(NULL,fd_head); - pinfo.fd->num = 4; + pinfo.num = 4; fd_head=fragment_add_seq_next(&test_reassembly_table, tvb, 5, &pinfo, 12, NULL, 60, FALSE); ASSERT_EQ(1,g_hash_table_size(test_reassembly_table.fragment_table)); @@ -1423,7 +1423,7 @@ test_missing_data_fragment_add_seq_next_2(void) printf("Starting test test_missing_data_fragment_add_seq_next_2\n"); - pinfo.fd->num = 11; + pinfo.num = 11; fd_head=fragment_add_seq_next(&test_reassembly_table, tvb, 10, &pinfo, 24, NULL, 50, TRUE); @@ -1431,7 +1431,7 @@ test_missing_data_fragment_add_seq_next_2(void) ASSERT_EQ(0,g_hash_table_size(test_reassembly_table.reassembled_table)); ASSERT_EQ(NULL,fd_head); - pinfo.fd->num = 12; + pinfo.num = 12; fd_head=fragment_add_seq_next(&test_reassembly_table, tvb, 5, &pinfo, 24, NULL, DATA_LEN-4, FALSE); @@ -1445,7 +1445,7 @@ test_missing_data_fragment_add_seq_next_2(void) /* check what happens when we revisit the packets */ pinfo.fd->flags.visited = TRUE; - pinfo.fd->num = 11; + pinfo.num = 11; fd_head=fragment_add_seq_next(&test_reassembly_table, tvb, 10, &pinfo, 24, NULL, 50, TRUE); @@ -1457,7 +1457,7 @@ test_missing_data_fragment_add_seq_next_2(void) ASSERT_EQ(0,g_hash_table_size(test_reassembly_table.reassembled_table)); ASSERT_EQ(NULL,fd_head); - pinfo.fd->num = 12; + pinfo.num = 12; fd_head=fragment_add_seq_next(&test_reassembly_table, tvb, 5, &pinfo, 24, NULL, DATA_LEN-4, FALSE); ASSERT_EQ(0,g_hash_table_size(test_reassembly_table.fragment_table)); @@ -1476,7 +1476,7 @@ test_missing_data_fragment_add_seq_next_3(void) printf("Starting test test_missing_data_fragment_add_seq_next_3\n"); - pinfo.fd->num = 20; + pinfo.num = 20; fd_head=fragment_add_seq_next(&test_reassembly_table, tvb, 5, &pinfo, 30, NULL, DATA_LEN-4, FALSE); @@ -1497,7 +1497,7 @@ test_missing_data_fragment_add_seq_next_3(void) /* revisiting the packet ought to produce the same result. */ pinfo.fd->flags.visited = TRUE; - pinfo.fd->num = 20; + pinfo.num = 20; fd_head=fragment_add_seq_next(&test_reassembly_table, tvb, 5, &pinfo, 30, NULL, DATA_LEN-4, FALSE); diff --git a/epan/show_exception.c b/epan/show_exception.c index efc896db43..f65bba2877 100644 --- a/epan/show_exception.c +++ b/epan/show_exception.c @@ -141,7 +141,7 @@ show_exception(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, exception_message == NULL ? dissector_error_nomsg : exception_message); g_warning("Dissector bug, protocol %s, in packet %u: %s", - pinfo->current_proto, pinfo->fd->num, + pinfo->current_proto, pinfo->num, exception_message == NULL ? dissector_error_nomsg : exception_message); expert_add_info_format(pinfo, item, &ei_malformed_dissector_bug, "%s", diff --git a/epan/timestats.c b/epan/timestats.c index 3fd252489e..100df8822d 100644 --- a/epan/timestats.c +++ b/epan/timestats.c @@ -44,23 +44,23 @@ time_stat_update(timestat_t *stats, const nstime_t *delta, packet_info *pinfo) { if(stats->num==0){ stats->max=*delta; - stats->max_num=pinfo->fd->num; + stats->max_num=pinfo->num; stats->min=*delta; - stats->min_num=pinfo->fd->num; + stats->min_num=pinfo->num; } if( (delta->secs<stats->min.secs) ||( (delta->secs==stats->min.secs) &&(delta->nsecs<stats->min.nsecs) ) ){ stats->min=*delta; - stats->min_num=pinfo->fd->num; + stats->min_num=pinfo->num; } if( (delta->secs>stats->max.secs) ||( (delta->secs==stats->max.secs) &&(delta->nsecs>stats->max.nsecs) ) ){ stats->max=*delta; - stats->max_num=pinfo->fd->num; + stats->max_num=pinfo->num; } nstime_add(&stats->tot, delta); diff --git a/epan/wslua/wslua_listener.c b/epan/wslua/wslua_listener.c index 53b6a708ef..d65fde263c 100644 --- a/epan/wslua/wslua_listener.c +++ b/epan/wslua/wslua_listener.c @@ -45,7 +45,7 @@ static int tap_packet_cb_error_handler(lua_State* L) { static int repeated = 0; static int next = 2; gchar* where = (lua_pinfo) ? - wmem_strdup_printf(NULL, "Lua: on packet %i Error During execution of Listener Packet Callback",lua_pinfo->fd->num) : + wmem_strdup_printf(NULL, "Lua: on packet %i Error During execution of Listener Packet Callback",lua_pinfo->num) : wmem_strdup_printf(NULL, "Lua: Error During execution of Listener Packet Callback") ; /* show the error the 1st, 3rd, 5th, 9th, 17th, 33th... time it appears to avoid window flooding */ diff --git a/epan/wslua/wslua_pinfo.c b/epan/wslua/wslua_pinfo.c index 3a9e94cf05..ac3e6c0b5a 100644 --- a/epan/wslua/wslua_pinfo.c +++ b/epan/wslua/wslua_pinfo.c @@ -218,7 +218,7 @@ lua_delta_nstime_to_sec(const Pinfo pinfo, const frame_data *fd, guint32 prev_nu PINFO_NAMED_BOOLEAN_GETTER(visited,fd->flags.visited); /* WSLUA_ATTRIBUTE Pinfo_number RO The number of this packet in the current file. */ -PINFO_NAMED_NUMBER_GETTER(number,fd->num); +PINFO_NAMED_NUMBER_GETTER(number,num); /* WSLUA_ATTRIBUTE Pinfo_len RO The length of the frame. */ PINFO_NAMED_NUMBER_GETTER(len,fd->pkt_len); @@ -233,7 +233,7 @@ WSLUA_ATTRIBUTE_BLOCK_NUMBER_GETTER(Pinfo,abs_ts,lua_nstime_to_sec(&obj->ws_pinf WSLUA_ATTRIBUTE_BLOCK_NUMBER_GETTER(Pinfo,rel_ts,lua_nstime_to_sec(&obj->ws_pinfo->rel_ts)); /* WSLUA_ATTRIBUTE Pinfo_delta_ts RO Number of seconds passed since the last captured packet. */ -WSLUA_ATTRIBUTE_BLOCK_NUMBER_GETTER(Pinfo,delta_ts,lua_delta_nstime_to_sec(obj, obj->ws_pinfo->fd, obj->ws_pinfo->fd->num - 1)); +WSLUA_ATTRIBUTE_BLOCK_NUMBER_GETTER(Pinfo,delta_ts,lua_delta_nstime_to_sec(obj, obj->ws_pinfo->fd, obj->ws_pinfo->num - 1)); /* WSLUA_ATTRIBUTE Pinfo_delta_dis_ts RO Number of seconds passed since the last displayed packet. */ WSLUA_ATTRIBUTE_BLOCK_NUMBER_GETTER(Pinfo,delta_dis_ts,lua_delta_nstime_to_sec(obj, obj->ws_pinfo->fd, obj->ws_pinfo->fd->prev_dis_num)); diff --git a/plugins/ethercat/packet-esl.c b/plugins/ethercat/packet-esl.c index df96742717..aed683517c 100644 --- a/plugins/ethercat/packet-esl.c +++ b/plugins/ethercat/packet-esl.c @@ -229,7 +229,7 @@ static void modify_times(tvbuff_t *tvb, gint offset, packet_info *pinfo) { ref_time_frame.esl_ts = tvb_get_letoh64(tvb, offset+8); ref_time_frame.fd = pinfo->fd; - ref_time_frame.num = pinfo->fd->num; + ref_time_frame.num = pinfo->num; ref_time_frame.abs_ts = pinfo->abs_ts; } else if ( !pinfo->fd->flags.visited ) @@ -268,7 +268,7 @@ dissect_esl_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data in_heur = TRUE; /*TRY */ { - if ( ref_time_frame.fd != NULL && !pinfo->fd->flags.visited && pinfo->fd->num <= ref_time_frame.num ) + if ( ref_time_frame.fd != NULL && !pinfo->fd->flags.visited && pinfo->num <= ref_time_frame.num ) ref_time_frame.fd = NULL; /* Check that there's enough data */ diff --git a/plugins/irda/packet-irda.c b/plugins/irda/packet-irda.c index 88213b42b1..1e2d070ee6 100644 --- a/plugins/irda/packet-irda.c +++ b/plugins/irda/packet-irda.c @@ -537,13 +537,13 @@ static void dissect_iap_request(tvbuff_t* tvb, packet_info* pinfo, proto_tree* r destaddr.len = 1; destaddr.data = (guint8*)&circuit_id; - conv = find_conversation(pinfo->fd->num, &srcaddr, &destaddr, PT_NONE, pinfo->srcport, pinfo->destport, 0); + conv = find_conversation(pinfo->num, &srcaddr, &destaddr, PT_NONE, pinfo->srcport, pinfo->destport, 0); if (conv) { iap_conv = (iap_conversation_t*)conversation_get_proto_data(conv, proto_iap); while (1) { - if (iap_conv->iap_query_frame == pinfo->fd->num) + if (iap_conv->iap_query_frame == pinfo->num) { iap_conv = NULL; break; @@ -559,7 +559,7 @@ static void dissect_iap_request(tvbuff_t* tvb, packet_info* pinfo, proto_tree* r } else { - conv = conversation_new(pinfo->fd->num, &srcaddr, &destaddr, PT_NONE, pinfo->srcport, pinfo->destport, 0); + conv = conversation_new(pinfo->num, &srcaddr, &destaddr, PT_NONE, pinfo->srcport, pinfo->destport, 0); iap_conv = wmem_new(wmem_file_scope(), iap_conversation_t); conversation_add_proto_data(conv, proto_iap, (void*)iap_conv); } @@ -573,7 +573,7 @@ static void dissect_iap_request(tvbuff_t* tvb, packet_info* pinfo, proto_tree* r iap_conv->pnext = NULL; - iap_conv->iap_query_frame = pinfo->fd->num; + iap_conv->iap_query_frame = pinfo->num; iap_conv->pattr_dissector = NULL; tvb_memcpy(tvb, class_name, offset + 1 + 1, clen); @@ -691,10 +691,10 @@ static void dissect_iap_result(tvbuff_t* tvb, packet_info* pinfo, proto_tree* ro destaddr.data = (guint8*)&circuit_id; /* Find result value dissector */ - conv = find_conversation(pinfo->fd->num, &srcaddr, &destaddr, PT_NONE, pinfo->srcport, pinfo->destport, 0); + conv = find_conversation(pinfo->num, &srcaddr, &destaddr, PT_NONE, pinfo->srcport, pinfo->destport, 0); if (conv) { - num = pinfo->fd->num; + num = pinfo->num; iap_conv = (iap_conversation_t*)conversation_get_proto_data(conv, proto_iap); while (iap_conv && (iap_conv->iap_query_frame >= num)) @@ -976,10 +976,10 @@ static void dissect_appl_proto(tvbuff_t* tvb, packet_info* pinfo, proto_tree* ro destaddr.data = (guint8*)&circuit_id; /* Find result value dissector */ - conv = find_conversation(pinfo->fd->num, &srcaddr, &destaddr, PT_NONE, pinfo->srcport, pinfo->destport, 0); + conv = find_conversation(pinfo->num, &srcaddr, &destaddr, PT_NONE, pinfo->srcport, pinfo->destport, 0); if (conv) { - num = pinfo->fd->num; + num = pinfo->num; lmp_conv = (lmp_conversation_t*)conversation_get_proto_data(conv, proto_irlmp); while (lmp_conv && (lmp_conv->iap_result_frame >= num)) @@ -1004,7 +1004,7 @@ static void dissect_appl_proto(tvbuff_t* tvb, packet_info* pinfo, proto_tree* ro if (lmp_conv) { /*g_message("%x:%d->%x:%d = %p\n", src, pinfo->srcport, circuit_id, pinfo->destport, lmp_conv); */ -/*g_message("->%d: %d %d %p\n", pinfo->fd->num, lmp_conv->iap_result_frame, lmp_conv->ttp, lmp_conv->proto_dissector); */ +/*g_message("->%d: %d %d %p\n", pinfo->num, lmp_conv->iap_result_frame, lmp_conv->ttp, lmp_conv->proto_dissector); */ if ((lmp_conv->ttp) && (pdu_type != DISCONNECT_PDU)) { offset += dissect_ttp(tvb, pinfo, root, (pdu_type == DATA_PDU)); @@ -1199,7 +1199,7 @@ void add_lmp_conversation(packet_info* pinfo, guint8 dlsap, gboolean ttp, dissec lmp_conversation_t* lmp_conv = NULL; -/*g_message("%d: add_lmp_conversation(%p, %d, %d, %p) = ", pinfo->fd->num, pinfo, dlsap, ttp, proto_dissector); */ +/*g_message("%d: add_lmp_conversation(%p, %d, %d, %p) = ", pinfo->num, pinfo, dlsap, ttp, proto_dissector); */ srcaddr.type = AT_NONE; srcaddr.len = 1; srcaddr.data = (guint8*)&circuit_id; @@ -1209,14 +1209,14 @@ void add_lmp_conversation(packet_info* pinfo, guint8 dlsap, gboolean ttp, dissec destaddr.len = 1; destaddr.data = (guint8*)&dest; - conv = find_conversation(pinfo->fd->num, &destaddr, &srcaddr, PT_NONE, dlsap, 0, NO_PORT_B); + conv = find_conversation(pinfo->num, &destaddr, &srcaddr, PT_NONE, dlsap, 0, NO_PORT_B); if (conv) { lmp_conv = (lmp_conversation_t*)conversation_get_proto_data(conv, proto_irlmp); while (1) { /* Does entry already exist? */ - if (lmp_conv->iap_result_frame == pinfo->fd->num) + if (lmp_conv->iap_result_frame == pinfo->num) return; if (lmp_conv->pnext == NULL) @@ -1230,13 +1230,13 @@ void add_lmp_conversation(packet_info* pinfo, guint8 dlsap, gboolean ttp, dissec } else { - conv = conversation_new(pinfo->fd->num, &destaddr, &srcaddr, PT_NONE, dlsap, 0, NO_PORT_B); + conv = conversation_new(pinfo->num, &destaddr, &srcaddr, PT_NONE, dlsap, 0, NO_PORT_B); lmp_conv = wmem_new(wmem_file_scope(), lmp_conversation_t); conversation_add_proto_data(conv, proto_irlmp, (void*)lmp_conv); } lmp_conv->pnext = NULL; - lmp_conv->iap_result_frame = pinfo->fd->num; + lmp_conv->iap_result_frame = pinfo->num; lmp_conv->ttp = ttp; lmp_conv->dissector = dissector; diff --git a/plugins/mate/mate_runtime.c b/plugins/mate/mate_runtime.c index 2fbd0db5aa..1c7f651cbc 100644 --- a/plugins/mate/mate_runtime.c +++ b/plugins/mate/mate_runtime.c @@ -846,7 +846,7 @@ extern void mate_analyze_frame(packet_info *pinfo, proto_tree* tree) { rd->now = (float) nstime_to_sec(&pinfo->rel_ts); if ( proto_tracking_interesting_fields(tree) - && rd->highest_analyzed_frame < pinfo->fd->num ) { + && rd->highest_analyzed_frame < pinfo->num ) { for ( i = 0; i < mc->pducfglist->len; i++ ) { cfg = (mate_cfg_pdu *)g_ptr_array_index(mc->pducfglist,i); @@ -862,7 +862,7 @@ extern void mate_analyze_frame(packet_info *pinfo, proto_tree* tree) { dbg_print (dbg_pdu,3,dbg_facility,"mate_analyze_frame: found matching proto, extracting: %s",cfg->name); proto = (field_info*) g_ptr_array_index(protos,j); - pdu = new_pdu(cfg, pinfo->fd->num, proto, tree); + pdu = new_pdu(cfg, pinfo->num, proto, tree); if (cfg->criterium) { criterium_match = new_avpl_from_match(cfg->criterium_match_mode,"",pdu->avpl,cfg->criterium,FALSE); @@ -897,7 +897,7 @@ extern void mate_analyze_frame(packet_info *pinfo, proto_tree* tree) { } if (!last) { - g_hash_table_insert(rd->frames,GINT_TO_POINTER(pinfo->fd->num),pdu); + g_hash_table_insert(rd->frames,GINT_TO_POINTER(pinfo->num),pdu); last = pdu; } else { last->next_in_frame = pdu; @@ -910,7 +910,7 @@ extern void mate_analyze_frame(packet_info *pinfo, proto_tree* tree) { } } - rd->highest_analyzed_frame = pinfo->fd->num; + rd->highest_analyzed_frame = pinfo->num; } } diff --git a/plugins/mate/packet-mate.c b/plugins/mate/packet-mate.c index 3b5bfa3a7b..5ece48b188 100644 --- a/plugins/mate/packet-mate.c +++ b/plugins/mate/packet-mate.c @@ -306,7 +306,7 @@ mate_tree(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) mate_analyze_frame(pinfo,tree); - if (( pdus = mate_get_pdus(pinfo->fd->num) )) { + if (( pdus = mate_get_pdus(pinfo->num) )) { for ( ; pdus; pdus = pdus->next_in_frame) { mate_i = proto_tree_add_protocol_format(tree,mc->hfid_mate,tvb,0,0,"MATE"); mate_t = proto_item_add_subtree(mate_i, mc->ett_root); diff --git a/plugins/profinet/packet-dcom-cba-acco.c b/plugins/profinet/packet-dcom-cba-acco.c index 4e28c25a52..5f6a92fa70 100644 --- a/plugins/profinet/packet-dcom-cba-acco.c +++ b/plugins/profinet/packet-dcom-cba-acco.c @@ -508,7 +508,7 @@ cba_pdev_add(packet_info *pinfo, const address *addr) /* not found, create a new */ pdev = (cba_pdev_t *)wmem_alloc(wmem_file_scope(), sizeof(cba_pdev_t)); memcpy( (void *) (pdev->ip), addr->data, 4); - pdev->first_packet = pinfo->fd->num; + pdev->first_packet = pinfo->num; pdev->ldevs = NULL; pdev->object = NULL; cba_pdevs = g_list_append(cba_pdevs, pdev); @@ -574,7 +574,7 @@ cba_ldev_add(packet_info *pinfo, cba_pdev_t *pdev, const char *name) /* not found, create a new */ ldev = (cba_ldev_t *)wmem_alloc(wmem_file_scope(), sizeof(cba_ldev_t)); ldev->name = wmem_strdup(wmem_file_scope(), name); - ldev->first_packet = pinfo->fd->num; + ldev->first_packet = pinfo->num; ldev->ldev_object = NULL; ldev->acco_object = NULL; ldev->parent = pdev; @@ -658,16 +658,16 @@ cba_packet_in_range(packet_info *pinfo, guint packet_connect, guint packet_disco { if (packet_connect == 0) { - g_warning("cba_packet_in_range#%u: packet_connect not set?", pinfo->fd->num); + g_warning("cba_packet_in_range#%u: packet_connect not set?", pinfo->num); } - if (packet_connect == 0 || pinfo->fd->num < packet_connect) { + if (packet_connect == 0 || pinfo->num < packet_connect) { return FALSE; } - if (packet_disconnect != 0 && pinfo->fd->num > packet_disconnect) { + if (packet_disconnect != 0 && pinfo->num > packet_disconnect) { return FALSE; } - if (packet_disconnectme != 0 && pinfo->fd->num > packet_disconnectme) { + if (packet_disconnectme != 0 && pinfo->num > packet_disconnectme) { return FALSE; } @@ -752,7 +752,7 @@ cba_frame_connect(packet_info *pinfo, cba_ldev_t *cons_ldev, cba_ldev_t *prov_ld frame->consparent = cons_ldev; frame->provparent = prov_ldev; - frame->packet_connect = pinfo->fd->num; + frame->packet_connect = pinfo->num; frame->packet_disconnect = 0; frame->packet_disconnectme = 0; frame->packet_first = 0; @@ -782,12 +782,12 @@ cba_frame_disconnect(packet_info *pinfo, cba_frame_t *frame) { if (frame->packet_disconnect == 0) { - frame->packet_disconnect = pinfo->fd->num; + frame->packet_disconnect = pinfo->num; } - if (frame->packet_disconnect != pinfo->fd->num) { + if (frame->packet_disconnect != pinfo->num) { g_warning("cba_frame_disconnect#%u: frame already disconnected in #%u", - pinfo->fd->num, frame->packet_disconnect); + pinfo->num, frame->packet_disconnect); } } @@ -808,12 +808,12 @@ cba_frame_disconnectme(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, cba_ cba_frame_info(tvb, pinfo, tree, frame); if (frame->packet_disconnectme == 0) { - frame->packet_disconnectme = pinfo->fd->num; + frame->packet_disconnectme = pinfo->num; } - if (frame->packet_disconnectme != pinfo->fd->num) { + if (frame->packet_disconnectme != pinfo->num) { g_warning("cba_frame_disconnectme#%u: frame already disconnectme'd in #%u", - pinfo->fd->num, frame->packet_disconnectme); + pinfo->num, frame->packet_disconnectme); } } } @@ -886,12 +886,12 @@ static void cba_frame_incoming_data(tvbuff_t *tvb _U_, packet_info *pinfo, proto_tree *tree _U_, cba_frame_t *frame) { if (frame->packet_first == 0) { - frame->packet_first = pinfo->fd->num; + frame->packet_first = pinfo->num; } - if ( pinfo->fd->num > frame->packet_last && + if ( pinfo->num > frame->packet_last && cba_packet_in_range(pinfo, frame->packet_connect, frame->packet_disconnect, frame->packet_disconnectme)) { - frame->packet_last = pinfo->fd->num; + frame->packet_last = pinfo->num; } } @@ -987,7 +987,7 @@ cba_connection_connect(packet_info *pinfo, cba_ldev_t *cons_ldev, cba_ldev_t *pr conn->provparentacco = prov_ldev; conn->parentframe = cons_frame; - conn->packet_connect = pinfo->fd->num; + conn->packet_connect = pinfo->num; conn->packet_disconnect = 0; conn->packet_disconnectme = 0; conn->packet_first = 0; @@ -1024,10 +1024,10 @@ cba_connection_disconnect(packet_info *pinfo, cba_connection_t *conn) { /* XXX - detect multiple disconnects? */ if (conn->packet_disconnect == 0) { - conn->packet_disconnect = pinfo->fd->num; + conn->packet_disconnect = pinfo->num; } - if (conn->packet_disconnect != pinfo->fd->num) { + if (conn->packet_disconnect != pinfo->num) { g_warning("connection_disconnect#%u: already disconnected", conn->packet_disconnect); } @@ -1050,10 +1050,10 @@ cba_connection_disconnectme(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, cba_connection_info(tvb, pinfo, tree, conn); if (conn->packet_disconnectme == 0) { - conn->packet_disconnectme = pinfo->fd->num; + conn->packet_disconnectme = pinfo->num; } - if (conn->packet_disconnectme != pinfo->fd->num) { + if (conn->packet_disconnectme != pinfo->num) { g_warning("connection_disconnectme#%u: already disconnectme'd", conn->packet_disconnectme); } @@ -1084,12 +1084,12 @@ static void cba_connection_incoming_data(tvbuff_t *tvb _U_, packet_info *pinfo, proto_tree *tree _U_, cba_connection_t *conn) { if (conn->packet_first == 0) { - conn->packet_first = pinfo->fd->num; + conn->packet_first = pinfo->num; } - if ( pinfo->fd->num > conn->packet_last && + if ( pinfo->num > conn->packet_last && cba_packet_in_range(pinfo, conn->packet_connect, conn->packet_disconnect, conn->packet_disconnectme)) { - conn->packet_last = pinfo->fd->num; + conn->packet_last = pinfo->num; } } diff --git a/plugins/profinet/packet-pn-rt.c b/plugins/profinet/packet-pn-rt.c index 78007d9138..011ca3867e 100644 --- a/plugins/profinet/packet-pn-rt.c +++ b/plugins/profinet/packet-pn-rt.c @@ -416,7 +416,7 @@ dissect_FRAG_PDU_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void if (uFragNumber == 0) { /* this is the first "new" fragment, so set up a new key Id */ guint32 u32FrameKey; - u32FrameKey = (pinfo->fd->num << 2) | u32FragID; + u32FrameKey = (pinfo->num << 2) | u32FragID; /* store it in the array */ start_frag_OR_ID[u32FragID] = u32FrameKey; } @@ -428,12 +428,12 @@ dissect_FRAG_PDU_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void if (pdu_frag && !bMoreFollows) /* PDU is complete! and last fragment */ { /* store this fragment as the completed fragment in hash table */ - g_hash_table_insert(reasembled_frag_table, GUINT_TO_POINTER(pinfo->fd->num), pdu_frag); + g_hash_table_insert(reasembled_frag_table, GUINT_TO_POINTER(pinfo->num), pdu_frag); start_frag_OR_ID[u32FragID] = 0; /* reset the starting frame counter */ } if (!bMoreFollows) /* last fragment */ { - pdu_frag = (fragment_head *)g_hash_table_lookup(reasembled_frag_table, GUINT_TO_POINTER(pinfo->fd->num)); + pdu_frag = (fragment_head *)g_hash_table_lookup(reasembled_frag_table, GUINT_TO_POINTER(pinfo->num)); if (pdu_frag) /* found a matching fragment; dissect it */ { guint16 type; diff --git a/plugins/unistim/packet-unistim.c b/plugins/unistim/packet-unistim.c index 9bc39aa84f..78e99c9bba 100644 --- a/plugins/unistim/packet-unistim.c +++ b/plugins/unistim/packet-unistim.c @@ -2317,10 +2317,10 @@ dissect_audio_switch(proto_tree *msg_tree,packet_info *pinfo, set_address(&far_addr, AT_IPv4, 4, &far_ip_addr); far_port = tvb_get_ntohs(tvb, offset-8); - rtp_add_address(pinfo, &far_addr, far_port, 0, "UNISTIM", pinfo->fd->num, FALSE, NULL); + rtp_add_address(pinfo, &far_addr, far_port, 0, "UNISTIM", pinfo->num, FALSE, NULL); far_port = tvb_get_ntohs(tvb, offset-6); - rtcp_add_address(pinfo, &far_addr, far_port, 0, "UNISTIM", pinfo->fd->num); + rtcp_add_address(pinfo, &far_addr, far_port, 0, "UNISTIM", pinfo->num); } } break; diff --git a/plugins/wimax/mac_hd_generic_decoder.c b/plugins/wimax/mac_hd_generic_decoder.c index 8d70c6718d..d2d644d94d 100644 --- a/plugins/wimax/mac_hd_generic_decoder.c +++ b/plugins/wimax/mac_hd_generic_decoder.c @@ -1027,7 +1027,7 @@ static int dissect_mac_header_generic_decoder(tvbuff_t *tvb, packet_info *pinfo, } } cid_index = i; - while (pinfo->fd->num > cid_adj_array_size) + while (pinfo->num > cid_adj_array_size) { cid_adj_array_size += 1024; cid_adj_array = (guint *)g_realloc(cid_adj_array, (int)sizeof(guint) * cid_adj_array_size); @@ -1048,21 +1048,21 @@ static int dissect_mac_header_generic_decoder(tvbuff_t *tvb, packet_info *pinfo, { frag_number[cid_index] = 0; } - if (cid_adj_array[pinfo->fd->num]) + if (cid_adj_array[pinfo->num]) { /* We apparently just clicked on the packet again. */ - cid_adjust[cid_index] = cid_adj_array[pinfo->fd->num]; + cid_adjust[cid_index] = cid_adj_array[pinfo->num]; /* Set the frag_number at start of packet. */ if (first_gmh) { - frag_number[cid_index] = frag_num_array[pinfo->fd->num]; + frag_number[cid_index] = frag_num_array[pinfo->num]; } } else { /* Save for next time we click on this packet. */ - cid_adj_array[pinfo->fd->num] = cid_adjust[cid_index]; + cid_adj_array[pinfo->num] = cid_adjust[cid_index]; if (first_gmh) { - frag_num_array[pinfo->fd->num] = frag_number[cid_index]; + frag_num_array[pinfo->num] = frag_number[cid_index]; } } /* Reset in case we stay in this while() loop to finish the packet. */ diff --git a/ui/cli/tap-comparestat.c b/ui/cli/tap-comparestat.c index 15fe950498..c76f4ece50 100644 --- a/ui/cli/tap-comparestat.c +++ b/ui/cli/tap-comparestat.c @@ -140,7 +140,7 @@ comparestat_packet(void *arg, packet_info *pinfo, epan_dissect_t *edt _U_, const fInfo->fp->partner = NULL; fInfo->fp->count = 1; fInfo->fp->cksum = computed_cksum; - fInfo->num = pinfo->fd->num; + fInfo->num = pinfo->num; fInfo->id = ci->ip_id; fInfo->ip_ttl = ci->ip_ttl; fInfo->dl_dst = pinfo->dl_dst; @@ -148,7 +148,7 @@ comparestat_packet(void *arg, packet_info *pinfo, epan_dissect_t *edt _U_, const /* clean memory */ nstime_set_zero(&fInfo->zebra_time); nstime_set_zero(&fInfo->fp->predecessor_time); - g_hash_table_insert(cs->packet_set, GINT_TO_POINTER(pinfo->fd->num), fInfo); + g_hash_table_insert(cs->packet_set, GINT_TO_POINTER(pinfo->num), fInfo); return 1; } @@ -175,7 +175,7 @@ call_foreach_count_ip_id(gpointer key _U_, gpointer value, gpointer arg) /* we only need one value out of pinfo we use a temp one */ packet_info *pinfo = (packet_info*)g_malloc(sizeof(packet_info)); pinfo->fd = (frame_data*)g_malloc(sizeof(frame_data)); - pinfo->fd->num = fInfo->num; + pinfo->num = fInfo->num; fInfoTemp = (frame_info *)g_hash_table_lookup(cs->ip_id_set, GINT_TO_POINTER((gint)fInfo->id)); if (fInfoTemp == NULL) { diff --git a/ui/cli/tap-diameter-avp.c b/ui/cli/tap-diameter-avp.c index 99c42813ff..efa9d3e478 100644 --- a/ui/cli/tap-diameter-avp.c +++ b/ui/cli/tap-diameter-avp.c @@ -143,8 +143,8 @@ diameteravp_packet(void *pds, packet_info *pinfo, epan_dissect_t *edt _U_, const /* Several diameter messages within one frame are possible. * * Check if we processing the message in same frame like befor or in new frame.*/ ds = (diameteravp_t *)pds; - if (pinfo->fd->num > ds->frame) { - ds->frame = pinfo->fd->num; + if (pinfo->num > ds->frame) { + ds->frame = pinfo->num; ds->diammsg_toprocess = 0; } else { ds->diammsg_toprocess += 1; @@ -187,7 +187,7 @@ diameteravp_packet(void *pds, packet_info *pinfo, epan_dissect_t *edt _U_, const } /* Output frame data.*/ printf("frame='%u' time='%f' src='%s' srcport='%u' dst='%s' dstport='%u' proto='diameter' msgnr='%u' is_request='%d' cmd='%u' req_frame='%u' ans_frame='%u' resp_time='%f' ", - pinfo->fd->num, nstime_to_sec(&pinfo->abs_ts), address_to_str(pinfo->pool, &pinfo->src), pinfo->srcport, address_to_str(pinfo->pool, &pinfo->dst), pinfo->destport, ds->diammsg_toprocess, is_request, cmd_code, req_frame, ans_frame, resp_time); + pinfo->num, nstime_to_sec(&pinfo->abs_ts), address_to_str(pinfo->pool, &pinfo->src), pinfo->srcport, address_to_str(pinfo->pool, &pinfo->dst), pinfo->destport, ds->diammsg_toprocess, is_request, cmd_code, req_frame, ans_frame, resp_time); /* Visit selected nodes of one diameter message.*/ tree_traverse_pre_order(current, diam_tree_to_csv, &ds); /* End of message.*/ diff --git a/ui/export_object_dicom.c b/ui/export_object_dicom.c index 0f075d5ebe..5404abb54f 100644 --- a/ui/export_object_dicom.c +++ b/ui/export_object_dicom.c @@ -50,7 +50,7 @@ eo_dicom_packet(void *tapdata, packet_info *pinfo, epan_dissect_t *edt _U_, */ entry = (export_object_entry_t *)g_malloc(sizeof(export_object_entry_t)); - entry->pkt_num = pinfo->fd->num; + entry->pkt_num = pinfo->num; entry->hostname = eo_info->hostname; entry->content_type = eo_info->content_type; entry->filename = g_strdup(g_path_get_basename(eo_info->filename)); diff --git a/ui/export_object_http.c b/ui/export_object_http.c index d92ec97660..3b314c4fb5 100644 --- a/ui/export_object_http.c +++ b/ui/export_object_http.c @@ -45,7 +45,7 @@ eo_http_packet(void *tapdata, packet_info *pinfo, epan_dissect_t *edt _U_, * is closed. */ entry = (export_object_entry_t *)g_malloc(sizeof(export_object_entry_t)); - entry->pkt_num = pinfo->fd->num; + entry->pkt_num = pinfo->num; entry->hostname = g_strdup(eo_info->hostname); entry->content_type = g_strdup(eo_info->content_type); entry->filename = g_strdup(g_path_get_basename(eo_info->filename)); diff --git a/ui/export_object_smb.c b/ui/export_object_smb.c index a0343c6692..ca22f8bef3 100644 --- a/ui/export_object_smb.c +++ b/ui/export_object_smb.c @@ -362,7 +362,7 @@ eo_smb_packet(void *tapdata, packet_info *pinfo, epan_dissect_t *edt _U_, const new_file->free_chunk_list = NULL; new_file->data_gathered = 0; new_file->is_out_of_memory = FALSE; - entry->pkt_num = pinfo->fd->num; + entry->pkt_num = pinfo->num; entry->hostname=g_filename_display_name(g_strcanon(eo_info->hostname,LEGAL_FILENAME_CHARS,'?')); entry->filename=g_filename_display_name(g_strcanon(eo_info->filename,LEGAL_FILENAME_CHARS,'?')); diff --git a/ui/export_object_tftp.c b/ui/export_object_tftp.c index 18eda94b09..11547aca38 100644 --- a/ui/export_object_tftp.c +++ b/ui/export_object_tftp.c @@ -59,7 +59,7 @@ eo_tftp_packet(void *tapdata, packet_info *pinfo, epan_dissect_t *edt _U_, entry = (export_object_entry_t*)g_malloc(sizeof(export_object_entry_t)); /* Remember which frame had the last block of the file */ - entry->pkt_num = pinfo->fd->num; + entry->pkt_num = pinfo->num; /* Copy filename */ entry->filename = g_strdup(g_path_get_basename(eo_info->filename)); diff --git a/ui/gtk/compare_stat.c b/ui/gtk/compare_stat.c index fdb4defbe1..1d77b253be 100644 --- a/ui/gtk/compare_stat.c +++ b/ui/gtk/compare_stat.c @@ -198,7 +198,7 @@ comparestat_packet(void *arg, packet_info *pinfo, epan_dissect_t *edt _U_, const computed_cksum=in_cksum(&cksum_vec[0], 3); /* Set up the new order to create the zebra effect */ - fInfoTemp=(frame_info *)g_hash_table_lookup(cs->packet_set, GINT_TO_POINTER(pinfo->fd->num)); + fInfoTemp=(frame_info *)g_hash_table_lookup(cs->packet_set, GINT_TO_POINTER(pinfo->num)); if((fInfoTemp!=NULL)){ col_set_time(pinfo->cinfo, COL_INFO, &fInfoTemp->zebra_time, "ZebraTime"); } @@ -209,7 +209,7 @@ comparestat_packet(void *arg, packet_info *pinfo, epan_dissect_t *edt _U_, const fInfo->fg->partner=NULL; fInfo->fg->count=1; fInfo->fg->cksum=computed_cksum; - fInfo->num=pinfo->fd->num; + fInfo->num=pinfo->num; fInfo->id=ci->ip_id; fInfo->ip_ttl=ci->ip_ttl; fInfo->dl_dst=pinfo->dl_dst; @@ -217,7 +217,7 @@ comparestat_packet(void *arg, packet_info *pinfo, epan_dissect_t *edt _U_, const /* clean memory */ nstime_set_zero(&fInfo->zebra_time); nstime_set_zero(&fInfo->fg->predecessor_time); - g_hash_table_insert(cs->packet_set, GINT_TO_POINTER(pinfo->fd->num), fInfo); + g_hash_table_insert(cs->packet_set, GINT_TO_POINTER(pinfo->num), fInfo); if((guint32)cf_get_packet_count(&cfile)==fInfo->num){ nstime_set_unset(&cs->current_time); @@ -248,7 +248,7 @@ call_foreach_count_ip_id(gpointer key _U_, gpointer value, gpointer arg) /* we only need one value out of pinfo we use a temp one */ packet_info *pinfo=(packet_info*)g_malloc(sizeof(packet_info)); pinfo->fd=(frame_data*)g_malloc(sizeof(frame_data)); - pinfo->fd->num = fInfo->num; + pinfo->num = fInfo->num; fInfoTemp=(frame_info *)g_hash_table_lookup(cs->ip_id_set, GINT_TO_POINTER((gint)fInfo->id)); if(fInfoTemp==NULL){ diff --git a/ui/gtk/iax2_analysis.c b/ui/gtk/iax2_analysis.c index 6a5e59ff94..d0eceb4a43 100644 --- a/ui/gtk/iax2_analysis.c +++ b/ui/gtk/iax2_analysis.c @@ -562,7 +562,7 @@ static int iax2_packet_add_info(GtkWidget *list, user_data_t * user_data, /* is this the first packet we got in this direction? */ if (statinfo->flags & STAT_FLAG_FIRST) { add_to_list(list, user_data, - pinfo->fd->num, + pinfo->num, 0, 0, statinfo->bandwidth, @@ -573,7 +573,7 @@ static int iax2_packet_add_info(GtkWidget *list, user_data_t * user_data, } else { add_to_list(list, user_data, - pinfo->fd->num, + pinfo->num, statinfo->delta*1000, statinfo->jitter*1000, statinfo->bandwidth, diff --git a/ui/gtk/lbm_stream_dlg.c b/ui/gtk/lbm_stream_dlg.c index 4478ffbe67..18ddbbf6d6 100644 --- a/ui/gtk/lbm_stream_dlg.c +++ b/ui/gtk/lbm_stream_dlg.c @@ -601,13 +601,13 @@ static gboolean lbmc_stream_dlg_tap_packet(void * tap_data, packet_info * pinfo, -1); } stream_iter = stream->iter; - if (stream->first_frame > pinfo->fd->num) + if (stream->first_frame > pinfo->num) { - stream->first_frame = pinfo->fd->num; + stream->first_frame = pinfo->num; } - if (stream->last_frame < pinfo->fd->num) + if (stream->last_frame < pinfo->num) { - stream->last_frame = pinfo->fd->num; + stream->last_frame = pinfo->num; } stream->bytes += tapinfo->bytes; stream->messages++; @@ -701,13 +701,13 @@ static gboolean lbmc_stream_dlg_tap_packet(void * tap_data, packet_info * pinfo, -1); } substream_iter = substream->iter; - if (substream->first_frame > pinfo->fd->num) + if (substream->first_frame > pinfo->num) { - substream->first_frame = pinfo->fd->num; + substream->first_frame = pinfo->num; } - if (substream->last_frame < pinfo->fd->num) + if (substream->last_frame < pinfo->num) { - substream->last_frame = pinfo->fd->num; + substream->last_frame = pinfo->num; } substream->bytes += tapinfo->bytes; substream->messages++; diff --git a/ui/gtk/lbm_uimflow_dlg.c b/ui/gtk/lbm_uimflow_dlg.c index 8855c240c6..477c067e4c 100644 --- a/ui/gtk/lbm_uimflow_dlg.c +++ b/ui/gtk/lbm_uimflow_dlg.c @@ -166,7 +166,7 @@ static int lbmc_uim_flow_graph_add_to_graph(packet_info * pinfo, const lbm_uim_s item = (seq_analysis_item_t *)g_malloc0(sizeof(seq_analysis_item_t)); copy_address(&(item->src_addr), &(pinfo->src)); copy_address(&(item->dst_addr), &(pinfo->dst)); - item->frame_number = pinfo->fd->num; + item->frame_number = pinfo->num; item->port_src = pinfo->srcport; item->port_dst = pinfo->destport; item->protocol = g_strdup(port_type_to_str(pinfo->ptype)); diff --git a/ui/gtk/rtp_analysis.c b/ui/gtk/rtp_analysis.c index 9c2c672209..9c1f6f685f 100644 --- a/ui/gtk/rtp_analysis.c +++ b/ui/gtk/rtp_analysis.c @@ -639,7 +639,7 @@ rtp_packet_add_info(GtkWidget *list, user_data_t * user_data, /* is this the first packet we got in this direction? */ if (statinfo->flags & STAT_FLAG_FIRST) { add_to_list(list, user_data, - pinfo->fd->num, rtpinfo->info_seq_num, + pinfo->num, rtpinfo->info_seq_num, statinfo->timestamp, 0, 0, @@ -653,7 +653,7 @@ rtp_packet_add_info(GtkWidget *list, user_data_t * user_data, } else { add_to_list(list, user_data, - pinfo->fd->num, rtpinfo->info_seq_num, + pinfo->num, rtpinfo->info_seq_num, statinfo->timestamp, statinfo->delta, statinfo->jitter, diff --git a/ui/io_graph_item.h b/ui/io_graph_item.h index bfb581a955..d4e51995a8 100644 --- a/ui/io_graph_item.h +++ b/ui/io_graph_item.h @@ -142,9 +142,9 @@ update_io_graph_item(io_graph_item_t *items, int idx, packet_info *pinfo, epan_d /* Set the first and last frame num in current interval matching the target field+filter */ if (item->first_frame_in_invl == 0) { - item->first_frame_in_invl = pinfo->fd->num; + item->first_frame_in_invl = pinfo->num; } - item->last_frame_in_invl = pinfo->fd->num; + item->last_frame_in_invl = pinfo->num; if (edt && hf_index >= 0) { GPtrArray *gp; diff --git a/ui/mcast_stream.c b/ui/mcast_stream.c index 549c5a9d0b..badc1fcf36 100644 --- a/ui/mcast_stream.c +++ b/ui/mcast_stream.c @@ -198,7 +198,7 @@ mcaststream_packet(void *arg, packet_info *pinfo, epan_dissect_t *edt _U_, const pinfo->srcport, address_to_display(NULL, &(pinfo->dst)), pinfo->destport);*/ tmp_strinfo.npackets = 0; tmp_strinfo.apackets = 0; - tmp_strinfo.first_frame_num = pinfo->fd->num; + tmp_strinfo.first_frame_num = pinfo->num; tmp_strinfo.start_abs = pinfo->abs_ts; tmp_strinfo.start_rel = pinfo->rel_ts; tmp_strinfo.vlan_id = 0; diff --git a/ui/qt/bluetooth_att_server_attributes_dialog.cpp b/ui/qt/bluetooth_att_server_attributes_dialog.cpp index 2b787552da..ae20f883e5 100644 --- a/ui/qt/bluetooth_att_server_attributes_dialog.cpp +++ b/ui/qt/bluetooth_att_server_attributes_dialog.cpp @@ -237,7 +237,7 @@ gboolean BluetoothAttServerAttributesDialog::tapPacket(void *tapinfo_ptr, packet item->setText(column_number_handle, handle); item->setText(column_number_uuid, uuid); item->setText(column_number_uuid_name, uuid_name); - item->setData(0, Qt::UserRole, qVariantFromValue(pinfo->fd->num)); + item->setData(0, Qt::UserRole, qVariantFromValue(pinfo->num)); for (int i = 0; i < dialog->ui->tableTreeWidget->columnCount(); i++) { dialog->ui->tableTreeWidget->resizeColumnToContents(i); diff --git a/ui/qt/bluetooth_devices_dialog.cpp b/ui/qt/bluetooth_devices_dialog.cpp index 4991b8e22b..914fbd3d1e 100644 --- a/ui/qt/bluetooth_devices_dialog.cpp +++ b/ui/qt/bluetooth_devices_dialog.cpp @@ -270,7 +270,7 @@ gboolean BluetoothDevicesDialog::tapPacket(void *tapinfo_ptr, packet_info *pinfo item_data_t *item_data = wmem_new(wmem_file_scope(), item_data_t); item_data->interface_id = tap_device->interface_id; item_data->adapter_id = tap_device->adapter_id; - item_data->frame_number = pinfo->fd->num; + item_data->frame_number = pinfo->num; item->setData(0, Qt::UserRole, QVariant::fromValue<item_data_t *>(item_data)); } diff --git a/ui/qt/bluetooth_hci_summary_dialog.cpp b/ui/qt/bluetooth_hci_summary_dialog.cpp index 035735837d..c896ac091a 100644 --- a/ui/qt/bluetooth_hci_summary_dialog.cpp +++ b/ui/qt/bluetooth_hci_summary_dialog.cpp @@ -406,7 +406,7 @@ gboolean BluetoothHciSummaryDialog::tapPacket(void *tapinfo_ptr, packet_info *pi break; frame_item = new QTreeWidgetItem(); - frame_item->setText(column_number_name, QString(tr("Frame %1")).arg(pinfo->fd->num)); + frame_item->setText(column_number_name, QString(tr("Frame %1")).arg(pinfo->num)); frame_item->setText(column_number_ogf, QString("").sprintf("0x%02X", tap_hci->ogf)); frame_item->setText(column_number_ocf, QString("").sprintf("0x%04X", tap_hci->ocf)); frame_item->setText(column_number_opcode, QString("").sprintf("0x%04X", tap_hci->ogf << 10 | tap_hci->ocf)); @@ -415,7 +415,7 @@ gboolean BluetoothHciSummaryDialog::tapPacket(void *tapinfo_ptr, packet_info *pi item_data = wmem_new(wmem_file_scope(), item_data_t); item_data->interface_id = tap_hci->interface_id; item_data->adapter_id = tap_hci->adapter_id; - item_data->frame_number = pinfo->fd->num; + item_data->frame_number = pinfo->num; frame_item->setData(0, Qt::UserRole, QVariant::fromValue<item_data_t *>(item_data)); break; @@ -454,14 +454,14 @@ gboolean BluetoothHciSummaryDialog::tapPacket(void *tapinfo_ptr, packet_info *pi break; frame_item = new QTreeWidgetItem(); - frame_item->setText(column_number_name, QString(tr("Frame %1")).arg(pinfo->fd->num)); + frame_item->setText(column_number_name, QString(tr("Frame %1")).arg(pinfo->num)); frame_item->setText(column_number_event, QString("").sprintf("0x%02X", tap_hci->event)); item->addChild(frame_item); item_data = wmem_new(wmem_file_scope(), item_data_t); item_data->interface_id = tap_hci->interface_id; item_data->adapter_id = tap_hci->adapter_id; - item_data->frame_number = pinfo->fd->num; + item_data->frame_number = pinfo->num; frame_item->setData(0, Qt::UserRole, QVariant::fromValue<item_data_t *>(item_data)); break; @@ -491,14 +491,14 @@ gboolean BluetoothHciSummaryDialog::tapPacket(void *tapinfo_ptr, packet_info *pi item->setText(column_number_occurrence, QString::number(item->text(column_number_occurrence).toInt() + 1)); frame_item = new QTreeWidgetItem(); - frame_item->setText(column_number_name, QString(tr("Frame %1")).arg(pinfo->fd->num)); + frame_item->setText(column_number_name, QString(tr("Frame %1")).arg(pinfo->num)); frame_item->setText(column_number_status, QString("").sprintf("0x%02X", tap_hci->status)); item->addChild(frame_item); item_data = wmem_new(wmem_file_scope(), item_data_t); item_data->interface_id = tap_hci->interface_id; item_data->adapter_id = tap_hci->adapter_id; - item_data->frame_number = pinfo->fd->num; + item_data->frame_number = pinfo->num; frame_item->setData(0, Qt::UserRole, QVariant::fromValue<item_data_t *>(item_data)); break; @@ -525,14 +525,14 @@ gboolean BluetoothHciSummaryDialog::tapPacket(void *tapinfo_ptr, packet_info *pi item->setText(column_number_occurrence, QString::number(item->text(column_number_occurrence).toInt() + 1)); frame_item = new QTreeWidgetItem(); - frame_item->setText(column_number_name, QString(tr("Frame %1")).arg(pinfo->fd->num)); + frame_item->setText(column_number_name, QString(tr("Frame %1")).arg(pinfo->num)); frame_item->setText(column_number_status, QString("").sprintf("%u", tap_hci->status)); item->addChild(frame_item); item_data = wmem_new(wmem_file_scope(), item_data_t); item_data->interface_id = tap_hci->interface_id; item_data->adapter_id = tap_hci->adapter_id; - item_data->frame_number = pinfo->fd->num; + item_data->frame_number = pinfo->num; frame_item->setData(0, Qt::UserRole, QVariant::fromValue<item_data_t *>(item_data)); break; @@ -562,14 +562,14 @@ gboolean BluetoothHciSummaryDialog::tapPacket(void *tapinfo_ptr, packet_info *pi item->setText(column_number_occurrence, QString::number(item->text(column_number_occurrence).toInt() + 1)); frame_item = new QTreeWidgetItem(); - frame_item->setText(column_number_name, QString(tr("Frame %1")).arg(pinfo->fd->num)); + frame_item->setText(column_number_name, QString(tr("Frame %1")).arg(pinfo->num)); frame_item->setText(column_number_reason, QString("").sprintf("0x%02X", tap_hci->reason)); item->addChild(frame_item); item_data = wmem_new(wmem_file_scope(), item_data_t); item_data->interface_id = tap_hci->interface_id; item_data->adapter_id = tap_hci->adapter_id; - item_data->frame_number = pinfo->fd->num; + item_data->frame_number = pinfo->num; frame_item->setData(0, Qt::UserRole, QVariant::fromValue<item_data_t *>(item_data)); break; @@ -596,14 +596,14 @@ gboolean BluetoothHciSummaryDialog::tapPacket(void *tapinfo_ptr, packet_info *pi item->setText(column_number_occurrence, QString::number(item->text(column_number_occurrence).toInt() + 1)); frame_item = new QTreeWidgetItem(); - frame_item->setText(column_number_name, QString(tr("Frame %1")).arg(pinfo->fd->num)); + frame_item->setText(column_number_name, QString(tr("Frame %1")).arg(pinfo->num)); frame_item->setText(column_number_hardware_error, QString("").sprintf("0x%02X", tap_hci->hardware_error)); item->addChild(frame_item); item_data = wmem_new(wmem_file_scope(), item_data_t); item_data->interface_id = tap_hci->interface_id; item_data->adapter_id = tap_hci->adapter_id; - item_data->frame_number = pinfo->fd->num; + item_data->frame_number = pinfo->num; frame_item->setData(0, Qt::UserRole, QVariant::fromValue<item_data_t *>(item_data)); break; diff --git a/ui/qt/iax2_analysis_dialog.cpp b/ui/qt/iax2_analysis_dialog.cpp index b8cb240a1f..506398b30c 100644 --- a/ui/qt/iax2_analysis_dialog.cpp +++ b/ui/qt/iax2_analysis_dialog.cpp @@ -81,7 +81,7 @@ public: Iax2AnalysisTreeWidgetItem(QTreeWidget *tree, tap_iax2_stat_t *statinfo, packet_info *pinfo) : QTreeWidgetItem(tree, iax2_analysis_type_) { - frame_num_ = pinfo->fd->num; + frame_num_ = pinfo->num; pkt_len_ = pinfo->fd->pkt_len; flags_ = statinfo->flags; if (flags_ & STAT_FLAG_FIRST) { diff --git a/ui/qt/lbm_lbtrm_transport_dialog.cpp b/ui/qt/lbm_lbtrm_transport_dialog.cpp index 54f199e640..8bf3553aa3 100644 --- a/ui/qt/lbm_lbtrm_transport_dialog.cpp +++ b/ui/qt/lbm_lbtrm_transport_dialog.cpp @@ -512,7 +512,7 @@ void LBMLBTRMSourceTransportEntry::processPacket(const packet_info * pinfo, cons sqn = it.value(); } } - sqn->processFrame(pinfo->fd->num); + sqn->processFrame(pinfo->num); } else if (tap_info->type == LBTRM_PACKET_TYPE_NCF) { @@ -535,7 +535,7 @@ void LBMLBTRMSourceTransportEntry::processPacket(const packet_info * pinfo, cons { sqn = it.value(); } - sqn->processFrame(tap_info->ncf_reason, pinfo->fd->num); + sqn->processFrame(tap_info->ncf_reason, pinfo->num); } } else if (tap_info->type == LBTRM_PACKET_TYPE_SM) @@ -555,7 +555,7 @@ void LBMLBTRMSourceTransportEntry::processPacket(const packet_info * pinfo, cons { sqn = it.value(); } - sqn->processFrame(pinfo->fd->num); + sqn->processFrame(pinfo->num); } else { @@ -874,7 +874,7 @@ void LBMLBTRMReceiverTransportEntry::processPacket(const packet_info * pinfo, co { sqn = it.value(); } - sqn->processFrame(pinfo->fd->num); + sqn->processFrame(pinfo->num); } } else diff --git a/ui/qt/lbm_lbtru_transport_dialog.cpp b/ui/qt/lbm_lbtru_transport_dialog.cpp index 447f1829fa..190ff5ae71 100644 --- a/ui/qt/lbm_lbtru_transport_dialog.cpp +++ b/ui/qt/lbm_lbtru_transport_dialog.cpp @@ -657,7 +657,7 @@ void LBMLBTRUSourceTransportEntry::processPacket(const packet_info * pinfo, cons { sqn = it.value(); } - sqn->processFrame(pinfo->fd->num); + sqn->processFrame(pinfo->num); } else { @@ -674,7 +674,7 @@ void LBMLBTRUSourceTransportEntry::processPacket(const packet_info * pinfo, cons sqn = it.value(); } } - sqn->processFrame(pinfo->fd->num); + sqn->processFrame(pinfo->num); } else if (tap_info->type == LBTRU_PACKET_TYPE_NCF) { @@ -697,7 +697,7 @@ void LBMLBTRUSourceTransportEntry::processPacket(const packet_info * pinfo, cons { sqn = it.value(); } - sqn->processFrame(tap_info->ncf_reason, pinfo->fd->num); + sqn->processFrame(tap_info->ncf_reason, pinfo->num); } } else if (tap_info->type == LBTRU_PACKET_TYPE_SM) @@ -717,7 +717,7 @@ void LBMLBTRUSourceTransportEntry::processPacket(const packet_info * pinfo, cons { sqn = it.value(); } - sqn->processFrame(pinfo->fd->num); + sqn->processFrame(pinfo->num); } else if (tap_info->type == LBTRU_PACKET_TYPE_RST) { @@ -736,7 +736,7 @@ void LBMLBTRUSourceTransportEntry::processPacket(const packet_info * pinfo, cons { reason = it.value(); } - reason->processFrame(pinfo->fd->num); + reason->processFrame(pinfo->num); } else { @@ -1105,7 +1105,7 @@ void LBMLBTRUReceiverTransportEntry::processPacket(const packet_info * pinfo, co { sqn = it.value(); } - sqn->processFrame(pinfo->fd->num); + sqn->processFrame(pinfo->num); } } break; @@ -1126,7 +1126,7 @@ void LBMLBTRUReceiverTransportEntry::processPacket(const packet_info * pinfo, co { sqn = it.value(); } - sqn->processFrame(pinfo->fd->num); + sqn->processFrame(pinfo->num); } break; case LBTRU_PACKET_TYPE_CREQ: @@ -1146,7 +1146,7 @@ void LBMLBTRUReceiverTransportEntry::processPacket(const packet_info * pinfo, co { req = it.value(); } - req->processFrame(pinfo->fd->num); + req->processFrame(pinfo->num); } break; default: diff --git a/ui/qt/lbm_stream_dialog.cpp b/ui/qt/lbm_stream_dialog.cpp index cc0341acac..b687cfc9a5 100644 --- a/ui/qt/lbm_stream_dialog.cpp +++ b/ui/qt/lbm_stream_dialog.cpp @@ -209,13 +209,13 @@ void LBMStreamEntry::processPacket(const packet_info * pinfo, const lbm_uim_stre LBMSubstreamEntry * substream = NULL; LBMSubstreamMapIterator it; - if (m_first_frame > pinfo->fd->num) + if (m_first_frame > pinfo->num) { - m_first_frame = pinfo->fd->num; + m_first_frame = pinfo->num; } - if (m_flast_frame < pinfo->fd->num) + if (m_flast_frame < pinfo->num) { - m_flast_frame = pinfo->fd->num; + m_flast_frame = pinfo->num; } m_bytes += stream_info->bytes; m_messages++; @@ -236,7 +236,7 @@ void LBMStreamEntry::processPacket(const packet_info * pinfo, const lbm_uim_stre substream = it.value(); } fillItem(); - substream->processPacket(pinfo->fd->num, stream_info->bytes); + substream->processPacket(pinfo->num, stream_info->bytes); } void LBMStreamEntry::setItem(QTreeWidgetItem * item) diff --git a/ui/qt/lbm_uimflow_dialog.cpp b/ui/qt/lbm_uimflow_dialog.cpp index c166a43fb4..f1b74517be 100644 --- a/ui/qt/lbm_uimflow_dialog.cpp +++ b/ui/qt/lbm_uimflow_dialog.cpp @@ -125,7 +125,7 @@ static gboolean lbm_uimflow_add_to_graph(seq_analysis_info_t * seq_info, packet_ item = (seq_analysis_item_t *)g_malloc0(sizeof(seq_analysis_item_t)); copy_address(&(item->src_addr), &(pinfo->src)); copy_address(&(item->dst_addr), &(pinfo->dst)); - item->frame_number = pinfo->fd->num; + item->frame_number = pinfo->num; item->port_src = pinfo->srcport; item->port_dst = pinfo->destport; item->protocol = g_strdup(port_type_to_str(pinfo->ptype)); diff --git a/ui/qt/packet_list.cpp b/ui/qt/packet_list.cpp index 11d7e2e585..ae4bb53d18 100644 --- a/ui/qt/packet_list.cpp +++ b/ui/qt/packet_list.cpp @@ -457,9 +457,9 @@ void PacketList::selectionChanged (const QItemSelection & selected, const QItemS if (proto_tree_ && cap_file_->edt->tree) { packet_info *pi = &cap_file_->edt->pi; - related_packet_delegate_.setCurrentFrame(pi->fd->num); + related_packet_delegate_.setCurrentFrame(pi->num); proto_tree_->fillProtocolTree(cap_file_->edt->tree); - conversation_t *conv = find_conversation(pi->fd->num, &pi->src, &pi->dst, pi->ptype, + conversation_t *conv = find_conversation(pi->num, &pi->src, &pi->dst, pi->ptype, pi->srcport, pi->destport, 0); if (conv) { related_packet_delegate_.setConversation(conv); diff --git a/ui/qt/packet_list_record.cpp b/ui/qt/packet_list_record.cpp index bdd17905a6..8fab6f03f9 100644 --- a/ui/qt/packet_list_record.cpp +++ b/ui/qt/packet_list_record.cpp @@ -166,7 +166,7 @@ void PacketListRecord::dissect(capture_file *cap_file, bool dissect_color) data_ver_ = col_data_ver_; packet_info *pi = &edt.pi; - conv_ = find_conversation(pi->fd->num, &pi->src, &pi->dst, pi->ptype, + conv_ = find_conversation(pi->num, &pi->src, &pi->dst, pi->ptype, pi->srcport, pi->destport, 0); epan_dissect_cleanup(&edt); diff --git a/ui/qt/rtp_analysis_dialog.cpp b/ui/qt/rtp_analysis_dialog.cpp index 04ddece52c..6821ce6af7 100644 --- a/ui/qt/rtp_analysis_dialog.cpp +++ b/ui/qt/rtp_analysis_dialog.cpp @@ -83,7 +83,7 @@ public: RtpAnalysisTreeWidgetItem(QTreeWidget *tree, tap_rtp_stat_t *statinfo, packet_info *pinfo, const struct _rtp_info *rtpinfo) : QTreeWidgetItem(tree, rtp_analysis_type_) { - frame_num_ = pinfo->fd->num; + frame_num_ = pinfo->num; sequence_num_ = rtpinfo->info_seq_num; pkt_len_ = pinfo->fd->pkt_len; flags_ = statinfo->flags; diff --git a/ui/qt/rtp_audio_stream.cpp b/ui/qt/rtp_audio_stream.cpp index 7ccaba690c..5cfba191e8 100644 --- a/ui/qt/rtp_audio_stream.cpp +++ b/ui/qt/rtp_audio_stream.cpp @@ -141,7 +141,7 @@ void RtpAudioStream::addRtpPacket(const struct _packet_info *pinfo, const struct start_abs_offset_ = nstime_to_sec(&pinfo->abs_ts) - start_rel_time_; start_rel_time_ = stop_rel_time_ = nstime_to_sec(&pinfo->rel_ts); } - rtp_packet->frame_num = pinfo->fd->num; + rtp_packet->frame_num = pinfo->num; rtp_packet->arrive_offset = nstime_to_sec(&pinfo->rel_ts) - start_rel_time_; rtp_packets_ << rtp_packet; diff --git a/ui/tap-iax2-analysis.c b/ui/tap-iax2-analysis.c index da06e279f1..f057743eb6 100644 --- a/ui/tap-iax2-analysis.c +++ b/ui/tap-iax2-analysis.c @@ -103,7 +103,7 @@ iax2_packet_analyse(tap_iax2_stat_t *statinfo, /* include it in maximum delta calculation */ if (statinfo->delta > statinfo->max_delta) { statinfo->max_delta = statinfo->delta; - statinfo->max_nr = pinfo->fd->num; + statinfo->max_nr = pinfo->num; } /* maximum and mean jitter calculation */ if (statinfo->jitter > statinfo->max_jitter) { diff --git a/ui/tap-rlc-graph.c b/ui/tap-rlc-graph.c index 1d807be734..e5bb6cfeb5 100644 --- a/ui/tap-rlc-graph.c +++ b/ui/tap-rlc-graph.c @@ -198,7 +198,7 @@ int rlc_lte_tap_for_graph_data(void *pct, packet_info *pinfo, epan_dissect_t *ed /* It matches. Add to end of segment list */ segment->next = NULL; - segment->num = pinfo->fd->num; + segment->num = pinfo->num; segment->rel_secs = (guint32) pinfo->rel_ts.secs; segment->rel_usecs = pinfo->rel_ts.nsecs/1000; segment->abs_secs = (guint32) pinfo->abs_ts.secs; diff --git a/ui/tap-rtp-common.c b/ui/tap-rtp-common.c index 312c4b4a38..b523b198bd 100644 --- a/ui/tap-rtp-common.c +++ b/ui/tap-rtp-common.c @@ -668,7 +668,7 @@ rtp_packet_analyse(tap_rtp_stat_t *statinfo, /* Include it in maximum delta calculation */ if (statinfo->delta > statinfo->max_delta) { statinfo->max_delta = statinfo->delta; - statinfo->max_nr = pinfo->fd->num; + statinfo->max_nr = pinfo->num; } if (clock_rate != 0) { /* Maximum and mean jitter calculation */ diff --git a/ui/tap-sctp-analysis.c b/ui/tap-sctp-analysis.c index 114f3d75d3..75375bdb03 100644 --- a/ui/tap-sctp-analysis.c +++ b/ui/tap-sctp-analysis.c @@ -336,7 +336,7 @@ packet(void *tapdata _U_, packet_info *pinfo, epan_dissect_t *edt _U_, const voi int i; guint8 idx = 0; - framenumber = PINFO_FD_NUM(pinfo); + framenumber = pinfo->num; type = sctp_info->ip_src.type; @@ -533,7 +533,7 @@ packet(void *tapdata _U_, packet_info *pinfo, epan_dissect_t *edt _U_, const voi info->max_usecs = tsn->usecs; } - sack->frame_number = tsn->frame_number = pinfo->fd->num; + sack->frame_number = tsn->frame_number = pinfo->num; } if ((tvb_get_guint8(sctp_info->tvb[0],0) == SCTP_INIT_CHUNK_ID) || (tvb_get_guint8(sctp_info->tvb[0],0) == SCTP_INIT_ACK_CHUNK_ID)) { @@ -751,7 +751,7 @@ packet(void *tapdata _U_, packet_info *pinfo, epan_dissect_t *edt _U_, const voi memcpy(addr,(tmp_info.dst.data),tmp_info.dst.len); store->data = addr; info = add_address(store, info, 2); - info->frame_numbers=g_list_prepend(info->frame_numbers,&(pinfo->fd->num)); + info->frame_numbers=g_list_prepend(info->frame_numbers,&(pinfo->num)); if (datachunk || forwardchunk) info->tsn1 = g_list_prepend(info->tsn1, tsn); if (sackchunk == TRUE) @@ -762,7 +762,7 @@ packet(void *tapdata _U_, packet_info *pinfo, epan_dissect_t *edt _U_, const voi { gchar* tmp_str; error = (sctp_error_info_t *)g_malloc(sizeof(sctp_error_info_t)); - error->frame_number = pinfo->fd->num; + error->frame_number = pinfo->num; error->chunk_info[0] = '\0'; if ((tvb_get_guint8(sctp_info->tvb[0],0)) == SCTP_INIT_CHUNK_ID) { @@ -848,9 +848,9 @@ packet(void *tapdata _U_, packet_info *pinfo, epan_dissect_t *edt _U_, const voi else if (tsn->secs == info->max_secs && tsn->usecs > info->max_usecs) info->max_usecs = tsn->usecs; } - sack->frame_number = tsn->frame_number = pinfo->fd->num; + sack->frame_number = tsn->frame_number = pinfo->num; } - info->frame_numbers = g_list_prepend(info->frame_numbers,&(pinfo->fd->num)); + info->frame_numbers = g_list_prepend(info->frame_numbers,&(pinfo->num)); store = (address *)g_malloc(sizeof (address)); store->type = tmp_info.src.type; diff --git a/ui/tap-sequence-analysis.c b/ui/tap-sequence-analysis.c index d9538bb180..696ab3b14d 100644 --- a/ui/tap-sequence-analysis.c +++ b/ui/tap-sequence-analysis.c @@ -105,7 +105,7 @@ seq_analysis_frame_packet( void *ptr, packet_info *pinfo, epan_dissect_t *edt _U if (!sai) return FALSE; - sai->frame_number = pinfo->fd->num; + sai->frame_number = pinfo->num; sai->port_src=pinfo->srcport; sai->port_dst=pinfo->destport; @@ -197,7 +197,7 @@ seq_analysis_tcp_packet( void *ptr _U_, packet_info *pinfo, epan_dissect_t *edt seq_analysis_item_t *sai; sai = (seq_analysis_item_t *)g_malloc0(sizeof(seq_analysis_item_t)); - sai->frame_number = pinfo->fd->num; + sai->frame_number = pinfo->num; if (sainfo->any_addr) { copy_address(&(sai->src_addr),&(pinfo->net_src)); copy_address(&(sai->dst_addr),&(pinfo->net_dst)); diff --git a/ui/tap-tcp-stream.c b/ui/tap-tcp-stream.c index 89d27651ef..abf357683d 100644 --- a/ui/tap-tcp-stream.c +++ b/ui/tap-tcp-stream.c @@ -76,7 +76,7 @@ tapall_tcpip_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, cons { struct segment *segment = (struct segment *)g_malloc(sizeof(struct segment)); segment->next = NULL; - segment->num = pinfo->fd->num; + segment->num = pinfo->num; segment->rel_secs = (guint32)pinfo->rel_ts.secs; segment->rel_usecs = pinfo->rel_ts.nsecs/1000; /* Currently unused diff --git a/ui/voip_calls.c b/ui/voip_calls.c index 954f35fd18..49060fb20b 100644 --- a/ui/voip_calls.c +++ b/ui/voip_calls.c @@ -330,7 +330,7 @@ add_to_graph(voip_calls_tapinfo_t *tapinfo, packet_info *pinfo, epan_dissect_t * } gai = (seq_analysis_item_t *)g_malloc0(sizeof(seq_analysis_item_t)); - gai->frame_number = pinfo->fd->num; + gai->frame_number = pinfo->num; copy_address(&(gai->src_addr),src_addr); copy_address(&(gai->dst_addr),dst_addr); @@ -516,7 +516,7 @@ rtp_event_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt _ return FALSE; } - tapinfo->rtp_evt_frame_num = pinfo->fd->num; + tapinfo->rtp_evt_frame_num = pinfo->num; tapinfo->rtp_evt = pi->info_rtp_evt; tapinfo->rtp_evt_end = pi->info_end; @@ -624,7 +624,7 @@ rtp_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, void c } /* if this is a duplicated RTP Event End, just return */ - if ((tapinfo->rtp_evt_frame_num == pinfo->fd->num) && !strinfo && (tapinfo->rtp_evt_end == TRUE)) { + if ((tapinfo->rtp_evt_frame_num == pinfo->num) && !strinfo && (tapinfo->rtp_evt_end == TRUE)) { return FALSE; } @@ -663,7 +663,7 @@ rtp_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, void c strinfo->stop_fd = pinfo->fd; /* process RTP Event */ - if (tapinfo->rtp_evt_frame_num == pinfo->fd->num) { + if (tapinfo->rtp_evt_frame_num == pinfo->num) { strinfo->rtp_event = tapinfo->rtp_evt; if (tapinfo->rtp_evt_end == TRUE) { strinfo->end_stream = TRUE; @@ -1085,7 +1085,7 @@ sip_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt , const sip_info_value_t *pi = (const sip_info_value_t *)SIPinfo; - tapinfo->sip_frame_num = pinfo->fd->num; + tapinfo->sip_frame_num = pinfo->num; /* do not consider packets without call_id */ if (pi->tap_call_id ==NULL) { @@ -1230,8 +1230,8 @@ TODO: is useful but not perfect, what is appended is truncated when displayed in g_free((void *)tmp_dst.data); /* add SDP info if apply */ - if ( (tapinfo->sdp_summary != NULL) && (tapinfo->sdp_frame_num == pinfo->fd->num) ) { - append_to_frame_graph(tapinfo, pinfo->fd->num, tapinfo->sdp_summary, NULL); + if ( (tapinfo->sdp_summary != NULL) && (tapinfo->sdp_frame_num == pinfo->num) ) { + append_to_frame_graph(tapinfo, pinfo->num, tapinfo->sdp_summary, NULL); g_free(tapinfo->sdp_summary); tapinfo->sdp_summary = NULL; } @@ -1307,7 +1307,7 @@ isup_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, const isup_tap_rec_t *pi = (const isup_tap_rec_t *)isup_info; /* check if the lower layer is MTP matching the frame number */ - if (tapinfo->mtp3_frame_num != pinfo->fd->num) + if (tapinfo->mtp3_frame_num != pinfo->num) return FALSE; /* check whether we already have a call with these parameters in the list */ @@ -1508,7 +1508,7 @@ mtp3_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt tapinfo->mtp3_opc = pi->addr_opc.pc; tapinfo->mtp3_dpc = pi->addr_dpc.pc; tapinfo->mtp3_ni = pi->addr_opc.ni; - tapinfo->mtp3_frame_num = pinfo->fd->num; + tapinfo->mtp3_frame_num = pinfo->num; return FALSE; } @@ -1596,7 +1596,7 @@ q931_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, else tapinfo->q931_called_number = g_strdup(""); tapinfo->q931_cause_value = pi->cause_value; - tapinfo->q931_frame_num = pinfo->fd->num; + tapinfo->q931_frame_num = pinfo->num; tapinfo->q931_crv = pi->crv; @@ -1718,7 +1718,7 @@ q931_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, } /* Add the H245 info if exists to the Graph */ - h245_add_to_graph(tapinfo, pinfo->fd->num); + h245_add_to_graph(tapinfo, pinfo->num); break; } } @@ -2004,7 +2004,7 @@ h225_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, g_queue_push_tail(tapinfo->callsinfos, callsinfo); } - tapinfo->h225_frame_num = pinfo->fd->num; + tapinfo->h225_frame_num = pinfo->num; tapinfo->h225_call_num = callsinfo->call_num; /* let's analyze the call state */ @@ -2109,13 +2109,13 @@ h225_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, /* add to graph analysis */ /* if the frame number exists in graph, append to it*/ - if (!append_to_frame_graph(tapinfo, pinfo->fd->num, pi->frame_label, comment)) { + if (!append_to_frame_graph(tapinfo, pinfo->num, pi->frame_label, comment)) { /* if not exist, add to the graph */ add_to_graph(tapinfo, pinfo, edt, frame_label, comment, callsinfo->call_num, &(pinfo->src), &(pinfo->dst), 1); } /* Add the H245 info if exists to the Graph */ - h245_add_to_graph(tapinfo, pinfo->fd->num); + h245_add_to_graph(tapinfo, pinfo->num); g_free(frame_label); g_free(comment); @@ -2268,7 +2268,7 @@ h245dg_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *ed /* increment the packets counter of all calls */ ++(tapinfo->npackets); /* if the frame number exists in graph, append to it*/ - if (!append_to_frame_graph(tapinfo, pinfo->fd->num, pi->frame_label, pi->comment)) { + if (!append_to_frame_graph(tapinfo, pinfo->num, pi->frame_label, pi->comment)) { /* if not exist, add to the graph */ add_to_graph(tapinfo, pinfo, edt, pi->frame_label, pi->comment, callsinfo->call_num, &(pinfo->src), &(pinfo->dst), 1); } @@ -2277,7 +2277,7 @@ h245dg_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *ed tunnel OFF but we did not matched the h245 add, in this case nobady will set this label since the frame_num will not match */ - h245_add_label(tapinfo, pinfo->fd->num, (gchar *) pi->frame_label, (gchar *) pi->comment); + h245_add_label(tapinfo, pinfo->num, (gchar *) pi->frame_label, (gchar *) pi->comment); } tapinfo->redraw |= REDRAW_H245DG; @@ -2349,10 +2349,10 @@ sdp_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt _ to use it later */ g_free(tapinfo->sdp_summary); - tapinfo->sdp_frame_num = pinfo->fd->num; + tapinfo->sdp_frame_num = pinfo->num; /* Append to graph the SDP summary if the packet exists */ tapinfo->sdp_summary = g_strdup_printf("SDP (%s)", pi->summary_str); - append_to_frame_graph(tapinfo, pinfo->fd->num, tapinfo->sdp_summary, NULL); + append_to_frame_graph(tapinfo, pinfo->num, tapinfo->sdp_summary, NULL); tapinfo->redraw |= REDRAW_SDP; @@ -2722,8 +2722,8 @@ mgcp_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, g_free(frame_label); /* add SDP info if apply */ - if ( (tapinfo->sdp_summary != NULL) && (tapinfo->sdp_frame_num == pinfo->fd->num) ) { - append_to_frame_graph(tapinfo, pinfo->fd->num, tapinfo->sdp_summary, NULL); + if ( (tapinfo->sdp_summary != NULL) && (tapinfo->sdp_frame_num == pinfo->num) ) { + append_to_frame_graph(tapinfo, pinfo->num, tapinfo->sdp_summary, NULL); g_free(tapinfo->sdp_summary); tapinfo->sdp_summary = NULL; } @@ -2796,7 +2796,7 @@ actrace_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *e voip_calls_info_t *tmp_listinfo; voip_calls_info_t *callsinfo = NULL; - tapinfo->actrace_frame_num = pinfo->fd->num; + tapinfo->actrace_frame_num = pinfo->num; tapinfo->actrace_trunk = pi->trunk; tapinfo->actrace_direction = pi->direction; @@ -4092,7 +4092,7 @@ voip_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, GList *list = NULL; const voip_packet_info_t *pi = (const voip_packet_info_t *)VoIPinfo; - /* VOIP_CALLS_DEBUG("num %u", pinfo->fd->num); */ + /* VOIP_CALLS_DEBUG("num %u", pinfo->num); */ if (pi->call_id) list = g_queue_peek_nth_link(tapinfo->callsinfos, 0); while (list) { @@ -4206,7 +4206,7 @@ prot_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt if (callsinfo!=NULL) { callsinfo->stop_abs = pinfo->abs_ts; callsinfo->stop_rel = pinfo->rel_ts; - callsinfo->last_frame_num=pinfo->fd->num; + callsinfo->last_frame_num=pinfo->num; ++(callsinfo->npackets); ++(tapinfo->npackets); } |