Renamed TreeConnectHelper to ServiceNameHelper

SMBLibrary/SMB1/Commands/TreeConnectAndXRequest.cs

@@ -43,7 +43,7 @@ namespace SMBLibrary.SMB1
             Path = SMB1Helper.ReadSMBString(this.SMBData, ref dataOffset, isUnicode);
             // Should be read as OEM string but it doesn't really matter
             string serviceString = ByteReader.ReadNullTerminatedAnsiString(this.SMBData, ref dataOffset);
-            Service = TreeConnectHelper.GetServiceName(serviceString);
+            Service = ServiceNameHelper.GetServiceName(serviceString);
         }
 
         public override byte[] GetBytes(bool isUnicode)
@@ -55,7 +55,7 @@ namespace SMBLibrary.SMB1
             LittleEndianWriter.WriteUInt16(this.SMBParameters, ref parametersOffset, (ushort)Flags);
             LittleEndianWriter.WriteUInt16(this.SMBParameters, ref parametersOffset, passwordLength);
 
-            string serviceString = TreeConnectHelper.GetServiceString(Service);
+            string serviceString = ServiceNameHelper.GetServiceString(Service);
             int dataLength = Password.Length + serviceString.Length;
             if (isUnicode)
             {

SMBLibrary/SMB1/Commands/TreeConnectAndXResponse.cs

@@ -38,7 +38,7 @@ namespace SMBLibrary.SMB1
             string serviceString = ByteReader.ReadNullTerminatedAnsiString(this.SMBData, ref dataOffset);
             NativeFileSystem = SMB1Helper.ReadSMBString(this.SMBData, ref dataOffset, isUnicode);
 
-            Service = TreeConnectHelper.GetServiceName(serviceString);
+            Service = ServiceNameHelper.GetServiceName(serviceString);
         }
 
         public override byte[] GetBytes(bool isUnicode)
@@ -47,7 +47,7 @@ namespace SMBLibrary.SMB1
             LittleEndianWriter.WriteUInt16(this.SMBParameters, 4, (ushort)OptionalSupport);
 
             // Should be written as OEM string but it doesn't really matter
-            string serviceString = TreeConnectHelper.GetServiceString(Service);
+            string serviceString = ServiceNameHelper.GetServiceString(Service);
             if (isUnicode)
             {
                 this.SMBData = new byte[serviceString.Length + NativeFileSystem.Length * 2 + 3];

SMBLibrary/SMB1/Commands/TreeConnectAndXResponseExtended.cs

@@ -43,7 +43,7 @@ namespace SMBLibrary.SMB1
             string serviceString = ByteReader.ReadNullTerminatedAnsiString(this.SMBData, ref dataOffset);
             NativeFileSystem = SMB1Helper.ReadSMBString(this.SMBData, ref dataOffset, isUnicode);
 
-            Service = TreeConnectHelper.GetServiceName(serviceString);
+            Service = ServiceNameHelper.GetServiceName(serviceString);
         }
 
         public override byte[] GetBytes(bool isUnicode)
@@ -55,7 +55,7 @@ namespace SMBLibrary.SMB1
             GuestMaximalShareAccessRights.WriteBytes(this.SMBParameters, ref parametersOffset);
 
             // Should be written as OEM string but it doesn't really matter
-            string serviceString = TreeConnectHelper.GetServiceString(Service);
+            string serviceString = ServiceNameHelper.GetServiceString(Service);
             if (isUnicode)
             {
                 this.SMBData = new byte[serviceString.Length + NativeFileSystem.Length * 2 + 3];

SMBLibrary/SMB1/TreeConnectHelper.cs

@@ -11,7 +11,7 @@ using Utilities;
 
 namespace SMBLibrary.SMB1
 {
-    public class TreeConnectHelper
+    public class ServiceNameHelper
     {
         public static string GetServiceString(ServiceName serviceName)
         {

SMBLibrary/SMBLibrary.csproj

@@ -274,6 +274,7 @@
     <Compile Include="SMB1\NTTransactSubcommands\NTTransactQuerySecurityDescriptorResponse.cs" />
     <Compile Include="SMB1\NTTransactSubcommands\NTTransactSetSecurityDescriptor.cs" />
     <Compile Include="SMB1\NTTransactSubcommands\NTTransactSubcommand.cs" />
+    <Compile Include="SMB1\ServiceNameHelper.cs" />
     <Compile Include="SMB1\SMB1Header.cs" />
     <Compile Include="SMB1\SMB1Helper.cs" />
     <Compile Include="SMB1\SMB1Message.cs" />
@@ -380,7 +381,6 @@
     <Compile Include="SMB1\TransactionSubcommands\TransactionWaitNamedPipeRequest.cs" />
     <Compile Include="SMB1\TransactionSubcommands\TransactionWriteNamedPipeRequest.cs" />
     <Compile Include="SMB1\TransactionSubcommands\TransactionWriteNamedPipeResponse.cs" />
-    <Compile Include="SMB1\TreeConnectHelper.cs" />
     <Compile Include="Structures\ACE\AccessAllowedACE.cs" />
     <Compile Include="Structures\ACE\ACE.cs" />
     <Compile Include="Structures\ACE\AceHeader.cs" />