use raw buffer for frist connect msg then use buffered stream to read more efficient

This commit is contained in:
Eggers Jan
2017-09-13 09:14:08 +02:00
parent 6c7e70f78a
commit c7c1691d75
9 changed files with 35 additions and 20 deletions
@@ -13,13 +13,15 @@ namespace MQTTnet.Implementations
{
public sealed class MqttTcpChannel : IMqttCommunicationChannel, IDisposable
{
private Stream _receiveStream;
private Stream _rawStream;
private Stream _sendStream;
private Stream _receiveStream;
private Socket _socket;
private SslStream _sslStream;
public Stream ReceiveStream => _receiveStream;
public Stream RawStream => _rawStream;
public Stream SendStream => _sendStream;
public Stream ReceiveStream => _receiveStream;
/// <summary>
/// called on client sockets are created in connect
@@ -92,8 +94,9 @@ namespace MQTTnet.Implementations
private void CreateCommStreams( Socket socket, SslStream sslStream )
{
//cannot use this as default buffering prevents from receiving the first connect message
_receiveStream = (Stream)sslStream ?? new NetworkStream( socket );
_sendStream = new BufferedStream( _receiveStream, BufferConstants.Size );
_rawStream = (Stream)sslStream ?? new NetworkStream( socket );
_sendStream = new BufferedStream( _rawStream, BufferConstants.Size );
_receiveStream = new BufferedStream( _rawStream, BufferConstants.Size );
}
private static X509CertificateCollection LoadCertificates(MqttClientOptions options)
@@ -12,10 +12,11 @@ namespace MQTTnet.Implementations
public sealed class MqttWebSocketChannel : IMqttCommunicationChannel, IDisposable
{
private ClientWebSocket _webSocket = new ClientWebSocket();
public Stream ReceiveStream { get; private set; }
public Stream SendStream { get; private set; }
public Stream RawStream { get; private set; }
public Stream SendStream => RawStream;
public Stream ReceiveStream => RawStream;
public async Task ConnectAsync(MqttClientOptions options)
{
@@ -26,7 +27,7 @@ namespace MQTTnet.Implementations
_webSocket = new ClientWebSocket();
await _webSocket.ConnectAsync(new Uri(options.Server), CancellationToken.None);
ReceiveStream = SendStream = new WebSocketStream(_webSocket);
RawStream = new WebSocketStream(_webSocket);
}
catch (WebSocketException exception)
{
@@ -36,7 +37,7 @@ namespace MQTTnet.Implementations
public Task DisconnectAsync()
{
ReceiveStream = null;
RawStream = null;
return _webSocket.CloseAsync(WebSocketCloseStatus.NormalClosure, string.Empty, CancellationToken.None);
}