8 files changed, 391 insertions, 0 deletions

diff --git a/default.cfg b/default.cfg
index de2fa3dec..59f910dd5 100644
--- a/default.cfg
+++ b/default.cfg
@@ -147,4 +147,8 @@
     <entry key="h02.enable">true</entry>
     <entry key="h02.port">5013</entry>
 
+    <!-- JT600 server configuration -->
+    <entry key="jt600.enable">true</entry>
+    <entry key="jt600.port">5014</entry>
+
 </properties>
diff --git a/src/org/traccar/Server.java b/src/org/traccar/Server.java
index f09e15913..140862d8b 100644
--- a/src/org/traccar/Server.java
+++ b/src/org/traccar/Server.java
@@ -100,6 +100,7 @@ public class Server {
         initST210Server(properties);
         initProgressServer(properties);
         initH02Server(properties);
+        initJt600Server(properties);
         
 
         // Initialize web server
@@ -547,4 +548,25 @@ public class Server {
         }
     }
 
+    /**
+     * Init JT600 server
+     */
+    private void initJt600Server(Properties properties) throws SQLException {
+
+        String protocol = "jt600";
+        if (isProtocolEnabled(properties, protocol)) {
+
+            TrackerServer server = new TrackerServer(getProtocolPort(properties, protocol));
+            final Integer resetDelay = getProtocolResetDelay(properties, protocol);
+
+            server.setPipelineFactory(new GenericPipelineFactory(server, dataManager, isLoggerEnabled(), geocoder) {
+                protected void addSpecificHandlers(ChannelPipeline pipeline) {
+                    pipeline.addLast("frameDecoder", new Jt600FrameDecoder());
+                    pipeline.addLast("objectDecoder", new Jt600ProtocolDecoder(getDataManager(), resetDelay));
+                }
+            });
+
+            serverList.add(server);
+        }
+    }
 }
diff --git a/src/org/traccar/helper/ChannelBufferTools.java b/src/org/traccar/helper/ChannelBufferTools.java
index 6df1f7ba2..9139ed7ae 100644
--- a/src/org/traccar/helper/ChannelBufferTools.java
+++ b/src/org/traccar/helper/ChannelBufferTools.java
@@ -52,5 +52,29 @@ public class ChannelBufferTools {
 
         return null;
     }
+    
+    /**
+     * Convert hex to integer (length in hex digits)
+     */
+    public static int readHexInteger(ChannelBuffer buf, int length) {
+        
+        int result = 0;
+        
+        for (int i = 0; i < length / 2; i++) {
+            int b = buf.readUnsignedByte();
+            result *= 10;
+            result += b >>> 4;
+            result *= 10;
+            result += b & 0x0f;
+        }
+        
+        if (length % 2 == 1) {
+            int b = buf.getUnsignedByte(buf.readerIndex());
+            result *= 10;
+            result += b >>> 4;
+        }
+        
+        return result;
+    }
 
 }
