Skip to content
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

Align mqtt5 disconnect packet behavior. #107

Merged
merged 1 commit into from
Dec 11, 2024
Merged

Align mqtt5 disconnect packet behavior. #107

Show file tree
Hide file tree
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
16 changes: 10 additions & 6 deletions ...omq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/v5/MQTT5MessageBuilders.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -715,8 +715,8 @@ public DisconnectBuilder serverReference(String serverReference) {
public MqttMessage build() {
MqttFixedHeader fixedHeader =
new MqttFixedHeader(MqttMessageType.DISCONNECT, false, MqttQoS.AT_MOST_ONCE, false, 0);
MQTT5MessageUtils.MqttPropertiesBuilder propsBuilder = MQTT5MessageUtils.mqttProps();
if (!Strings.isNullOrEmpty(reasonString) || userProps != null || !Strings.isNullOrEmpty(serverReference)) {
MQTT5MessageUtils.MqttPropertiesBuilder propsBuilder = MQTT5MessageUtils.mqttProps();
if (!Strings.isNullOrEmpty(reasonString)) {
propsBuilder.addReasonString(reasonString);
}
Expand All @@ -726,12 +726,16 @@ public MqttMessage build() {
if (userProps != null) {
propsBuilder.addUserProperties(userProps);
}
MqttReasonCodeAndPropertiesVariableHeader variableHeader =
new MqttReasonCodeAndPropertiesVariableHeader(reasonCode.value(), propsBuilder.build());
return new MqttMessage(fixedHeader, variableHeader);
}
return new MqttMessage(fixedHeader);

MqttProperties mqttProperties = propsBuilder.build();
if (reasonCode == MQTT5DisconnectReasonCode.Normal && mqttProperties.isEmpty()) {
// The Reason Code and Property Length can be omitted if the Reason Code is 0x00 (Normal disconnection)
// and there are no Properties
return new MqttMessage(fixedHeader);
}
MqttReasonCodeAndPropertiesVariableHeader variableHeader =
new MqttReasonCodeAndPropertiesVariableHeader(reasonCode.value(), mqttProperties);
return new MqttMessage(fixedHeader, variableHeader);
}
}

Expand Down
15 changes: 14 additions & 1 deletion ...bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/utils/MQTT5MessageSizerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,8 +237,21 @@ public void testDisconnect() {
.reasonCode(MQTT5DisconnectReasonCode.Normal)
.build();
verifySize(message);
}

message = MQTT5MessageBuilders.disconnect()
.reasonCode(MQTT5DisconnectReasonCode.Normal)
.reasonString("disconnected")
.build();
verifySize(message);

message = MQTT5MessageBuilders.disconnect()
.reasonCode(MQTT5DisconnectReasonCode.PacketTooLarge)
.reasonString("packet toolarge")
.userProps(UserProperties.newBuilder()
.addUserProperties(StringPair.newBuilder().setKey("key").setValue("val").build()).build())
.build();
verifySize(message);
}

private void verifySize(MqttMessage message) {
IMQTTMessageSizer.MqttMessageSize calcSize = sizer.sizeOf(message);
Expand Down
Loading