@@ -1,6 +1,7 @@ | |||
using System; | |||
using System.Collections.Generic; | |||
using System.IO; | |||
using System.Linq; | |||
using System.Net.Sockets; | |||
using System.Runtime.InteropServices; | |||
using System.Threading; | |||
@@ -55,52 +56,41 @@ namespace MQTTnet.Adapter | |||
return ExecuteAndWrapExceptionAsync(async () => | |||
{ | |||
await _semaphore.WaitAsync(cancellationToken).ConfigureAwait(false); | |||
try | |||
foreach (var packet in packets) | |||
{ | |||
foreach (var packet in packets) | |||
{ | |||
if (cancellationToken.IsCancellationRequested) | |||
{ | |||
return; | |||
} | |||
if (packet == null) | |||
{ | |||
continue; | |||
} | |||
_logger.Verbose<MqttChannelAdapter>("TX >>> {0} [Timeout={1}]", packet, timeout); | |||
var chunks = PacketSerializer.Serialize(packet); | |||
foreach (var chunk in chunks) | |||
{ | |||
if (cancellationToken.IsCancellationRequested) | |||
{ | |||
return; | |||
} | |||
await _channel.SendStream.WriteAsync(chunk.Array, chunk.Offset, chunk.Count, cancellationToken).ConfigureAwait(false); | |||
} | |||
} | |||
if (cancellationToken.IsCancellationRequested) | |||
{ | |||
return; | |||
} | |||
if (timeout > TimeSpan.Zero) | |||
if (packet == null) | |||
{ | |||
await _channel.SendStream.FlushAsync(cancellationToken).TimeoutAfter(timeout).ConfigureAwait(false); | |||
continue; | |||
} | |||
else | |||
_logger.Verbose<MqttChannelAdapter>("TX >>> {0} [Timeout={1}]", packet, timeout); | |||
var packetData = PacketSerializer.Serialize(packet); | |||
if (cancellationToken.IsCancellationRequested) | |||
{ | |||
await _channel.SendStream.FlushAsync(cancellationToken).ConfigureAwait(false); | |||
return; | |||
} | |||
await _channel.SendStream.WriteAsync(packetData.Array, packetData.Offset, (int)packetData.Count, cancellationToken).ConfigureAwait(false); | |||
} | |||
finally | |||
if (cancellationToken.IsCancellationRequested) | |||
{ | |||
return; | |||
} | |||
if (timeout > TimeSpan.Zero) | |||
{ | |||
await _channel.SendStream.FlushAsync(cancellationToken).TimeoutAfter(timeout).ConfigureAwait(false); | |||
} | |||
else | |||
{ | |||
_semaphore.Release(); | |||
await _channel.SendStream.FlushAsync(cancellationToken).ConfigureAwait(false); | |||
} | |||
}); | |||
} | |||
@@ -60,6 +60,7 @@ namespace MQTTnet.Implementations | |||
if (_socket == null) | |||
{ | |||
_socket = new Socket(SocketType.Stream, ProtocolType.Tcp); | |||
} | |||
#if NET452 || NET461 | |||
@@ -68,6 +69,8 @@ namespace MQTTnet.Implementations | |||
await _socket.ConnectAsync(_options.Server, _options.GetPort()).ConfigureAwait(false); | |||
#endif | |||
_socket.NoDelay = true; | |||
if (_options.TlsOptions.UseTls) | |||
{ | |||
_sslStream = new SslStream(new NetworkStream(_socket, true), false, InternalUserCertificateValidationCallback); | |||
@@ -39,6 +39,8 @@ namespace MQTTnet.Implementations | |||
if (options.DefaultEndpointOptions.IsEnabled) | |||
{ | |||
_defaultEndpointSocket = new Socket(SocketType.Stream, ProtocolType.Tcp); | |||
_defaultEndpointSocket.NoDelay = true; | |||
_defaultEndpointSocket.Bind(new IPEndPoint(options.DefaultEndpointOptions.BoundIPAddress, options.GetDefaultEndpointPort())); | |||
_defaultEndpointSocket.Listen(options.ConnectionBacklog); | |||
@@ -102,7 +104,7 @@ namespace MQTTnet.Implementations | |||
#else | |||
var clientSocket = await _defaultEndpointSocket.AcceptAsync().ConfigureAwait(false); | |||
#endif | |||
clientSocket.NoDelay=true; | |||
var clientAdapter = new MqttChannelAdapter(new MqttTcpChannel(clientSocket, null), new MqttPacketSerializer(), _logger); | |||
ClientAccepted?.Invoke(this, new MqttServerAdapterClientAcceptedEventArgs(clientAdapter)); | |||
} | |||
@@ -9,7 +9,7 @@ namespace MQTTnet.Serializer | |||
{ | |||
MqttProtocolVersion ProtocolVersion { get; set; } | |||
ICollection<ArraySegment<byte>> Serialize(MqttBasePacket mqttPacket); | |||
ArraySegment<byte> Serialize(MqttBasePacket mqttPacket); | |||
MqttBasePacket Deserialize(MqttPacketHeader header, MemoryStream body); | |||
} |
@@ -16,29 +16,36 @@ namespace MQTTnet.Serializer | |||
public MqttProtocolVersion ProtocolVersion { get; set; } = MqttProtocolVersion.V311; | |||
public ICollection<ArraySegment<byte>> Serialize(MqttBasePacket packet) | |||
public ArraySegment<byte> Serialize(MqttBasePacket packet) | |||
{ | |||
if (packet == null) throw new ArgumentNullException(nameof(packet)); | |||
using (var stream = new MemoryStream(128)) | |||
using (var writer = new MqttPacketWriter(stream)) | |||
{ | |||
//leave enough head space for max header (fixed + 4 variable remaining lenght) | |||
stream.Position = 5; | |||
var fixedHeader = SerializePacket(packet, writer); | |||
var remainingLength = (int)stream.Length; | |||
writer.Write(fixedHeader); | |||
MqttPacketWriter.WriteRemainingLength(remainingLength, writer); | |||
var headerLength = (int)stream.Length - remainingLength; | |||
var remainingLength = MqttPacketWriter.GetRemainingLength((int)stream.Length-5); | |||
var headerSize = remainingLength.Length + 1; | |||
var headerOffset = 5 - headerSize; | |||
//position curson on correct offset on beginining of array | |||
stream.Position = headerOffset; | |||
//write header | |||
writer.Write(fixedHeader); | |||
writer.Write(remainingLength,0,remainingLength.Length); | |||
#if NET461 || NET452 || NETSTANDARD2_0 | |||
var buffer = stream.GetBuffer(); | |||
#else | |||
var buffer = stream.ToArray(); | |||
#endif | |||
return new List<ArraySegment<byte>> | |||
{ | |||
new ArraySegment<byte>(buffer, remainingLength, headerLength), | |||
new ArraySegment<byte>(buffer, 0, remainingLength) | |||
}; | |||
return new ArraySegment<byte>(buffer, headerOffset, (int)stream.Length- headerOffset); | |||
} | |||
} | |||
@@ -1,5 +1,6 @@ | |||
using System; | |||
using System.IO; | |||
using System.Linq; | |||
using System.Text; | |||
using MQTTnet.Protocol; | |||
@@ -55,14 +56,16 @@ namespace MQTTnet.Serializer | |||
Write(value); | |||
} | |||
public static void WriteRemainingLength(int length, BinaryWriter target) | |||
public static byte[] GetRemainingLength(int length) | |||
{ | |||
if (length == 0) | |||
{ | |||
target.Write((byte)0); | |||
return; | |||
return new byte[] { (byte)0 }; | |||
} | |||
var bytes = new byte[4]; | |||
int arraySize = 0; | |||
// Alorithm taken from http://docs.oasis-open.org/mqtt/mqtt/v3.1.1/os/mqtt-v3.1.1-os.html. | |||
var x = length; | |||
do | |||
@@ -74,8 +77,12 @@ namespace MQTTnet.Serializer | |||
encodedByte = encodedByte | 128; | |||
} | |||
target.Write((byte)encodedByte); | |||
bytes[arraySize] = (byte)encodedByte; | |||
arraySize++; | |||
} while (x > 0); | |||
return bytes.Take(arraySize).ToArray(); | |||
} | |||
} | |||
} |