Merge branch 'develop'

dotnet · Jun 28, 2019 · 1847af1 · 1847af1
2 parents f66da92 + 8916df8
commit 1847af1
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 4 deletions.
diff --git a/Build/MQTTnet.nuspec b/Build/MQTTnet.nuspec
@@ -11,8 +11,7 @@
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>MQTTnet is a high performance .NET library for MQTT based communication. It provides a MQTT client and a MQTT server (broker) and supports v3.1.0, v3.1.1 and v5.0.0 of the MQTT protocol.</description>
     <releaseNotes>
-* [Core] Fixed wrong versions in nuget packages.
-* [Server] The TCP address is now reused when starting which should prevent "port in used" error when restarting.
+* [Server] Moved new socket options to TCP options to avoid incompatibility with Linux hosts.
     </releaseNotes>
     <copyright>Copyright Christian Kratky 2016-2019</copyright>
     <tags>MQTT Message Queue Telemetry Transport MQTTClient MQTTServer Server MQTTBroker Broker NETStandard IoT InternetOfThings Messaging Hardware Arduino Sensor Actuator M2M ESP Smart Home Cities Automation Xamarin</tags> 

diff --git a/Source/MQTTnet/Implementations/MqttTcpServerListener.cs b/Source/MQTTnet/Implementations/MqttTcpServerListener.cs
@@ -60,8 +60,17 @@ public bool Start(bool treatErrorsAsWarning, CancellationToken cancellationToken
                 _logger.Info($"Starting TCP listener for {_localEndPoint} TLS={_tlsCertificate != null}.");
 
                 _socket = new Socket(_addressFamily, SocketType.Stream, ProtocolType.Tcp);
-                _socket.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.ReuseAddress, true);
-                _socket.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.NoDelay, true);
+
+                if (_options.ReuseAddress)
+                {
+                    _socket.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.ReuseAddress, true);
+                }
+
+                if (_options.NoDelay)
+                {
+                    _socket.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.NoDelay, true);
+                }
+
                 _socket.Bind(_localEndPoint);
                 _socket.Listen(_options.ConnectionBacklog);
 

diff --git a/Source/MQTTnet/Server/MqttServerTcpEndpointBaseOptions.cs b/Source/MQTTnet/Server/MqttServerTcpEndpointBaseOptions.cs
@@ -19,5 +19,10 @@ public abstract class MqttServerTcpEndpointBaseOptions
         public IPAddress BoundInterNetworkAddress { get; set; } = IPAddress.Any;
 
         public IPAddress BoundInterNetworkV6Address { get; set; } = IPAddress.IPv6Any;
+
+        /// <summary>
+        /// This requires admin permissions on Linux.
+        /// </summary>
+        public bool ReuseAddress { get; set; }
     }
 }