4 files changed, 115 insertions, 32 deletions
diff --git a/src/org/traccar/BasePipelineFactory.java b/src/org/traccar/BasePipelineFactory.java
index fcb6266ef..2414d7a63 100644
--- a/src/org/traccar/BasePipelineFactory.java
+++ b/src/org/traccar/BasePipelineFactory.java
@@ -120,6 +120,7 @@ public abstract class BasePipelineFactory implements ChannelPipelineFactory {
         if (Context.getReverseGeocoder() != null) {
             pipeline.addLast("geocoder", new ReverseGeocoderHandler(Context.getReverseGeocoder(), processInvalidPositions));
         }
+        pipeline.addLast("remoteAddress", new RemoteAddressHandler());
         pipeline.addLast("handler", new TrackerEventHandler());
         return pipeline;
     }
diff --git a/src/org/traccar/BaseProtocolDecoder.java b/src/org/traccar/BaseProtocolDecoder.java
index d150c9c80..b10f4d355 100644
--- a/src/org/traccar/BaseProtocolDecoder.java
+++ b/src/org/traccar/BaseProtocolDecoder.java
@@ -32,7 +32,7 @@ import org.traccar.model.Device;
 /**
  * Base class for protocol decoders
  */
-public abstract class BaseProtocolDecoder extends OneToOneDecoder {
+public abstract class BaseProtocolDecoder extends ExtendedObjectDecoder {
 
     private final String protocol;
 
@@ -77,36 +77,5 @@ public abstract class BaseProtocolDecoder extends OneToOneDecoder {
     public BaseProtocolDecoder(String protocol) {
         this.protocol = protocol;
     }
-    
-    @Override
-    public void handleUpstream(
-            ChannelHandlerContext ctx, ChannelEvent evt) throws Exception {
-        if (!(evt instanceof MessageEvent)) {
-            ctx.sendUpstream(evt);
-            return;
-        }
-
-        MessageEvent e = (MessageEvent) evt;
-        Object originalMessage = e.getMessage();
-        Object decodedMessage = decode(ctx, e.getChannel(), e.getRemoteAddress(), originalMessage);
-        if (originalMessage == decodedMessage) {
-            ctx.sendUpstream(evt);
-        } else if (decodedMessage != null) {
-            fireMessageReceived(ctx, decodedMessage, e.getRemoteAddress());
-        }
-    }
-    
-    protected Object decode(
-            ChannelHandlerContext ctx, Channel channel, SocketAddress remoteAddress, Object msg) throws Exception {
-        
-        return decode(ctx, channel, msg);
-    }
-    
-    @Override
-    protected Object decode(
-            ChannelHandlerContext ctx, Channel channel, Object msg) throws Exception {
-        
-        return null; // default implementation
-    }
 
 }
diff --git a/src/org/traccar/ExtendedObjectDecoder.java b/src/org/traccar/ExtendedObjectDecoder.java
new file mode 100644
index 000000000..55a75bb67
--- /dev/null
+++ b/src/org/traccar/ExtendedObjectDecoder.java
@@ -0,0 +1,61 @@
+/*
+ * 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;
+
+import org.jboss.netty.channel.Channel;
+import org.jboss.netty.channel.ChannelEvent;
+import org.jboss.netty.channel.ChannelHandlerContext;
+import org.jboss.netty.channel.MessageEvent;
+import org.jboss.netty.handler.codec.oneone.OneToOneDecoder;
+
+import java.net.SocketAddress;
+
+import static org.jboss.netty.channel.Channels.fireMessageReceived;
+
+public abstract class ExtendedObjectDecoder extends OneToOneDecoder {
+
+    @Override
+    public void handleUpstream(
+            ChannelHandlerContext ctx, ChannelEvent evt) throws Exception {
+        if (!(evt instanceof MessageEvent)) {
+            ctx.sendUpstream(evt);
+            return;
+        }
+
+        MessageEvent e = (MessageEvent) evt;
+        Object originalMessage = e.getMessage();
+        Object decodedMessage = decode(ctx, e.getChannel(), e.getRemoteAddress(), originalMessage);
+        if (originalMessage == decodedMessage) {
+            ctx.sendUpstream(evt);
+        } else if (decodedMessage != null) {
+            fireMessageReceived(ctx, decodedMessage, e.getRemoteAddress());
+        }
+    }
+    
+    protected Object decode(
+            ChannelHandlerContext ctx, Channel channel, SocketAddress remoteAddress, Object msg) throws Exception {
+        
+        return decode(ctx, channel, msg);
+    }
+    
+    @Override
+    protected Object decode(
+            ChannelHandlerContext ctx, Channel channel, Object msg) throws Exception {
+        
+        return null; // default implementation
+    }
+
+}
diff --git a/src/org/traccar/RemoteAddressHandler.java b/src/org/traccar/RemoteAddressHandler.java
new file mode 100644
index 000000000..3aa28daf7
--- /dev/null
+++ b/src/org/traccar/RemoteAddressHandler.java
@@ -0,0 +1,52 @@
+/*
+ * 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;
+
+import org.jboss.netty.channel.Channel;
+import org.jboss.netty.channel.ChannelHandlerContext;
+import org.jboss.netty.handler.codec.oneone.OneToOneDecoder;
+import org.traccar.geocode.AddressFormat;
+import org.traccar.geocode.ReverseGeocoder;
+import org.traccar.model.Event;
+import org.traccar.model.Position;
+
+import java.net.InetSocketAddress;
+import java.net.SocketAddress;
+import java.util.List;
+
+public class RemoteAddressHandler extends ExtendedObjectDecoder {
+
+    @Override
+    protected Object decode(
+            ChannelHandlerContext ctx, Channel channel, SocketAddress remoteAddress, Object msg)
+            throws Exception {
+
+        String hostAddress = ((InetSocketAddress) remoteAddress).getAddress().getHostAddress();
+        
+        if (msg instanceof Position) {
+            Position position = (Position) msg;
+            position.set(Event.KEY_IP, hostAddress);
+        } else if (msg instanceof List) {
+            List<Position> positions = (List<Position>) msg;
+            for (Position position : positions) {
+                position.set(Event.KEY_IP, hostAddress);
+            }
+        }
+
+        return msg;
+    }
+
+}