Fix breaking changes.

MQTTnet.Core/Server/DefaultEndpointOptions.cs

@@ -0,0 +1,9 @@
+namespace MQTTnet.Core.Server
+{
+    public sealed class DefaultEndpointOptions
+    {
+        public bool IsEnabled { get; set; } = true;
+
+        public int? Port { get; set; }
+    }
+}

MQTTnet.Core/Server/GetOrCreateClientSessionResult.cs

@@ -1,6 +1,6 @@
 namespace MQTTnet.Core.Server
 {
-    public class GetOrCreateClientSessionResult
+    public sealed class GetOrCreateClientSessionResult
     {
         public bool IsExistingSession { get; set; }
 

MQTTnet.Core/Server/MqttClientMessageQueue.cs

@@ -11,7 +11,7 @@ using MQTTnet.Core.Packets;
 
 namespace MQTTnet.Core.Server
 {
-    public class MqttClientMessageQueue
+    public sealed class MqttClientMessageQueue
     {
         private readonly List<MqttClientPublishPacketContext> _pendingPublishPackets = new List<MqttClientPublishPacketContext>();
         private readonly AsyncGate _gate = new AsyncGate();

MQTTnet.Core/Server/MqttClientPublishPacketContext.cs

@@ -3,7 +3,7 @@ using MQTTnet.Core.Packets;
 
 namespace MQTTnet.Core.Server
 {
-    public class MqttClientPublishPacketContext
+    public sealed class MqttClientPublishPacketContext
     {
         public MqttClientPublishPacketContext(MqttClientSession senderClientSession, MqttPublishPacket publishPacket)
         {

MQTTnet.Core/Server/MqttClientSessionsManager.cs

@@ -10,7 +10,7 @@ using MQTTnet.Core.Protocol;
 
 namespace MQTTnet.Core.Server
 {
-    public class MqttClientSessionsManager
+    public sealed class MqttClientSessionsManager
     {
         private readonly object _syncRoot = new object();
         private readonly Dictionary<string, MqttClientSession> _clientSessions = new Dictionary<string, MqttClientSession>();

MQTTnet.Core/Server/MqttClientSubscriptionsManager.cs

@@ -5,7 +5,7 @@ using MQTTnet.Core.Protocol;
 
 namespace MQTTnet.Core.Server
 {
-    public class MqttClientSubscriptionsManager
+    public sealed class MqttClientSubscriptionsManager
     {
         private readonly ConcurrentDictionary<string, MqttQualityOfServiceLevel> _subscribedTopics = new ConcurrentDictionary<string, MqttQualityOfServiceLevel>();
 

MQTTnet.Core/Server/MqttServer.cs

@@ -7,18 +7,18 @@ using MQTTnet.Core.Diagnostics;
 
 namespace MQTTnet.Core.Server
 {
-    public class MqttServer
+    public sealed class MqttServer
     {
         private readonly MqttClientSessionsManager _clientSessionsManager;
-        private readonly IMqttServerAdapter _adapter;
+        private readonly ICollection<IMqttServerAdapter> _adapters;
         private readonly MqttServerOptions _options;
 
         private CancellationTokenSource _cancellationTokenSource;
 
-        public MqttServer(MqttServerOptions options, IMqttServerAdapter adapter)
+        public MqttServer(MqttServerOptions options, ICollection<IMqttServerAdapter> adapters)
         {
             _options = options ?? throw new ArgumentNullException(nameof(options));
-            _adapter = adapter ?? throw new ArgumentNullException(nameof(adapter));
+            _adapters = adapters ?? throw new ArgumentNullException(nameof(adapters));
             
             _clientSessionsManager = new MqttClientSessionsManager(options);
         }
@@ -45,9 +45,12 @@ namespace MQTTnet.Core.Server
 
             _cancellationTokenSource = new CancellationTokenSource();
 
-            _adapter.ClientConnected += OnClientConnected;
-            _adapter.Start(_options);
-
+            foreach (var adapter in _adapters)
+            {
+                adapter.ClientConnected += OnClientConnected;
+                adapter.Start(_options);
+            }
+            
             MqttTrace.Information(nameof(MqttServer), "Started.");
         }
 
@@ -56,8 +59,11 @@ namespace MQTTnet.Core.Server
             _cancellationTokenSource?.Cancel();
             _cancellationTokenSource = null;
 
-            _adapter.ClientConnected -= OnClientConnected;
-            _adapter.Stop();
+            foreach (var adapter in _adapters)
+            {
+                adapter.ClientConnected -= OnClientConnected;
+                adapter.Stop();
+            }
 
             _clientSessionsManager.Clear();
 

MQTTnet.Core/Server/MqttServerOptions.cs

@@ -4,21 +4,16 @@ using MQTTnet.Core.Protocol;
 
 namespace MQTTnet.Core.Server
 {
-    public class MqttServerOptions
+    public sealed class MqttServerOptions
     {
-        public int Port { get; set; } = 1883;
+        public DefaultEndpointOptions DefaultEndpointOptions { get; } = new DefaultEndpointOptions();
 
+        public SslEndpointOptions SslEndpointOptions { get; } = new SslEndpointOptions();
+        
         public int ConnectionBacklog { get; set; } = 10;
 
         public TimeSpan DefaultCommunicationTimeout { get; set; } = TimeSpan.FromSeconds(10);
 
         public Func<MqttConnectPacket, MqttConnectReturnCode> ConnectionValidator { get; set; }
-
-        public bool UseSSL = false;
-
-        /// <summary>
-        /// The path to the X509 SSL certificate.
-        /// </summary>
-        public string CertificatePath = string.Empty;
     }
 }

MQTTnet.Core/Server/MqttServerOptionsExtensions.cs

@@ -0,0 +1,31 @@
+using System;
+
+namespace MQTTnet.Core.Server
+{
+    public static class MqttServerOptionsExtensions
+    {
+        public static int GetSslEndpointPort(this MqttServerOptions options)
+        {
+            if (options == null) throw new ArgumentNullException(nameof(options));
+
+            if (!options.SslEndpointOptions.Port.HasValue)
+            {
+                return 8883;
+            }
+
+            return options.SslEndpointOptions.Port.Value;
+        }
+
+        public static int GetDefaultEndpointPort(this MqttServerOptions options)
+        {
+            if (options == null) throw new ArgumentNullException(nameof(options));
+
+            if (!options.DefaultEndpointOptions.Port.HasValue)
+            {
+                return 1883;
+            }
+
+            return options.DefaultEndpointOptions.Port.Value;
+        }
+    }
+}

MQTTnet.Core/Server/SslEndpointOptions.cs

@@ -0,0 +1,11 @@
+namespace MQTTnet.Core.Server
+{
+    public sealed class SslEndpointOptions
+    {
+        public bool IsEnabled { get; set; }
+
+        public int? Port { get; set; }
+
+        public byte[] Certificate { get; set; }
+    }
+}

MQTTnet.Core/Server/SslEndpointOptionsExtensions.cs

@@ -0,0 +1,19 @@
+using System;
+
+namespace MQTTnet.Core.Server
+{
+    public static class SslEndpointOptionsExtensions
+    {
+        public static int GetPort(this DefaultEndpointOptions options)
+        {
+            if (options == null) throw new ArgumentNullException(nameof(options));
+
+            if (!options.Port.HasValue)
+            {
+                return 1883;
+            }
+
+            return options.Port.Value;
+        }
+    }
+}