aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-smb-pipe.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2018-12-26 18:26:24 -0800
committerGuy Harris <guy@alum.mit.edu>2018-12-27 04:34:29 +0000
commit7eb3e47fa49806ea2cf59f0fa009240fae049a2b (patch)
treed668ff9ceae57934fe33582457fc5169f6e764ba /epan/dissectors/packet-smb-pipe.c
parentc3a7986b86f5355e6bd1791f70b78c91bcdac247 (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-smb-pipe.c')
-rw-r--r--epan/dissectors/packet-smb-pipe.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/epan/dissectors/packet-smb-pipe.c b/epan/dissectors/packet-smb-pipe.c
index 23bc1bf8cc..f714710893 100644
--- a/epan/dissectors/packet-smb-pipe.c
+++ b/epan/dissectors/packet-smb-pipe.c
@@ -460,7 +460,7 @@ add_detail_level(tvbuff_t *tvb, int offset, int count _U_, packet_info *pinfo,
trp = (smb_transact_info_t *)smb_info->sip->extra_info;
level = tvb_get_letohs(tvb, offset);
- if (!pinfo->fd->flags.visited)
+ if (!pinfo->fd->visited)
if (trp)
trp->info_level = level; /* remember this for the response */
@@ -2647,7 +2647,7 @@ dissect_pipe_lanman(tvbuff_t *pd_tvb, tvbuff_t *p_tvb, tvbuff_t *d_tvb,
* the code parsing the reply, and initialize the detail
* level to -1, meaning "unknown".
*/
- if (!pinfo->fd->flags.visited) {
+ if (!pinfo->fd->visited) {
trp->lanman_cmd = cmd;
trp->info_level = -1;
trp->param_descrip=NULL;
@@ -2659,7 +2659,7 @@ dissect_pipe_lanman(tvbuff_t *pd_tvb, tvbuff_t *p_tvb, tvbuff_t *d_tvb,
param_descrip = tvb_get_const_stringz(p_tvb, offset, &descriptor_len);
proto_tree_add_item(tree, hf_param_desc, p_tvb, offset,
descriptor_len, ENC_ASCII|ENC_NA);
- if (!pinfo->fd->flags.visited) {
+ if (!pinfo->fd->visited) {
/*
* Save the parameter descriptor for future use.
*/
@@ -2672,7 +2672,7 @@ dissect_pipe_lanman(tvbuff_t *pd_tvb, tvbuff_t *p_tvb, tvbuff_t *d_tvb,
data_descrip = tvb_get_const_stringz(p_tvb, offset, &descriptor_len);
proto_tree_add_item(tree, hf_return_desc, p_tvb, offset,
descriptor_len, ENC_ASCII|ENC_NA);
- if (!pinfo->fd->flags.visited) {
+ if (!pinfo->fd->visited) {
/*
* Save the return descriptor for future use.
*/
@@ -2697,7 +2697,7 @@ dissect_pipe_lanman(tvbuff_t *pd_tvb, tvbuff_t *p_tvb, tvbuff_t *d_tvb,
aux_data_descrip = tvb_get_const_stringz(p_tvb, offset, &descriptor_len);
proto_tree_add_item(tree, hf_aux_data_desc, p_tvb, offset,
descriptor_len, ENC_ASCII|ENC_NA);
- if (!pinfo->fd->flags.visited) {
+ if (!pinfo->fd->visited) {
/*
* Save the auxiliary data descriptor for
* future use.
@@ -3279,7 +3279,7 @@ dissect_pipe_dcerpc(tvbuff_t *d_tvb, packet_info *pinfo, proto_tree *parent_tree
pdu and if not, check if the dissector wants us
to reassemble it
*/
- if(!pinfo->fd->flags.visited){
+ if(!pinfo->fd->visited){
/*
* This is the first pass.
*
@@ -3599,7 +3599,7 @@ dissect_pipe_smb(tvbuff_t *sp_tvb, tvbuff_t *s_tvb, tvbuff_t *pd_tvb,
trans_subcmd=PIPE_DCERPC;
}
- if (!pinfo->fd->flags.visited) {
+ if (!pinfo->fd->visited) {
if (tri == NULL)
return FALSE;
tri->trans_subcmd = trans_subcmd;
@@ -3707,7 +3707,7 @@ dissect_pipe_smb(tvbuff_t *sp_tvb, tvbuff_t *s_tvb, tvbuff_t *pd_tvb,
info_level = tvb_get_letohs(p_tvb, offset);
proto_tree_add_uint(pipe_tree, hf_smb_pipe_getinfo_info_level,
p_tvb, offset, 2, info_level);
- if (!pinfo->fd->flags.visited)
+ if (!pinfo->fd->visited)
tri->info_level = info_level;
} else {
guint8 pipe_namelen;