Merge branch 'master' into feature/low_level_client

Source/MQTTnet.AspnetCore/Extensions/ReaderExtensions.cs

@@ -80,7 +80,7 @@ namespace MQTTnet.AspNetCore
             headerLength = 0;
             bodyLength = 0;
             
-            var temp = input.Slice(0, Math.Min(5, input.Length)).GetMemory();
+            var temp = input.Slice(0, Math.Min(5, input.Length)).GetMemory().Span;
 
             do
             {
@@ -88,7 +88,7 @@ namespace MQTTnet.AspNetCore
                 {
                     return false;
                 }
-                encodedByte = temp.Span[index];
+                encodedByte = temp[index];
                 index++;
 
                 value += (byte)(encodedByte & 127) * multiplier;

Source/MQTTnet.AspnetCore/Extensions/ServiceCollectionExtensions.cs

@@ -1,10 +1,10 @@
-using System;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using MQTTnet.Adapter;
 using MQTTnet.Diagnostics;
-using MQTTnet.Server;
 using MQTTnet.Implementations;
-using Microsoft.Extensions.DependencyInjection;
+using MQTTnet.Server;
+using System;
 
 namespace MQTTnet.AspNetCore
 {
@@ -13,7 +13,7 @@ namespace MQTTnet.AspNetCore
         public static IServiceCollection AddHostedMqttServer(this IServiceCollection services, IMqttServerOptions options)
         {
             if (options == null) throw new ArgumentNullException(nameof(options));
-            
+
             services.AddSingleton(options);
 
             services.AddHostedMqttServer();
@@ -23,7 +23,8 @@ namespace MQTTnet.AspNetCore
 
         public static IServiceCollection AddHostedMqttServer(this IServiceCollection services, Action<MqttServerOptionsBuilder> configure)
         {
-            services.AddSingleton<IMqttServerOptions>(s => {
+            services.AddSingleton<IMqttServerOptions>(s =>
+            {
                 var builder = new MqttServerOptionsBuilder();
                 configure(builder);
                 return builder.Build();
@@ -36,7 +37,8 @@ namespace MQTTnet.AspNetCore
 
         public static IServiceCollection AddHostedMqttServerWithServices(this IServiceCollection services, Action<AspNetMqttServerOptionsBuilder> configure)
         {
-            services.AddSingleton<IMqttServerOptions>(s => {
+            services.AddSingleton<IMqttServerOptions>(s =>
+            {
                 var builder = new AspNetMqttServerOptionsBuilder(s);
                 configure(builder);
                 return builder.Build();
@@ -60,14 +62,12 @@ namespace MQTTnet.AspNetCore
         private static IServiceCollection AddHostedMqttServer(this IServiceCollection services)
         {
             var logger = new MqttNetLogger();
-            var childLogger = logger.CreateChildLogger();
 
             services.AddSingleton<IMqttNetLogger>(logger);
-            services.AddSingleton(childLogger);
             services.AddSingleton<MqttHostedServer>();
             services.AddSingleton<IHostedService>(s => s.GetService<MqttHostedServer>());
             services.AddSingleton<IMqttServer>(s => s.GetService<MqttHostedServer>());
-            
+
             return services;
         }
 

Source/MQTTnet.AspnetCore/MQTTnet.AspNetCore.csproj

@@ -14,11 +14,13 @@
     <DefineConstants>RELEASE;NETSTANDARD2_0</DefineConstants>
   </PropertyGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
+  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
+
+    <PackageReference Include="System.IO.Pipelines" Version="4.7.1" />
   </ItemGroup>
     
-  <ItemGroup Condition=" '$(TargetFramework)' != 'netcoreapp3.1' ">
+  <ItemGroup Condition="'$(TargetFramework)' != 'netcoreapp3.1'">
     <PackageReference Include="Microsoft.AspNetCore.Connections.Abstractions" Version="2.1.3" />
     <PackageReference Include="Microsoft.AspNetCore.Http.Connections" Version="1.0.3" />
     <PackageReference Include="Microsoft.AspNetCore.WebSockets" Version="2.1.1" />

Source/MQTTnet.Extensions.ManagedClient/MqttFactoryExtensions.cs

@@ -1,5 +1,5 @@
-using System;
-using MQTTnet.Diagnostics;
+using MQTTnet.Diagnostics;
+using System;
 
 namespace MQTTnet.Extensions.ManagedClient
 {
@@ -9,7 +9,7 @@ namespace MQTTnet.Extensions.ManagedClient
         {
             if (factory == null) throw new ArgumentNullException(nameof(factory));
 
-            return new ManagedMqttClient(factory.CreateMqttClient(), factory.DefaultLogger.CreateChildLogger());
+            return new ManagedMqttClient(factory.CreateMqttClient(), factory.DefaultLogger);
         }
 
         public static IManagedMqttClient CreateManagedMqttClient(this IMqttFactory factory, IMqttNetLogger logger)
@@ -17,7 +17,7 @@ namespace MQTTnet.Extensions.ManagedClient
             if (factory == null) throw new ArgumentNullException(nameof(factory));
             if (logger == null) throw new ArgumentNullException(nameof(logger));
 
-            return new ManagedMqttClient(factory.CreateMqttClient(logger), logger.CreateChildLogger());
+            return new ManagedMqttClient(factory.CreateMqttClient(logger), logger);
         }
     }
 }

Source/MQTTnet.Server/Logging/MqttNetLoggerWrapper.cs

@@ -21,15 +21,24 @@ namespace MQTTnet.Server.Logging
             return new MqttNetLogger(source);
         }
 
-        public void Publish(MqttNetLogLevel logLevel, string source, string message, object[] parameters, Exception exception)
+        public void Publish(MqttNetLogLevel level, string source, string message, object[] parameters, Exception exception)
         {
-            var convertedLogLevel = ConvertLogLevel(logLevel);
+            var convertedLogLevel = ConvertLogLevel(level);
             _logger.Log(convertedLogLevel, exception, message, parameters);
 
             var logMessagePublishedEvent = LogMessagePublished;
             if (logMessagePublishedEvent != null)
             {
-                var logMessage = new MqttNetLogMessage(null, DateTime.UtcNow, Thread.CurrentThread.ManagedThreadId, source, logLevel, message, exception);
+                var logMessage = new MqttNetLogMessage
+                {
+                    Timestamp = DateTime.UtcNow,
+                    ThreadId = Thread.CurrentThread.ManagedThreadId,
+                    Source = source,
+                    Level = level,
+                    Message = message,
+                    Exception = exception
+                };
+
                 logMessagePublishedEvent.Invoke(this, new MqttNetLogMessagePublishedEventArgs(logMessage));
             }
         }

Source/MQTTnet.Server/Mqtt/MqttServerService.cs

@@ -1,11 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net.WebSockets;
-using System.Security.Authentication;
-using System.Text;
-using System.Threading.Tasks;
-using IronPython.Runtime;
+using IronPython.Runtime;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Logging;
 using MQTTnet.Adapter;
@@ -16,6 +9,13 @@ using MQTTnet.Protocol;
 using MQTTnet.Server.Configuration;
 using MQTTnet.Server.Scripting;
 using MQTTnet.Server.Status;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net.WebSockets;
+using System.Security.Authentication;
+using System.Text;
+using System.Threading.Tasks;
 
 namespace MQTTnet.Server.Mqtt
 {
@@ -65,11 +65,11 @@ namespace MQTTnet.Server.Mqtt
             _pythonScriptHostService = pythonScriptHostService ?? throw new ArgumentNullException(nameof(pythonScriptHostService));
             _logger = logger ?? throw new ArgumentNullException(nameof(logger));
 
-            _webSocketServerAdapter = new MqttWebSocketServerAdapter(mqttFactory.Logger.CreateChildLogger());
+            _webSocketServerAdapter = new MqttWebSocketServerAdapter(mqttFactory.Logger);
 
             var adapters = new List<IMqttServerAdapter>
             {
-                new MqttTcpServerAdapter(mqttFactory.Logger.CreateChildLogger())
+                new MqttTcpServerAdapter(mqttFactory.Logger)
                 {
                     TreatSocketOpeningErrorAsWarning = true // Opening other ports than for HTTP is not allows in Azure App Services.
                 },
@@ -215,7 +215,7 @@ namespace MQTTnet.Server.Mqtt
                 options
                     .WithEncryptedEndpoint()
                     .WithEncryptionSslProtocol(SslProtocols.Tls12);
-                
+
                 if (!string.IsNullOrEmpty(_settings.EncryptedTcpEndPoint?.Certificate?.Path))
                 {
                     IMqttServerCertificateCredentials certificateCredentials = null;
@@ -230,7 +230,7 @@ namespace MQTTnet.Server.Mqtt
 
                     options.WithEncryptionCertificate(_settings.EncryptedTcpEndPoint.Certificate.ReadCertificate(), certificateCredentials);
                 }
-                
+
                 if (_settings.EncryptedTcpEndPoint.TryReadIPv4(out var address4))
                 {
                     options.WithEncryptedEndpointBoundIPAddress(address4);

Source/MQTTnet/Adapter/MqttChannelAdapter.cs

@@ -19,14 +19,14 @@ namespace MQTTnet.Adapter
         const uint ErrorOperationAborted = 0x800703E3;
         const int ReadBufferSize = 4096;  // TODO: Move buffer size to config
 
-        readonly SemaphoreSlim _writerSemaphore = new SemaphoreSlim(1, 1);
-
         readonly IMqttNetLogger _logger;
         readonly IMqttChannel _channel;
         readonly MqttPacketReader _packetReader;
 
         readonly byte[] _fixedHeaderBuffer = new byte[2];
 
+        SemaphoreSlim _writerSemaphore = new SemaphoreSlim(1, 1);
+
         long _bytesReceived;
         long _bytesSent;
 
@@ -143,7 +143,7 @@ namespace MQTTnet.Adapter
             }
             finally
             {
-                _writerSemaphore.Release();
+                _writerSemaphore?.Release();
             }
         }
 
@@ -212,7 +212,9 @@ namespace MQTTnet.Adapter
             if (disposing)
             {
                 _channel?.Dispose();
+
                 _writerSemaphore?.Dispose();
+                _writerSemaphore = null;
             }
 
             base.Dispose(disposing);

Source/MQTTnet/Diagnostics/IMqttNetLogger.cs

@@ -6,7 +6,7 @@ namespace MQTTnet.Diagnostics
     {
         event EventHandler<MqttNetLogMessagePublishedEventArgs> LogMessagePublished;
 
-        IMqttNetLogger CreateChildLogger(string source = null);
+        IMqttNetLogger CreateChildLogger(string source);
 
         void Publish(MqttNetLogLevel logLevel, string message, object[] parameters, Exception exception);
     }

Source/MQTTnet/Diagnostics/MqttNetLogMessage.cs

@@ -4,30 +4,19 @@ namespace MQTTnet.Diagnostics
 {
     public class MqttNetLogMessage
     {
-        public MqttNetLogMessage(string logId, DateTime timestamp, int threadId, string source, MqttNetLogLevel level, string message, Exception exception)
-        {
-            LogId = logId;
-            Timestamp = timestamp;
-            ThreadId = threadId;
-            Source = source;
-            Level = level;
-            Message = message;
-            Exception = exception;
-        }
+        public string LogId { get; set; }
 
-        public string LogId { get; }
+        public DateTime Timestamp { get; set; }
 
-        public DateTime Timestamp { get; }
+        public int ThreadId { get; set; }
 
-        public int ThreadId { get; }
+        public string Source { get; set; }
 
-        public string Source { get; }
+        public MqttNetLogLevel Level { get; set; }
 
-        public MqttNetLogLevel Level { get; }
+        public string Message { get; set; }
 
-        public string Message { get; }
-
-        public Exception Exception { get; }
+        public Exception Exception { get; set; }
 
         public override string ToString()
         {

Source/MQTTnet/Diagnostics/MqttNetLogMessagePublishedEventArgs.cs

@@ -6,8 +6,9 @@ namespace MQTTnet.Diagnostics
     {
         public MqttNetLogMessagePublishedEventArgs(MqttNetLogMessage logMessage)
         {
-            TraceMessage = logMessage ?? throw new ArgumentNullException(nameof(logMessage));
             LogMessage = logMessage ?? throw new ArgumentNullException(nameof(logMessage));
+
+            TraceMessage = logMessage ?? throw new ArgumentNullException(nameof(logMessage));
         }
 
         [Obsolete("Use new proeprty LogMessage instead.")]

Source/MQTTnet/Diagnostics/MqttNetLogger.cs

@@ -7,6 +7,8 @@ namespace MQTTnet.Diagnostics
         readonly string _logId;
         readonly string _source;
 
+        readonly MqttNetLogger _parentLogger;
+
         public MqttNetLogger(string source, string logId = null)
         {
             _source = source;
@@ -17,19 +19,31 @@ namespace MQTTnet.Diagnostics
         {
         }
 
-        public event EventHandler<MqttNetLogMessagePublishedEventArgs> LogMessagePublished;
-
-        public IMqttNetLogger CreateChildLogger(string source = null)
+        MqttNetLogger(MqttNetLogger parentLogger, string logId, string source)
         {
-            return new MqttNetLogger(source, _logId);
+            _parentLogger = parentLogger ?? throw new ArgumentNullException(nameof(parentLogger));
+            _source = source ?? throw new ArgumentNullException(nameof(source));
+
+            _logId = logId;
         }
 
-        public void Publish(MqttNetLogLevel logLevel, string message, object[] parameters, Exception exception)
+        public event EventHandler<MqttNetLogMessagePublishedEventArgs> LogMessagePublished;
+
+        // TODO: Consider creating a LoggerFactory which will allow creating loggers. The logger factory will
+        // be the only place which has the published event.
+        public IMqttNetLogger CreateChildLogger(string source)
+        {
+            if (source is null) throw new ArgumentNullException(nameof(source));
+
+            return new MqttNetLogger(this, _logId, source);
+        }
+
+        public void Publish(MqttNetLogLevel level, string message, object[] parameters, Exception exception)
         {
             var hasLocalListeners = LogMessagePublished != null;
             var hasGlobalListeners = MqttNetGlobalLogger.HasListeners;
 
-            if (!hasLocalListeners && !hasGlobalListeners)
+            if (!hasLocalListeners && !hasGlobalListeners && _parentLogger == null)
             {
                 return;
             }
@@ -46,17 +60,35 @@ namespace MQTTnet.Diagnostics
                 }
             }
 
-            var traceMessage = new MqttNetLogMessage(_logId, DateTime.UtcNow, Environment.CurrentManagedThreadId, _source, logLevel, message, exception);
+            var logMessage = new MqttNetLogMessage
+            {
+                LogId = _logId,
+                Timestamp = DateTime.UtcNow,
+                Source = _source,
+                ThreadId = Environment.CurrentManagedThreadId,
+                Level = level,
+                Message = message,
+                Exception = exception
+            };
 
             if (hasGlobalListeners)
             {
-                MqttNetGlobalLogger.Publish(traceMessage);
+                MqttNetGlobalLogger.Publish(logMessage);
             }
 
             if (hasLocalListeners)
             {
-                LogMessagePublished?.Invoke(this, new MqttNetLogMessagePublishedEventArgs(traceMessage));
+                LogMessagePublished?.Invoke(this, new MqttNetLogMessagePublishedEventArgs(logMessage));
             }
+
+            _parentLogger?.Publish(logMessage);
+        }
+
+        void Publish(MqttNetLogMessage logMessage)
+        {
+            LogMessagePublished?.Invoke(this, new MqttNetLogMessagePublishedEventArgs(logMessage));
+
+            _parentLogger?.Publish(logMessage);
         }
     }
 }

Source/MQTTnet/Implementations/MqttTcpChannel.cs

@@ -1,25 +1,24 @@
 #if !WINDOWS_UWP
-using System;
-using System.Net.Security;
-using System.Net.Sockets;
-using System.Security.Cryptography.X509Certificates;
-using System.Threading.Tasks;
-using System.IO;
-using System.Linq;
-using System.Runtime.ExceptionServices;
-using System.Threading;
 using MQTTnet.Channel;
 using MQTTnet.Client.Options;
-using MQTTnet.Internal;
+using System;
+using System.IO;
+using System.Linq;
+using System.Net.Security;
+using System.Net.Sockets;
+using System.Runtime.ExceptionServices;
+using System.Security.Cryptography.X509Certificates;
+using System.Threading;
+using System.Threading.Tasks;
 
 namespace MQTTnet.Implementations
 {
-    public class MqttTcpChannel : Disposable, IMqttChannel
+    public sealed class MqttTcpChannel : IDisposable, IMqttChannel
     {
-        private readonly IMqttClientOptions _clientOptions;
-        private readonly MqttClientTcpOptions _options;
+        readonly IMqttClientOptions _clientOptions;
+        readonly MqttClientTcpOptions _options;
 
-        private Stream _stream;
+        Stream _stream;
 
         public MqttTcpChannel(IMqttClientOptions clientOptions)
         {
@@ -69,7 +68,7 @@ namespace MQTTnet.Implementations
                 // of the actual value.
                 socket.DualMode = _options.DualMode.Value;
             }
-            
+
             // Workaround for: workaround for https://github.com/dotnet/corefx/issues/24430
             using (cancellationToken.Register(() => socket.Dispose()))
             {
@@ -83,7 +82,7 @@ namespace MQTTnet.Implementations
                 var sslStream = new SslStream(networkStream, false, InternalUserCertificateValidationCallback);
                 _stream = sslStream;
 
-                await sslStream.AuthenticateAsClientAsync(_options.Server, LoadCertificates(), _options.TlsOptions.SslProtocol, !_options.TlsOptions.IgnoreCertificateRevocationErrors).ConfigureAwait(false);                
+                await sslStream.AuthenticateAsClientAsync(_options.Server, LoadCertificates(), _options.TlsOptions.SslProtocol, !_options.TlsOptions.IgnoreCertificateRevocationErrors).ConfigureAwait(false);
             }
             else
             {
@@ -95,12 +94,14 @@ namespace MQTTnet.Implementations
 
         public Task DisconnectAsync(CancellationToken cancellationToken)
         {
-            Cleanup();
+            Dispose();
             return Task.FromResult(0);
         }
 
         public async Task<int> ReadAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken)
         {
+            if (buffer is null) throw new ArgumentNullException(nameof(buffer));
+
             try
             {
                 // Workaround for: https://github.com/dotnet/corefx/issues/24430
@@ -131,6 +132,8 @@ namespace MQTTnet.Implementations
 
         public async Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken)
         {
+            if (buffer is null) throw new ArgumentNullException(nameof(buffer));
+
             try
             {
                 // Workaround for: https://github.com/dotnet/corefx/issues/24430
@@ -159,7 +162,7 @@ namespace MQTTnet.Implementations
             }
         }
 
-        private void Cleanup()
+        public void Dispose()
         {
             // When the stream is disposed it will also close the socket and this will also dispose it.
             // So there is no need to dispose the socket again.
@@ -178,16 +181,7 @@ namespace MQTTnet.Implementations
             _stream = null;
         }
 
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing)
-            {
-                Cleanup();
-            }
-            base.Dispose(disposing);
-        }
-
-        private bool InternalUserCertificateValidationCallback(object sender, X509Certificate x509Certificate, X509Chain chain, SslPolicyErrors sslPolicyErrors)
+        bool InternalUserCertificateValidationCallback(object sender, X509Certificate x509Certificate, X509Chain chain, SslPolicyErrors sslPolicyErrors)
         {
             if (_options.TlsOptions.CertificateValidationCallback != null)
             {
@@ -218,7 +212,7 @@ namespace MQTTnet.Implementations
             return _options.TlsOptions.AllowUntrustedCertificates;
         }
 
-        private X509CertificateCollection LoadCertificates()
+        X509CertificateCollection LoadCertificates()
         {
             var certificates = new X509CertificateCollection();
             if (_options.TlsOptions.Certificates == null)

Source/MQTTnet/Implementations/PlatformAbstractionLayer.cs

@@ -7,6 +7,7 @@ namespace MQTTnet.Implementations
 {
     public static class PlatformAbstractionLayer
     {
+        // TODO: Consider creating primitives like "MqttNetSocket" which will wrap all required methods and do the platform stuff.
         public static async Task<Socket> AcceptAsync(Socket socket)
         {
 #if NET452 || NET461
@@ -90,7 +91,7 @@ namespace MQTTnet.Implementations
 
         public static Task CompletedTask
         {
-            get 
+            get
             {
 #if NET452 
                 return Task.FromResult(0);

Source/MQTTnet/Internal/Disposable.cs

@@ -2,32 +2,20 @@
 
 namespace MQTTnet.Internal
 {
-    public class Disposable : IDisposable
+    public abstract class Disposable : IDisposable
     {
-        protected bool IsDisposed => _isDisposed;
+        protected bool IsDisposed { get; private set; } = false;
 
         protected void ThrowIfDisposed()
         {
-            if (_isDisposed)
+            if (IsDisposed)
             {
                 throw new ObjectDisposedException(GetType().Name);
             }
         }
 
-
-        #region IDisposable Support
-       
-        private bool _isDisposed = false; // To detect redundant calls
-
         protected virtual void Dispose(bool disposing)
         {
-            if (disposing)
-            {
-                // TODO: dispose managed state (managed objects).
-            }
-
-            // TODO: free unmanaged resources (unmanaged objects) and override a finalizer below.
-            // TODO: set large fields to null.
         }
 
         // TODO: override a finalizer only if Dispose(bool disposing) above has code to free unmanaged resources.
@@ -40,18 +28,17 @@ namespace MQTTnet.Internal
         // This code added to correctly implement the disposable pattern.
         public void Dispose()
         {
-            if (_isDisposed)
+            // Do not change this code. Put cleanup code in Dispose(bool disposing) above.
+
+            if (IsDisposed)
             {
                 return;
             }
 
-            _isDisposed = true;
+            IsDisposed = true;
 
-            // Do not change this code. Put cleanup code in Dispose(bool disposing) above.
             Dispose(true);
-            // TODO: uncomment the following line if the finalizer is overridden above.
-            // GC.SuppressFinalize(this);
+            GC.SuppressFinalize(this);
         }
-        #endregion
     }
 }

Source/MQTTnet/MqttFactory.cs

@@ -93,7 +93,7 @@ namespace MQTTnet
         {
             if (logger == null) throw new ArgumentNullException(nameof(logger));
 
-            return CreateMqttServer(new List<IMqttServerAdapter> { new MqttTcpServerAdapter(logger.CreateChildLogger()) }, logger);
+            return CreateMqttServer(new List<IMqttServerAdapter> { new MqttTcpServerAdapter(logger) }, logger);
         }
 
         public IMqttServer CreateMqttServer(IEnumerable<IMqttServerAdapter> serverAdapters, IMqttNetLogger logger)
@@ -101,14 +101,14 @@ namespace MQTTnet
             if (serverAdapters == null) throw new ArgumentNullException(nameof(serverAdapters));
             if (logger == null) throw new ArgumentNullException(nameof(logger));
 
-            return new MqttServer(serverAdapters, logger.CreateChildLogger());
+            return new MqttServer(serverAdapters, logger);
         }
 
         public IMqttServer CreateMqttServer(IEnumerable<IMqttServerAdapter> serverAdapters)
         {
             if (serverAdapters == null) throw new ArgumentNullException(nameof(serverAdapters));
 
-            return new MqttServer(serverAdapters, DefaultLogger.CreateChildLogger());
+            return new MqttServer(serverAdapters, DefaultLogger);
         }
     }
 }

Source/MQTTnet/PacketDispatcher/MqttPacketAwaiter.cs

@@ -1,9 +1,9 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using MQTTnet.Exceptions;
+using MQTTnet.Exceptions;
 using MQTTnet.Internal;
 using MQTTnet.Packets;
+using System;
+using System.Threading;
+using System.Threading.Tasks;
 
 namespace MQTTnet.PacketDispatcher
 {
@@ -12,7 +12,7 @@ namespace MQTTnet.PacketDispatcher
         private readonly TaskCompletionSource<MqttBasePacket> _taskCompletionSource;
         private readonly ushort? _packetIdentifier;
         private readonly MqttPacketDispatcher _owningPacketDispatcher;
-        
+
         public MqttPacketAwaiter(ushort? packetIdentifier, MqttPacketDispatcher owningPacketDispatcher)
         {
             _packetIdentifier = packetIdentifier;
@@ -87,6 +87,7 @@ namespace MQTTnet.PacketDispatcher
             {
                 _owningPacketDispatcher.RemovePacketAwaiter<TPacket>(_packetIdentifier);
             }
+
             base.Dispose(disposing);
         }
     }

Source/MQTTnet/Server/MqttClientConnection.cs

@@ -437,9 +437,8 @@ namespace MQTTnet.Server
                 {
                     _logger.Warning(exception, "Sending publish packet failed: Communication exception (ClientId: {0}).", ClientId);
                 }
-                else if (exception is OperationCanceledException && _cancellationToken.Token.IsCancellationRequested)
+                else if (exception is OperationCanceledException)
                 {
-                    // The cancellation was triggered externally.
                 }
                 else
                 {

Source/MQTTnet/Server/MqttClientSessionsManager.cs

@@ -1,5 +1,6 @@
 using MQTTnet.Adapter;
 using MQTTnet.Diagnostics;
+using MQTTnet.Exceptions;
 using MQTTnet.Formatter;
 using MQTTnet.Internal;
 using MQTTnet.Packets;
@@ -236,12 +237,23 @@ namespace MQTTnet.Server
             string clientId = null;
             var clientWasConnected = true;
 
+            MqttConnectPacket connectPacket = null;
+
             try
             {
-                var firstPacket = await channelAdapter.ReceivePacketAsync(_options.DefaultCommunicationTimeout, cancellationToken).ConfigureAwait(false);
-                if (!(firstPacket is MqttConnectPacket connectPacket))
+                try
                 {
-                    _logger.Warning(null, "The first packet from client '{0}' was no 'CONNECT' packet [MQTT-3.1.0-1].", channelAdapter.Endpoint);
+                    var firstPacket = await channelAdapter.ReceivePacketAsync(_options.DefaultCommunicationTimeout, cancellationToken).ConfigureAwait(false);
+                    connectPacket = firstPacket as MqttConnectPacket;
+                    if (connectPacket == null)
+                    {
+                        _logger.Warning(null, "The first packet from client '{0}' was no 'CONNECT' packet [MQTT-3.1.0-1].", channelAdapter.Endpoint);
+                        return;
+                    }
+                }
+                catch (MqttCommunicationTimedOutException)
+                {
+                    _logger.Warning(null, "Client '{0}' connected but did not sent a CONNECT packet.", channelAdapter.Endpoint);
                     return;
                 }