aboutsummaryrefslogtreecommitdiffstats
path: root/epan
diff options
context:
space:
mode:
authorRonnie Sahlberg <ronnie_sahlberg@ozemail.com.au>2005-11-26 00:34:22 +0000
committerRonnie Sahlberg <ronnie_sahlberg@ozemail.com.au>2005-11-26 00:34:22 +0000
commitd149d98fc375e8d0ad44aa9983e6c79968cc68d7 (patch)
tree26d8c14573d05992b1157263dcda44d7a01b6cdd /epan
parent6244dc8ec9d8a9a81383d6aee053be4a03aadb79 (diff)
assume the four bytes after the fid in notify request is the completion mask
svn path=/trunk/; revision=16596
Diffstat (limited to 'epan')
-rw-r--r--epan/dissectors/packet-smb.c2
-rw-r--r--epan/dissectors/packet-smb.h1
-rw-r--r--epan/dissectors/packet-smb2.c7
3 files changed, 7 insertions, 3 deletions
diff --git a/epan/dissectors/packet-smb.c b/epan/dissectors/packet-smb.c
index 31e290fc9b..9a6385da4e 100644
--- a/epan/dissectors/packet-smb.c
+++ b/epan/dissectors/packet-smb.c
@@ -7175,7 +7175,7 @@ dissect_nt_create_options(tvbuff_t *tvb, proto_tree *parent_tree, int offset)
return offset;
}
-static int
+int
dissect_nt_notify_completion_filter(tvbuff_t *tvb, proto_tree *parent_tree, int offset)
{
guint32 mask;
diff --git a/epan/dissectors/packet-smb.h b/epan/dissectors/packet-smb.h
index 401e642fdc..f654bf72f5 100644
--- a/epan/dissectors/packet-smb.h
+++ b/epan/dissectors/packet-smb.h
@@ -316,5 +316,6 @@ extern int dissect_qfi_SMB_FILE_ALIGNMENT_INFO(tvbuff_t *tvb, packet_info *pinfo
extern int dissect_qfi_SMB_FILE_COMPRESSION_INFO(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset, guint16 *bcp, gboolean *trunc);
extern int dissect_qfi_SMB_FILE_NETWORK_OPEN_INFO(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset, guint16 *bcp, gboolean *trunc);
extern int dissect_qfi_SMB_FILE_ATTRIBUTE_TAG_INFO(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset, guint16 *bcp, gboolean *trunc);
+extern int dissect_nt_notify_completion_filter(tvbuff_t *tvb, proto_tree *parent_tree, int offset);
#endif
diff --git a/epan/dissectors/packet-smb2.c b/epan/dissectors/packet-smb2.c
index c6b7583ce4..b2c4c44e5d 100644
--- a/epan/dissectors/packet-smb2.c
+++ b/epan/dissectors/packet-smb2.c
@@ -1556,9 +1556,12 @@ dissect_smb2_notify_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
/* fid */
offset = dissect_smb2_fid(tvb, pinfo, tree, offset, si, FID_MODE_USE);
+ /* completion filter */
+ offset = dissect_nt_notify_completion_filter(tvb, tree, offset);
+
/* some unknown bytes */
- proto_tree_add_item(tree, hf_smb2_unknown, tvb, offset, 8, TRUE);
- offset += 8;
+ proto_tree_add_item(tree, hf_smb2_unknown, tvb, offset, 4, TRUE);
+ offset += 4;
return offset;
}