Skip to content

Send disconnect even without mqtt reset extension #689

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jfallows merged 1 commit into from
Jan 2, 2024
Merged

Send disconnect even without mqtt reset extension #689

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 20 additions & 14 deletions ...c/main/java/io/aklivity/zilla/runtime/binding/mqtt/internal/stream/MqttServerFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4922,29 +4922,35 @@ private void onSessionReset(
final OctetsFW extension = reset.extension();
final MqttResetExFW mqttResetEx = extension.get(mqttResetExRO::tryWrap);

byte reasonCode = SESSION_TAKEN_OVER;
boolean serverRefExists = false;
String16FW serverRef = null;
String16FW reason = null;

if (mqttResetEx != null)
{
String16FW serverRef = mqttResetEx.serverRef();
byte reasonCode = (byte) mqttResetEx.reasonCode();
String16FW reason = mqttResetEx.reason();
boolean serverRefExists = serverRef != null && serverRef.asString() != null;
serverRef = mqttResetEx.serverRef();
reasonCode = (byte) mqttResetEx.reasonCode();
reason = mqttResetEx.reason();
serverRefExists = serverRef != null && serverRef.asString() != null;

if (reasonCode == SUCCESS)
{
reasonCode = serverRefExists ? SERVER_MOVED : SESSION_TAKEN_OVER;
}
}

if (!connected)
{
doCancelConnectTimeout();
doEncodeConnack(traceId, authorization, reasonCode, assignedClientId,
false, serverRefExists ? serverRef : null, reason, version);
}
else if (version == MQTT_PROTOCOL_VERSION_5)
{
doEncodeDisconnect(traceId, authorization, reasonCode, serverRefExists ? serverRef : null, reason);
}
if (!connected)
{
doCancelConnectTimeout();
doEncodeConnack(traceId, authorization, reasonCode, assignedClientId,
false, serverRefExists ? serverRef : null, reason, version);
}
else if (version == MQTT_PROTOCOL_VERSION_5)
{
doEncodeDisconnect(traceId, authorization, reasonCode, serverRefExists ? serverRef : null, reason);
}

doNetworkEnd(traceId, authorization);
setInitialClosed();
decodeNetwork(traceId);
Expand Down