Merge pull request #1 from chkr1011/develop

Develop

Source/MQTTnet/Implementations/MqttTcpChannel.Uwp.cs

@@ -40,7 +40,18 @@ namespace MQTTnet.Implementations
 
         public static Func<MqttClientTcpOptions, IEnumerable<ChainValidationResult>> CustomIgnorableServerCertificateErrorsResolver { get; set; }
 
-        public string Endpoint => _socket?.Information?.RemoteAddress?.ToString(); // TODO: Check if contains also the port.
+        public string Endpoint
+        {
+            get
+            {
+                if (_socket?.Information != null)
+                {
+                    return _socket.Information.RemoteAddress + ":" + _socket.Information.RemotePort;
+                }
+
+                return null;
+            }
+        }
 
         public async Task ConnectAsync(CancellationToken cancellationToken)
         {
@@ -81,10 +92,13 @@ namespace MQTTnet.Implementations
             return _readStream.ReadAsync(buffer, offset, count, cancellationToken);
         }
 
-        public async Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken)
+        public Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken)
         {
-            await _writeStream.WriteAsync(buffer, offset, count, cancellationToken);
-            await _writeStream.FlushAsync(cancellationToken);
+            // In the write method only the internal buffer will be filled. So here is no
+            // async/await required. The real network transmit is done when calling the
+            // Flush method.
+            _writeStream.Write(buffer, offset, count);
+            return _writeStream.FlushAsync(cancellationToken);
         }
 
         public void Dispose()

Source/MQTTnet/Implementations/MqttTcpChannel.cs

@@ -1,4 +1,4 @@
-#if NET452 || NET461 || NETSTANDARD1_3 || NETSTANDARD2_0
+#if !WINDOWS_UWP
 using System;
 using System.Net.Security;
 using System.Net.Sockets;

Source/MQTTnet/Implementations/MqttTcpServerAdapter.cs

@@ -1,4 +1,4 @@
-#if NET452 || NET461 || NETSTANDARD1_3 || NETSTANDARD2_0
+#if !WINDOWS_UWP
 using System;
 using System.Collections.Generic;
 using System.Net.Sockets;

Source/MQTTnet/Implementations/MqttTcpServerListener.cs

@@ -1,4 +1,4 @@
-#if NET452 || NET461 || NETSTANDARD1_3 || NETSTANDARD2_0
+#if !WINDOWS_UWP
 using System;
 using System.Net;
 using System.Net.Security;
@@ -78,7 +78,8 @@ namespace MQTTnet.Implementations
                         await sslStream.AuthenticateAsServerAsync(_tlsCertificate, false, SslProtocols.Tls12, false).ConfigureAwait(false);
                     }
 
-                    _logger.Verbose($"Client '{clientSocket.RemoteEndPoint}' accepted by TCP listener '{_socket.LocalEndPoint}, {_addressFamily}'.");
+                    var protocol = _addressFamily == AddressFamily.InterNetwork ? "ipv4" : "ipv6";
+                    _logger.Verbose($"Client '{clientSocket.RemoteEndPoint}' accepted by TCP listener '{_socket.LocalEndPoint}, {protocol}'.");
 
                     var clientAdapter = new MqttChannelAdapter(new MqttTcpChannel(clientSocket, sslStream), new MqttPacketSerializer(), _logger);
                     ClientAccepted?.Invoke(this, new MqttServerAdapterClientAcceptedEventArgs(clientAdapter));
@@ -104,7 +105,7 @@ namespace MQTTnet.Implementations
         {
             _socket?.Dispose();
 
-#if NETSTANDARD1_3 || NETSTANDARD2_0 || NET461
+#if NETSTANDARD1_3 || NETSTANDARD2_0 || NET461 || NET472
             _tlsCertificate?.Dispose();
 #endif
         }