diff --git a/SMBLibrary/NTFileStore/Enums/FileInformation/ExtendedAttributeFlags.cs b/SMBLibrary/NTFileStore/Enums/FileInformation/ExtendedAttributeFlags.cs new file mode 100644 index 0000000..64e8c63 --- /dev/null +++ b/SMBLibrary/NTFileStore/Enums/FileInformation/ExtendedAttributeFlags.cs @@ -0,0 +1,10 @@ +using System; + +namespace SMBLibrary +{ + [Flags] + public enum ExtendedAttributeFlags : byte + { + FILE_NEED_EA = 0x80, + } +} diff --git a/SMBLibrary/NTFileStore/Structures/FileInformation/Query/FileFullEAEntry.cs b/SMBLibrary/NTFileStore/Structures/FileInformation/Query/FileFullEAEntry.cs index eb62dc8..8b9e3c9 100644 --- a/SMBLibrary/NTFileStore/Structures/FileInformation/Query/FileFullEAEntry.cs +++ b/SMBLibrary/NTFileStore/Structures/FileInformation/Query/FileFullEAEntry.cs @@ -19,7 +19,7 @@ namespace SMBLibrary public const int FixedLength = 8; public uint NextEntryOffset; - public byte Flags; + public ExtendedAttributeFlags Flags; private byte EaNameLength; private ushort EaValueLength; public string EaName; // 8-bit ASCII followed by a single terminating null character byte @@ -32,7 +32,7 @@ namespace SMBLibrary public FileFullEAEntry(byte[] buffer, int offset) { NextEntryOffset = LittleEndianReader.ReadUInt32(buffer, ref offset); - Flags = ByteReader.ReadByte(buffer, ref offset); + Flags = (ExtendedAttributeFlags)ByteReader.ReadByte(buffer, ref offset); EaNameLength = ByteReader.ReadByte(buffer, ref offset); EaValueLength = LittleEndianReader.ReadUInt16(buffer, ref offset); EaName = ByteReader.ReadAnsiString(buffer, ref offset, EaNameLength); @@ -45,7 +45,7 @@ namespace SMBLibrary EaNameLength = (byte)EaName.Length; EaValueLength = (ushort)EaValue.Length; LittleEndianWriter.WriteUInt32(buffer, ref offset, NextEntryOffset); - ByteWriter.WriteByte(buffer, ref offset, Flags); + ByteWriter.WriteByte(buffer, ref offset, (byte)Flags); ByteWriter.WriteByte(buffer, ref offset, EaNameLength); LittleEndianWriter.WriteUInt16(buffer, ref offset, EaValueLength); ByteWriter.WriteAnsiString(buffer, ref offset, EaName); diff --git a/SMBLibrary/SMB1FileStore/Structures/ExtendedFileAttributes/Enums/ExtendedAttributeFlag.cs b/SMBLibrary/SMB1FileStore/Structures/ExtendedFileAttributes/Enums/ExtendedAttributeFlag.cs deleted file mode 100644 index 55010cd..0000000 --- a/SMBLibrary/SMB1FileStore/Structures/ExtendedFileAttributes/Enums/ExtendedAttributeFlag.cs +++ /dev/null @@ -1,8 +0,0 @@ - -namespace SMBLibrary.SMB1 -{ - public enum ExtendedAttributeFlag : byte - { - FILE_NEED_EA = 0x80, - } -} diff --git a/SMBLibrary/SMB1FileStore/Structures/ExtendedFileAttributes/FullExtendedAttribute.cs b/SMBLibrary/SMB1FileStore/Structures/ExtendedFileAttributes/FullExtendedAttribute.cs index fe5e3e8..5a633a8 100644 --- a/SMBLibrary/SMB1FileStore/Structures/ExtendedFileAttributes/FullExtendedAttribute.cs +++ b/SMBLibrary/SMB1FileStore/Structures/ExtendedFileAttributes/FullExtendedAttribute.cs @@ -16,7 +16,7 @@ namespace SMBLibrary.SMB1 /// public class FullExtendedAttribute { - public ExtendedAttributeFlag ExtendedAttributeFlag; + public ExtendedAttributeFlags ExtendedAttributeFlag; private byte AttributeNameLengthInBytes; private ushort AttributeValueLengthInBytes; public string AttributeName; // ANSI, AttributeNameLengthInBytes + 1 byte null termination @@ -28,7 +28,7 @@ namespace SMBLibrary.SMB1 public FullExtendedAttribute(byte[] buffer, int offset) { - ExtendedAttributeFlag = (ExtendedAttributeFlag)ByteReader.ReadByte(buffer, offset); + ExtendedAttributeFlag = (ExtendedAttributeFlags)ByteReader.ReadByte(buffer, offset); AttributeNameLengthInBytes = ByteReader.ReadByte(buffer, offset + 1); AttributeValueLengthInBytes = LittleEndianConverter.ToUInt16(buffer, offset + 2); AttributeName = ByteReader.ReadAnsiString(buffer, offset + 4, AttributeNameLengthInBytes); diff --git a/SMBLibrary/SMBLibrary.csproj b/SMBLibrary/SMBLibrary.csproj index 0d2f0e4..c1eedbb 100644 --- a/SMBLibrary/SMBLibrary.csproj +++ b/SMBLibrary/SMBLibrary.csproj @@ -94,6 +94,7 @@ + @@ -458,7 +459,6 @@ -