diff options
Diffstat (limited to 'src/org')
| -rw-r--r-- | src/org/traccar/model/Extensible.java | 2 | ||||
| -rw-r--r-- | src/org/traccar/protocol/UlbotechFrameDecoder.java | 41 | ||||
| -rw-r--r-- | src/org/traccar/protocol/UlbotechProtocolDecoder.java | 6 |
3 files changed, 32 insertions, 17 deletions
diff --git a/src/org/traccar/model/Extensible.java b/src/org/traccar/model/Extensible.java index 40a286987..f59b3d22e 100644 --- a/src/org/traccar/model/Extensible.java +++ b/src/org/traccar/model/Extensible.java @@ -53,7 +53,7 @@ public abstract class Extensible extends Message { } public void add(Map.Entry<String, Object> entry) { - if (entry.getValue() != null) { + if (entry != null && entry.getValue() != null) { attributes.put(entry.getKey(), entry.getValue()); } } diff --git a/src/org/traccar/protocol/UlbotechFrameDecoder.java b/src/org/traccar/protocol/UlbotechFrameDecoder.java index f0671c717..09c1db717 100644 --- a/src/org/traccar/protocol/UlbotechFrameDecoder.java +++ b/src/org/traccar/protocol/UlbotechFrameDecoder.java @@ -33,25 +33,36 @@ public class UlbotechFrameDecoder extends FrameDecoder { return null; } - int index = buf.indexOf(buf.readerIndex() + 1, buf.writerIndex(), (byte) 0xF8); - if (index != -1) { - ChannelBuffer result = ChannelBuffers.buffer(index + 1 - buf.readerIndex()); - - while (buf.readerIndex() <= index) { - int b = buf.readUnsignedByte(); - if (b == 0xF7) { - int ext = buf.readUnsignedByte(); - if (ext == 0x00) { - result.writeByte(0xF7); - } else if (ext == 0x0F) { - result.writeByte(0xF8); + if (buf.getUnsignedByte(buf.readerIndex()) == 0xF8) { + + int index = buf.indexOf(buf.readerIndex() + 1, buf.writerIndex(), (byte) 0xF8); + if (index != -1) { + ChannelBuffer result = ChannelBuffers.buffer(index + 1 - buf.readerIndex()); + + while (buf.readerIndex() <= index) { + int b = buf.readUnsignedByte(); + if (b == 0xF7) { + int ext = buf.readUnsignedByte(); + if (ext == 0x00) { + result.writeByte(0xF7); + } else if (ext == 0x0F) { + result.writeByte(0xF8); + } + } else { + result.writeByte(b); } - } else { - result.writeByte(b); } + + return result; + } + + } else { + + int index = buf.indexOf(buf.readerIndex(), buf.writerIndex(), (byte) '#'); + if (index != -1) { + return buf.readBytes(index + 1 - buf.readerIndex()); } - return result; } return null; diff --git a/src/org/traccar/protocol/UlbotechProtocolDecoder.java b/src/org/traccar/protocol/UlbotechProtocolDecoder.java index 712444d95..3dc5b36cb 100644 --- a/src/org/traccar/protocol/UlbotechProtocolDecoder.java +++ b/src/org/traccar/protocol/UlbotechProtocolDecoder.java @@ -101,7 +101,10 @@ public class UlbotechProtocolDecoder extends BaseProtocolDecoder { ChannelBuffer buf = (ChannelBuffer) msg; - buf.readByte(); // header + if (buf.readUnsignedByte() != 0xF8) { + return null; + } + buf.readUnsignedByte(); // version buf.readUnsignedByte(); // type @@ -218,6 +221,7 @@ public class UlbotechProtocolDecoder extends BaseProtocolDecoder { if (hasLocation) { return position; } + return null; } |