diff options
| author | Ronnie Sahlberg <ronnie_sahlberg@ozemail.com.au> | 2005-12-06 00:27:51 +0000 |
|---|---|---|
| committer | Ronnie Sahlberg <ronnie_sahlberg@ozemail.com.au> | 2005-12-06 00:27:51 +0000 |
| commit | 55c9157d6b7cea2f54d2cd063024d5cc0e8c4012 (patch) | |
| tree | 42d956ab854c5256f76ef24e9e8052d640e0fb10 /epan/dissectors/packet-smb2.c | |
| parent | 7e3a24418c8e8ccd91047deb280de9d72758d57d (diff) | |
objectid updates
svn path=/trunk/; revision=16692
Diffstat (limited to 'epan/dissectors/packet-smb2.c')
| -rw-r--r-- | epan/dissectors/packet-smb2.c | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/epan/dissectors/packet-smb2.c b/epan/dissectors/packet-smb2.c index bd77a5b521..9bf1d98565 100644 --- a/epan/dissectors/packet-smb2.c +++ b/epan/dissectors/packet-smb2.c @@ -132,7 +132,7 @@ static int hf_smb2_fs_info_04 = -1; static int hf_smb2_fs_info_05 = -1; static int hf_smb2_fs_info_06 = -1; static int hf_smb2_fs_info_07 = -1; -static int hf_smb2_fs_info_08 = -1; +static int hf_smb2_fs_objectid_info = -1; static int hf_smb2_sec_info_00 = -1; static int hf_smb2_fid = -1; static int hf_smb2_write_length = -1; @@ -205,7 +205,7 @@ static gint ett_smb2_fs_info_04 = -1; static gint ett_smb2_fs_info_05 = -1; static gint ett_smb2_fs_info_06 = -1; static gint ett_smb2_fs_info_07 = -1; -static gint ett_smb2_fs_info_08 = -1; +static gint ett_smb2_fs_objectid_info = -1; static gint ett_smb2_sec_info_00 = -1; static gint ett_smb2_tid_tree = -1; static gint ett_smb2_create_flags = -1; @@ -254,7 +254,7 @@ static const value_string smb2_class_vals[] = { #define SMB2_FS_INFO_05 0x05 #define SMB2_FS_INFO_06 0x06 #define SMB2_FS_INFO_07 0x07 -#define SMB2_FS_INFO_08 0x08 +#define SMB2_FS_OBJECTID_INFO 0x08 #define SMB2_SEC_INFO_00 0x00 @@ -1458,19 +1458,18 @@ dissect_smb2_fs_info_06(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *paren } static int -dissect_smb2_fs_info_08(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *parent_tree, int offset, smb2_info_t *si _U_) +dissect_smb2_FS_OBJECTID_INFO(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *parent_tree, int offset, smb2_info_t *si _U_) { proto_item *item=NULL; proto_tree *tree=NULL; - guint16 bc; if(parent_tree){ - item = proto_tree_add_item(parent_tree, hf_smb2_fs_info_08, tvb, offset, -1, TRUE); - tree = proto_item_add_subtree(item, ett_smb2_fs_info_08); + item = proto_tree_add_item(parent_tree, hf_smb2_fs_objectid_info, tvb, offset, -1, TRUE); + tree = proto_item_add_subtree(item, ett_smb2_fs_objectid_info); } - bc=tvb_length_remaining(tvb, offset); - offset=dissect_qfsi_FS_OBJECTID_INFO(tvb, pinfo, tree, offset, &bc); + /* FILE_OBJECTID_BUFFER */ + offset=dissect_smb2_FILE_OBJECTID_BUFFER(tvb, pinfo, tree, offset); return offset; } @@ -2142,8 +2141,8 @@ dissect_smb2_infolevel(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, case SMB2_FS_INFO_07: dissect_smb2_fs_info_07(tvb, pinfo, tree, offset, si); break; - case SMB2_FS_INFO_08: - dissect_smb2_fs_info_08(tvb, pinfo, tree, offset, si); + case SMB2_FS_OBJECTID_INFO: + dissect_smb2_FS_OBJECTID_INFO(tvb, pinfo, tree, offset, si); break; default: /* we dont handle this infolevel yet */ @@ -4350,9 +4349,9 @@ proto_register_smb2(void) { "SMB2_FS_INFO_07", "smb2.smb2_fs_info_07", FT_NONE, BASE_NONE, NULL, 0, "SMB2_FS_INFO_07 structure", HFILL }}, - { &hf_smb2_fs_info_08, - { "SMB2_FS_INFO_08", "smb2.smb2_fs_info_08", FT_NONE, BASE_NONE, - NULL, 0, "SMB2_FS_INFO_08 structure", HFILL }}, + { &hf_smb2_fs_objectid_info, + { "SMB2_FS_OBJECTID_INFO", "smb2.smb2_fs_objectid_info", FT_NONE, BASE_NONE, + NULL, 0, "SMB2_FS_OBJECTID_INFO structure", HFILL }}, { &hf_smb2_sec_info_00, { "SMB2_SEC_INFO_00", "smb2.smb2_sec_info_00", FT_NONE, BASE_NONE, @@ -4560,7 +4559,7 @@ proto_register_smb2(void) &ett_smb2_fs_info_05, &ett_smb2_fs_info_06, &ett_smb2_fs_info_07, - &ett_smb2_fs_info_08, + &ett_smb2_fs_objectid_info, &ett_smb2_sec_info_00, &ett_smb2_tid_tree, &ett_smb2_create_flags, |