diff options
| -rw-r--r-- | default.cfg | 4 | ||||
| -rw-r--r-- | src/org/traccar/ServerManager.java | 12 | ||||
| -rw-r--r-- | src/org/traccar/protocol/TytanProtocolDecoder.java | 121 | ||||
| -rw-r--r-- | test/org/traccar/protocol/TytanProtocolDecoderTest.java | 43 |
4 files changed, 180 insertions, 0 deletions
diff --git a/default.cfg b/default.cfg index dad9335b7..50fe2259f 100644 --- a/default.cfg +++ b/default.cfg @@ -407,4 +407,8 @@ <entry key='mtx.enable'>true</entry> <entry key='mtx.port'>5083</entry> + <!-- Tytan server configuration --> + <entry key='tytan.enable'>true</entry> + <entry key='tytan.port'>5084</entry> + </properties> diff --git a/src/org/traccar/ServerManager.java b/src/org/traccar/ServerManager.java index 28cbac34d..184b54078 100644 --- a/src/org/traccar/ServerManager.java +++ b/src/org/traccar/ServerManager.java @@ -184,6 +184,7 @@ public class ServerManager { initXirgoServer("xirgo"); initCalAmpServer("calamp"); initMtxServer("mtx"); + initTytanServer("tytan"); initProtocolDetector(); @@ -1380,4 +1381,15 @@ public class ServerManager { } } + private void initTytanServer(final String protocol) throws SQLException { + if (isProtocolEnabled(properties, protocol)) { + serverList.add(new TrackerServer(this, new ConnectionlessBootstrap(), protocol) { + @Override + protected void addSpecificHandlers(ChannelPipeline pipeline) { + pipeline.addLast("objectDecoder", new TytanProtocolDecoder(dataManager, protocol, properties)); + } + }); + } + } + } diff --git a/src/org/traccar/protocol/TytanProtocolDecoder.java b/src/org/traccar/protocol/TytanProtocolDecoder.java new file mode 100644 index 000000000..5b3772d31 --- /dev/null +++ b/src/org/traccar/protocol/TytanProtocolDecoder.java @@ -0,0 +1,121 @@ +/* + * 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 java.net.SocketAddress; +import java.nio.charset.Charset; +import java.util.Date; +import java.util.LinkedList; +import java.util.List; +import java.util.Properties; + +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.traccar.BaseProtocolDecoder; +import org.traccar.database.DataManager; +import org.traccar.helper.Log; +import org.traccar.model.ExtendedInfoFormatter; +import org.traccar.model.Position; + +public class TytanProtocolDecoder extends BaseProtocolDecoder { + + public TytanProtocolDecoder(DataManager dataManager, String protocol, Properties properties) { + super(dataManager, protocol, properties); + } + + private static final int MSG_HEARTBEAT = 0x1A; + private static final int MSG_DATA = 0x10; + + @Override + protected Object decode( + ChannelHandlerContext ctx, Channel channel, SocketAddress remoteAddress, Object msg) + throws Exception { + + ChannelBuffer buf = (ChannelBuffer) msg; + + buf.readUnsignedByte(); // protocol + int index = buf.readUnsignedByte() >> 3; + + if (channel != null) { + ChannelBuffer response = ChannelBuffers.copiedBuffer( + "^" + index, Charset.defaultCharset()); + channel.write(response, remoteAddress); + } + + String id = String.valueOf(buf.readUnsignedInt()); + long deviceId; + try { + deviceId = getDataManager().getDeviceByImei(id).getId(); + } catch(Exception error) { + Log.warning("Unknown device - " + id); + return null; + } + + List<Position> positions = new LinkedList<Position>(); + + while (buf.readable()) { + + Position position = new Position(); + ExtendedInfoFormatter extendedInfo = new ExtendedInfoFormatter(getProtocol()); + position.setDeviceId(deviceId); + + int end = buf.readerIndex() + buf.readUnsignedByte(); + + position.setTime(new Date(buf.readUnsignedInt() * 1000)); + + int flags = buf.readUnsignedByte(); + extendedInfo.set("gps", flags >> 5); + extendedInfo.set("gsm", flags & 0x07); + position.setValid(((flags & 0x08) != 0) ^ ((flags & 0x10) != 0)); + + // Latitude + double lat = buf.readUnsignedMedium(); + lat = lat * -180 / 16777216 + 90; + position.setLatitude(lat); + + // Longitude + double lon = buf.readUnsignedMedium(); + lon = lon * 360 / 16777216 - 180; + position.setLongitude(lon); + + // Altitude + position.setAltitude(0.0); + + // Course + int course = (buf.readUnsignedByte() >> 5) * 45; + course = (course + 180) % 360; + position.setCourse((double) course); + + // Speed + int speed = buf.readUnsignedByte(); + if (speed >= 250) { + position.setSpeed(0.0); + } else { + position.setSpeed(speed * 0.539957); + } + + buf.skipBytes(end - buf.readerIndex()); + + position.setExtendedInfo(extendedInfo.toString()); + positions.add(position); + } + + return positions; + } + +} diff --git a/test/org/traccar/protocol/TytanProtocolDecoderTest.java b/test/org/traccar/protocol/TytanProtocolDecoderTest.java new file mode 100644 index 000000000..2139cbcb5 --- /dev/null +++ b/test/org/traccar/protocol/TytanProtocolDecoderTest.java @@ -0,0 +1,43 @@ +package org.traccar.protocol; + +import org.jboss.netty.buffer.ChannelBuffers; +import static org.junit.Assert.assertNull; +import org.junit.Test; +import org.traccar.helper.ChannelBufferTools; +import static org.traccar.helper.DecoderVerifier.verify; +import org.traccar.helper.TestDataManager; + +public class TytanProtocolDecoderTest { + + @Test + public void testDecode() throws Exception { + + TytanProtocolDecoder decoder = new TytanProtocolDecoder(new TestDataManager(), null, null); + + verify(decoder.decode(null, null, null, ChannelBuffers.wrappedBuffer(ChannelBufferTools.convertHexString( + "D56000000AF20E4FA7C77AFF3282C68D2F890800")))); + + verify(decoder.decode(null, null, null, ChannelBuffers.wrappedBuffer(ChannelBufferTools.convertHexString( + "D56000000AF20e552e248007375bee8c02b3c002")))); + + verify(decoder.decode(null, null, null, ChannelBuffers.wrappedBuffer(ChannelBufferTools.convertHexString( + "D5F0FF00001032552F9121D5325FCB8D11AFA0000205396504004C0602FB5B434118001765006603676B68006B80426C02E2C8206D2F9600")))); + + verify(decoder.decode(null, null, null, ChannelBuffers.wrappedBuffer(ChannelBufferTools.convertHexString( + "D5C0FF00013D21552F9148D3325E8F8D11A80800060228816541061245FF674107C0001810130D21552F9148D3325E8F8D11A8080006022881654106121C46694107C0001810130D21552F9182D3325E8F8D11A8080006022881654106121C46694107C0001810140C")))); + + verify(decoder.decode(null, null, null, ChannelBuffers.wrappedBuffer(ChannelBufferTools.convertHexString( + "D56000000AF221552e31f4d3325e908d11a7c8000602d60e68410612cd74694107c00018100f0b")))); + + verify(decoder.decode(null, null, null, ChannelBuffers.wrappedBuffer(ChannelBufferTools.convertHexString( + "D56000000AF232552e0322d332603f8d1199a1100204bda204004c06024dea454118000e6515661b677068626b80486c02e2ae586d319600")))); + + verify(decoder.decode(null, null, null, ChannelBuffers.wrappedBuffer(ChannelBufferTools.convertHexString( + "D56000000AF20e552e259707375bee8c02b3c002")))); + + verify(decoder.decode(null, null, null, ChannelBuffers.wrappedBuffer(ChannelBufferTools.convertHexString( + "D56000000AF20e552e259707375bee8c02b3c002")))); + + } + +} |