10 files changed, 292 insertions, 20 deletions

diff --git a/src/org/traccar/Server.java b/src/org/traccar/Server.java
index 83e18a537..a747df536 100644
--- a/src/org/traccar/Server.java
+++ b/src/org/traccar/Server.java
@@ -53,6 +53,7 @@ import org.jboss.netty.channel.ChannelPipelineFactory;
 import org.jboss.netty.channel.ChannelStateEvent;
 import org.jboss.netty.channel.Channels;
 import org.jboss.netty.channel.SimpleChannelHandler;
+import org.traccar.protocol.gl100.Gl100ProtocolDecoder;
 import org.traccar.protocol.xexun2.Xexun2ProtocolDecoder;
 
 /**
@@ -94,6 +95,7 @@ public class Server implements DataManager {
         initXexunServer(properties);
         initGps103Server(properties);
         initTk103Server(properties);
+        initGl100Server(properties);
         initGl200Server(properties);
         initT55Server(properties);
         initXexun2Server(properties);
@@ -399,6 +401,59 @@ public class Server implements DataManager {
     }
 
     /**
+     * Gl100 pipeline factory
+     */
+    protected class Gl100PipelineFactory implements ChannelPipelineFactory {
+
+        private TrackerServer server;
+        private Server serverCreator;
+        private Integer resetDelay;
+        
+        public Gl100PipelineFactory(
+                TrackerServer server, Server serverCreator, Integer resetDelay) {
+            this.server = server;
+            this.serverCreator = serverCreator;
+            this.resetDelay = resetDelay;
+        }
+        
+        public ChannelPipeline getPipeline() {
+            ChannelPipeline pipeline = Channels.pipeline();
+            pipeline.addLast("openHandler", new OpenChannelHandler(server));
+            if (serverCreator.isLoggerEnabled()) {
+                pipeline.addLast("logger", new LoggingHandler("logger"));
+            }
+            byte delimiter[] = { (byte) 0x0 };
+            pipeline.addLast("frameDecoder",
+                    new DelimiterBasedFrameDecoder(1024, ChannelBuffers.wrappedBuffer(delimiter)));
+            pipeline.addLast("stringDecoder", new StringDecoder());
+            pipeline.addLast("stringEncoder", new StringEncoder());
+            pipeline.addLast("objectDecoder", new Gl100ProtocolDecoder(serverCreator, resetDelay));
+            pipeline.addLast("handler", new TrackerEventHandler(serverCreator));
+            return pipeline;
+        }
+    }    
+    
+    /**
+     * Init Gl100 server
+     */
+    public void initGl100Server(Properties properties) throws SQLException {
+
+        boolean enable = Boolean.valueOf(properties.getProperty("gl100.enable"));
+        if (enable) {
+
+            TrackerServer server = new TrackerServer(
+                    Integer.valueOf(properties.getProperty("gl100.port")));
+
+            String resetDelay = properties.getProperty("gl100.resetDelay");
+            server.setPipelineFactory(new Gl100PipelineFactory(
+                    server, this, (resetDelay == null) ? 0 : Integer.valueOf(resetDelay)));
+
+            serverList.add(server);
+        }
+    }
+
+    
+    /**
      * Gl200 pipeline factory
      */
     protected class Gl200PipelineFactory implements ChannelPipelineFactory {
diff --git a/src/org/traccar/protocol/gl100/Gl100ProtocolDecoder.java b/src/org/traccar/protocol/gl100/Gl100ProtocolDecoder.java
new file mode 100644
index 000000000..e2c576d69
--- /dev/null
+++ b/src/org/traccar/protocol/gl100/Gl100ProtocolDecoder.java
@@ -0,0 +1,159 @@
+/*
+ * Copyright 2010 Anton Tananaev (anton@tananaev.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.gl100;
+
+import java.util.Calendar;
+import java.util.GregorianCalendar;
+import java.util.TimeZone;
+import java.util.Timer;
+import java.util.TimerTask;
+import java.util.regex.Pattern;
+import java.util.regex.Matcher;
+import org.jboss.netty.channel.Channel;
+import org.jboss.netty.channel.ChannelHandlerContext;
+import org.jboss.netty.handler.codec.oneone.OneToOneDecoder;
+import org.traccar.Position;
+import org.traccar.DataManager;
+import org.jboss.netty.channel.ChannelEvent;
+import org.jboss.netty.channel.ChannelState;
+import org.jboss.netty.channel.ChannelStateEvent;
+
+/**
+ * GL200 tracker protocol decoder
+ */
+public class Gl100ProtocolDecoder extends OneToOneDecoder {
+
+    /**
+     * Data manager
+     */
+    private DataManager dataManager;
+
+    /**
+     * Reset connection delay
+     */
+    private Integer resetDelay;
+
+    /**
+     * Init device table
+     */
+    public Gl100ProtocolDecoder(DataManager dataManager, Integer resetDelay) {
+        this.dataManager = dataManager;
+        this.resetDelay = resetDelay;
+    }
+
+    /**
+     * Regular expressions pattern
+     */
+    static private Pattern pattern = Pattern.compile(
+            "\\+RESP:GT...," +
+            "(\\d{15})," +                      // IMEI
+            "(?:(?:\\d+," +                     // Number
+            "\\d," +                            // Reserved / Geofence id
+            "\\d)|" +                           // Reserved / Geofence alert
+            "(?:[^,]*))," +                     // Calling number
+            "([01])," +                         // GPS fix
+            "(\\d+.\\d)," +                     // Speed
+            "(\\d+)," +                         // Course
+            "(-?\\d+.\\d)," +                   // Altitude
+            "\\d*," +                           // GPS accuracy
+            "(-?\\d+.\\d+)," +                  // Longitude
+            "(-?\\d+.\\d+)," +                  // Latitude
+            "(\\d{4})(\\d{2})(\\d{2})" +        // Date (YYYYMMDD)
+            "(\\d{2})(\\d{2})(\\d{2})," +       // Time (HHMMSS)
+            ".*");
+
+    /**
+     * Decode message
+     */
+    protected Object decode(
+            ChannelHandlerContext ctx, Channel channel, Object msg)
+            throws Exception {
+
+        String sentence = (String) msg;
+        
+        // Parse message
+        Matcher parser = pattern.matcher(sentence);
+        if (!parser.matches()) {
+            return null;
+        }
+
+        // Create new position
+        Position position = new Position();
+
+        Integer index = 1;
+
+        // Get device by IMEI
+        String imei = parser.group(index++);
+        position.setDeviceId(dataManager.getDeviceByImei(imei).getId());
+        
+        // Validity
+        position.setValid(Integer.valueOf(parser.group(index++)) == 0 ? false : true);
+        
+        // Position info
+        position.setSpeed(Double.valueOf(parser.group(index++)));
+        position.setCourse(Double.valueOf(parser.group(index++)));
+        position.setAltitude(Double.valueOf(parser.group(index++)));
+        position.setLongitude(Double.valueOf(parser.group(index++)));
+        position.setLatitude(Double.valueOf(parser.group(index++)));
+        
+        // Date
+        Calendar time = new GregorianCalendar(TimeZone.getTimeZone("UTC"));
+        time.clear();
+        time.set(Calendar.YEAR, Integer.valueOf(parser.group(index++)));
+        time.set(Calendar.MONTH, Integer.valueOf(parser.group(index++)) - 1);
+        time.set(Calendar.DAY_OF_MONTH, Integer.valueOf(parser.group(index++)));
+
+        // Time
+        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());
+
+        return position;
+    }
+
+    /**
+     * Disconnect channel
+     */
+    class DisconnectTask extends TimerTask {
+        private Channel channel;
+        
+        public DisconnectTask(Channel channel) {
+            this.channel = channel;
+        }
+        
+        public void run() {
+            channel.disconnect();
+        } 
+    }
+
+    /**
+     * Handle connect event
+     */
+    @Override
+    public void handleUpstream(ChannelHandlerContext ctx, ChannelEvent evt) throws Exception {
+        super.handleUpstream(ctx, evt);
+
+        if (evt instanceof ChannelStateEvent) {
+            ChannelStateEvent event = (ChannelStateEvent) evt;
+
+            if (event.getState() == ChannelState.CONNECTED && event.getValue() != null && resetDelay != 0) {
+                new Timer().schedule(new DisconnectTask(evt.getChannel()), resetDelay);
+            }
+        }
+    }
+
+}
diff --git a/src/org/traccar/protocol/gl200/Gl200ProtocolDecoder.java b/src/org/traccar/protocol/gl200/Gl200ProtocolDecoder.java
index 410477d19..a6daa141a 100644
--- a/src/org/traccar/protocol/gl200/Gl200ProtocolDecoder.java
+++ b/src/org/traccar/protocol/gl200/Gl200ProtocolDecoder.java
@@ -62,9 +62,10 @@ public class Gl200ProtocolDecoder extends OneToOneDecoder {
             "\\d{6}," +                         // Protocol version
             "(\\d{15})," +                      // IMEI
             "[^,]*," +                          // Device name
-            "\\d," +                            // Report ID
-            "\\d," +                            // Report type
-            "\\d*," +                           // Number
+            "(?:(?:\\d," +                      // Report ID / Geo mode
+            "\\d*," +                           // Report type / Geo radius
+            "\\d*)|" +                          // Number / Geo check interval
+            "(?:[^,]*))," +                     // Call number
             "(\\d*)," +                         // GPS accuracy
             "(\\d+.\\d)," +                     // Speed
             "(\\d+)," +                         // Course
@@ -73,7 +74,7 @@ public class Gl200ProtocolDecoder extends OneToOneDecoder {
             "(-?\\d+.\\d+)," +                  // Latitude
             "(\\d{4})(\\d{2})(\\d{2})" +        // Date (YYYYMMDD)
             "(\\d{2})(\\d{2})(\\d{2})," +       // Time (HHMMSS)
-            "[^$]*");
+            ".*");
 
     /**
      * Decode message
@@ -83,7 +84,7 @@ public class Gl200ProtocolDecoder extends OneToOneDecoder {
             throws Exception {
 
         String sentence = (String) msg;
-
+        
         // Parse message
         Matcher parser = pattern.matcher(sentence);
         if (!parser.matches()) {
diff --git a/test/org/traccar/protocol/gl100/Gl100ProtocolDecoderTest.java b/test/org/traccar/protocol/gl100/Gl100ProtocolDecoderTest.java
new file mode 100644
index 000000000..614eb3478
--- /dev/null
+++ b/test/org/traccar/protocol/gl100/Gl100ProtocolDecoderTest.java
@@ -0,0 +1,57 @@
+package org.traccar.protocol.gl100;
+
+import java.util.List;
+import org.junit.Test;
+import org.traccar.Device;
+import org.traccar.Position;
+import org.traccar.DataManager;
+import static org.junit.Assert.*;
+
+public class Gl100ProtocolDecoderTest {
+
+    private class TestDataManager implements DataManager {
+        public List getDevices() {
+            return null;
+        }
+
+        public Device getDeviceByImei(String imei) {
+            Device device = new Device();
+            device.setId(new Long(1));
+            device.setImei("10000000000000");
+            return device;
+        }
+
+        public void setPosition(Position position) {
+        }
+    }
+
+    @Test
+    public void testDecode() throws Exception {
+        
+        Gl100ProtocolDecoder decoder = new Gl100ProtocolDecoder(new TestDataManager(), 0);
+        
+        assertNotNull(decoder.decode(null, null,
+                "+RESP:GTSOS,359231030000010,0,0,0,1,4.3,92,70.0,1,121.354335,31.222073,20090101000000,0460,0000,18d8,6141,00,11F0,0102120204"));
+
+        assertNotNull(decoder.decode(null, null,
+                "+RESP:GTRTL,359231030000010,0,0,0,1,4.3,92,70.0,1,121.354335,31.222073,20090101000000,0460,0000,18d8,6141,00,11F0,0102120204"));
+
+        assertNotNull(decoder.decode(null, null,
+                "+RESP:GTEST,359231030000010,0,0,0,1,4.3,92,70.0,1,121.354335,31.222073,20090101000000,0460,0000,18d8,6141,00,11F0,0102120204"));
+
+        assertNotNull(decoder.decode(null, null,
+                "+RESP:GTSZI,359231030000010,0,3,0,1,4.3,92,70.0,1,121.354335,31.222073,20090101000000,0460,0000,18d8,6141,00,11F0,0102120204"));
+
+        assertNotNull(decoder.decode(null, null,
+                "+RESP:GTLBC,359231030000010,02132523415,1,4.3,92,70.0,1,121.354335,31.222073,20090101000000,0460,0000,18d8,6141,00,11F0,0102120204"));
+
+        assertNotNull(decoder.decode(null, null,
+                "+RESP:GTTRI,359231030000010,1,0,0,1,4.3,92,70.0,1,121.354335,31.222073,20090101000000,0460,0000,18d8,6141,00,11F0,0102120204"));
+
+        assertNotNull(decoder.decode(null, null,
+                "+RESP:GTTRI,359231030000010,2,0,0,1,4.3,92,70.0,1,121.354335,31.222073,20090101000000,0460,0000,18d8,6141,00,0,0,1,-3.6,145,30.0,2,121.354442,31.221940,20090101000100,0460,0000,18d8,6141,00,11F0,0102120204"));
+
+        
+    }
+
+}
diff --git a/test/org/traccar/protocol/gl200/Gl200ProtocolDecoderTest.java b/test/org/traccar/protocol/gl200/Gl200ProtocolDecoderTest.java
index e2f4188bc..5f6707ab7 100644
--- a/test/org/traccar/protocol/gl200/Gl200ProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/gl200/Gl200ProtocolDecoderTest.java
@@ -1,8 +1,5 @@
 package org.traccar.protocol.gl200;
 
-import java.util.Calendar;
-import java.util.TimeZone;
-import java.util.GregorianCalendar;
 import java.util.List;
 import org.junit.Test;
 import org.traccar.Device;
@@ -36,6 +33,21 @@ public class Gl200ProtocolDecoderTest {
         assertNotNull(decoder.decode(null, null,
                 "+RESP:GTFRI,020102,000035988863964,,0,0,1,1,4.3,92,70.0,121.354335,31.222073,20090214013254,0460,0000,18d8,6141,00,,20090214093254,11F0"));
 
+        assertNotNull(decoder.decode(null, null,
+                "+RESP:GTFRI,020102,135790246811220,,0,0,1,1,4.3,92,70.0,121.354335,31.222073,20090214013254,0460,0000,18d8,6141,00,,20090214093254,11F0"));
+ 
+        assertNotNull(decoder.decode(null, null,
+                "+RESP:GTFRI,020102,135790246811220,,0,0,2,1,4.3,92,70.0,121.354335,31.222073,20090214013254,0460,0000,18d8,6141,00,0,4.3,92,70.0,121.354335,31.222073,20090101000000,0460,0000,18d8,6141,00,,20090214093254,11F0"));
+ 
+        assertNotNull(decoder.decode(null, null,
+                "+RESP:GTDOG,020102,135790246811220,,0,0,1,1,4.3,92,70.0,121.354335,31.222073,20090214013254,0460,0000,18d8,6141,00,2000.0,20090214093254,11F0"));
+
+        assertNotNull(decoder.decode(null, null,
+                "+RESP:GTLBC,020102,135790246811220,,+8613800000000,1,4.3,92,70.0,121.354335,31.222073,20090214013254,0460,0000,18d8,6141,00,,20090214093254,11F0"));
+        
+        assertNotNull(decoder.decode(null, null,
+                "+RESP:GTGCR,020102,135790246811220,,3,50,180,2,0.4,296,-5.4,121.391055,31.164473,20100714104934,0460,0000,1878,0873,00,,20100714104934,000C"));
+
     }
 
 }
diff --git a/test/org/traccar/protocol/gps103/Gps103ProtocolDecoderTest.java b/test/org/traccar/protocol/gps103/Gps103ProtocolDecoderTest.java
index 99255fbe8..79ba76586 100644
--- a/test/org/traccar/protocol/gps103/Gps103ProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/gps103/Gps103ProtocolDecoderTest.java
@@ -1,8 +1,5 @@
 package org.traccar.protocol.gps103;
 
-import java.util.Calendar;
-import java.util.TimeZone;
-import java.util.GregorianCalendar;
 import java.util.List;
 import org.junit.Test;
 import org.traccar.Device;
diff --git a/test/org/traccar/protocol/t55/T55ProtocolDecoderTest.java b/test/org/traccar/protocol/t55/T55ProtocolDecoderTest.java
index e806d49de..8ee9ce9e9 100644
--- a/test/org/traccar/protocol/t55/T55ProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/t55/T55ProtocolDecoderTest.java
@@ -1,7 +1,5 @@
 package org.traccar.protocol.t55;
 
-import java.util.Date;
-import java.util.GregorianCalendar;
 import java.util.List;
 import org.junit.Test;
 import org.traccar.Device;
diff --git a/test/org/traccar/protocol/tk103/Tk103ProtocolDecoderTest.java b/test/org/traccar/protocol/tk103/Tk103ProtocolDecoderTest.java
index 68ea941fd..f1ef85b06 100644
--- a/test/org/traccar/protocol/tk103/Tk103ProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/tk103/Tk103ProtocolDecoderTest.java
@@ -1,8 +1,5 @@
 package org.traccar.protocol.tk103;
 
-import java.util.Calendar;
-import java.util.TimeZone;
-import java.util.GregorianCalendar;
 import java.util.List;
 import org.junit.Test;
 import org.traccar.Device;
diff --git a/test/org/traccar/protocol/xexun/XexunProtocolDecoderTest.java b/test/org/traccar/protocol/xexun/XexunProtocolDecoderTest.java
index 76c299cd2..ec5370406 100644
--- a/test/org/traccar/protocol/xexun/XexunProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/xexun/XexunProtocolDecoderTest.java
@@ -1,7 +1,5 @@
 package org.traccar.protocol.xexun;
 
-import java.util.Date;
-import java.util.GregorianCalendar;
 import java.util.List;
 import org.junit.Test;
 import org.traccar.Device;
diff --git a/test/org/traccar/protocol/xexun2/Xexun2ProtocolDecoderTest.java b/test/org/traccar/protocol/xexun2/Xexun2ProtocolDecoderTest.java
index 75b132e98..790abc222 100644
--- a/test/org/traccar/protocol/xexun2/Xexun2ProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/xexun2/Xexun2ProtocolDecoderTest.java
@@ -1,7 +1,5 @@
 package org.traccar.protocol.xexun2;
 
-import java.util.Date;
-import java.util.GregorianCalendar;
 import java.util.List;
 import org.junit.Test;
 import org.traccar.Device;