diff --git a/src/org/traccar/protocol/Jt600FrameDecoder.java b/src/org/traccar/protocol/Jt600FrameDecoder.java
new file mode 100644
index 000000000..2e2fd228b
--- /dev/null
+++ b/src/org/traccar/protocol/Jt600FrameDecoder.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2012 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.text.ParseException;
+import org.jboss.netty.buffer.ChannelBuffer;
+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 Jt600FrameDecoder extends FrameDecoder {
+
+    private static int MESSAGE_LENGTH = 37;
+
+    protected Object decode(
+            ChannelHandlerContext ctx,
+            Channel channel,
+            ChannelBuffer buf) throws Exception {
+
+        // Message identifier
+        char first = (char) buf.getByte(0);
+        int length = buf.readableBytes();
+        
+        if (first == '$') {
+            // Check length
+            if (length >= MESSAGE_LENGTH) {
+                return buf.readBytes(MESSAGE_LENGTH);
+            }
+        } else if (first == '(') {
+            // Find ending
+            Integer endIndex = ChannelBufferTools.find(buf, 0, length, ")");
+            if (endIndex != null) {
+                return buf.readBytes(endIndex + 1);
+            }
+        } else {
+            // Unknown message
+            throw new ParseException(null, 0);
+        }
+
+        return null;
+    }
+
+}
diff --git a/src/org/traccar/protocol/Jt600ProtocolDecoder.java b/src/org/traccar/protocol/Jt600ProtocolDecoder.java
new file mode 100644
index 000000000..8a2be63fb
--- /dev/null
+++ b/src/org/traccar/protocol/Jt600ProtocolDecoder.java
@@ -0,0 +1,220 @@
+/*
+ * Copyright 2012 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.nio.charset.Charset;
+import java.util.Calendar;
+import java.util.TimeZone;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import org.jboss.netty.buffer.ChannelBuffer;
+import org.jboss.netty.channel.Channel;
+import org.jboss.netty.channel.ChannelHandlerContext;
+import org.traccar.GenericProtocolDecoder;
+import org.traccar.helper.ChannelBufferTools;
+import org.traccar.model.DataManager;
+import org.traccar.model.Position;
+
+/**
+ * JT600 protocol decoder
+ */
+public class Jt600ProtocolDecoder extends GenericProtocolDecoder {
+
+    /**
+     * Initialize
+     */
+    public Jt600ProtocolDecoder(DataManager dataManager, Integer resetDelay) {
+        super(dataManager, resetDelay);
+    }
+
+    /**
+     * Decode regular message
+     */
+    private Position decodeNormalMessage(ChannelBuffer buf) throws Exception {
+        
+        Position position = new Position();
+        
+        buf.readByte(); // header
+        
+        // Get device by identifier
+        int id = ChannelBufferTools.readHexInteger(buf, 10);
+        position.setDeviceId(getDataManager().getDeviceByImei(String.valueOf(id)).getId());
+        
+        buf.readByte(); // protocol version + data type
+        
+        buf.readBytes(2); // length
+        
+        // Time
+        Calendar time = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
+        time.clear();
+        time.set(Calendar.DAY_OF_MONTH, ChannelBufferTools.readHexInteger(buf, 2));
+        time.set(Calendar.MONTH, ChannelBufferTools.readHexInteger(buf, 2) - 1);
+        time.set(Calendar.YEAR, 2000 + ChannelBufferTools.readHexInteger(buf, 2));
+        time.set(Calendar.HOUR, ChannelBufferTools.readHexInteger(buf, 2));
+        time.set(Calendar.MINUTE, ChannelBufferTools.readHexInteger(buf, 2));
+        time.set(Calendar.SECOND, ChannelBufferTools.readHexInteger(buf, 2));
+        position.setTime(time.getTime());
+        
+        // Coordinates
+        int temp = ChannelBufferTools.readHexInteger(buf, 8);
+        double latitude = temp % 1000000;
+        latitude /= 60 * 10000;
+        latitude += temp / 1000000;
+        temp = ChannelBufferTools.readHexInteger(buf, 9);
+        double longitude = temp % 1000000;
+        longitude /= 60 * 10000;
+        longitude += temp / 1000000;
+        
+        // Flags
+        byte flags = buf.readByte();
+        position.setValid((flags & 0x1) == 0x1);
+        if ((flags & 0x2) == 0) latitude = -latitude;
+        position.setLatitude(latitude);
+        if ((flags & 0x4) == 0) longitude = -longitude;
+        position.setLongitude(longitude);
+        
+        // Speed
+        double speed = ChannelBufferTools.readHexInteger(buf, 2);
+        position.setSpeed(speed);
+
+        // Course
+        double course = buf.readUnsignedByte() * 2;
+        position.setCourse(course);
+        
+        buf.readByte(); // number of satellites
+        
+        // Course
+        double power = buf.readUnsignedByte();
+        position.setPower(power);
+        
+        buf.readByte(); // other flags and sensors
+        
+        // Altitude
+        double altitude = buf.readUnsignedShort();
+        position.setAltitude(altitude);
+        
+        buf.readUnsignedShort(); // cell id
+        buf.readUnsignedShort(); // lac
+        
+        buf.readUnsignedByte(); // gsm signal
+        
+        buf.readUnsignedByte(); // message number
+        
+        return position;
+    }
+
+    /**
+     * Alert message pattern
+     */
+    static private Pattern pattern = Pattern.compile(
+            "\\(" +
+            "([\\d]+)," +                // Id
+            "W01," +                     // Type
+            "(\\d{3})(\\d{2}.\\d{4})," + // Longitude (DDDMM.MMMM)
+            "([EW])," +
+            "(\\d{2})(\\d{2}.\\d{4})," + // Latitude (DDMM.MMMM)
+            "([NS])," +
+            "([AV])," +                  // Validity
+            "(\\d{2})(\\d{2})(\\d{2})," + // Date (DDMMYY)
+            "(\\d{2})(\\d{2})(\\d{2})," + // Time (HHMMSS)
+            "(\\d+)," +                  // Speed (km/h)
+            "(\\d+)," +                  // Course
+            "(\\d+)," +                  // Power
+            "(\\d+)," +                  // GPS signal
+            "(\\d+)," +                  // GSM signal
+            "(\\d+)," +                  // Alert Type
+            ".*\\)");
+
+    /**
+     * Decode alert message
+     */
+    private Position decodeAlertMessage(ChannelBuffer buf) throws Exception {
+
+        String message = buf.toString(Charset.defaultCharset());
+        
+        // Parse message
+        Matcher parser = pattern.matcher(message);
+        if (!parser.matches()) {
+            return null;
+        }
+
+        // Create new position
+        Position position = new Position();
+        Integer index = 1;
+
+        // Get device by identifier
+        String id = parser.group(index++);
+        position.setDeviceId(getDataManager().getDeviceByImei(id).getId());
+
+        // Longitude
+        Double lonlitude = Double.valueOf(parser.group(index++));
+        lonlitude += Double.valueOf(parser.group(index++)) / 60;
+        if (parser.group(index++).compareTo("W") == 0) lonlitude = -lonlitude;
+        position.setLongitude(lonlitude);
+        
+        // Latitude
+        Double latitude = Double.valueOf(parser.group(index++));
+        latitude += Double.valueOf(parser.group(index++)) / 60;
+        if (parser.group(index++).compareTo("S") == 0) latitude = -latitude;
+        position.setLatitude(latitude);
+
+        // Validity
+        position.setValid(parser.group(index++).compareTo("A") == 0 ? true : false);
+        
+        // Time
+        Calendar time = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
+        time.clear();
+        time.set(Calendar.DAY_OF_MONTH, Integer.valueOf(parser.group(index++)));
+        time.set(Calendar.MONTH, Integer.valueOf(parser.group(index++)) - 1);
+        time.set(Calendar.YEAR, 2000 + Integer.valueOf(parser.group(index++)));
+        time.set(Calendar.HOUR, Integer.valueOf(parser.group(index++)));
+        time.set(Calendar.MINUTE, Integer.valueOf(parser.group(index++)));
+        time.set(Calendar.SECOND, Integer.valueOf(parser.group(index++)));
+        position.setTime(time.getTime());
+
+        // Speed
+        position.setSpeed(Double.valueOf(parser.group(index++)));
+
+        // Course
+        position.setCourse(Double.valueOf(parser.group(index++)));
+
+        // Power
+        position.setPower(Double.valueOf(parser.group(index++)));
+        
+        return position;
+    }
+
+    /**
+     * Decode message
+     */
+    protected Object decode(
+            ChannelHandlerContext ctx, Channel channel, Object msg)
+            throws Exception {
+
+        ChannelBuffer buf = (ChannelBuffer) msg;
+        char first = (char) buf.getByte(0);
+
+        // Check message type
+        if (first == '$') {
+            return decodeNormalMessage(buf);
+        } else if (first == '(') {
+            return decodeAlertMessage(buf);
+        }
+
+        return null;
+    }
+
+}
diff --git a/test.sh b/test.sh
index b7e09f7f8..e870f173c 100755
--- a/test.sh
+++ b/test.sh
@@ -44,3 +44,12 @@ echo "10. maxon"
 
 echo "11. st210"
 (echo -n -e "SA200STT;123456;042;20120101;12:11:00;16d41;-15.618767;-056.083214;000.011;000.00;11;1;41557;12.21;000000;1;3205\r";) | nc -v localhost 5011
