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

Integrated by hand part of the pull request #13 'fix pom and clean deprecated class and add bat file to windows'

Browse Source
This commit is contained in:
andrea
2015-03-04 22:40:56 +01:00
parent 443682f24f
commit 4baf407657
10 changed files with 69 additions and 21 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
+8 -8
View File
@@ -32,8 +32,8 @@ import org.eclipse.moquette.proto.messages.ConnectMessage;
* @author andrea
*/
public class ConnectDecoder extends DemuxDecoder {
static final AttributeKey<Boolean> CONNECT_STATUS = new AttributeKey<Boolean>("connected");
static final AttributeKey<Boolean> CONNECT_STATUS = AttributeKey.valueOf("connected");
@Override
void decode(AttributeMap ctx, ByteBuf in, List<Object> out) throws UnsupportedEncodingException {
@@ -119,17 +119,17 @@ public class ConnectDecoder extends DemuxDecoder {
throw new CorruptedFrameException("Received a CONNECT with connectionFlags[0(bit)] != 0");
}
}
boolean cleanSession = ((connFlags & 0x02) >> 1) == 1 ? true : false;
boolean willFlag = ((connFlags & 0x04) >> 2) == 1 ? true : false;
boolean cleanSession = ((connFlags & 0x02) >> 1) == 1;
boolean willFlag = ((connFlags & 0x04) >> 2) == 1;
byte willQos = (byte) ((connFlags & 0x18) >> 3);
if (willQos > 2) {
in.resetReaderIndex();
throw new CorruptedFrameException("Expected will QoS in range 0..2 but found: " + willQos);
}
boolean willRetain = ((connFlags & 0x20) >> 5) == 1 ? true : false;
boolean passwordFlag = ((connFlags & 0x40) >> 6) == 1 ? true : false;
boolean userFlag = ((connFlags & 0x80) >> 7) == 1 ? true : false;
boolean willRetain = ((connFlags & 0x20) >> 5) == 1;
boolean passwordFlag = ((connFlags & 0x40) >> 6) == 1;
boolean userFlag = ((connFlags & 0x80) >> 7) == 1;
//a password is true iff user is true.
if (!userFlag && passwordFlag) {
in.resetReaderIndex();
netty_parser/src/main/java/org/eclipse/moquette/parser/netty/MQTTDecoder.java
+2 -2
View File
@@ -32,9 +32,9 @@ import org.eclipse.moquette.proto.messages.AbstractMessage;
public class MQTTDecoder extends ByteToMessageDecoder {
//3 = 3.1, 4 = 3.1.1
static final AttributeKey<Integer> PROTOCOL_VERSION = new AttributeKey<Integer>("version");
static final AttributeKey<Integer> PROTOCOL_VERSION = AttributeKey.valueOf("version");
private final Map<Byte, DemuxDecoder> m_decoderMap = new HashMap<Byte, DemuxDecoder>();
private final Map<Byte, DemuxDecoder> m_decoderMap = new HashMap<>();
public MQTTDecoder() {
m_decoderMap.put(AbstractMessage.CONNECT, new ConnectDecoder());