Fix Norad decoder (fix #610)

3 files changed, 51 insertions, 3 deletions

diff --git a/src/org/traccar/BasePipelineFactory.java b/src/org/traccar/BasePipelineFactory.java
index 9d2ab5071..e0c88ff90 100644
--- a/src/org/traccar/BasePipelineFactory.java
+++ b/src/org/traccar/BasePipelineFactory.java
@@ -15,6 +15,7 @@
  */
 package org.traccar;
 
+import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import org.jboss.netty.buffer.ChannelBuffer;
 import org.jboss.netty.buffer.ChannelBuffers;
@@ -66,6 +67,12 @@ public abstract class BasePipelineFactory implements ChannelPipelineFactory {
 
                 msg.append("[").append(((InetSocketAddress) e.getChannel().getLocalAddress()).getPort());
                 msg.append((e instanceof DownstreamMessageEvent) ? " -> " : " <- ");
+
+                event.getRemoteAddress().hashCode();
+                //InetSocketAddress a = (InetSocketAddress) event.getRemoteAddress();
+                //InetAddress b = a.getAddress();
+                //String s = b.getHostAddress();
+                
                 msg.append(((InetSocketAddress) event.getRemoteAddress()).getAddress().getHostAddress()).append("]");
 
                 // Append hex message
diff --git a/src/org/traccar/BaseProtocolDecoder.java b/src/org/traccar/BaseProtocolDecoder.java
index 657e56258..447bf364b 100644
--- a/src/org/traccar/BaseProtocolDecoder.java
+++ b/src/org/traccar/BaseProtocolDecoder.java
@@ -15,6 +15,12 @@
  */
 package org.traccar;
 
+import java.net.SocketAddress;
+import org.jboss.netty.channel.Channel;
+import org.jboss.netty.channel.ChannelEvent;
+import org.jboss.netty.channel.ChannelHandlerContext;
+import static org.jboss.netty.channel.Channels.fireMessageReceived;
+import org.jboss.netty.channel.MessageEvent;
 import org.jboss.netty.handler.codec.oneone.OneToOneDecoder;
 import org.traccar.model.DataManager;
 
@@ -51,5 +57,38 @@ public abstract class BaseProtocolDecoder extends OneToOneDecoder {
             dataManager = serverManager.getDataManager();
         }
     }
+    
+    @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/protocol/NoranProtocolDecoder.java b/src/org/traccar/protocol/NoranProtocolDecoder.java
index 7fecf18e1..fc4654016 100644
--- a/src/org/traccar/protocol/NoranProtocolDecoder.java
+++ b/src/org/traccar/protocol/NoranProtocolDecoder.java
@@ -15,6 +15,7 @@
  */
 package org.traccar.protocol;
 
+import java.net.SocketAddress;
 import java.nio.ByteOrder;
 import java.nio.charset.Charset;
 import java.util.Calendar;
@@ -45,11 +46,11 @@ public class NoranProtocolDecoder extends BaseProtocolDecoder {
 
     @Override
     protected Object decode(
-            ChannelHandlerContext ctx, Channel channel, Object msg)
+            ChannelHandlerContext ctx, Channel channel, SocketAddress remoteAddress, Object msg)
             throws Exception {
         
         ChannelBuffer buf = (ChannelBuffer) msg;
-
+        
         buf.readUnsignedShort(); // length
         int type = buf.readUnsignedShort();
         
@@ -63,7 +64,7 @@ public class NoranProtocolDecoder extends BaseProtocolDecoder {
             response.writeByte(1); // status
             response.writeBytes(ChannelBuffers.copiedBuffer(ByteOrder.LITTLE_ENDIAN, "\r\n", Charset.defaultCharset()));
             
-            channel.write(response);
+            channel.write(response, remoteAddress);
         }
         
         else if (type == MSG_UPLOAD_POSITION ||
@@ -111,6 +112,7 @@ public class NoranProtocolDecoder extends BaseProtocolDecoder {
                 position.setDeviceId(getDataManager().getDeviceByImei(id).getId());
             } catch(Exception error) {
                 Log.warning("Unknown device - " + id);
+                return null;
             }
             
             // IO status