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, 10 insertions, 10 deletions

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)