Implement Orion protocol

3 files changed, 101 insertions, 178 deletions

diff --git a/src/org/traccar/ServerManager.java b/src/org/traccar/ServerManager.java
index 8845df738..c6204441d 100644
--- a/src/org/traccar/ServerManager.java
+++ b/src/org/traccar/ServerManager.java
@@ -1223,7 +1223,7 @@ public class ServerManager {
 
     private void initOrionServer(String protocol) throws SQLException {
         if (isProtocolEnabled(properties, protocol)) {
-            TrackerServer server = new TrackerServer(this, new ConnectionlessBootstrap(), protocol) {
+            TrackerServer server = new TrackerServer(this, new ServerBootstrap(), protocol) {
                 @Override
                 protected void addSpecificHandlers(ChannelPipeline pipeline) {
                     pipeline.addLast("frameDecoder", new OrionFrameDecoder());
diff --git a/src/org/traccar/protocol/OrionFrameDecoder.java b/src/org/traccar/protocol/OrionFrameDecoder.java
index 92236225b..cc3efa6a5 100644
--- a/src/org/traccar/protocol/OrionFrameDecoder.java
+++ b/src/org/traccar/protocol/OrionFrameDecoder.java
@@ -21,6 +21,9 @@ import org.jboss.netty.channel.ChannelHandlerContext;
 import org.jboss.netty.handler.codec.frame.FrameDecoder;
 
 public class OrionFrameDecoder extends FrameDecoder {
+    
+    private static final int TYPE_USERLOG = 0;
+    private static final int TYPE_SYSLOG = 3;
 
     @Override
     protected Object decode(
@@ -28,22 +31,41 @@ public class OrionFrameDecoder extends FrameDecoder {
             Channel channel,
             ChannelBuffer buf) throws Exception {
         
-        // Check minimum length
-        if (buf.readableBytes() < 5) {
-            return null;
-        }
-        
-        int length = 2 + 2; // head and tail
-        
-        if (buf.getByte(buf.readerIndex()) == 0x78) {
-            length += 1 + buf.getByte(buf.readerIndex() + 2);
-        } else {
-            length += 2 + buf.getShort(buf.readerIndex() + 2);
-        }
+        int length = 6;
         
-        // Check length and return buffer
         if (buf.readableBytes() >= length) {
-            return buf.readBytes(length);
+        
+            int type = buf.getUnsignedByte(buf.readerIndex() + 2) & 0x0f;
+            
+            if (type == TYPE_USERLOG) {
+                if (buf.readableBytes() >= length + 5) {
+                
+                    int index = buf.readerIndex() + 3;
+                    int count = buf.getUnsignedByte(index) & 0x0f;
+                    index += 5;
+                    length += 5;
+
+                    for (int i = 0; i < count; i++) {
+                        if (buf.readableBytes() < length) {
+                            return null;
+                        }
+                        int logLength = buf.getUnsignedByte(index + 1);
+                        index += logLength;
+                        length += logLength;
+                    }
+                
+                    if (buf.readableBytes() >= length) {
+                        return buf.readBytes(length);
+                    }
+                }
+            } else if (type == TYPE_SYSLOG) {
+                if (buf.readableBytes() >= length + 12) {
+                    length += buf.getUnsignedShort(buf.readerIndex() + 8);
+                    if (buf.readableBytes() >= length) {
+                        return buf.readBytes(length);
+                    }
+                }
+            }
         }
 
         return null;
diff --git a/src/org/traccar/protocol/OrionProtocolDecoder.java b/src/org/traccar/protocol/OrionProtocolDecoder.java
index f321380eb..fa04c6dca 100644
--- a/src/org/traccar/protocol/OrionProtocolDecoder.java
+++ b/src/org/traccar/protocol/OrionProtocolDecoder.java
@@ -16,6 +16,8 @@
 package org.traccar.protocol;
 
 import java.util.Calendar;
+import java.util.LinkedList;
+import java.util.List;
 import java.util.TimeZone;
 import org.jboss.netty.buffer.ChannelBuffer;
 import org.jboss.netty.buffer.ChannelBuffers;
@@ -30,193 +32,92 @@ import org.traccar.model.Position;
 
 public class OrionProtocolDecoder extends BaseProtocolDecoder {
 
-    private Long deviceId;
-    private final TimeZone timeZone = TimeZone.getTimeZone("UTC");
-
     public OrionProtocolDecoder(ServerManager serverManager) {
         super(serverManager);
     }
+    
+    private static final int TYPE_USERLOG = 0;
+    private static final int TYPE_SYSLOG = 3;
 
-    private String readImei(ChannelBuffer buf) {
-        int b = buf.readUnsignedByte();
-        StringBuilder imei = new StringBuilder();
-        imei.append(b & 0x0F);
-        for (int i = 0; i < 7; i++) {
-            b = buf.readUnsignedByte();
-            imei.append((b & 0xF0) >> 4);
-            imei.append(b & 0x0F);
-        }
-        return imei.toString();
-    }
-
-    private static final int MSG_LOGIN = 0x01;
-    private static final int MSG_GPS = 0x10;
-    private static final int MSG_LBS = 0x11;
-    private static final int MSG_GPS_LBS = 0x12;
-    private static final int MSG_STATUS = 0x13;
-    private static final int MSG_SATELLITE = 0x14;
-    private static final int MSG_STRING = 0x15;
-    private static final int MSG_GPS_LBS_STATUS = 0x16;
-    private static final int MSG_LBS_PHONE = 0x17;
-    private static final int MSG_LBS_EXTEND = 0x18;
-    private static final int MSG_LBS_STATUS = 0x19;
-    private static final int MSG_GPS_PHONE = 0x1A;
-    private static final int MSG_GPS_LBS_EXTEND = 0x1E;
-
-    private static void sendResponse(Channel channel, int type, int index) {
+    private static void sendResponse(Channel channel, ChannelBuffer buf) {
         if (channel != null) {
-            ChannelBuffer response = ChannelBuffers.directBuffer(10);
-            response.writeByte(0x78); response.writeByte(0x78); // header
-            response.writeByte(0x05); // size
-            response.writeByte(type);
-            response.writeShort(index);
-            response.writeShort(Crc.crc16Ccitt(response.toByteBuffer(2, 4)));
-            response.writeByte(0x0D); response.writeByte(0x0A); // ending
+            ChannelBuffer response = ChannelBuffers.directBuffer(4);
+            response.writeByte('*');
+            response.writeShort(buf.getUnsignedShort(buf.writerIndex() - 2));
+            response.writeByte(buf.getUnsignedByte(buf.writerIndex() - 3));
             channel.write(response);
         }
     }
-
+    
     @Override
     protected Object decode(
             ChannelHandlerContext ctx, Channel channel, Object msg)
             throws Exception {
 
         ChannelBuffer buf = (ChannelBuffer) msg;
-
-        // Check header
-        if (buf.readByte() != 0x78 || buf.readByte() != 0x78) {
-            return null;
-        }
         
-        int length = buf.readByte(); // size
-        int dataLength = length - 5;
-
-        int type = buf.readUnsignedByte();
+        buf.skipBytes(2); // header
+        int type = buf.readUnsignedByte() & 0x0f;
         
-        if (type == MSG_LOGIN) {
-
-            String imei = readImei(buf);
-            buf.readUnsignedShort(); // type
-
-            // Timezone offset
-            if (dataLength > 10) {
-                int extensionBits = buf.readUnsignedShort();
-                int offset = (extensionBits >> 4) * 36000;
-                if ((extensionBits & 0x8) != 0) {
-                    offset = -offset;
-                }
-                timeZone.setRawOffset(offset);
+        if (type == TYPE_USERLOG) {
+            
+            int header = buf.readUnsignedByte();
+            
+            if ((header & 0x40) != 0) {
+                sendResponse(channel, buf);
             }
             
+            String id = String.valueOf(buf.readUnsignedInt());
+            long deviceId;
             try {
-                deviceId = getDataManager().getDeviceByImei(imei).getId();
-                buf.skipBytes(dataLength - 8);
-                sendResponse(channel, type, buf.readUnsignedShort());
+                deviceId = getDataManager().getDeviceByImei(id).getId();
             } catch(Exception error) {
-                Log.warning("Unknown device - " + imei);
+                Log.warning("Unknown device - " + id);
+                return null;
             }
             
-        }
-
-        else if (deviceId != null && (
-                 type == MSG_GPS ||
-                 type == MSG_GPS_LBS ||
-                 type == MSG_GPS_LBS_STATUS ||
-                 type == MSG_GPS_PHONE ||
-                 type == MSG_GPS_LBS_EXTEND)) {
-
-            // Create new position
-            Position position = new Position();
-            position.setDeviceId(deviceId);
-            ExtendedInfoFormatter extendedInfo = new ExtendedInfoFormatter("gt06");
-
-            // Date and time
-            Calendar time = Calendar.getInstance(timeZone);
-            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());
-
-            // GPS length and Satellites count
-            int gpsLength = buf.readUnsignedByte();
-            extendedInfo.set("satellites", gpsLength & 0xf);
-            gpsLength >>= 4;
-
-            // Latitude
-            double latitude = buf.readUnsignedInt() / (60.0 * 30000.0);
-
-            // Longitude
-            double longitude = buf.readUnsignedInt() / (60.0 * 30000.0);
-
-            // Speed
-            position.setSpeed(buf.readUnsignedByte() * 0.539957);
-
-            // Course and flags
-            int union = buf.readUnsignedShort();
-            position.setCourse((double) (union & 0x03FF));
-            position.setValid((union & 0x1000) != 0);
-            if ((union & 0x0400) == 0) latitude = -latitude;
-            if ((union & 0x0800) != 0) longitude = -longitude;
-
-            position.setLatitude(latitude);
-            position.setLongitude(longitude);
-            position.setAltitude(0.0);
+            List<Position> positions = new LinkedList<Position>();
             
-            if ((union & 0x4000) != 0) {
-                extendedInfo.set("acc", (union & 0x8000) != 0);
-            }
-
-            buf.skipBytes(gpsLength - 12); // skip reserved
-
-            if (type == MSG_GPS_LBS || type == MSG_GPS_LBS_STATUS) {
-
-                int lbsLength = 0;
-                if (type == MSG_GPS_LBS_STATUS) {
-                    lbsLength = buf.readUnsignedByte();
-                }
-
-                // Cell information
-                extendedInfo.set("mcc", buf.readUnsignedShort());
-                extendedInfo.set("mnc", buf.readUnsignedByte());
-                extendedInfo.set("lac", buf.readUnsignedShort());
-                extendedInfo.set("cell", buf.readUnsignedShort() << 8 + buf.readUnsignedByte());
-                buf.skipBytes(lbsLength - 9);
-
-                // Status
-                if (type == MSG_GPS_LBS_STATUS) {
-                    extendedInfo.set("alarm", true);
-                    
-                    int flags = buf.readUnsignedByte();
-                    extendedInfo.set("acc", (flags & 0x2) != 0);
-                    // TODO parse other flags
-
-                    // Voltage
-                    extendedInfo.set("power", buf.readUnsignedByte());
-
-                    // GSM signal
-                    extendedInfo.set("gsm", buf.readUnsignedByte());
-                }
-            }
-
-            // Index
-            if (buf.readableBytes() > 6) {
-                buf.skipBytes(buf.readableBytes() - 6);
+            for (int i = 0; i < (header & 0x0f); i++) {
+                
+                // Create new position
+                Position position = new Position();
+                position.setDeviceId(deviceId);
+                ExtendedInfoFormatter extendedInfo = new ExtendedInfoFormatter("orion");
+                
+                extendedInfo.set("event", buf.readUnsignedByte());
+                buf.readUnsignedByte(); // length
+                extendedInfo.set("flag1", buf.readUnsignedByte());
+                extendedInfo.set("flag2", buf.readUnsignedByte());
+                
+                // Location
+                position.setLatitude(buf.readInt() / 10000.0);
+                position.setLongitude(buf.readInt() / 10000.0);
+                position.setAltitude(buf.readShort()/ 10.0);
+                position.setCourse((double) buf.readUnsignedShort());
+                position.setSpeed(buf.readUnsignedShort() * 0.0539957);
+                
+                // 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());
+                
+                // Accuracy
+                int satellites = buf.readUnsignedByte();
+                extendedInfo.set("satellites", satellites);
+                position.setValid(satellites >= 3);
+                
+                position.setExtendedInfo(extendedInfo.toString());
+                positions.add(position);
             }
-            int index = buf.readUnsignedShort();
-            extendedInfo.set("index", index);
-            sendResponse(channel, type, index);
-
-            position.setExtendedInfo(extendedInfo.toString());
-            return position;
-        }
-
-        else {
-            buf.skipBytes(dataLength);
-            sendResponse(channel, type, buf.readUnsignedShort());
+            
+            return positions;
         }
 
         return null;