diff options
author | Guy Harris <guy@alum.mit.edu> | 2018-12-26 18:26:24 -0800 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2018-12-27 04:34:29 +0000 |
commit | 7eb3e47fa49806ea2cf59f0fa009240fae049a2b (patch) | |
tree | d668ff9ceae57934fe33582457fc5169f6e764ba /epan/dissectors/packet-wcp.c | |
parent | c3a7986b86f5355e6bd1791f70b78c91bcdac247 (diff) |
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>
Diffstat (limited to 'epan/dissectors/packet-wcp.c')
-rw-r--r-- | epan/dissectors/packet-wcp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-wcp.c b/epan/dissectors/packet-wcp.c index 0a79e2b6ac..5145f16db7 100644 --- a/epan/dissectors/packet-wcp.c +++ b/epan/dissectors/packet-wcp.c @@ -355,7 +355,7 @@ static int dissect_wcp( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi return 2; if ( cmd == 1) { /* uncompressed data */ - if ( !pinfo->fd->flags.visited){ /* if first pass */ + if ( !pinfo->fd->visited){ /* if first pass */ wcp_save_data( tvb, pinfo); } next_tvb = tvb_new_subset_remaining(tvb, wcp_header_len); @@ -563,7 +563,7 @@ static tvbuff_t *wcp_uncompress( tvbuff_t *src_tvb, int offset, packet_info *pin data_cnt, data_offset+1); return NULL; } - if ( !pinfo->fd->flags.visited){ /* if first pass */ + if ( !pinfo->fd->visited){ /* if first pass */ dst = decompressed_entry(dst, data_offset, data_cnt, &len, buf_ptr); @@ -588,7 +588,7 @@ static tvbuff_t *wcp_uncompress( tvbuff_t *src_tvb, int offset, packet_info *pin return NULL; } - if ( !pinfo->fd->flags.visited){ + if ( !pinfo->fd->visited){ /* * This is the first pass through * the packets, so copy it to the @@ -622,7 +622,7 @@ static tvbuff_t *wcp_uncompress( tvbuff_t *src_tvb, int offset, packet_info *pin } } - if ( pinfo->fd->flags.visited){ /* if not first pass */ + if ( pinfo->fd->visited){ /* if not first pass */ /* get uncompressed data */ pdata_ptr = (wcp_pdata_t *)p_get_proto_data(wmem_file_scope(), pinfo, proto_wcp, 0); |