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

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
Christian Kratky
2020-01-25 23:34:53 +01:00
parent 49c5278ba0 8ae318fd5c
commit 4d27f42e72
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/MQTTnet/Adapter/MqttConnectingFailedException.cs
+5 -4
View File
@@ -5,12 +5,13 @@ namespace MQTTnet.Adapter
{ {
public class MqttConnectingFailedException : MqttCommunicationException public class MqttConnectingFailedException : MqttCommunicationException
{ {
public MqttConnectingFailedException(MqttClientConnectResultCode resultCode) public MqttConnectingFailedException(MqttClientAuthenticateResult result)
: base($"Connecting with MQTT server failed ({resultCode.ToString()}).") : base($"Connecting with MQTT server failed ({result.ResultCode.ToString()}).")
{ {
ResultCode = resultCode; Result = result;
} }
public MqttClientConnectResultCode ResultCode { get; } public MqttClientAuthenticateResult Result { get; }
public MqttClientConnectResultCode ResultCode => Result.ResultCode;
} }
} }
Source/MQTTnet/Client/MqttClient.cs
+1 -1
View File
@@ -255,7 +255,7 @@ namespace MQTTnet.Client
if (result.ResultCode != MqttClientConnectResultCode.Success) if (result.ResultCode != MqttClientConnectResultCode.Success)
{ {
throw new MqttConnectingFailedException(result.ResultCode); throw new MqttConnectingFailedException(result);
} }
_logger.Verbose("Authenticated MQTT connection with server established."); _logger.Verbose("Authenticated MQTT connection with server established.");
Source/MQTTnet/Formatter/V5/MqttV500DataConverter.cs
+1 -1
View File
@@ -139,7 +139,7 @@ namespace MQTTnet.Formatter.V5
ReasonCode = connectionValidatorContext.ReasonCode, ReasonCode = connectionValidatorContext.ReasonCode,
Properties = new MqttConnAckPacketProperties Properties = new MqttConnAckPacketProperties
{ {
UserProperties = connectionValidatorContext.UserProperties, UserProperties = connectionValidatorContext.ResponseUserProperties,
AuthenticationMethod = connectionValidatorContext.AuthenticationMethod, AuthenticationMethod = connectionValidatorContext.AuthenticationMethod,
AuthenticationData = connectionValidatorContext.ResponseAuthenticationData, AuthenticationData = connectionValidatorContext.ResponseAuthenticationData,
AssignedClientIdentifier = connectionValidatorContext.AssignedClientIdentifier, AssignedClientIdentifier = connectionValidatorContext.AssignedClientIdentifier,