diff options
| -rw-r--r-- | default.cfg | 4 | ||||
| -rw-r--r-- | src/org/traccar/ServerManager.java | 135 | ||||
| -rw-r--r-- | src/org/traccar/protocol/CastelProtocolDecoder.java | 141 | ||||
| -rw-r--r-- | test/org/traccar/protocol/CastelProtocolDecoderTest.java | 28 | ||||
| -rw-r--r-- | test/org/traccar/protocol/MeitrackProtocolDecoderTest.java | 4 |
5 files changed, 309 insertions, 3 deletions
diff --git a/default.cfg b/default.cfg index bc552c9cb..6226f10f3 100644 --- a/default.cfg +++ b/default.cfg @@ -418,4 +418,8 @@ <entry key='avl301.enable'>true</entry> <entry key='avl301.port'>5085</entry> + <!-- Castel server configuration --> + <entry key='castel.enable'>true</entry> + <entry key='castel.port'>5086</entry> + </properties> diff --git a/src/org/traccar/ServerManager.java b/src/org/traccar/ServerManager.java index 9e5da51b1..13ca885a9 100644 --- a/src/org/traccar/ServerManager.java +++ b/src/org/traccar/ServerManager.java @@ -19,7 +19,6 @@ import java.nio.ByteOrder; import java.sql.SQLException; import java.util.LinkedList; import java.util.List; - import org.jboss.netty.bootstrap.ConnectionlessBootstrap; import org.jboss.netty.bootstrap.ServerBootstrap; import org.jboss.netty.channel.ChannelPipeline; @@ -31,7 +30,114 @@ import org.jboss.netty.handler.codec.http.HttpRequestDecoder; import org.jboss.netty.handler.codec.http.HttpResponseEncoder; import org.jboss.netty.handler.codec.string.StringDecoder; import org.jboss.netty.handler.codec.string.StringEncoder; -import org.traccar.protocol.*; +import org.traccar.protocol.ApelProtocolDecoder; +import org.traccar.protocol.AplicomFrameDecoder; +import org.traccar.protocol.AplicomProtocolDecoder; +import org.traccar.protocol.Ardi01ProtocolDecoder; +import org.traccar.protocol.AtrackFrameDecoder; +import org.traccar.protocol.AtrackProtocolDecoder; +import org.traccar.protocol.AutoFon45FrameDecoder; +import org.traccar.protocol.AutoFon45ProtocolDecoder; +import org.traccar.protocol.AutoFonFrameDecoder; +import org.traccar.protocol.AutoFonProtocolDecoder; +import org.traccar.protocol.Avl301ProtocolDecoder; +import org.traccar.protocol.BceFrameDecoder; +import org.traccar.protocol.BceProtocolDecoder; +import org.traccar.protocol.BoxProtocolDecoder; +import org.traccar.protocol.CalAmpProtocolDecoder; +import org.traccar.protocol.CarTrackProtocolDecoder; +import org.traccar.protocol.CarscopProtocolDecoder; +import org.traccar.protocol.CastelProtocolDecoder; +import org.traccar.protocol.CellocatorFrameDecoder; +import org.traccar.protocol.CellocatorProtocolDecoder; +import org.traccar.protocol.EasyTrackProtocolDecoder; +import org.traccar.protocol.EelinkProtocolDecoder; +import org.traccar.protocol.EnforaProtocolDecoder; +import org.traccar.protocol.Ev603ProtocolDecoder; +import org.traccar.protocol.FreedomProtocolDecoder; +import org.traccar.protocol.GalileoFrameDecoder; +import org.traccar.protocol.GalileoProtocolDecoder; +import org.traccar.protocol.GatorProtocolDecoder; +import org.traccar.protocol.Gl100ProtocolDecoder; +import org.traccar.protocol.Gl200ProtocolDecoder; +import org.traccar.protocol.GlobalSatProtocolDecoder; +import org.traccar.protocol.GoSafeProtocolDecoder; +import org.traccar.protocol.GotopProtocolDecoder; +import org.traccar.protocol.Gps103ProtocolDecoder; +import org.traccar.protocol.GpsGateProtocolDecoder; +import org.traccar.protocol.Gt02ProtocolDecoder; +import org.traccar.protocol.Gt06FrameDecoder; +import org.traccar.protocol.Gt06ProtocolDecoder; +import org.traccar.protocol.H02FrameDecoder; +import org.traccar.protocol.H02ProtocolDecoder; +import org.traccar.protocol.HaicomProtocolDecoder; +import org.traccar.protocol.IntellitracFrameDecoder; +import org.traccar.protocol.IntellitracProtocolDecoder; +import org.traccar.protocol.Jt600FrameDecoder; +import org.traccar.protocol.Jt600ProtocolDecoder; +import org.traccar.protocol.KhdProtocolDecoder; +import org.traccar.protocol.LaipacProtocolDecoder; +import org.traccar.protocol.M2mProtocolDecoder; +import org.traccar.protocol.ManPowerProtocolDecoder; +import org.traccar.protocol.MaxonProtocolDecoder; +import org.traccar.protocol.MegastekProtocolDecoder; +import org.traccar.protocol.MeiligaoFrameDecoder; +import org.traccar.protocol.MeiligaoProtocolDecoder; +import org.traccar.protocol.MeitrackFrameDecoder; +import org.traccar.protocol.MeitrackProtocolDecoder; +import org.traccar.protocol.MiniFinderProtocolDecoder; +import org.traccar.protocol.Mta6ProtocolDecoder; +import org.traccar.protocol.MtxProtocolDecoder; +import org.traccar.protocol.NavigilFrameDecoder; +import org.traccar.protocol.NavigilProtocolDecoder; +import org.traccar.protocol.NavisProtocolDecoder; +import org.traccar.protocol.NoranProtocolDecoder; +import org.traccar.protocol.OrionFrameDecoder; +import org.traccar.protocol.OrionProtocolDecoder; +import org.traccar.protocol.OsmAndProtocolDecoder; +import org.traccar.protocol.PiligrimProtocolDecoder; +import org.traccar.protocol.ProgressProtocolDecoder; +import org.traccar.protocol.Pt3000ProtocolDecoder; +import org.traccar.protocol.Pt502FrameDecoder; +import org.traccar.protocol.Pt502ProtocolDecoder; +import org.traccar.protocol.RitiProtocolDecoder; +import org.traccar.protocol.RuptelaProtocolDecoder; +import org.traccar.protocol.SanavProtocolDecoder; +import org.traccar.protocol.SkypatrolProtocolDecoder; +import org.traccar.protocol.Stl060FrameDecoder; +import org.traccar.protocol.Stl060ProtocolDecoder; +import org.traccar.protocol.SuntechProtocolDecoder; +import org.traccar.protocol.SyrusProtocolDecoder; +import org.traccar.protocol.T55ProtocolDecoder; +import org.traccar.protocol.TelikProtocolDecoder; +import org.traccar.protocol.TeltonikaFrameDecoder; +import org.traccar.protocol.TeltonikaProtocolDecoder; +import org.traccar.protocol.Tk102ProtocolDecoder; +import org.traccar.protocol.Tk103ProtocolDecoder; +import org.traccar.protocol.Tlt2hProtocolDecoder; +import org.traccar.protocol.TopflytechProtocolDecoder; +import org.traccar.protocol.TotemFrameDecoder; +import org.traccar.protocol.TotemProtocolDecoder; +import org.traccar.protocol.Tr20ProtocolDecoder; +import org.traccar.protocol.Tr900ProtocolDecoder; +import org.traccar.protocol.TrackboxProtocolDecoder; +import org.traccar.protocol.TramigoFrameDecoder; +import org.traccar.protocol.TramigoProtocolDecoder; +import org.traccar.protocol.TytanProtocolDecoder; +import org.traccar.protocol.UlbotechFrameDecoder; +import org.traccar.protocol.UlbotechProtocolDecoder; +import org.traccar.protocol.V680ProtocolDecoder; +import org.traccar.protocol.VisiontekProtocolDecoder; +import org.traccar.protocol.WialonProtocolDecoder; +import org.traccar.protocol.WondexFrameDecoder; +import org.traccar.protocol.WondexProtocolDecoder; +import org.traccar.protocol.Xexun2ProtocolDecoder; +import org.traccar.protocol.XexunFrameDecoder; +import org.traccar.protocol.XexunProtocolDecoder; +import org.traccar.protocol.XirgoProtocolDecoder; +import org.traccar.protocol.Xt013ProtocolDecoder; +import org.traccar.protocol.Xt7ProtocolDecoder; +import org.traccar.protocol.YwtProtocolDecoder; public class ServerManager { @@ -125,6 +231,7 @@ public class ServerManager { initMtxServer("mtx"); initTytanServer("tytan"); initAvl301Server("avl301"); + initCastelServer("castel"); initProtocolDetector(); } @@ -170,6 +277,7 @@ public class ServerManager { }); } } + private void initGps103Server(final String protocol) throws SQLException { if (isProtocolEnabled(protocol)) { serverList.add(new TrackerServer(new ServerBootstrap(), protocol) { @@ -1326,4 +1434,27 @@ public class ServerManager { } } + private void initCastelServer(final String protocol) throws SQLException { + if (isProtocolEnabled(protocol)) { + TrackerServer server = new TrackerServer(new ServerBootstrap(), protocol) { + @Override + protected void addSpecificHandlers(ChannelPipeline pipeline) { + pipeline.addLast("frameDecoder", new LengthFieldBasedFrameDecoder(1024, 2, 2, -2, 0)); + pipeline.addLast("objectDecoder", new CastelProtocolDecoder(protocol)); + } + }; + server.setEndianness(ByteOrder.LITTLE_ENDIAN); + serverList.add(server); + + server = new TrackerServer(new ConnectionlessBootstrap(), protocol) { + @Override + protected void addSpecificHandlers(ChannelPipeline pipeline) { + pipeline.addLast("objectDecoder", new Gps103ProtocolDecoder(protocol)); + } + }; + server.setEndianness(ByteOrder.LITTLE_ENDIAN); + serverList.add(server); + } + } + } diff --git a/src/org/traccar/protocol/CastelProtocolDecoder.java b/src/org/traccar/protocol/CastelProtocolDecoder.java new file mode 100644 index 000000000..071218bf8 --- /dev/null +++ b/src/org/traccar/protocol/CastelProtocolDecoder.java @@ -0,0 +1,141 @@ +/* + * 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.Calendar; +import java.util.TimeZone; +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.helper.Crc; +import org.traccar.helper.UnitsConverter; +import org.traccar.model.Event; +import org.traccar.model.Position; + +public class CastelProtocolDecoder extends BaseProtocolDecoder { + + public CastelProtocolDecoder(String protocol) { + super(protocol); + } + + private static final int MSG_LOGIN = 0x0110; + private static final int MSG_LOGIN_RESPONSE = 0x0190; + private static final int MSG_HEARTBEAT = 0x0301; + private static final int MSG_HEARTBEAT_RESPONSE = 0x0390; + private static final int MSG_GPS = 0x0140; + + @Override + protected Object decode( + ChannelHandlerContext ctx, Channel channel, SocketAddress remoteAddress, Object msg) + throws Exception { + + ChannelBuffer buf = (ChannelBuffer) msg; + + buf.skipBytes(2); // header + buf.readUnsignedShort(); // length + int version = buf.readUnsignedByte(); + ChannelBuffer id = buf.readBytes(20); + int type = buf.readUnsignedShort(); + + if (type == MSG_HEARTBEAT) { + + if (channel != null) { + ChannelBuffer response = ChannelBuffers.directBuffer(31); + response.writeByte(0x40); response.writeByte(0x40); // header + response.writeShort(response.capacity()); // size + response.writeByte(version); + response.writeBytes(id); + response.writeShort(MSG_HEARTBEAT_RESPONSE); + response.writeShort(Crc.crc16Ccitt(response.toByteBuffer(2, 4))); // TODO + response.writeByte(0x0D); response.writeByte(0x0A); // ending + channel.write(response, remoteAddress); + } + + } else if (type == MSG_LOGIN || type == MSG_GPS) { + + Position position = new Position(); + position.setDeviceId(getDeviceId()); + position.setProtocol(getProtocol()); + + if (!identify(id.toString(Charset.defaultCharset()))) { + return null; + } else if (type == MSG_LOGIN) { + + if (channel != null) { + ChannelBuffer response = ChannelBuffers.directBuffer(41); + response.writeByte(0x40); response.writeByte(0x40); // header + response.writeShort(response.capacity()); // size + response.writeByte(version); + response.writeBytes(id); + response.writeShort(MSG_LOGIN_RESPONSE); + response.writeInt(0xFFFFFFFF); + response.writeShort(0); + response.writeInt(0); // TODO + response.writeShort(Crc.crc16Ccitt(response.toByteBuffer(2, 4))); // TODO + response.writeByte(0x0D); response.writeByte(0x0A); // ending + channel.write(response, remoteAddress); + } + + } + + if (type == MSG_GPS) { + buf.readUnsignedByte(); // historical + } + + buf.readUnsignedInt(); // ACC ON time + buf.readUnsignedInt(); // UTC time + position.set(Event.KEY_ODOMETER, buf.readUnsignedInt()); + buf.readUnsignedInt(); // trip odometer + buf.readUnsignedInt(); // total fuel consumption + buf.readUnsignedShort(); // current fuel consumption + position.set(Event.KEY_STATUS, buf.readUnsignedInt()); + buf.skipBytes(8); + + buf.readUnsignedByte(); // count + + // Date and time + Calendar time = Calendar.getInstance(TimeZone.getTimeZone("UTC")); + time.clear(); + time.set(Calendar.DAY_OF_MONTH, buf.readUnsignedByte()); + time.set(Calendar.MONTH, buf.readUnsignedByte() - 1); + time.set(Calendar.YEAR, 2000 + buf.readUnsignedByte()); + time.set(Calendar.HOUR_OF_DAY, buf.readUnsignedByte()); + time.set(Calendar.MINUTE, buf.readUnsignedByte()); + time.set(Calendar.SECOND, buf.readUnsignedByte()); + position.setTime(time.getTime()); + + double lat = buf.readUnsignedInt() / 3600000.0; + double lon = buf.readUnsignedInt() / 3600000.0; + position.setSpeed(UnitsConverter.knotsFromKph(buf.readUnsignedShort())); + position.setCourse(buf.readUnsignedShort()); + + int flags = buf.readUnsignedByte(); + position.setLatitude((flags & 0x01) == 0 ? -lat : lat); + position.setLongitude((flags & 0x02) == 0 ? -lon : lon); + position.setValid((flags & 0x0C) > 0); + position.set(Event.KEY_SATELLITES, flags >> 4); + + return position; + } + + return null; + } + +} diff --git a/test/org/traccar/protocol/CastelProtocolDecoderTest.java b/test/org/traccar/protocol/CastelProtocolDecoderTest.java new file mode 100644 index 000000000..71d34bc5e --- /dev/null +++ b/test/org/traccar/protocol/CastelProtocolDecoderTest.java @@ -0,0 +1,28 @@ +package org.traccar.protocol; + +import java.nio.ByteOrder; +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; + +public class CastelProtocolDecoderTest extends ProtocolDecoderTest { + + @Test + public void testDecode() throws Exception { + + CastelProtocolDecoder decoder = new CastelProtocolDecoder(null); + + assertNull(decoder.decode(null, null, null, ChannelBuffers.wrappedBuffer(ByteOrder.LITTLE_ENDIAN, ChannelBufferTools.convertHexString( + "40401F00043130303131313235323939383700000000000000100303320D0A")))); + + verify(decoder.decode(null, null, null, ChannelBuffers.wrappedBuffer(ByteOrder.LITTLE_ENDIAN, ChannelBufferTools.convertHexString( + "40407F000431303031313132353239393837000000000000001001C1F06952FDF069529C91110000000000698300000C0000000000036401014C00030001190A0D04121A1480D60488C5721800000000AF4944445F3231364730325F532056312E322E31004944445F3231364730325F482056312E322E31000000DF640D0A")))); + + //verify(decoder.decode(null, null, null, ChannelBuffers.wrappedBuffer(ByteOrder.LITTLE_ENDIAN, ChannelBufferTools.convertHexString( + // "404057000431303031313132353239393837000000000000004002C1F06952F0F169529C9111000000000069830000470000000400036401014C01030078000505210C210D210F21102101073BE8030064280AEB930D0A")))); + + } + +} diff --git a/test/org/traccar/protocol/MeitrackProtocolDecoderTest.java b/test/org/traccar/protocol/MeitrackProtocolDecoderTest.java index 339cddde5..6c3aa1b46 100644 --- a/test/org/traccar/protocol/MeitrackProtocolDecoderTest.java +++ b/test/org/traccar/protocol/MeitrackProtocolDecoderTest.java @@ -3,7 +3,6 @@ package org.traccar.protocol; import java.nio.ByteOrder; import java.nio.charset.Charset; import org.jboss.netty.buffer.ChannelBuffers; -import org.traccar.helper.TestDataManager; import org.junit.Test; import org.traccar.helper.ChannelBufferTools; import static org.traccar.helper.DecoderVerifier.verify; @@ -14,6 +13,9 @@ public class MeitrackProtocolDecoderTest extends ProtocolDecoderTest { public void testDecode() throws Exception { MeitrackProtocolDecoder decoder = new MeitrackProtocolDecoder(null); + + verify(decoder.decode(null, null, ChannelBuffers.copiedBuffer( + "$$G145,862106024274815,AAA,35,-1.287125,36.906061,150530054639,A,10,13,12,67,0.8,1621,38359791,42330881,639|2|FB2|2F3,0000,3|0|0|A58|432,,,1,0009,*26", Charset.defaultCharset()))); verify(decoder.decode(null, null, ChannelBuffers.copiedBuffer( "$$I152,013949004569813,AAA,37,54.739468,25.273648,150208173414,A,5,24,0,73,1.5,165,74,3381,246|1|0065|118A,0000,0003|0003|0000|08D4|0002,006380DF,,1,0008*7C", Charset.defaultCharset()))); |