mirror of
https://github.com/TalAloni/SMBLibrary.git
synced 2025-07-12 12:28:09 +02:00
Utilities: Renamed ReadGuidBytes / WriteGuidBytes to ReadGuid / WriteGuid
This commit is contained in:
parent
f5d727ddf2
commit
153abe3d27
12 changed files with 21 additions and 21 deletions
|
@ -33,7 +33,7 @@ namespace SMBLibrary
|
|||
|
||||
public override void WriteBytes(byte[] buffer, int offset)
|
||||
{
|
||||
LittleEndianWriter.WriteGuidBytes(buffer, offset + 0, ObjectID);
|
||||
LittleEndianWriter.WriteGuid(buffer, offset + 0, ObjectID);
|
||||
ByteWriter.WriteBytes(buffer, offset + 16, ExtendedInfo);
|
||||
}
|
||||
|
||||
|
|
|
@ -38,10 +38,10 @@ namespace SMBLibrary
|
|||
public byte[] GetBytes()
|
||||
{
|
||||
byte[] buffer = new byte[Length];
|
||||
LittleEndianWriter.WriteGuidBytes(buffer, 0, ObjectId);
|
||||
LittleEndianWriter.WriteGuidBytes(buffer, 16, BirthVolumeId);
|
||||
LittleEndianWriter.WriteGuidBytes(buffer, 32, BirthObjectId);
|
||||
LittleEndianWriter.WriteGuidBytes(buffer, 48, DomainId);
|
||||
LittleEndianWriter.WriteGuid(buffer, 0, ObjectId);
|
||||
LittleEndianWriter.WriteGuid(buffer, 16, BirthVolumeId);
|
||||
LittleEndianWriter.WriteGuid(buffer, 32, BirthObjectId);
|
||||
LittleEndianWriter.WriteGuid(buffer, 48, DomainId);
|
||||
return buffer;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -57,7 +57,7 @@ namespace SMBLibrary.RPC
|
|||
LittleEndianWriter.WriteUInt16(buffer, ref offset, OpNum);
|
||||
if ((Flags & PacketFlags.ObjectUUID) > 0)
|
||||
{
|
||||
LittleEndianWriter.WriteGuidBytes(buffer, ref offset, ObjectGuid);
|
||||
LittleEndianWriter.WriteGuid(buffer, ref offset, ObjectGuid);
|
||||
}
|
||||
ByteWriter.WriteBytes(buffer, ref offset, Data);
|
||||
ByteWriter.WriteBytes(buffer, ref offset, AuthVerifier);
|
||||
|
|
|
@ -35,7 +35,7 @@ namespace SMBLibrary.RPC
|
|||
|
||||
public void WriteBytes(byte[] buffer, int offset)
|
||||
{
|
||||
LittleEndianWriter.WriteGuidBytes(buffer, offset + 0, InterfaceUUID);
|
||||
LittleEndianWriter.WriteGuid(buffer, offset + 0, InterfaceUUID);
|
||||
LittleEndianWriter.WriteUInt32(buffer, offset + 16, InterfaceVersion);
|
||||
}
|
||||
|
||||
|
|
|
@ -85,7 +85,7 @@ namespace SMBLibrary.SMB1
|
|||
LittleEndianWriter.WriteUInt16(this.SMBParameters, ref parametersOffset, (ushort)ResourceType);
|
||||
LittleEndianWriter.WriteUInt16(this.SMBParameters, ref parametersOffset, NMPipeStatus_or_FileStatusFlags);
|
||||
ByteWriter.WriteByte(this.SMBParameters, ref parametersOffset, Convert.ToByte(Directory));
|
||||
LittleEndianWriter.WriteGuidBytes(this.SMBParameters, ref parametersOffset, VolumeGuid);
|
||||
LittleEndianWriter.WriteGuid(this.SMBParameters, ref parametersOffset, VolumeGuid);
|
||||
LittleEndianWriter.WriteUInt64(this.SMBParameters, ref parametersOffset, FileID);
|
||||
LittleEndianWriter.WriteUInt32(this.SMBParameters, ref parametersOffset, (uint)MaximalAccessRights);
|
||||
LittleEndianWriter.WriteUInt32(this.SMBParameters, ref parametersOffset, (uint)GuestMaximalAccessRights);
|
||||
|
|
|
@ -74,7 +74,7 @@ namespace SMBLibrary.SMB1
|
|||
ByteWriter.WriteByte(this.SMBParameters, 33, ChallengeLength);
|
||||
|
||||
this.SMBData = new byte[16 + SecurityBlob.Length];
|
||||
LittleEndianWriter.WriteGuidBytes(this.SMBData, 0, ServerGuid);
|
||||
LittleEndianWriter.WriteGuid(this.SMBData, 0, ServerGuid);
|
||||
ByteWriter.WriteBytes(this.SMBData, 16, SecurityBlob);
|
||||
|
||||
return base.GetBytes(isUnicode);
|
||||
|
|
|
@ -55,7 +55,7 @@ namespace SMBLibrary.SMB2
|
|||
LittleEndianWriter.WriteUInt16(buffer, offset + 4, (ushort)SecurityMode);
|
||||
LittleEndianWriter.WriteUInt16(buffer, offset + 6, Reserved);
|
||||
LittleEndianWriter.WriteUInt32(buffer, offset + 8, (uint)Capabilities);
|
||||
LittleEndianWriter.WriteGuidBytes(buffer, offset + 12, ClientGuid);
|
||||
LittleEndianWriter.WriteGuid(buffer, offset + 12, ClientGuid);
|
||||
LittleEndianWriter.WriteInt64(buffer, offset + 28, ClientStartTime.ToFileTimeUtc());
|
||||
|
||||
for (int index = 0; index < Dialects.Count; index++)
|
||||
|
|
|
@ -81,7 +81,7 @@ namespace SMBLibrary.SMB2
|
|||
LittleEndianWriter.WriteUInt16(buffer, offset + 2, (ushort)SecurityMode);
|
||||
LittleEndianWriter.WriteUInt16(buffer, offset + 4, (ushort)DialectRevision);
|
||||
LittleEndianWriter.WriteUInt16(buffer, offset + 6, NegotiateContextCount);
|
||||
LittleEndianWriter.WriteGuidBytes(buffer, offset + 8, ServerGuid);
|
||||
LittleEndianWriter.WriteGuid(buffer, offset + 8, ServerGuid);
|
||||
LittleEndianWriter.WriteUInt32(buffer, offset + 24, (uint)Capabilities);
|
||||
LittleEndianWriter.WriteUInt32(buffer, offset + 28, MaxTransactSize);
|
||||
LittleEndianWriter.WriteUInt32(buffer, offset + 32, MaxReadSize);
|
||||
|
|
|
@ -52,7 +52,7 @@ namespace Utilities
|
|||
return BigEndianConverter.ToUInt64(buffer, offset - 8);
|
||||
}
|
||||
|
||||
public static Guid ReadGuidBytes(byte[] buffer, ref int offset)
|
||||
public static Guid ReadGuid(byte[] buffer, ref int offset)
|
||||
{
|
||||
offset += 16;
|
||||
return BigEndianConverter.ToGuid(buffer, offset - 16);
|
||||
|
@ -107,7 +107,7 @@ namespace Utilities
|
|||
return BigEndianConverter.ToUInt64(buffer, 0);
|
||||
}
|
||||
|
||||
public static Guid ReadGuidBytes(Stream stream)
|
||||
public static Guid ReadGuid(Stream stream)
|
||||
{
|
||||
byte[] buffer = new byte[16];
|
||||
stream.Read(buffer, 0, 16);
|
||||
|
|
|
@ -89,15 +89,15 @@ namespace Utilities
|
|||
offset += 8;
|
||||
}
|
||||
|
||||
public static void WriteGuidBytes(byte[] buffer, int offset, Guid value)
|
||||
public static void WriteGuid(byte[] buffer, int offset, Guid value)
|
||||
{
|
||||
byte[] bytes = BigEndianConverter.GetBytes(value);
|
||||
Array.Copy(bytes, 0, buffer, offset, bytes.Length);
|
||||
}
|
||||
|
||||
public static void WriteGuidBytes(byte[] buffer, ref int offset, Guid value)
|
||||
public static void WriteGuid(byte[] buffer, ref int offset, Guid value)
|
||||
{
|
||||
WriteGuidBytes(buffer, offset, value);
|
||||
WriteGuid(buffer, offset, value);
|
||||
offset += 16;
|
||||
}
|
||||
|
||||
|
@ -143,7 +143,7 @@ namespace Utilities
|
|||
stream.Write(bytes, 0, bytes.Length);
|
||||
}
|
||||
|
||||
public static void WriteGuidBytes(Stream stream, Guid value)
|
||||
public static void WriteGuid(Stream stream, Guid value)
|
||||
{
|
||||
byte[] bytes = BigEndianConverter.GetBytes(value);
|
||||
stream.Write(bytes, 0, bytes.Length);
|
||||
|
|
|
@ -89,7 +89,7 @@ namespace Utilities
|
|||
return LittleEndianConverter.ToUInt64(buffer, 0);
|
||||
}
|
||||
|
||||
public static Guid ReadGuidBytes(Stream stream)
|
||||
public static Guid ReadGuid(Stream stream)
|
||||
{
|
||||
byte[] buffer = new byte[16];
|
||||
stream.Read(buffer, 0, 16);
|
||||
|
|
|
@ -77,15 +77,15 @@ namespace Utilities
|
|||
offset += 8;
|
||||
}
|
||||
|
||||
public static void WriteGuidBytes(byte[] buffer, int offset, Guid value)
|
||||
public static void WriteGuid(byte[] buffer, int offset, Guid value)
|
||||
{
|
||||
byte[] bytes = LittleEndianConverter.GetBytes(value);
|
||||
Array.Copy(bytes, 0, buffer, offset, bytes.Length);
|
||||
}
|
||||
|
||||
public static void WriteGuidBytes(byte[] buffer, ref int offset, Guid value)
|
||||
public static void WriteGuid(byte[] buffer, ref int offset, Guid value)
|
||||
{
|
||||
WriteGuidBytes(buffer, offset, value);
|
||||
WriteGuid(buffer, offset, value);
|
||||
offset += 16;
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue