From 1d4484ff7ea549047530ec2f45615d6a6598ca3d Mon Sep 17 00:00:00 2001 From: Tal Aloni Date: Sat, 3 Aug 2024 10:44:37 +0300 Subject: [PATCH] NetBiosSuffix.FileServiceService: Corrected typo --- SMBLibrary/Client/NameServiceClient.cs | 2 +- SMBLibrary/Client/SMB1Client.cs | 2 +- SMBLibrary/Client/SMB2Client.cs | 2 +- .../NetBios/NameServicePackets/Enums/NetBiosSuffix.cs | 8 ++------ SMBLibrary/Server/NameServer.cs | 6 +++--- 5 files changed, 8 insertions(+), 12 deletions(-) diff --git a/SMBLibrary/Client/NameServiceClient.cs b/SMBLibrary/Client/NameServiceClient.cs index e67ecd0..e4e6c47 100644 --- a/SMBLibrary/Client/NameServiceClient.cs +++ b/SMBLibrary/Client/NameServiceClient.cs @@ -32,7 +32,7 @@ namespace SMBLibrary.Client foreach (KeyValuePair entry in response.Names) { NetBiosSuffix suffix = NetBiosUtils.GetSuffixFromMSNetBiosName(entry.Key); - if (suffix == NetBiosSuffix.FileServiceService) + if (suffix == NetBiosSuffix.FileServerService) { return entry.Key; } diff --git a/SMBLibrary/Client/SMB1Client.cs b/SMBLibrary/Client/SMB1Client.cs index 6f6e785..b23ef96 100644 --- a/SMBLibrary/Client/SMB1Client.cs +++ b/SMBLibrary/Client/SMB1Client.cs @@ -103,7 +103,7 @@ namespace SMBLibrary.Client if (transport == SMBTransportType.NetBiosOverTCP) { SessionRequestPacket sessionRequest = new SessionRequestPacket(); - sessionRequest.CalledName = NetBiosUtils.GetMSNetBiosName("*SMBSERVER", NetBiosSuffix.FileServiceService); + sessionRequest.CalledName = NetBiosUtils.GetMSNetBiosName("*SMBSERVER", NetBiosSuffix.FileServerService); sessionRequest.CallingName = NetBiosUtils.GetMSNetBiosName(Environment.MachineName, NetBiosSuffix.WorkstationService); TrySendPacket(m_clientSocket, sessionRequest); diff --git a/SMBLibrary/Client/SMB2Client.cs b/SMBLibrary/Client/SMB2Client.cs index dd2f50b..42a150a 100644 --- a/SMBLibrary/Client/SMB2Client.cs +++ b/SMBLibrary/Client/SMB2Client.cs @@ -113,7 +113,7 @@ namespace SMBLibrary.Client if (transport == SMBTransportType.NetBiosOverTCP) { SessionRequestPacket sessionRequest = new SessionRequestPacket(); - sessionRequest.CalledName = NetBiosUtils.GetMSNetBiosName("*SMBSERVER", NetBiosSuffix.FileServiceService); + sessionRequest.CalledName = NetBiosUtils.GetMSNetBiosName("*SMBSERVER", NetBiosSuffix.FileServerService); sessionRequest.CallingName = NetBiosUtils.GetMSNetBiosName(Environment.MachineName, NetBiosSuffix.WorkstationService); TrySendPacket(m_clientSocket, sessionRequest); diff --git a/SMBLibrary/NetBios/NameServicePackets/Enums/NetBiosSuffix.cs b/SMBLibrary/NetBios/NameServicePackets/Enums/NetBiosSuffix.cs index a7126fc..9e11352 100644 --- a/SMBLibrary/NetBios/NameServicePackets/Enums/NetBiosSuffix.cs +++ b/SMBLibrary/NetBios/NameServicePackets/Enums/NetBiosSuffix.cs @@ -1,12 +1,8 @@ -using System; -using System.Collections.Generic; -using System.Text; - namespace SMBLibrary.NetBios { /// /// 16th character suffix for netbios name. - /// see http://support.microsoft.com/kb/163409/en-us + /// see https://learn.microsoft.com/en-us/openspecs/windows_protocols/ms-nbte/6dbf0972-bb15-4f29-afeb-baaae98416ed /// public enum NetBiosSuffix : byte { @@ -15,6 +11,6 @@ namespace SMBLibrary.NetBios DomainMasterBrowser = 0x1B, MasterBrowser = 0x1D, BrowserServiceElections = 0x1E, - FileServiceService = 0x20, + FileServerService = 0x20, } } diff --git a/SMBLibrary/Server/NameServer.cs b/SMBLibrary/Server/NameServer.cs index db42cf9..86149ff 100644 --- a/SMBLibrary/Server/NameServer.cs +++ b/SMBLibrary/Server/NameServer.cs @@ -111,7 +111,7 @@ namespace SMBLibrary.Server bool nameMatch = String.Equals(name, Environment.MachineName, StringComparison.OrdinalIgnoreCase); - if (nameMatch && ((suffix == NetBiosSuffix.WorkstationService) || (suffix == NetBiosSuffix.FileServiceService))) + if (nameMatch && ((suffix == NetBiosSuffix.WorkstationService) || (suffix == NetBiosSuffix.FileServerService))) { PositiveNameQueryResponse response = new PositiveNameQueryResponse(); response.Header.TransactionID = request.Header.TransactionID; @@ -129,7 +129,7 @@ namespace SMBLibrary.Server response.Resource.Name = request.Question.Name; NameFlags nameFlags = new NameFlags(); string name1 = NetBiosUtils.GetMSNetBiosName(Environment.MachineName, NetBiosSuffix.WorkstationService); - string name2 = NetBiosUtils.GetMSNetBiosName(Environment.MachineName, NetBiosSuffix.FileServiceService); + string name2 = NetBiosUtils.GetMSNetBiosName(Environment.MachineName, NetBiosSuffix.FileServerService); NameFlags nameFlags3 = new NameFlags(); nameFlags3.WorkGroup = true; string name3 = NetBiosUtils.GetMSNetBiosName(WorkgroupName, NetBiosSuffix.WorkstationService); @@ -164,7 +164,7 @@ namespace SMBLibrary.Server private void RegisterNetBIOSName() { NameRegistrationRequest request1 = new NameRegistrationRequest(Environment.MachineName, NetBiosSuffix.WorkstationService, m_serverAddress); - NameRegistrationRequest request2 = new NameRegistrationRequest(Environment.MachineName, NetBiosSuffix.FileServiceService, m_serverAddress); + NameRegistrationRequest request2 = new NameRegistrationRequest(Environment.MachineName, NetBiosSuffix.FileServerService, m_serverAddress); NameRegistrationRequest request3 = new NameRegistrationRequest(WorkgroupName, NetBiosSuffix.WorkstationService, m_serverAddress); request3.NameFlags.WorkGroup = true; RegisterName(request1);