+
+echo "12. progress"
+
+
+echo "13. h02"
+(echo -n -e "*HQ,123456789012345,V1,121300,A,6000.0000,N,13000.0000,E,0.00,0.00,010112,ffffffff,000000,000000,000000,000000#";) | nc -v localhost 5013
+
+echo "14. jt600"
+(echo -n -e "\$\x00\x00\x12\x34\x56\x11\x00\x1B\x01\x01\x12\x12\x14\x00\x60\x00\x00\x00\x13\x00\x00\x00\x0F\x00\x00\x07\x50\x00\x00\x00\x2B\x91\x04\x4D\x1F\xA1";) | nc -v localhost 5014
diff --git a/test/org/traccar/helper/ChannelBufferToolsTest.java b/test/org/traccar/helper/ChannelBufferToolsTest.java
new file mode 100644
index 000000000..16ff036b8
--- /dev/null
+++ b/test/org/traccar/helper/ChannelBufferToolsTest.java
@@ -0,0 +1,23 @@
+package org.traccar.helper;
+
+import org.jboss.netty.buffer.ChannelBufferFactory;
+import org.jboss.netty.buffer.HeapChannelBufferFactory;
+import static org.junit.Assert.*;
+import org.junit.Test;
+
+public class ChannelBufferToolsTest {
+    
+    private ChannelBufferFactory factory = new HeapChannelBufferFactory();
+    
+    @Test
+    public void testFind() {
+    }
+
+    @Test
+    public void testReadHexInteger() {
+        byte[] buf = {0x01,(byte)0x90,0x34};
+        int result = ChannelBufferTools.readHexInteger(
+                factory.getBuffer(buf, 0, buf.length), 5);
+        assertEquals(1903, result);
+    }
+}
diff --git a/test/org/traccar/protocol/Jt600ProtocolDecoderTest1.java b/test/org/traccar/protocol/Jt600ProtocolDecoderTest1.java
new file mode 100644
index 000000000..cdf8f1568
--- /dev/null
+++ b/test/org/traccar/protocol/Jt600ProtocolDecoderTest1.java
@@ -0,0 +1,32 @@
+package org.traccar.protocol;
+
+import java.nio.charset.Charset;
+import org.jboss.netty.buffer.ChannelBuffers;
+import static org.junit.Assert.assertNotNull;
+import org.junit.Test;
+
+public class Jt600ProtocolDecoderTest1 {
+
+    @Test
+    public void testDecode() throws Exception {
+        
+        Jt600ProtocolDecoder decoder = new Jt600ProtocolDecoder(new TestDataManager(), 0);
+        
+        byte[] buf1 = {0x24,0x31,0x10,0x21,0x60,0x01,0x11,0x00,0x1B,0x16,0x02,0x11,0x05,0x59,0x10,0x22,0x32,(byte)0x98,0x62,0x11,0x40,0x46,0x22,0x7B,0x05,(byte)0x98,0x09,0x50,(byte)0x80,0x01,0x23,0x27,(byte)0x95,0x14,0x35,0x16,0x1F};
+        assertNotNull(decoder.decode(null, null, ChannelBuffers.wrappedBuffer(buf1)));
+        
+        byte[] buf2 = {0x24,0x31,0x20,(byte)0x82,0x00,0x29,0x11,0x00,0x1B,0x17,0x10,0x12,0x05,0x28,0x31,0x24,0x38,0x10,0x12,0x02,0x55,0x33,0x64,0x25,0x00,0x19,0x07,0x19,0x00,0x03,(byte)0xFD,0x2B,(byte)0x91,0x04,0x4D,0x1F,(byte)0xA0};
+        assertNotNull(decoder.decode(null, null, ChannelBuffers.wrappedBuffer(buf2)));
+
+        byte[] buf3 = {0x24,0x31,0x20,(byte)0x82,0x00,0x29,0x11,0x00,0x1B,0x17,0x10,0x12,0x05,0x33,0x05,0x24,0x38,0x09,(byte)0x97,0x02,0x55,0x33,0x58,0x45,0x00,0x04,0x06,0x1E,0x00,0x03,(byte)0xEE,0x00,0x00,0x00,0x00,0x0C,0x00};
+        assertNotNull(decoder.decode(null, null, ChannelBuffers.wrappedBuffer(buf2)));
+        
+        assertNotNull(decoder.decode(null, null,
+                ChannelBuffers.copiedBuffer("(3110312099,W01,11404.6204,E,2232.9961,N,A,040511,063736,4,7,100,4,17,1,1,company)", Charset.defaultCharset())));
+
+        assertNotNull(decoder.decode(null, null,
+                ChannelBuffers.copiedBuffer("(3120820029,W01,02553.3555,E,2438.0997,S,A,171012,053339,0,8,20,6,31,5,20,20)", Charset.defaultCharset())));
+
+    }
+
+}