Begin BCE implementation

5 files changed, 212 insertions, 1 deletions

diff --git a/default.cfg b/default.cfg
index c0adcc97c..3b1b1113d 100644
--- a/default.cfg
+++ b/default.cfg
@@ -387,8 +387,12 @@
     <entry key='gosafe.enable'>true</entry>
     <entry key='gosafe.port'>5078</entry>
 
-    <!-- AutoFon 4.5 / Starline M10/M11/M16/M17 server configuration -->
+    <!-- AutoFon 4.5 server configuration -->
     <entry key='autofon45.enable'>true</entry>
     <entry key='autofon45.port'>5079</entry>
 
+    <!-- BCE server configuration -->
+    <entry key='bce.enable'>true</entry>
+    <entry key='bce.port'>5080</entry>
+
 </properties>
diff --git a/src/org/traccar/ServerManager.java b/src/org/traccar/ServerManager.java
index 6b46079e9..f637f8161 100644
--- a/src/org/traccar/ServerManager.java
+++ b/src/org/traccar/ServerManager.java
@@ -180,6 +180,7 @@ public class ServerManager {
         initAutoFonServer("autofon");
         initGoSafeServer("gosafe");
         initAutoFon45Server("autofon45");
+        initBceServer("bce");
 
         initProtocolDetector();
 
@@ -1322,4 +1323,17 @@ public class ServerManager {
             });
         }
     }
+
+    private void initBceServer(final String protocol) throws SQLException {
+        if (isProtocolEnabled(properties, protocol)) {
+            serverList.add(new TrackerServer(this, new ServerBootstrap(), protocol) {
+                @Override
+                protected void addSpecificHandlers(ChannelPipeline pipeline) {
+                    pipeline.addLast("frameDecoder", new BceFrameDecoder());
+                    pipeline.addLast("objectDecoder", new BceProtocolDecoder(dataManager, protocol, properties));
+                }
+            });
+        }
+    }
+
 }
diff --git a/src/org/traccar/protocol/BceFrameDecoder.java b/src/org/traccar/protocol/BceFrameDecoder.java
new file mode 100644
index 000000000..84f7aa870
--- /dev/null
+++ b/src/org/traccar/protocol/BceFrameDecoder.java
@@ -0,0 +1,47 @@
+/*
+ * 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.channel.Channel;
+import org.jboss.netty.channel.ChannelHandlerContext;
+import org.jboss.netty.handler.codec.frame.LengthFieldBasedFrameDecoder;
+
+public class BceFrameDecoder extends LengthFieldBasedFrameDecoder {
+
+    private static final int HANDSHAKE_LENGTH = 7; // "#BCE#\r\n"
+    
+    private boolean header = true;
+    
+    public BceFrameDecoder() {
+        super(1024, 8, 2);
+    }
+    
+    @Override
+    protected Object decode(
+            ChannelHandlerContext ctx,
+            Channel channel,
+            ChannelBuffer buf) throws Exception {
+        
+        if (header && buf.readableBytes() >= HANDSHAKE_LENGTH) {
+            buf.skipBytes(HANDSHAKE_LENGTH);
+            header = false;
+        }
+
+        return super.decode(ctx, channel, buf);
+    }
+
+}
diff --git a/src/org/traccar/protocol/BceProtocolDecoder.java b/src/org/traccar/protocol/BceProtocolDecoder.java
new file mode 100644
index 000000000..1b65f85da
--- /dev/null
+++ b/src/org/traccar/protocol/BceProtocolDecoder.java
@@ -0,0 +1,124 @@
+/*
+ * 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.util.Calendar;
+import java.util.Properties;
+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.database.DataManager;
+import org.traccar.helper.Log;
+import org.traccar.model.ExtendedInfoFormatter;
+import org.traccar.model.Position;
+
+public class BceProtocolDecoder extends BaseProtocolDecoder {
+
+    public BceProtocolDecoder(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, Object msg)
+            throws Exception {
+
+        ChannelBuffer buf = (ChannelBuffer) msg;
+
+        /*buf.skipBytes(2); // header
+        buf.readByte(); // size
+
+        // Zero for location messages
+        buf.readByte(); // voltage
+        buf.readByte(); // gsm signal
+
+        String imei = readImei(buf);
+        long index = buf.readUnsignedShort();
+        int type = buf.readUnsignedByte();
+
+        if (type == MSG_HEARTBEAT) {
+            if (channel != null) {
+                byte[] response = {0x54, 0x68, 0x1A, 0x0D, 0x0A};
+                channel.write(ChannelBuffers.wrappedBuffer(response));
+            }
+        }
+
+        else if (type == MSG_DATA) {
+
+            // Create new position
+            Position position = new Position();
+            ExtendedInfoFormatter extendedInfo = new ExtendedInfoFormatter(getProtocol());
+            extendedInfo.set("index", index);
+
+            // Get device id
+            try {
+                position.setDeviceId(getDataManager().getDeviceByImei(imei).getId());
+            } catch(Exception error) {
+                Log.warning("Unknown device - " + imei);
+                return null;
+            }
+
+            // Date and time
+            Calendar time = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
+            time.clear();
+            time.set(Calendar.YEAR, 2000 + buf.readUnsignedByte());
+            time.set(Calendar.MONTH, buf.readUnsignedByte() - 1);
+            time.set(Calendar.DAY_OF_MONTH, 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());
+
+            // Latitude
+            double latitude = buf.readUnsignedInt() / (60.0 * 30000.0);
+
+            // Longitude
+            double longitude = buf.readUnsignedInt() / (60.0 * 30000.0);
+
+            // Speed
+            position.setSpeed((double) buf.readUnsignedByte());
+
+            // Course
+            position.setCourse((double) buf.readUnsignedShort());
+
+            buf.skipBytes(3); // reserved
+
+            // Flags
+            long flags = buf.readUnsignedInt();
+            position.setValid((flags & 0x1) == 0x1);
+            if ((flags & 0x2) == 0) latitude = -latitude;
+            if ((flags & 0x4) == 0) longitude = -longitude;
+
+            position.setLatitude(latitude);
+            position.setLongitude(longitude);
+            position.setAltitude(0.0);
+
+            position.setExtendedInfo(extendedInfo.toString());
+            return position;
+        }*/
+
+        return null;
+    }
+
+}
diff --git a/test/org/traccar/protocol/BceProtocolDecoderTest.java b/test/org/traccar/protocol/BceProtocolDecoderTest.java
new file mode 100644
index 000000000..93fc080a4
--- /dev/null
+++ b/test/org/traccar/protocol/BceProtocolDecoderTest.java
@@ -0,0 +1,22 @@
+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 BceProtocolDecoderTest {
+
+    @Test
+    public void testDecode() throws Exception {
+
+        BceProtocolDecoder decoder = new BceProtocolDecoder(new TestDataManager(), null, null);
+
+        verify(decoder.decode(null, null, ChannelBuffers.wrappedBuffer(ChannelBufferTools.convertHexString(
+                "be76619c834601004200a0003fd769c568ffc3db0079161d420683a9414918b1150000000000d102660167040000000000009f06357f0000a401042ea415e10232000000000000000000000051"))));
+
+    }
+
+}