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

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