aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/protocol/NoranProtocolDecoder.java
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2015-06-29 10:49:13 +1200
committerAnton Tananaev <anton.tananaev@gmail.com>2015-06-29 10:49:13 +1200
commit55448d82b2971bc16c67bfa2b2e996d81c4c702e (patch)
tree565ee245ea0e98b88674b775147fbc6d3e1933cb /src/org/traccar/protocol/NoranProtocolDecoder.java
parent88b3f00f3855aa408c7859051efdcb5b37fe559f (diff)
parentd1c4cd526845aad56c5b0a3e20454638bbc7fecc (diff)
downloadtrackermap-server-55448d82b2971bc16c67bfa2b2e996d81c4c702e.tar.gz
trackermap-server-55448d82b2971bc16c67bfa2b2e996d81c4c702e.tar.bz2
trackermap-server-55448d82b2971bc16c67bfa2b2e996d81c4c702e.zip
Merge branch implement commands (fix #1271)
Diffstat (limited to 'src/org/traccar/protocol/NoranProtocolDecoder.java')
-rw-r--r--src/org/traccar/protocol/NoranProtocolDecoder.java7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/org/traccar/protocol/NoranProtocolDecoder.java b/src/org/traccar/protocol/NoranProtocolDecoder.java
index 69ed623d8..f7eb26e97 100644
--- a/src/org/traccar/protocol/NoranProtocolDecoder.java
+++ b/src/org/traccar/protocol/NoranProtocolDecoder.java
@@ -21,7 +21,6 @@ import java.nio.charset.Charset;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.Calendar;
-import java.util.Date;
import java.util.TimeZone;
import org.jboss.netty.buffer.ChannelBuffer;
@@ -35,7 +34,7 @@ import org.traccar.model.Position;
public class NoranProtocolDecoder extends BaseProtocolDecoder {
- public NoranProtocolDecoder(String protocol) {
+ public NoranProtocolDecoder(NoranProtocol protocol) {
super(protocol);
}
@@ -88,7 +87,7 @@ public class NoranProtocolDecoder extends BaseProtocolDecoder {
// Create new position
Position position = new Position();
- position.setProtocol(getProtocol());
+ position.setProtocol(getProtocolName());
if (type == MSG_CONTROL_RESPONSE) {
buf.readUnsignedInt(); // GIS ip
@@ -129,7 +128,7 @@ public class NoranProtocolDecoder extends BaseProtocolDecoder {
// Identification
String id = buf.readBytes(newFormat ? 12 : 11).toString(Charset.defaultCharset()).replaceAll("[^\\p{Print}]", "");
- if (!identify(id)) {
+ if (!identify(id, channel, remoteAddress)) {
return null;
}
position.setDeviceId(getDeviceId());