From 3325d1842f0ebe9242ab15cd05f4fcef8ca6bd12 Mon Sep 17 00:00:00 2001 From: Tal Aloni Date: Sat, 4 Mar 2017 11:26:49 +0200 Subject: [PATCH] ConnectionState: Renamed ServerDialect to Dialect --- SMBLibrary/Server/ConnectionState/ConnectionState.cs | 6 +++--- SMBLibrary/Server/SMB2/NegotiateHelper.cs | 6 +++--- SMBLibrary/Server/SMBServer.SMB1.cs | 4 ++-- SMBLibrary/Server/SMBServer.SMB2.cs | 4 ++-- SMBLibrary/Server/SMBServer.cs | 8 ++++---- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/SMBLibrary/Server/ConnectionState/ConnectionState.cs b/SMBLibrary/Server/ConnectionState/ConnectionState.cs index 0645dc2..cac8262 100644 --- a/SMBLibrary/Server/ConnectionState/ConnectionState.cs +++ b/SMBLibrary/Server/ConnectionState/ConnectionState.cs @@ -21,14 +21,14 @@ namespace SMBLibrary.Server public IPEndPoint ClientEndPoint; public NBTConnectionReceiveBuffer ReceiveBuffer; protected LogDelegate LogToServerHandler; - public SMBDialect ServerDialect; + public SMBDialect Dialect; public object AuthenticationContext; public ConnectionState(LogDelegate logToServerHandler) { ReceiveBuffer = new NBTConnectionReceiveBuffer(); LogToServerHandler = logToServerHandler; - ServerDialect = SMBDialect.NotSet; + Dialect = SMBDialect.NotSet; } public ConnectionState(ConnectionState state) @@ -37,7 +37,7 @@ namespace SMBLibrary.Server ClientEndPoint = state.ClientEndPoint; ReceiveBuffer = state.ReceiveBuffer; LogToServerHandler = state.LogToServerHandler; - ServerDialect = state.ServerDialect; + Dialect = state.Dialect; } public void LogToServer(Severity severity, string message) diff --git a/SMBLibrary/Server/SMB2/NegotiateHelper.cs b/SMBLibrary/Server/SMB2/NegotiateHelper.cs index 17166e5..001ae55 100644 --- a/SMBLibrary/Server/SMB2/NegotiateHelper.cs +++ b/SMBLibrary/Server/SMB2/NegotiateHelper.cs @@ -32,7 +32,7 @@ namespace SMBLibrary.Server.SMB2 } else if (smb2Dialects.Contains(SMB2002Dialect)) { - state.ServerDialect = SMBDialect.SMB202; + state.Dialect = SMBDialect.SMB202; response.DialectRevision = SMB2Dialect.SMB202; } else @@ -55,12 +55,12 @@ namespace SMBLibrary.Server.SMB2 NegotiateResponse response = new NegotiateResponse(); if (request.Dialects.Contains(SMB2Dialect.SMB210)) { - state.ServerDialect = SMBDialect.SMB210; + state.Dialect = SMBDialect.SMB210; response.DialectRevision = SMB2Dialect.SMB210; } else if (request.Dialects.Contains(SMB2Dialect.SMB202)) { - state.ServerDialect = SMBDialect.SMB202; + state.Dialect = SMBDialect.SMB202; response.DialectRevision = SMB2Dialect.SMB202; } else diff --git a/SMBLibrary/Server/SMBServer.SMB1.cs b/SMBLibrary/Server/SMBServer.SMB1.cs index 6ee5ffc..61e901a 100644 --- a/SMBLibrary/Server/SMBServer.SMB1.cs +++ b/SMBLibrary/Server/SMBServer.SMB1.cs @@ -67,7 +67,7 @@ namespace SMBLibrary.Server /// private List ProcessSMB1Command(SMB1Header header, SMB1Command command, ref ConnectionState state) { - if (state.ServerDialect == SMBDialect.NotSet) + if (state.Dialect == SMBDialect.NotSet) { if (command is NegotiateRequest) { @@ -75,7 +75,7 @@ namespace SMBLibrary.Server if (request.Dialects.Contains(SMBServer.NTLanManagerDialect)) { state = new SMB1ConnectionState(state); - state.ServerDialect = SMBDialect.NTLM012; + state.Dialect = SMBDialect.NTLM012; if (EnableExtendedSecurity && header.ExtendedSecurityFlag) { return NegotiateHelper.GetNegotiateResponseExtended(request, m_serverGuid); diff --git a/SMBLibrary/Server/SMBServer.SMB2.cs b/SMBLibrary/Server/SMBServer.SMB2.cs index 72258d2..439abb1 100644 --- a/SMBLibrary/Server/SMBServer.SMB2.cs +++ b/SMBLibrary/Server/SMBServer.SMB2.cs @@ -69,13 +69,13 @@ namespace SMBLibrary.Server /// private SMB2Command ProcessSMB2Command(SMB2Command command, ref ConnectionState state) { - if (state.ServerDialect == SMBDialect.NotSet) + if (state.Dialect == SMBDialect.NotSet) { if (command is NegotiateRequest) { NegotiateRequest request = (NegotiateRequest)command; SMB2Command response = NegotiateHelper.GetNegotiateResponse(request, m_securityProvider, state, m_serverGuid, m_serverStartTime); - if (state.ServerDialect != SMBDialect.NotSet) + if (state.Dialect != SMBDialect.NotSet) { state = new SMB2ConnectionState(state, AllocatePersistentFileID); } diff --git a/SMBLibrary/Server/SMBServer.cs b/SMBLibrary/Server/SMBServer.cs index 10a6902..2956ad6 100644 --- a/SMBLibrary/Server/SMBServer.cs +++ b/SMBLibrary/Server/SMBServer.cs @@ -222,8 +222,8 @@ namespace SMBLibrary.Server { // Note: To be compatible with SMB2 specifications, we must accept SMB_COM_NEGOTIATE. // We will disconnect the connection if m_enableSMB1 == false and the client does not support SMB2. - bool acceptSMB1 = (state.ServerDialect == SMBDialect.NotSet || state.ServerDialect == SMBDialect.NTLM012); - bool acceptSMB2 = (m_enableSMB2 && (state.ServerDialect == SMBDialect.NotSet || state.ServerDialect == SMBDialect.SMB202 || state.ServerDialect == SMBDialect.SMB210)); + bool acceptSMB1 = (state.Dialect == SMBDialect.NotSet || state.Dialect == SMBDialect.NTLM012); + bool acceptSMB2 = (m_enableSMB2 && (state.Dialect == SMBDialect.NotSet || state.Dialect == SMBDialect.SMB202 || state.Dialect == SMBDialect.SMB210)); if (SMB1Header.IsValidSMB1Header(packet.Trailer)) { @@ -246,14 +246,14 @@ namespace SMBLibrary.Server return; } state.LogToServer(Severity.Verbose, "SMB1 message received: {0} requests, First request: {1}, Packet length: {2}", message.Commands.Count, message.Commands[0].CommandName.ToString(), packet.Length); - if (state.ServerDialect == SMBDialect.NotSet && m_enableSMB2) + if (state.Dialect == SMBDialect.NotSet && m_enableSMB2) { // Check if the client supports SMB 2 List smb2Dialects = SMB2.NegotiateHelper.FindSMB2Dialects(message); if (smb2Dialects.Count > 0) { SMB2Command response = SMB2.NegotiateHelper.GetNegotiateResponse(smb2Dialects, m_securityProvider, state, m_serverGuid, m_serverStartTime); - if (state.ServerDialect != SMBDialect.NotSet) + if (state.Dialect != SMBDialect.NotSet) { state = new SMB2ConnectionState(state, AllocatePersistentFileID); }