Try to squeeze some bytes out of the frame_data structure.

Make the time stamp precision a 4-bit bitfield, so, when combined with
the other bitfields, we have 32 bits.  That means we put the flags at
the same structure level as the time stamp precision, so they can be
combined; that gets rid of an extra "flags." for references to the flags.

Put the two pointers next to each other, and after a multiple of 8 bytes
worth of other fields, so that there's no padding before or between them.

It's still not down to 64 bytes, which is the next lower power of 2, so
there's more work to do.

Change-Id: I6f3e9d9f6f48137bbee8f100c152d2c42adb8fbe
Reviewed-on: https://code.wireshark.org/review/31213
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>

1 files changed, 7 insertions, 7 deletions

diff --git a/epan/dissectors/packet-x25.c b/epan/dissectors/packet-x25.c
index c09a4158aa..48216d71f5 100644
--- a/epan/dissectors/packet-x25.c
+++ b/epan/dissectors/packet-x25.c
@@ -1471,7 +1471,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)
+                    if (!pinfo->fd->visited)
                         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. */
@@ -1479,7 +1479,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)
+                    if (!pinfo->fd->visited)
                         x25_hash_add_proto_start(vc, pinfo->num, ositp_handle);
                     break;
                 }
@@ -1492,7 +1492,7 @@ dissect_x25_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
                         proto_tree_add_item( userdata_tree, hf_x263_sec_protocol_id, tvb, localoffset, 1, ENC_BIG_ENDIAN);
                 }
 
-                if (!pinfo->fd->flags.visited) {
+                if (!pinfo->fd->visited) {
                     /*
                      * Is there a dissector handle for this SPI?
                      * If so, assign it to this virtual circuit.
@@ -1931,7 +1931,7 @@ dissect_x25_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
     /* Did the user suggest QLLC/SNA? */
     if (payload_is_qllc_sna) {
         /* Yes - dissect it as QLLC/SNA. */
-        if (!pinfo->fd->flags.visited)
+        if (!pinfo->fd->visited)
             x25_hash_add_proto_start(vc, pinfo->num, qllc_handle);
         call_dissector_with_data(qllc_handle, next_tvb, pinfo, tree, &q_bit_set);
         return;
@@ -1944,7 +1944,7 @@ dissect_x25_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
       /* First byte contains the length of the remaining buffer */
       if ((tvb_get_guint8(tvb, localoffset+1) & 0x0F) == 0) {
         /* Second byte contains a valid COTP TPDU */
-        if (!pinfo->fd->flags.visited)
+        if (!pinfo->fd->visited)
             x25_hash_add_proto_start(vc, pinfo->num, ositp_handle);
         call_dissector(ositp_handle, next_tvb, pinfo, tree);
         return;
@@ -1957,13 +1957,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)
+        if (!pinfo->fd->visited)
             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)
+        if (!pinfo->fd->visited)
             x25_hash_add_proto_start(vc, pinfo->num, clnp_handle);
         call_dissector(clnp_handle, next_tvb, pinfo, tree);
         return;