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-cip.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-cip.c')
| -rw-r--r-- | epan/dissectors/packet-cip.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-cip.c b/epan/dissectors/packet-cip.c index 1cde118bba..30e56eb06e 100644 --- a/epan/dissectors/packet-cip.c +++ b/epan/dissectors/packet-cip.c @@ -6368,7 +6368,7 @@ dissect_cip_cm_fwd_open_req(cip_req_info_t *preq_info, proto_tree *cmd_tree, tvb epath_tree = proto_tree_add_subtree(cmd_tree, tvb, offset+26+net_param_offset+6, conn_path_size, ett_path, &pi, "Connection Path: "); dissect_epath( tvb, pinfo, epath_tree, pi, offset+26+net_param_offset+6, conn_path_size, FALSE, FALSE, &connection_path, &safety_fwdopen, DISPLAY_CONNECTION_PATH, NULL, FALSE); - if (pinfo->fd->flags.visited) + if (pinfo->fd->visited) { /* "Connection" is created during ForwardOpen reply (which will be after ForwardOpen request), so ForwardOpen request can only be marked after the first pass */ @@ -6489,7 +6489,7 @@ dissect_cip_cm_fwd_open_rsp_success(cip_req_info_t *preq_info, proto_tree *tree, /* See if we've captured the ForwardOpen request. If so some of the conversation data has already been populated and we just need to update it. */ - if (pinfo->fd->flags.visited) + if (pinfo->fd->visited) return parsed_len + app_rep_size; if ((preq_info != NULL) && (preq_info->connInfo != NULL)) @@ -6584,7 +6584,7 @@ static void dissect_cip_cm_fwd_close_req(proto_tree* cmd_data_tree, tvbuff_t* tv hf_cip_cm_conn_serial_num, hf_cip_cm_vendor, hf_cip_cm_orig_serial_num, &conn_triad); - if (!pinfo->fd->flags.visited) + if (!pinfo->fd->visited) enip_mark_connection_triad(pinfo, &conn_triad); /* Add the path size */ |