aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2015-01-13 15:53:05 +1300
committerAnton Tananaev <anton.tananaev@gmail.com>2015-01-13 15:53:05 +1300
commit04982b2acfa6e79c7ebccb814457ab0eaab86f9f (patch)
tree59ffec104b2aa360a9ebbde5d3c2a86478bfa676
parentda7852b28d48f0c3a3a2e5d272fa89ea28817abf (diff)
downloadtrackermap-server-04982b2acfa6e79c7ebccb814457ab0eaab86f9f.tar.gz
trackermap-server-04982b2acfa6e79c7ebccb814457ab0eaab86f9f.tar.bz2
trackermap-server-04982b2acfa6e79c7ebccb814457ab0eaab86f9f.zip
Add frame decoder for Ulbotech
-rw-r--r--src/org/traccar/ServerManager.java5
-rw-r--r--src/org/traccar/protocol/UlbotechFrameDecoder.java61
2 files changed, 62 insertions, 4 deletions
diff --git a/src/org/traccar/ServerManager.java b/src/org/traccar/ServerManager.java
index ca698f977..95c1d1f71 100644
--- a/src/org/traccar/ServerManager.java
+++ b/src/org/traccar/ServerManager.java
@@ -1274,14 +1274,11 @@ public class ServerManager {
}
private void initUlbotechServer(final String protocol) throws SQLException {
-
- // TODO: Waiting for feedback from manufacturer
-
if (isProtocolEnabled(properties, protocol)) {
serverList.add(new TrackerServer(this, new ServerBootstrap(), protocol) {
@Override
protected void addSpecificHandlers(ChannelPipeline pipeline) {
- pipeline.addLast("frameDecoder", new LengthFieldBasedFrameDecoder(1024, 2, 1, 2, 0));
+ pipeline.addLast("frameDecoder", new UlbotechFrameDecoder());
pipeline.addLast("objectDecoder", new UlbotechProtocolDecoder(dataManager, protocol, properties));
}
});
diff --git a/src/org/traccar/protocol/UlbotechFrameDecoder.java b/src/org/traccar/protocol/UlbotechFrameDecoder.java
new file mode 100644
index 000000000..3466118b0
--- /dev/null
+++ b/src/org/traccar/protocol/UlbotechFrameDecoder.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2014 Anton Tananaev (anton.tananaev@gmail.com)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.traccar.protocol;
+
+import org.jboss.netty.buffer.ChannelBuffer;
+import org.jboss.netty.buffer.ChannelBuffers;
+import org.jboss.netty.channel.Channel;
+import org.jboss.netty.channel.ChannelHandlerContext;
+import org.jboss.netty.handler.codec.frame.FrameDecoder;
+import org.traccar.helper.ChannelBufferTools;
+
+public class UlbotechFrameDecoder extends FrameDecoder {
+
+ @Override
+ protected Object decode(
+ ChannelHandlerContext ctx,
+ Channel channel,
+ ChannelBuffer buf) throws Exception {
+
+ if (buf.readableBytes() < 2) {
+ return null;
+ }
+
+ int index = buf.indexOf(buf.readerIndex() + 1, buf.writerIndex(), (byte) 0xF8);
+ if (index != -1) {
+ ChannelBuffer result = ChannelBuffers.buffer(index - 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);
+ }
+ }
+
+ return result;
+ }
+
+ return null;
+ }
+
+}