Browse Source

Some more cleaning up:

release/3.x.x
Lucas Rosa 5 years ago
parent
commit
4105beb7e6
4 changed files with 4 additions and 9 deletions
  1. +0
    -1
      Source/MQTTnet/Server/MqttClientConnection.cs
  2. +3
    -6
      Source/MQTTnet/Server/MqttClientSessionsManager.cs
  3. +1
    -1
      Source/MQTTnet/Server/MqttClientSubscriptionsManager.cs
  4. +0
    -1
      Source/MQTTnet/Server/MqttServerEventDispatcher.cs

+ 0
- 1
Source/MQTTnet/Server/MqttClientConnection.cs View File

@@ -12,7 +12,6 @@ using MQTTnet.PacketDispatcher;
using MQTTnet.Packets; using MQTTnet.Packets;
using MQTTnet.Protocol; using MQTTnet.Protocol;
using MQTTnet.Server.Status; using MQTTnet.Server.Status;
using static MQTTnet.Server.MqttClientSessionsManager;


namespace MQTTnet.Server namespace MQTTnet.Server
{ {


+ 3
- 6
Source/MQTTnet/Server/MqttClientSessionsManager.cs View File

@@ -1,7 +1,6 @@
using System; using System;
using System.Collections.Concurrent; using System.Collections.Concurrent;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using MQTTnet.Adapter; using MQTTnet.Adapter;
@@ -231,8 +230,7 @@ namespace MQTTnet.Server
{ {
var disconnectType = MqttClientDisconnectType.NotClean; var disconnectType = MqttClientDisconnectType.NotClean;
string clientId = null; string clientId = null;

var ok = true;
var clientWasConnected = true;


try try
{ {
@@ -249,7 +247,7 @@ namespace MQTTnet.Server


if (connectionValidatorContext.ReasonCode != MqttConnectReasonCode.Success) if (connectionValidatorContext.ReasonCode != MqttConnectReasonCode.Success)
{ {
ok = false;
clientWasConnected = false;
// Send failure response here without preparing a session. The result for a successful connect // Send failure response here without preparing a session. The result for a successful connect
// will be sent from the session itself. // will be sent from the session itself.
var connAckPacket = channelAdapter.PacketFormatterAdapter.DataConverter.CreateConnAckPacket(connectionValidatorContext); var connAckPacket = channelAdapter.PacketFormatterAdapter.DataConverter.CreateConnAckPacket(connectionValidatorContext);
@@ -263,7 +261,6 @@ namespace MQTTnet.Server
await _eventDispatcher.HandleClientConnectedAsync(clientId).ConfigureAwait(false); await _eventDispatcher.HandleClientConnectedAsync(clientId).ConfigureAwait(false);
disconnectType = await connection.RunAsync().ConfigureAwait(false); disconnectType = await connection.RunAsync().ConfigureAwait(false);

} }
catch (OperationCanceledException) catch (OperationCanceledException)
{ {
@@ -274,7 +271,7 @@ namespace MQTTnet.Server
} }
finally finally
{ {
if (ok)
if (clientWasConnected)
{ {
if (clientId != null) if (clientId != null)
{ {


+ 1
- 1
Source/MQTTnet/Server/MqttClientSubscriptionsManager.cs View File

@@ -4,7 +4,6 @@ using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
using MQTTnet.Packets; using MQTTnet.Packets;
using MQTTnet.Protocol; using MQTTnet.Protocol;
using static MQTTnet.Server.MqttClientSessionsManager;


namespace MQTTnet.Server namespace MQTTnet.Server
{ {
@@ -158,6 +157,7 @@ namespace MQTTnet.Server
{ {
continue; continue;
} }

qosLevels.Add(subscription.Value.QualityOfServiceLevel); qosLevels.Add(subscription.Value.QualityOfServiceLevel);
} }
} }


+ 0
- 1
Source/MQTTnet/Server/MqttServerEventDispatcher.cs View File

@@ -2,7 +2,6 @@
using System.Threading.Tasks; using System.Threading.Tasks;
using MQTTnet.Client.Receiving; using MQTTnet.Client.Receiving;
using MQTTnet.Diagnostics; using MQTTnet.Diagnostics;
using static MQTTnet.Server.MqttClientSessionsManager;


namespace MQTTnet.Server namespace MQTTnet.Server
{ {


Loading…
Cancel
Save