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-netflow.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-netflow.c')
-rw-r--r-- | epan/dissectors/packet-netflow.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-netflow.c b/epan/dissectors/packet-netflow.c index 9b47eb25ef..b9cd988a56 100644 --- a/epan/dissectors/packet-netflow.c +++ b/epan/dissectors/packet-netflow.c @@ -3787,7 +3787,7 @@ dissect_netflow(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data observation domain id. */ if ((ver == 5) || (ver == 7) || (ver == 8) || (ver == 9) || (ver == 10)) { /* On first pass check sequence analysis */ - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { if (ver != 10) { flows_seen = pdus; /* i.e. use value from header rather than counted value */ } @@ -10543,7 +10543,7 @@ dissect_v9_v10_options_template(tvbuff_t *tvb, packet_info *pinfo, proto_tree *p /* XXX: Is an Options template with only scope fields allowed for V9 ?? */ tmplt_p = (v9_v10_tmplt_t *)wmem_map_lookup(v9_v10_tmplt_table, &tmplt); - if (!pinfo->fd->flags.visited) { /* cache template info only during first pass */ + if (!pinfo->fd->visited) { /* cache template info only during first pass */ do { if (v9_tmplt_max_fields && ((option_scope_field_count > v9_tmplt_max_fields) @@ -10647,7 +10647,7 @@ dissect_v9_v10_data_template(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdut /* ToDo: expert warning if replacement (changed) and new template ignored. */ tmplt_p = (v9_v10_tmplt_t *)wmem_map_lookup(v9_v10_tmplt_table, &tmplt); - if (!pinfo->fd->flags.visited) { /* cache template info only during first pass */ + if (!pinfo->fd->visited) { /* cache template info only during first pass */ do { if ((count == 0) || (v9_tmplt_max_fields && (count > v9_tmplt_max_fields))) { |