aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/protocol/Avl301ProtocolDecoder.java
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2016-07-19 15:11:35 +1200
committerAnton Tananaev <anton.tananaev@gmail.com>2016-07-19 15:11:35 +1200
commit815c3de43ee8943fddb916f27317c37a7a806d65 (patch)
treea38e4f6bf80c35ccc83ae9d4c4d3d88e0d837b00 /src/org/traccar/protocol/Avl301ProtocolDecoder.java
parent4054777eac379ce07560c44901ada659aad062ba (diff)
downloadtrackermap-server-815c3de43ee8943fddb916f27317c37a7a806d65.tar.gz
trackermap-server-815c3de43ee8943fddb916f27317c37a7a806d65.tar.bz2
trackermap-server-815c3de43ee8943fddb916f27317c37a7a806d65.zip
Move device id to a session
Diffstat (limited to 'src/org/traccar/protocol/Avl301ProtocolDecoder.java')
-rw-r--r--src/org/traccar/protocol/Avl301ProtocolDecoder.java17
1 files changed, 12 insertions, 5 deletions
diff --git a/src/org/traccar/protocol/Avl301ProtocolDecoder.java b/src/org/traccar/protocol/Avl301ProtocolDecoder.java
index 1f7e3470c..4d2dfe126 100644
--- a/src/org/traccar/protocol/Avl301ProtocolDecoder.java
+++ b/src/org/traccar/protocol/Avl301ProtocolDecoder.java
@@ -19,6 +19,7 @@ import org.jboss.netty.buffer.ChannelBuffer;
import org.jboss.netty.buffer.ChannelBuffers;
import org.jboss.netty.channel.Channel;
import org.traccar.BaseProtocolDecoder;
+import org.traccar.DeviceSession;
import org.traccar.helper.DateBuilder;
import org.traccar.model.Position;
@@ -46,7 +47,7 @@ public class Avl301ProtocolDecoder extends BaseProtocolDecoder {
public static final int MSG_STATUS = 'H';
public static final int MSG_GPS_LBS_STATUS = '$';
- private static void sendResponse(Channel channel, int type) {
+ private void sendResponse(Channel channel, int type) {
if (channel != null) {
ChannelBuffer response = ChannelBuffers.directBuffer(5);
response.writeByte('$');
@@ -69,18 +70,24 @@ public class Avl301ProtocolDecoder extends BaseProtocolDecoder {
if (type == MSG_LOGIN) {
- if (identify(readImei(buf), channel, remoteAddress)) {
+ DeviceSession deviceSession = getDeviceSession(channel, remoteAddress, readImei(buf));
+ if (deviceSession == null) {
sendResponse(channel, type);
}
- } else if (hasDeviceId() && type == MSG_STATUS) {
+ } else if (type == MSG_STATUS) {
sendResponse(channel, type);
- } else if (hasDeviceId() && type == MSG_GPS_LBS_STATUS) {
+ } else if (type == MSG_GPS_LBS_STATUS) {
+
+ DeviceSession deviceSession = getDeviceSession(channel, remoteAddress);
+ if (deviceSession == null) {
+ return null;
+ }
Position position = new Position();
- position.setDeviceId(getDeviceId());
+ position.setDeviceId(deviceSession.getDeviceId());
position.setProtocol(getProtocolName());
DateBuilder dateBuilder = new DateBuilder()