YangWX/MQTTnet
1
0
Fork 0
mirror of https://github.com/dotnet/MQTTnet.git synced 2026-10-20 19:58:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Clean Up

Browse Source
This commit is contained in:
IMPAQ\pnow
2017-09-01 11:28:31 +02:00
parent 3a1e32f5aa
commit 4a57d050f6
3 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Frameworks/MQTTnet.NetStandard/Implementations/MqttWebSocketsChannel.cs
+9 -9
View File
@@ -10,12 +10,12 @@ namespace MQTTnet.Implementations
{ {
public sealed class MqttWebSocketsChannel : IMqttCommunicationChannel, IDisposable public sealed class MqttWebSocketsChannel : IMqttCommunicationChannel, IDisposable
{ {
private ClientWebSocket _webSocket = null; private ClientWebSocket _webSocket;
private const int BufferSize = 4096; private const int BufferSize = 4096;
private const int BufferAmplifier = 20; private const int BufferAmplifier = 20;
private byte[] WebSocketBuffer = new byte[BufferSize * BufferAmplifier]; private readonly byte[] WebSocketBuffer = new byte[BufferSize * BufferAmplifier];
private int WebSocketBufferSize = 0; private int WebSocketBufferSize;
private int WebSocketBufferOffset = 0; private int WebSocketBufferOffset;
public MqttWebSocketsChannel() public MqttWebSocketsChannel()
{ {
@@ -36,9 +36,6 @@ namespace MQTTnet.Implementations
{ {
throw new MqttCommunicationException(exception); throw new MqttCommunicationException(exception);
} }
finally
{
}
} }
public async Task DisconnectAsync() public async Task DisconnectAsync()
@@ -49,7 +46,9 @@ namespace MQTTnet.Implementations
public void Dispose() public void Dispose()
{ {
if (_webSocket != null) if (_webSocket != null)
{
_webSocket.Dispose(); _webSocket.Dispose();
}
} }
public Task ReadAsync(byte[] buffer) public Task ReadAsync(byte[] buffer)
@@ -102,9 +101,10 @@ namespace MQTTnet.Implementations
public Task WriteAsync(byte[] buffer) public Task WriteAsync(byte[] buffer)
{ {
if (buffer == null) throw new ArgumentNullException(nameof(buffer)); if (buffer == null) {
throw new ArgumentNullException(nameof(buffer));
}
var writeBuffer = System.Text.Encoding.ASCII.GetString(buffer);
try try
{ {
return _webSocket.SendAsync(new ArraySegment<byte>(buffer), WebSocketMessageType.Binary, true, return _webSocket.SendAsync(new ArraySegment<byte>(buffer), WebSocketMessageType.Binary, true,
Frameworks/MQTTnet.NetStandard/MqttClientFactory.cs
+4 -2
View File
@@ -11,12 +11,14 @@ namespace MQTTnet
{ {
public IMqttClient CreateMqttClient(MqttClientOptions options) public IMqttClient CreateMqttClient(MqttClientOptions options)
{ {
if (options == null) throw new ArgumentNullException(nameof(options)); if (options == null) {
throw new ArgumentNullException(nameof(options));
}
return new MqttClient(options, new MqttChannelCommunicationAdapter(GetMqttCommunicationChannel(options), new MqttPacketSerializer())); return new MqttClient(options, new MqttChannelCommunicationAdapter(GetMqttCommunicationChannel(options), new MqttPacketSerializer()));
} }
private IMqttCommunicationChannel GetMqttCommunicationChannel(MqttClientOptions options) private static IMqttCommunicationChannel GetMqttCommunicationChannel(MqttClientOptions options)
{ {
switch (options.ConnectionType) switch (options.ConnectionType)
{ {
MQTTnet.TestApp.NetCore/Program.cs
+1 -1
View File
@@ -12,7 +12,7 @@ using System.Threading.Tasks;
namespace MQTTnet.TestApp.NetCore namespace MQTTnet.TestApp.NetCore
{ {
class Program public static class Program
{ {
public static void Main(string[] args) public static void Main(string[] args)
{ {