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>

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