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>

1 files changed, 8 insertions, 8 deletions

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);