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

Minor changed, fixed typo in method name (ProcotolVersion to ProtocolVersion)

Browse Source
This commit is contained in:
andrea
2015-08-08 19:03:27 +02:00
parent ccc5ceb3b9
commit 0c114d3dab
6 changed files with 39 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
netty_parser/src/main/java/org/eclipse/moquette/parser/netty/ConnectDecoder.java
+5 -5
View File
@@ -94,8 +94,8 @@ public class ConnectDecoder extends DemuxDecoder {
}
//ProtocolVersion 1 byte (value 0x03 for 3.1, 0x04 for 3.1.1)
message.setProcotolVersion(in.readByte());
if (message.getProcotolVersion() == VERSION_3_1_1) {
message.setProtocolVersion(in.readByte());
if (message.getProtocolVersion() == VERSION_3_1_1) {
//if 3.1.1, check the flags (dup, retain and qos == 0)
if (message.isDupFlag() || message.isRetainFlag() || message.getQos() != AbstractMessage.QOSType.MOST_ONE) {
throw new CorruptedFrameException("Received a CONNECT with fixed header flags != 0");
@@ -114,7 +114,7 @@ public class ConnectDecoder extends DemuxDecoder {
//Connection flag
byte connFlags = in.readByte();
if (message.getProcotolVersion() == VERSION_3_1_1) {
if (message.getProtocolVersion() == VERSION_3_1_1) {
if ((connFlags & 0x01) != 0) { //bit(0) of connection flags is != 0
throw new CorruptedFrameException("Received a CONNECT with connectionFlags[0(bit)] != 0");
}
@@ -147,8 +147,8 @@ public class ConnectDecoder extends DemuxDecoder {
int keepAlive = in.readUnsignedShort();
message.setKeepAlive(keepAlive);
if ((remainingLength == 12 && message.getProcotolVersion() == VERSION_3_1) ||
(remainingLength == 10 && message.getProcotolVersion() == VERSION_3_1_1)) {
if ((remainingLength == 12 && message.getProtocolVersion() == VERSION_3_1) ||
(remainingLength == 10 && message.getProtocolVersion() == VERSION_3_1_1)) {
out.add(message);
return;
}
netty_parser/src/test/java/org/eclipse/moquette/parser/netty/ConnectDecoderTest.java
+2 -2
View File
@@ -238,7 +238,7 @@ public class ConnectDecoderTest {
private void verifyBaseHeader(ConnectMessage connMessage) {
assertNotNull(connMessage);
assertEquals("MQIsdp", connMessage.getProtocolName());
assertEquals(VERSION_3_1, connMessage.getProcotolVersion());
assertEquals(VERSION_3_1, connMessage.getProtocolVersion());
assertTrue(connMessage.isUserFlag());
assertTrue(connMessage.isPasswordFlag());
assertTrue(connMessage.isCleanSession());
@@ -251,7 +251,7 @@ public class ConnectDecoderTest {
private void verifyBaseHeader311(ConnectMessage connMessage) {
assertNotNull(connMessage);
assertEquals("MQTT", connMessage.getProtocolName());
assertEquals(VERSION_3_1_1, connMessage.getProcotolVersion());
assertEquals(VERSION_3_1_1, connMessage.getProtocolVersion());
assertTrue(connMessage.isUserFlag());
assertTrue(connMessage.isPasswordFlag());
assertTrue(connMessage.isCleanSession());