detected length of next (incomplete) message was readed from wrong position
Change-Id: Iea7ec3f392c2a38e8dc6becb21914b018f878faa
Signed-off-by: Michal Rehak <mirehak@cisco.com>
@Override\r
protected void decode(ChannelHandlerContext ctx, VersionMessageWrapper msg,\r
List<Object> out) throws Exception {\r
@Override\r
protected void decode(ChannelHandlerContext ctx, VersionMessageWrapper msg,\r
List<Object> out) throws Exception {\r
- LOGGER.debug("VersionMessageWrapper received");\r
- LOGGER.debug("<< " + ByteBufUtils.byteBufToHexString(msg.getMessageBuffer()));\r
+ if (LOGGER.isDebugEnabled()) {\r
+ LOGGER.debug("VersionMessageWrapper received");\r
+ LOGGER.debug("buffer size: " + msg.getMessageBuffer().readableBytes());\r
+ LOGGER.debug("<< " + ByteBufUtils.byteBufToHexString(msg.getMessageBuffer()));\r
+ }\r
DataObject dataObject = null;\r
try {\r
dataObject = DeserializationFactory.bufferToMessage(msg.getMessageBuffer(),\r
DataObject dataObject = null;\r
try {\r
dataObject = DeserializationFactory.bufferToMessage(msg.getMessageBuffer(),\r
+import org.opendaylight.openflowjava.protocol.impl.util.ByteBufUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@Override
protected void decode(ChannelHandlerContext chc, ByteBuf bb, List<Object> list) throws Exception {
@Override
protected void decode(ChannelHandlerContext chc, ByteBuf bb, List<Object> list) throws Exception {
- if (bb.readableBytes() < LENGTH_OF_HEADER) {
- LOGGER.debug("skipping bb - too few data for header: " + bb.readableBytes());
+ int readableBytes = bb.readableBytes();
+ if (readableBytes < LENGTH_OF_HEADER) {
+ LOGGER.debug("skipping bb - too few data for header: " + readableBytes);
-
- int length = bb.getUnsignedShort(LENGTH_INDEX_IN_HEADER);
- if (bb.readableBytes() < length) {
- LOGGER.debug("skipping bb - too few data for msg: " +
- bb.readableBytes() + " < " + length);
+
+ int length = bb.getUnsignedShort(bb.readerIndex() + LENGTH_INDEX_IN_HEADER);
+ LOGGER.debug("length of actual message: {}", length);
+
+ if (readableBytes < length) {
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug("skipping bb - too few data for msg: " +
+ readableBytes + " < " + length);
+ LOGGER.debug("bb: " + ByteBufUtils.byteBufToHexString(bb));
+ LOGGER.debug("readableBytes: " + readableBytes);
+ }
+
+ } else {
+ LOGGER.debug("[enough bytes] readableBytes: " + readableBytes);
- LOGGER.info("OF Protocol message received, type:{}", bb.getByte(1));
-
+ LOGGER.info("OF Protocol message received, type:{}", bb.getByte(bb.readerIndex() + 1));
+
ByteBuf messageBuffer = bb.slice(bb.readerIndex(), length);
list.add(messageBuffer);
messageBuffer.retain();
ByteBuf messageBuffer = bb.slice(bb.readerIndex(), length);
list.add(messageBuffer);
messageBuffer.retain();