anna/IM-server-new
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added missed version in Connect message

Browse Source
This commit is contained in:
selva.andre
2012-01-21 20:33:53 +01:00
parent 422fbc4d2c
commit 556eec95d8
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/org/dna/mqtt/moquette/proto/ConnectEncoder.java
+4 -1
View File
@@ -16,7 +16,10 @@ public class ConnectEncoder implements MessageEncoder<ConnectMessage> {
public void encode(IoSession session, ConnectMessage message, ProtocolEncoderOutput out) throws Exception { public void encode(IoSession session, ConnectMessage message, ProtocolEncoderOutput out) throws Exception {
IoBuffer staticHeaderBuff = IoBuffer.allocate(12); IoBuffer staticHeaderBuff = IoBuffer.allocate(12);
staticHeaderBuff.put(Utils.encodeString("MQIsdp")); staticHeaderBuff.put(Utils.encodeString("MQIsdp"));
//version
staticHeaderBuff.put((byte)0x03);
//connection flags and Strings //connection flags and Strings
byte connectionFlags = 0; byte connectionFlags = 0;
if (message.isCleanSession()) { if (message.isCleanSession()) {
src/test/java/org/dna/mqtt/moquette/proto/ConnectEncoderTest.java
+3
View File
@@ -68,6 +68,7 @@ public class ConnectEncoderTest {
assertEquals(0x10, m_mockProtoEncoder.getBuffer().get()); //1 byte assertEquals(0x10, m_mockProtoEncoder.getBuffer().get()); //1 byte
assertEquals(12, m_mockProtoEncoder.getBuffer().get()); //remaining length assertEquals(12, m_mockProtoEncoder.getBuffer().get()); //remaining length
verifyString("MQIsdp", m_mockProtoEncoder.getBuffer()); verifyString("MQIsdp", m_mockProtoEncoder.getBuffer());
assertEquals(0x03, m_mockProtoEncoder.getBuffer().get()); //protocol version
assertEquals(0x32, m_mockProtoEncoder.getBuffer().get()); //flags assertEquals(0x32, m_mockProtoEncoder.getBuffer().get()); //flags
assertEquals(2, m_mockProtoEncoder.getBuffer().get()); //keepAliveTimer msb assertEquals(2, m_mockProtoEncoder.getBuffer().get()); //keepAliveTimer msb
assertEquals(0, m_mockProtoEncoder.getBuffer().get()); //keepAliveTimer lsb assertEquals(0, m_mockProtoEncoder.getBuffer().get()); //keepAliveTimer lsb
@@ -94,6 +95,7 @@ public class ConnectEncoderTest {
assertEquals(0x10, m_mockProtoEncoder.getBuffer().get()); //1 byte assertEquals(0x10, m_mockProtoEncoder.getBuffer().get()); //1 byte
assertEquals(36, m_mockProtoEncoder.getBuffer().get()); //remaining length assertEquals(36, m_mockProtoEncoder.getBuffer().get()); //remaining length
verifyString("MQIsdp", m_mockProtoEncoder.getBuffer()); verifyString("MQIsdp", m_mockProtoEncoder.getBuffer());
assertEquals(0x03, m_mockProtoEncoder.getBuffer().get()); //protocol version
assertEquals(0x36, m_mockProtoEncoder.getBuffer().get()); //flags assertEquals(0x36, m_mockProtoEncoder.getBuffer().get()); //flags
assertEquals(2, m_mockProtoEncoder.getBuffer().get()); //keepAliveTimer msb assertEquals(2, m_mockProtoEncoder.getBuffer().get()); //keepAliveTimer msb
assertEquals(0, m_mockProtoEncoder.getBuffer().get()); //keepAliveTimer lsb assertEquals(0, m_mockProtoEncoder.getBuffer().get()); //keepAliveTimer lsb
@@ -129,6 +131,7 @@ public class ConnectEncoderTest {
assertEquals(0x10, m_mockProtoEncoder.getBuffer().get()); //1 byte assertEquals(0x10, m_mockProtoEncoder.getBuffer().get()); //1 byte
assertEquals(48, m_mockProtoEncoder.getBuffer().get()); //remaining length assertEquals(48, m_mockProtoEncoder.getBuffer().get()); //remaining length
verifyString("MQIsdp", m_mockProtoEncoder.getBuffer()); verifyString("MQIsdp", m_mockProtoEncoder.getBuffer());
assertEquals(0x03, m_mockProtoEncoder.getBuffer().get()); //protocol version
assertEquals((byte)0xF6, (byte)m_mockProtoEncoder.getBuffer().get()); //flags assertEquals((byte)0xF6, (byte)m_mockProtoEncoder.getBuffer().get()); //flags
assertEquals(2, m_mockProtoEncoder.getBuffer().get()); //keepAliveTimer msb assertEquals(2, m_mockProtoEncoder.getBuffer().get()); //keepAliveTimer msb
assertEquals(0, m_mockProtoEncoder.getBuffer().get()); //keepAliveTimer lsb assertEquals(0, m_mockProtoEncoder.getBuffer().get()); //keepAliveTimer lsb