aboutsummaryrefslogtreecommitdiff
path: root/src/org
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2015-08-31 16:36:04 +1200
committerAnton Tananaev <anton.tananaev@gmail.com>2015-08-31 16:36:04 +1200
commit142734931830f117b0e86dfa5f6dddec5416d878 (patch)
treec549452fc812896789786a090c4f38983d048d10 /src/org
parent82872aacbbc0a1a0b7e76481055164b435422a50 (diff)
downloadtraccar-server-142734931830f117b0e86dfa5f6dddec5416d878.tar.gz
traccar-server-142734931830f117b0e86dfa5f6dddec5416d878.tar.bz2
traccar-server-142734931830f117b0e86dfa5f6dddec5416d878.zip
Implement KHD protocol commands
Diffstat (limited to 'src/org')
-rw-r--r--src/org/traccar/protocol/KhdProtocol.java7
-rw-r--r--src/org/traccar/protocol/KhdProtocolDecoder.java4
-rw-r--r--src/org/traccar/protocol/KhdProtocolEncoder.java60
3 files changed, 68 insertions, 3 deletions
diff --git a/src/org/traccar/protocol/KhdProtocol.java b/src/org/traccar/protocol/KhdProtocol.java
index be89df580..a2edbfd5e 100644
--- a/src/org/traccar/protocol/KhdProtocol.java
+++ b/src/org/traccar/protocol/KhdProtocol.java
@@ -20,6 +20,7 @@ import org.jboss.netty.channel.ChannelPipeline;
import org.jboss.netty.handler.codec.frame.LengthFieldBasedFrameDecoder;
import org.traccar.BaseProtocol;
import org.traccar.TrackerServer;
+import org.traccar.model.Command;
import java.util.List;
@@ -27,6 +28,9 @@ public class KhdProtocol extends BaseProtocol {
public KhdProtocol() {
super("khd");
+ setSupportedCommands(
+ Command.TYPE_ENGINE_STOP,
+ Command.TYPE_ENGINE_RESUME);
}
@Override
@@ -34,8 +38,9 @@ public class KhdProtocol extends BaseProtocol {
serverList.add(new TrackerServer(new ServerBootstrap(), this.getName()) {
@Override
protected void addSpecificHandlers(ChannelPipeline pipeline) {
- pipeline.addLast("frameDecoder", new LengthFieldBasedFrameDecoder(256, 3, 2));
+ pipeline.addLast("frameDecoder", new LengthFieldBasedFrameDecoder(512, 3, 2));
pipeline.addLast("objectDecoder", new KhdProtocolDecoder(KhdProtocol.this));
+ pipeline.addLast("objectEncoder", new KhdProtocolEncoder());
}
});
}
diff --git a/src/org/traccar/protocol/KhdProtocolDecoder.java b/src/org/traccar/protocol/KhdProtocolDecoder.java
index bff7568a7..f98f3e963 100644
--- a/src/org/traccar/protocol/KhdProtocolDecoder.java
+++ b/src/org/traccar/protocol/KhdProtocolDecoder.java
@@ -130,14 +130,14 @@ public class KhdProtocolDecoder extends BaseProtocolDecoder {
buf.skipBytes(4); // serial number
buf.readByte(); // reserved
- ChannelBuffer response = ChannelBuffers.directBuffer(10);
+ ChannelBuffer response = ChannelBuffers.dynamicBuffer();
response.writeByte(0x29); response.writeByte(0x29); // header
response.writeByte(MSG_CONFIRMATION);
response.writeShort(5); // size
response.writeByte(buf.readUnsignedByte());
response.writeByte(type);
response.writeByte(0); // reserved
- response.writeByte(Crc.xorChecksum(response.toByteBuffer(0, 8)));
+ response.writeByte(Crc.xorChecksum(response.toByteBuffer()));
response.writeByte(0x0D); // ending
channel.write(response);
diff --git a/src/org/traccar/protocol/KhdProtocolEncoder.java b/src/org/traccar/protocol/KhdProtocolEncoder.java
new file mode 100644
index 000000000..20d8eb40a
--- /dev/null
+++ b/src/org/traccar/protocol/KhdProtocolEncoder.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2015 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.traccar.BaseProtocolEncoder;
+import org.traccar.helper.Crc;
+import org.traccar.model.Command;
+
+public class KhdProtocolEncoder extends BaseProtocolEncoder {
+
+ private static final int MSG_CUT_OIL = 0x39;
+ private static final int MSG_RESUME_OIL = 0x38;
+
+ private ChannelBuffer encodeCommand(int command) {
+
+ ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
+
+ buf.writeByte(0x29);
+ buf.writeByte(0x29);
+
+ buf.writeByte(command);
+ buf.writeShort(6); // size
+
+ buf.writeInt(0); // terminal id
+
+ buf.writeByte(Crc.xorChecksum(buf.toByteBuffer()));
+ buf.writeByte(0x0D); // ending
+
+ return buf;
+ }
+
+ @Override
+ protected Object encodeCommand(Command command) {
+
+ switch (command.getType()) {
+ case Command.TYPE_ENGINE_STOP:
+ return encodeCommand(MSG_CUT_OIL);
+ case Command.TYPE_ENGINE_RESUME:
+ return encodeCommand(MSG_RESUME_OIL);
+ }
+
+ return null;
+ }
+
+}