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