1 files changed, 2 insertions, 97 deletions

diff --git a/src/main/java/org/traccar/BaseProtocolDecoder.java b/src/main/java/org/traccar/BaseProtocolDecoder.java
index 3fc6e7697..d6c571b79 100644
--- a/src/main/java/org/traccar/BaseProtocolDecoder.java
+++ b/src/main/java/org/traccar/BaseProtocolDecoder.java
@@ -18,14 +18,9 @@ package org.traccar;
 import com.google.inject.Inject;
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.Channel;
-import io.netty.channel.socket.DatagramChannel;
-import io.netty.handler.codec.http.HttpRequestDecoder;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.traccar.config.Config;
 import org.traccar.config.Keys;
 import org.traccar.database.CommandsManager;
-import org.traccar.session.ConnectionManager;
 import org.traccar.database.IdentityManager;
 import org.traccar.database.MediaManager;
 import org.traccar.database.StatisticsManager;
@@ -33,22 +28,19 @@ import org.traccar.helper.UnitsConverter;
 import org.traccar.model.Command;
 import org.traccar.model.Device;
 import org.traccar.model.Position;
+import org.traccar.session.ConnectionManager;
 import org.traccar.session.DeviceSession;
 
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;
 import java.util.Collection;
 import java.util.Date;
-import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Map;
 import java.util.Set;
 import java.util.TimeZone;
 
 public abstract class BaseProtocolDecoder extends ExtendedObjectDecoder {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(BaseProtocolDecoder.class);
-
     private static final String PROTOCOL_UNKNOWN = "unknown";
 
     private final Protocol protocol;
@@ -147,95 +139,8 @@ public abstract class BaseProtocolDecoder extends ExtendedObjectDecoder {
         return result;
     }
 
-    private DeviceSession channelDeviceSession; // connection-based protocols
-    private final Map<SocketAddress, DeviceSession> addressDeviceSessions = new HashMap<>(); // connectionless protocols
-
-    private long findDeviceId(SocketAddress remoteAddress, String... uniqueIds) {
-        if (uniqueIds.length > 0) {
-            long deviceId = 0;
-            Device device = null;
-            try {
-                for (String uniqueId : uniqueIds) {
-                    if (uniqueId != null) {
-                        device = identityManager.getByUniqueId(uniqueId);
-                        if (device != null) {
-                            deviceId = device.getId();
-                            break;
-                        }
-                    }
-                }
-            } catch (Exception e) {
-                LOGGER.warn("Find device error", e);
-            }
-            if (deviceId == 0 && config.getBoolean(Keys.DATABASE_REGISTER_UNKNOWN)) {
-                return identityManager.addUnknownDevice(uniqueIds[0]);
-            }
-            if (device != null && !device.getDisabled()) {
-                return deviceId;
-            }
-            StringBuilder message = new StringBuilder();
-            if (deviceId == 0) {
-                message.append("Unknown device -");
-            } else {
-                message.append("Disabled device -");
-            }
-            for (String uniqueId : uniqueIds) {
-                message.append(" ").append(uniqueId);
-            }
-            if (remoteAddress != null) {
-                message.append(" (").append(((InetSocketAddress) remoteAddress).getHostString()).append(")");
-            }
-            LOGGER.warn(message.toString());
-        }
-        return 0;
-    }
-
     public DeviceSession getDeviceSession(Channel channel, SocketAddress remoteAddress, String... uniqueIds) {
-        return getDeviceSession(channel, remoteAddress, false, uniqueIds);
-    }
-
-    public DeviceSession getDeviceSession(
-            Channel channel, SocketAddress remoteAddress, boolean ignoreCache, String... uniqueIds) {
-        if (channel != null && BasePipelineFactory.getHandler(channel.pipeline(), HttpRequestDecoder.class) != null
-                || ignoreCache || config.getBoolean(Keys.PROTOCOL_IGNORE_SESSIONS_CACHE.withPrefix(getProtocolName()))
-                || config.getBoolean(Keys.DECODER_IGNORE_SESSIONS_CACHE)) {
-            long deviceId = findDeviceId(remoteAddress, uniqueIds);
-            if (deviceId != 0) {
-                if (connectionManager != null) {
-                    connectionManager.addActiveDevice(deviceId, protocol, channel, remoteAddress);
-                }
-                return new DeviceSession(deviceId);
-            } else {
-                return null;
-            }
-        }
-        if (channel instanceof DatagramChannel) {
-            long deviceId = findDeviceId(remoteAddress, uniqueIds);
-            DeviceSession deviceSession = addressDeviceSessions.get(remoteAddress);
-            if (deviceSession != null && (deviceSession.getDeviceId() == deviceId || uniqueIds.length == 0)) {
-                return deviceSession;
-            } else if (deviceId != 0) {
-                deviceSession = new DeviceSession(deviceId);
-                addressDeviceSessions.put(remoteAddress, deviceSession);
-                if (connectionManager != null) {
-                    connectionManager.addActiveDevice(deviceId, protocol, channel, remoteAddress);
-                }
-                return deviceSession;
-            } else {
-                return null;
-            }
-        } else {
-            if (channelDeviceSession == null) {
-                long deviceId = findDeviceId(remoteAddress, uniqueIds);
-                if (deviceId != 0) {
-                    channelDeviceSession = new DeviceSession(deviceId);
-                    if (connectionManager != null) {
-                        connectionManager.addActiveDevice(deviceId, protocol, channel, remoteAddress);
-                    }
-                }
-            }
-            return channelDeviceSession;
-        }
+        return connectionManager.getDeviceSession(protocol, channel, remoteAddress, uniqueIds);
     }
 
     public void getLastLocation(Position position, Date deviceTime) {