3 files changed, 178 insertions, 1 deletions
diff --git a/src/org/traccar/protocol/OwnTracksProtocol.java b/src/org/traccar/protocol/OwnTracksProtocol.java
new file mode 100644
index 000000000..c4a6ab163
--- /dev/null
+++ b/src/org/traccar/protocol/OwnTracksProtocol.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2017 Jan-Piet Mens (jpmens@gmail.com)
+ * Copyright 2017 Anton Tananaev (anton@traccar.org)
+ *
+ * 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.bootstrap.ServerBootstrap;
+import org.jboss.netty.channel.ChannelPipeline;
+import org.jboss.netty.handler.codec.http.HttpRequestDecoder;
+import org.jboss.netty.handler.codec.http.HttpResponseEncoder;
+import org.traccar.BaseProtocol;
+import org.traccar.TrackerServer;
+
+import java.util.List;
+
+public class OwnTracksProtocol extends BaseProtocol {
+
+    public OwnTracksProtocol() {
+        super("owntracks");
+    }
+
+    @Override
+    public void initTrackerServers(List<TrackerServer> serverList) {
+        serverList.add(new TrackerServer(new ServerBootstrap(), getName()) {
+            @Override
+            protected void addSpecificHandlers(ChannelPipeline pipeline) {
+                pipeline.addLast("httpEncoder", new HttpResponseEncoder());
+                pipeline.addLast("httpDecoder", new HttpRequestDecoder());
+                pipeline.addLast("objectDecoder", new OwnTracksProtocolDecoder(OwnTracksProtocol.this));
+            }
+        });
+    }
+
+}
diff --git a/src/org/traccar/protocol/OwnTracksProtocolDecoder.java b/src/org/traccar/protocol/OwnTracksProtocolDecoder.java
new file mode 100644
index 000000000..f664d113b
--- /dev/null
+++ b/src/org/traccar/protocol/OwnTracksProtocolDecoder.java
@@ -0,0 +1,103 @@
+/*
+ * Copyright 2017 Jan-Piet Mens (jpmens@gmail.com)
+ * Copyright 2017 Anton Tananaev (anton@traccar.org)
+ *
+ * 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.channel.Channel;
+import org.jboss.netty.handler.codec.http.DefaultHttpResponse;
+import org.jboss.netty.handler.codec.http.HttpHeaders;
+import org.jboss.netty.handler.codec.http.HttpRequest;
+import org.jboss.netty.handler.codec.http.HttpResponse;
+import org.jboss.netty.handler.codec.http.HttpResponseStatus;
+import org.jboss.netty.handler.codec.http.HttpVersion;
+import org.traccar.BaseProtocolDecoder;
+import org.traccar.DeviceSession;
+import org.traccar.model.Position;
+import org.traccar.helper.UnitsConverter;
+
+import java.net.SocketAddress;
+import java.nio.charset.StandardCharsets;
+import java.util.Date;
+
+import java.io.StringReader;
+import javax.json.Json;
+import javax.json.JsonObject;
+
+public class OwnTracksProtocolDecoder extends BaseProtocolDecoder {
+
+    public OwnTracksProtocolDecoder(OwnTracksProtocol protocol) {
+        super(protocol);
+    }
+
+    private void sendResponse(Channel channel, HttpResponseStatus status) {
+        if (channel != null) {
+            HttpResponse response = new DefaultHttpResponse(HttpVersion.HTTP_1_1, status);
+            response.headers().add(HttpHeaders.Names.CONTENT_LENGTH, 0);
+            channel.write(response);
+        }
+    }
+
+    @Override
+    protected Object decode(
+            Channel channel, SocketAddress remoteAddress, Object msg) throws Exception {
+
+        HttpRequest request = (HttpRequest) msg;
+        JsonObject root = Json.createReader(
+                new StringReader(request.getContent().toString(StandardCharsets.US_ASCII))).readObject();
+
+        Position position = new Position();
+        position.setProtocol(getProtocolName());
+        position.setValid(true);
+
+        position.setLatitude(root.getJsonNumber("lat").doubleValue());
+        position.setLongitude(root.getJsonNumber("lon").doubleValue());
+
+        if (root.containsKey("vel")) {
+            position.setSpeed(UnitsConverter.knotsFromCps(root.getInt("vel")));
+        }
+        if (root.containsKey("alt")) {
+            position.setAltitude(root.getInt("alt"));
+        }
+        if (root.containsKey("cog")) {
+            position.setCourse(root.getInt("cog"));
+        }
+        if (root.containsKey("acc")) {
+            position.setAccuracy(root.getInt("acc"));
+        }
+        if (root.containsKey("t")) {
+            position.set("t", root.getString("t"));
+        }
+        if (root.containsKey("batt")) {
+            position.set(Position.KEY_BATTERY, root.getInt("batt"));
+        }
+        if (root.containsKey("topic")) {
+            position.set("topic", root.getString("topic"));
+        }
+
+        position.setTime(new Date(root.getJsonNumber("tst").longValue() * 1000));
+
+        DeviceSession deviceSession = getDeviceSession(channel, remoteAddress, root.getString("tid"));
+        if (deviceSession == null) {
+            sendResponse(channel, HttpResponseStatus.BAD_REQUEST);
+            return null;
+        }
+        position.setDeviceId(deviceSession.getDeviceId());
+
+        sendResponse(channel, HttpResponseStatus.OK);
+        return position;
+    }
+
+}
diff --git a/src/org/traccar/protocol/WatchFrameDecoder.java b/src/org/traccar/protocol/WatchFrameDecoder.java
index 26aba68c7..826a8b4d0 100644
--- a/src/org/traccar/protocol/WatchFrameDecoder.java
+++ b/src/org/traccar/protocol/WatchFrameDecoder.java
@@ -36,7 +36,35 @@ public class WatchFrameDecoder extends FrameDecoder {
             buf.getBytes(buf.readerIndex() + MESSAGE_HEADER - 4 - 1, lengthBuffer, 4);
             int length = Integer.parseInt(lengthBuffer.toString(StandardCharsets.US_ASCII), 16) + MESSAGE_HEADER + 1;
             if (buf.readableBytes() >= length) {
-                return buf.readBytes(length);
+                ChannelBuffer frame = ChannelBuffers.dynamicBuffer();
+                int endIndex = buf.readerIndex() + length;
+                while (buf.readerIndex() < endIndex) {
+                    byte b = buf.readByte();
+                    if (b == 0x7D) {
+                        switch (buf.readByte()) {
+                            case 0x01:
+                                frame.writeByte(0x7D);
+                                break;
+                            case 0x02:
+                                frame.writeByte(0x5B);
+                                break;
+                            case 0x03:
+                                frame.writeByte(0x5D);
+                                break;
+                            case 0x04:
+                                frame.writeByte(0x2C);
+                                break;
+                            case 0x05:
+                                frame.writeByte(0x2A);
+                                break;
+                            default:
+                                throw new IllegalArgumentException();
+                        }
+                    } else {
+                        frame.writeByte(b);
+                    }
+                }
+                return frame;
             }
         }