diff --git a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/ConnAckDecoder.java b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/ConnAckDecoder.java index 6100e70a..2775585f 100644 --- a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/ConnAckDecoder.java +++ b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/ConnAckDecoder.java @@ -16,7 +16,7 @@ class ConnAckDecoder extends DemuxDecoder { in.resetReaderIndex(); //Common decoding part ConnAckMessage message = new ConnAckMessage(); - if (!decodeCommonHeader(message, in)) { + if (!decodeCommonHeader(message, 0x00, in)) { in.resetReaderIndex(); return; } diff --git a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/ConnectDecoder.java b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/ConnectDecoder.java index e296270c..bc7760dc 100644 --- a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/ConnectDecoder.java +++ b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/ConnectDecoder.java @@ -46,7 +46,7 @@ public class ConnectDecoder extends DemuxDecoder { in.resetReaderIndex(); //Common decoding part ConnectMessage message = new ConnectMessage(); - if (!decodeCommonHeader(message, in)) { + if (!decodeCommonHeader(message, 0x00, in)) { in.resetReaderIndex(); return; } diff --git a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/DisconnectDecoder.java b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/DisconnectDecoder.java index 63cca6f6..8bf8cd9f 100644 --- a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/DisconnectDecoder.java +++ b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/DisconnectDecoder.java @@ -31,7 +31,7 @@ class DisconnectDecoder extends DemuxDecoder { //Common decoding part in.resetReaderIndex(); DisconnectMessage message = new DisconnectMessage(); - if (!decodeCommonHeader(message, in)) { + if (!decodeCommonHeader(message, 0x00, in)) { in.resetReaderIndex(); return; } diff --git a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/MessageIDDecoder.java b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/MessageIDDecoder.java index 55cd8134..650f1f53 100644 --- a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/MessageIDDecoder.java +++ b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/MessageIDDecoder.java @@ -33,7 +33,7 @@ abstract class MessageIDDecoder extends DemuxDecoder { in.resetReaderIndex(); //Common decoding part MessageIDMessage message = createMessage(); - if (!decodeCommonHeader(message, in)) { + if (!decodeCommonHeader(message, 0x00, in)) { in.resetReaderIndex(); return; } diff --git a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PingReqDecoder.java b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PingReqDecoder.java index 2e2c7789..ddb1c4ab 100644 --- a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PingReqDecoder.java +++ b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PingReqDecoder.java @@ -31,7 +31,7 @@ class PingReqDecoder extends DemuxDecoder { //Common decoding part in.resetReaderIndex(); PingReqMessage message = new PingReqMessage(); - if (!decodeCommonHeader(message, in)) { + if (!decodeCommonHeader(message, 0x00, in)) { in.resetReaderIndex(); return; } diff --git a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PingRespDecoder.java b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PingRespDecoder.java index 025a6901..54b6cf74 100644 --- a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PingRespDecoder.java +++ b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PingRespDecoder.java @@ -31,7 +31,7 @@ class PingRespDecoder extends DemuxDecoder { //Common decoding part in.resetReaderIndex(); PingRespMessage message = new PingRespMessage(); - if (!decodeCommonHeader(message, in)) { + if (!decodeCommonHeader(message, 0x00, in)) { in.resetReaderIndex(); return; } diff --git a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PubRelDecoder.java b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PubRelDecoder.java index 10b53341..509c6fd7 100644 --- a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PubRelDecoder.java +++ b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PubRelDecoder.java @@ -17,7 +17,6 @@ package org.dna.mqtt.moquette.parser.netty; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; -import io.netty.handler.codec.CorruptedFrameException; import io.netty.util.AttributeMap; import java.io.UnsupportedEncodingException; import java.util.List; diff --git a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/SubAckDecoder.java b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/SubAckDecoder.java index b0d89595..d2f4c5cf 100644 --- a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/SubAckDecoder.java +++ b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/SubAckDecoder.java @@ -32,7 +32,7 @@ class SubAckDecoder extends DemuxDecoder { //Common decoding part in.resetReaderIndex(); SubAckMessage message = new SubAckMessage(); - if (!decodeCommonHeader(message, in)) { + if (!decodeCommonHeader(message, 0x00, in)) { in.resetReaderIndex(); return; } diff --git a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/SubscribeDecoder.java b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/SubscribeDecoder.java index 034d856d..0830d43b 100644 --- a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/SubscribeDecoder.java +++ b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/SubscribeDecoder.java @@ -34,11 +34,10 @@ class SubscribeDecoder extends DemuxDecoder { //Common decoding part SubscribeMessage message = new SubscribeMessage(); in.resetReaderIndex(); - if (!decodeCommonHeader(message, in)) { + if (!decodeCommonHeader(message, 0x02, in)) { in.resetReaderIndex(); return; } - //TODO check reserved fixed flags = b0010 //check qos level if (message.getQos() != QOSType.LEAST_ONE) { diff --git a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/UnsubscribeDecoder.java b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/UnsubscribeDecoder.java index 15ecb6f3..b8f751b7 100644 --- a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/UnsubscribeDecoder.java +++ b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/UnsubscribeDecoder.java @@ -33,7 +33,7 @@ class UnsubscribeDecoder extends DemuxDecoder { //Common decoding part in.resetReaderIndex(); UnsubscribeMessage message = new UnsubscribeMessage(); - if (!decodeCommonHeader(message, in)) { + if (!decodeCommonHeader(message, 0x02, in)) { in.resetReaderIndex(); return; }