YangWX/MQTTnet
1
0
Fork 0
mirror of https://github.com/dotnet/MQTTnet.git synced 2026-10-16 09:13:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1004 from JanEggers/fix#990

Browse Source 
improved behavior when multiple connections fight over a session
This commit is contained in:
Christian
2020-10-14 21:18:36 +02:00
committed by GitHub
parent bea6d75251 2eaebe0e6a
commit 5d73de2a86
5 changed files with 78 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/MQTTnet/Client/MqttClient.cs
+5 -2
View File
@@ -561,12 +561,15 @@ namespace MQTTnet.Client
{
await SendAsync(new MqttPingRespPacket(), cancellationToken).ConfigureAwait(false);
}
else if (packet is MqttDisconnectPacket)
else if (packet is MqttDisconnectPacket disconnectPacket)
{
// Also dispatch disconnect to waiting threads to generate a proper exception.
_packetDispatcher.Dispatch(packet);
await DisconnectAsync(null, cancellationToken).ConfigureAwait(false);
await DisconnectAsync(new MqttClientDisconnectOptions()
{
ReasonCode = (MqttClientDisconnectReason)(disconnectPacket.ReasonCode ?? MqttDisconnectReasonCode.UnspecifiedError)
}, cancellationToken).ConfigureAwait(false);
}
else if (packet is MqttAuthPacket authPacket)
{
Source/MQTTnet/Server/MqttClientConnection.cs
+9
View File
@@ -257,6 +257,15 @@ namespace MQTTnet.Server
Session.WillMessage = null;
}
if (_isTakeover)
{
// dont use SendAsync here _cancellationToken is already cancelled
await _channelAdapter.SendPacketAsync(new MqttDisconnectPacket()
{
ReasonCode = MqttDisconnectReasonCode.SessionTakenOver
}, TimeSpan.Zero, CancellationToken.None).ConfigureAwait(false);
}
_packetDispatcher.Reset();
_channelAdapter.ReadingPacketStartedCallback = null;
Source/MQTTnet/Server/MqttClientSessionsManager.cs
+25 -20
View File
@@ -316,7 +316,11 @@ namespace MQTTnet.Server
{
if (clientId != null)
{
_connections.TryRemove(clientId, out _);
// in case it is a takeover _connections already contains the new connection
if (disconnectType != MqttClientDisconnectType.Takeover)
{
_connections.TryRemove(clientId, out _);
}
if (!_options.EnablePersistentSessions)
{
@@ -364,38 +368,39 @@ namespace MQTTnet.Server
{
using (await _createConnectionGate.WaitAsync(_cancellationToken).ConfigureAwait(false))
{
var isSessionPresent = _sessions.TryGetValue(connectPacket.ClientId, out var session);
var isConnectionPresent = _connections.TryGetValue(connectPacket.ClientId, out var existingConnection);
if (isConnectionPresent)
var session = _sessions.AddOrUpdate(connectPacket.ClientId, key =>
{
await existingConnection.StopAsync(true).ConfigureAwait(false);
}
if (isSessionPresent)
_logger.Verbose("Created a new session for client '{0}'.", key);
return new MqttClientSession(key, connectionValidatorContext.SessionItems, _eventDispatcher, _options, _retainedMessagesManager, _rootLogger);
}, (key, existingSession) =>
{
if (connectPacket.CleanSession)
{
session = null;
_logger.Verbose("Deleting existing session of client '{0}'.", connectPacket.ClientId);
return new MqttClientSession(key, connectionValidatorContext.SessionItems, _eventDispatcher, _options, _retainedMessagesManager, _rootLogger);
}
else
{
_logger.Verbose("Reusing existing session of client '{0}'.", connectPacket.ClientId);
return existingSession;
}
}
if (session == null)
{
session = new MqttClientSession(connectPacket.ClientId, connectionValidatorContext.SessionItems, _eventDispatcher, _options, _retainedMessagesManager, _rootLogger);
_logger.Verbose("Created a new session for client '{0}'.", connectPacket.ClientId);
}
});
var connection = new MqttClientConnection(connectPacket, channelAdapter, session, _options, this, _retainedMessagesManager, onStart, onStop, _rootLogger);
MqttClientConnection existingConnection = null;
_connections.AddOrUpdate(connectPacket.ClientId, key =>
{
return connection;
}, (key, tempExistingConnection) =>
{
existingConnection = tempExistingConnection;
return connection;
});
_connections[connection.ClientId] = connection;
_sessions[session.ClientId] = session;
if (existingConnection != null)
{
await existingConnection.StopAsync(true).ConfigureAwait(false);
}
return connection;
}