zydronium/SMBLibrary
1
0
Fork 0
mirror of https://github.com/TalAloni/SMBLibrary.git synced 2025-08-15 03:33:47 +02:00
Code Issues Projects Releases Packages Wiki Activity

Minor code refactoring

Browse source
This commit is contained in:
Tal Aloni 2017-12-08 14:20:04 +02:00
parent 74b4a83635
commit 387b3b6709
4 changed files with 26 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

8
SMBLibrary/SMB1/EnumStructures/NamedPipeStatus.cs
View file

@ -37,6 +37,8 @@ namespace SMBLibrary.SMB1
/// </summary> /// </summary>
public struct NamedPipeStatus // ushort public struct NamedPipeStatus // ushort
{ {
public const int Length = 2;
public byte ICount; public byte ICount;
public ReadMode ReadMode; public ReadMode ReadMode;
public NamedPipeType NamedPipeType; public NamedPipeType NamedPipeType;
@ -45,7 +47,7 @@ namespace SMBLibrary.SMB1
public NamedPipeStatus(byte[] buffer, int offset) public NamedPipeStatus(byte[] buffer, int offset)
{ {
ICount = buffer[offset]; ICount = buffer[offset + 0];
ReadMode = (ReadMode)(buffer[offset + 1] & 0x03); ReadMode = (ReadMode)(buffer[offset + 1] & 0x03);
NamedPipeType = (NamedPipeType)((buffer[offset + 1] & 0x0C) >> 2); NamedPipeType = (NamedPipeType)((buffer[offset + 1] & 0x0C) >> 2);
Endpoint = (Endpoint)((buffer[offset + 1] & 0x40) >> 6); Endpoint = (Endpoint)((buffer[offset + 1] & 0x40) >> 6);
@ -73,7 +75,7 @@ namespace SMBLibrary.SMB1
public void WriteBytes(byte[] buffer, ref int offset) public void WriteBytes(byte[] buffer, ref int offset)
{ {
WriteBytes(buffer, offset); WriteBytes(buffer, offset);
offset += 2; offset += Length;
} }
public ushort ToUInt16() public ushort ToUInt16()
@ -88,7 +90,7 @@ namespace SMBLibrary.SMB1
public static NamedPipeStatus Read(byte[] buffer, ref int offset) public static NamedPipeStatus Read(byte[] buffer, ref int offset)
{ {
offset += 2; offset += Length;
return new NamedPipeStatus(buffer, offset - 2); return new NamedPipeStatus(buffer, offset - 2);
} }
} }

12
SMBLibrary/SMB1/EnumStructures/OpenResults.cs
View file

@ -1,4 +1,4 @@
/* Copyright (C) 2014 Tal Aloni <tal.aloni.il@gmail.com>. All rights reserved. /* Copyright (C) 2014-2017 Tal Aloni <tal.aloni.il@gmail.com>. All rights reserved.
* *
* You can redistribute this program and/or modify it under the terms of * You can redistribute this program and/or modify it under the terms of
* the GNU Lesser Public License as published by the Free Software Foundation, * the GNU Lesser Public License as published by the Free Software Foundation,
@ -13,12 +13,14 @@ namespace SMBLibrary.SMB1
{ {
public struct OpenResults // 2 bytes public struct OpenResults // 2 bytes
{ {
public const int Length = 2;
public OpenResult OpenResult; public OpenResult OpenResult;
public bool OpLockGranted; public bool OpLockGranted;
public OpenResults(byte[] buffer, int offset) public OpenResults(byte[] buffer, int offset)
{ {
OpenResult = (OpenResult)(buffer[offset] & 0x3); OpenResult = (OpenResult)(buffer[offset + 0] & 0x3);
OpLockGranted = (buffer[offset + 1] & 0x80) > 0; OpLockGranted = (buffer[offset + 1] & 0x80) > 0;
} }
@ -38,13 +40,13 @@ namespace SMBLibrary.SMB1
public void WriteBytes(byte[] buffer, ref int offset) public void WriteBytes(byte[] buffer, ref int offset)
{ {
WriteBytes(buffer, offset); WriteBytes(buffer, offset);
offset += 2; offset += Length;
} }
public static OpenResults Read(byte[] buffer, ref int offset) public static OpenResults Read(byte[] buffer, ref int offset)
{ {
offset += 2; offset += Length;
return new OpenResults(buffer, offset - 2); return new OpenResults(buffer, offset - Length);
} }
} }
} }

12
SMBLibrary/SMB1/Transaction2Subcommands/EnumStructures/AccessModeOptions.cs
View file

@ -1,4 +1,4 @@
/* Copyright (C) 2014-2016 Tal Aloni <tal.aloni.il@gmail.com>. All rights reserved. /* Copyright (C) 2014-2017 Tal Aloni <tal.aloni.il@gmail.com>. All rights reserved.
* *
* You can redistribute this program and/or modify it under the terms of * You can redistribute this program and/or modify it under the terms of
* the GNU Lesser Public License as published by the Free Software Foundation, * the GNU Lesser Public License as published by the Free Software Foundation,
@ -56,6 +56,8 @@ namespace SMBLibrary.SMB1
public struct AccessModeOptions // 2 bytes public struct AccessModeOptions // 2 bytes
{ {
public const int Length = 2;
public AccessMode AccessMode; public AccessMode AccessMode;
public SharingMode SharingMode; public SharingMode SharingMode;
public ReferenceLocality ReferenceLocality; public ReferenceLocality ReferenceLocality;
@ -64,8 +66,8 @@ namespace SMBLibrary.SMB1
public AccessModeOptions(byte[] buffer, int offset) public AccessModeOptions(byte[] buffer, int offset)
{ {
AccessMode = (AccessMode)(buffer[offset] & 0x07); AccessMode = (AccessMode)(buffer[offset + 0] & 0x07);
SharingMode = (SharingMode)((buffer[offset] & 0x70) >> 4); SharingMode = (SharingMode)((buffer[offset + 0] & 0x70) >> 4);
ReferenceLocality = (ReferenceLocality)(buffer[offset + 1] & 0x07); ReferenceLocality = (ReferenceLocality)(buffer[offset + 1] & 0x07);
CachedMode = (CachedMode)((buffer[offset + 1] & 0x10) >> 4); CachedMode = (CachedMode)((buffer[offset + 1] & 0x10) >> 4);
WriteThroughMode = (WriteThroughMode)((buffer[offset + 1] & 0x40) >> 6); WriteThroughMode = (WriteThroughMode)((buffer[offset + 1] & 0x40) >> 6);
@ -82,8 +84,8 @@ namespace SMBLibrary.SMB1
public static AccessModeOptions Read(byte[] buffer, ref int offset) public static AccessModeOptions Read(byte[] buffer, ref int offset)
{ {
offset += 2; offset += Length;
return new AccessModeOptions(buffer, offset - 2); return new AccessModeOptions(buffer, offset - Length);
} }
} }
} }

12
SMBLibrary/SMB1/Transaction2Subcommands/EnumStructures/OpenMode.cs
View file

@ -1,4 +1,4 @@
/* Copyright (C) 2014 Tal Aloni <tal.aloni.il@gmail.com>. All rights reserved. /* Copyright (C) 2014-2017 Tal Aloni <tal.aloni.il@gmail.com>. All rights reserved.
* *
* You can redistribute this program and/or modify it under the terms of * You can redistribute this program and/or modify it under the terms of
* the GNU Lesser Public License as published by the Free Software Foundation, * the GNU Lesser Public License as published by the Free Software Foundation,
@ -25,13 +25,15 @@ namespace SMBLibrary.SMB1
public struct OpenMode // 2 bytes public struct OpenMode // 2 bytes
{ {
public const int Length = 2;
public FileExistsOpts FileExistsOpts; public FileExistsOpts FileExistsOpts;
public CreateFile CreateFile; public CreateFile CreateFile;
public OpenMode(byte[] buffer, int offset) public OpenMode(byte[] buffer, int offset)
{ {
FileExistsOpts = (FileExistsOpts)(buffer[offset] & 0x3); FileExistsOpts = (FileExistsOpts)(buffer[offset + 0] & 0x3);
CreateFile = (CreateFile)((buffer[offset] & 0x10) >> 4); CreateFile = (CreateFile)((buffer[offset + 0] & 0x10) >> 4);
} }
public void WriteBytes(byte[] buffer, int offset) public void WriteBytes(byte[] buffer, int offset)
@ -42,8 +44,8 @@ namespace SMBLibrary.SMB1
public static OpenMode Read(byte[] buffer, ref int offset) public static OpenMode Read(byte[] buffer, ref int offset)
{ {
offset += 2; offset += Length;
return new OpenMode(buffer, offset - 2); return new OpenMode(buffer, offset - Length);
} }
} }
} }