Make methods static
[lispflowmapping.git] / mappingservice / southbound / src / main / java / org / opendaylight / lispflowmapping / southbound / lisp / LispSouthboundHandler.java
index f892094f854adb5ff87b6700850bfa7afa3e926e..535ab72631d62720faf91ca21d19bee00169a192 100644 (file)
@@ -8,25 +8,24 @@
 
 package org.opendaylight.lispflowmapping.southbound.lisp;
 
-import com.google.common.base.Preconditions;
+import static org.opendaylight.yangtools.yang.common.UintConversions.fromJava;
+
 import io.netty.buffer.ByteBufUtil;
+import io.netty.channel.Channel;
 import io.netty.channel.ChannelHandler;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.SimpleChannelInboundHandler;
 import io.netty.channel.socket.DatagramPacket;
 import java.net.InetAddress;
 import java.nio.ByteBuffer;
-import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.binding.api.NotificationPublishService;
-import org.opendaylight.lispflowmapping.dsbackend.DataStoreBackEnd;
-import org.opendaylight.lispflowmapping.inmemorydb.HashMapDb;
-import org.opendaylight.lispflowmapping.southbound.authentication.LispAuthenticationUtil;
-import org.opendaylight.lispflowmapping.interfaces.lisp.ILispAuthentication;
+import org.opendaylight.lispflowmapping.config.ConfigIni;
+import org.opendaylight.lispflowmapping.lisp.authentication.ILispAuthentication;
+import org.opendaylight.lispflowmapping.lisp.authentication.LispAuthenticationUtil;
 import org.opendaylight.lispflowmapping.lisp.serializer.MapNotifySerializer;
 import org.opendaylight.lispflowmapping.lisp.serializer.MapRegisterSerializer;
 import org.opendaylight.lispflowmapping.lisp.serializer.MapReplySerializer;
@@ -35,15 +34,13 @@ import org.opendaylight.lispflowmapping.lisp.type.LispMessage;
 import org.opendaylight.lispflowmapping.lisp.util.ByteUtil;
 import org.opendaylight.lispflowmapping.lisp.util.LispAddressStringifier;
 import org.opendaylight.lispflowmapping.lisp.util.MapRequestUtil;
-import org.opendaylight.lispflowmapping.mapcache.SimpleMapCache;
+import org.opendaylight.lispflowmapping.southbound.ConcurrentLispSouthboundStats;
 import org.opendaylight.lispflowmapping.southbound.LispSouthboundPlugin;
-import org.opendaylight.lispflowmapping.southbound.LispSouthboundStats;
-import org.opendaylight.lispflowmapping.southbound.lisp.cache.MapRegisterCache;
 import org.opendaylight.lispflowmapping.southbound.lisp.cache.MapRegisterPartialDeserializer;
 import org.opendaylight.lispflowmapping.southbound.lisp.exception.LispMalformedPacketException;
 import org.opendaylight.lispflowmapping.southbound.lisp.network.PacketHeader;
 import org.opendaylight.lispflowmapping.southbound.util.LispNotificationHelper;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.PortNumber;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.PortNumber;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.AddMappingBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.GotMapNotifyBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.GotMapReplyBuilder;
@@ -61,52 +58,33 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.ma
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.map.register.cache.metadata.container.MapRegisterCacheMetadataBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.map.register.cache.metadata.container.map.register.cache.metadata.EidLispAddress;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.map.register.cache.metadata.container.map.register.cache.metadata.EidLispAddressBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.map.register.cache.metadata.container.map.register.cache.metadata.EidLispAddressKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.map.register.cache.value.grouping.MapRegisterCacheValue;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.map.register.cache.value.grouping.MapRegisterCacheValueBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping.record.container.MappingRecord;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping.record.list.MappingRecordItem;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping._record.container.MappingRecord;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping._record.list.MappingRecordItem;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping.authkey.container.MappingAuthkey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.transport.address.TransportAddressBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.db.instance.AuthenticationKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.mapping.authkey.container.MappingAuthkey;
-import org.opendaylight.yangtools.yang.binding.Notification;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @ChannelHandler.Sharable
 public class LispSouthboundHandler extends SimpleChannelInboundHandler<DatagramPacket>
         implements ILispSouthboundService, AutoCloseable {
-    private MapRegisterCache mapRegisterCache;
-    private boolean mapRegisterCacheEnabled = true;
-
-    /**
-     * How long is record supposed to be relevant. After this time record isn't valid.
-     *
-     * If you modify this value, please update the LispSouthboundServiceTest class too.
-     */
-    private static final long CACHE_RECORD_TIMEOUT = 90000;
-    private DataBroker dataBroker;
-
-    private NotificationPublishService notificationPublishService;
     protected static final Logger LOG = LoggerFactory.getLogger(LispSouthboundHandler.class);
 
     //TODO: think whether this field can be accessed through mappingservice or some other configuration parameter
-    private boolean authenticationEnabled = true;
-
+    private final boolean authenticationEnabled = ConfigIni.getInstance().isAuthEnabled();
     private final LispSouthboundPlugin lispSbPlugin;
-    private LispSouthboundStats lispSbStats = null;
-    private SimpleMapCache smc;
-    private AuthenticationKeyDataListener authenticationKeyDataListener;
-    private DataStoreBackEnd dsbe;
+    private final boolean isReadFromChannelEnabled = true;
+
+    private Channel channel;
 
     public LispSouthboundHandler(LispSouthboundPlugin lispSbPlugin) {
         this.lispSbPlugin = lispSbPlugin;
-        if (lispSbPlugin != null) {
-            this.lispSbStats = lispSbPlugin.getStats();
-        }
-        this.mapRegisterCache = new MapRegisterCache();
-        this.smc = new SimpleMapCache(new HashMapDb());
     }
 
+    @Override
     public void handlePacket(DatagramPacket msg) {
         ByteBuffer inBuffer = msg.content().nioBuffer();
         int type = ByteUtil.getUnsignedByte(inBuffer, LispMessage.Pos.TYPE) >> 4;
@@ -117,7 +95,7 @@ public class LispSouthboundHandler extends SimpleChannelInboundHandler<DatagramP
             handleEncapsulatedControlMessage(inBuffer, msg.sender().getAddress());
         } else if (lispType == MessageType.MapRequest) {
             LOG.trace("Received packet of type Map-Request");
-            handleMapRequest(inBuffer, msg.sender().getPort());
+            handleMapRequest(inBuffer, msg.sender().getAddress(), msg.sender().getPort());
         } else if (lispType == MessageType.MapRegister) {
             LOG.trace("Received packet of type Map-Register");
             handleMapRegister(inBuffer, msg.sender().getAddress(), msg.sender().getPort());
@@ -128,22 +106,24 @@ public class LispSouthboundHandler extends SimpleChannelInboundHandler<DatagramP
             LOG.trace("Received packet of type Map-Reply");
             handleMapReply(inBuffer, msg.sender().getAddress(), msg.sender().getPort());
         } else {
-            LOG.warn("Received unknown LISP control packet (type " + ((lispType != null) ? lispType : type) + ")");
+            LOG.warn("Received unknown LISP control packet (type " + (lispType != null ? lispType : type) + ")");
         }
     }
 
+    @SuppressWarnings("checkstyle:IllegalCatch")
     private void handleEncapsulatedControlMessage(ByteBuffer inBuffer, InetAddress sourceAddress) {
         try {
-            handleMapRequest(inBuffer, extractEncapsulatedSourcePort(inBuffer));
+            handleMapRequest(inBuffer, sourceAddress, extractEncapsulatedSourcePort(inBuffer));
         } catch (RuntimeException re) {
             throw new LispMalformedPacketException("Couldn't deserialize Map-Request (len="
                     + inBuffer.capacity() + ")", re);
         }
     }
 
-    private void handleMapRequest(ByteBuffer inBuffer, int port) {
+    @SuppressWarnings("checkstyle:IllegalCatch")
+    private void handleMapRequest(ByteBuffer inBuffer, InetAddress sourceAddress, int port) {
         try {
-            MapRequest request = MapRequestSerializer.getInstance().deserialize(inBuffer);
+            MapRequest request = MapRequestSerializer.getInstance().deserialize(inBuffer, sourceAddress);
             InetAddress finalSourceAddress = MapRequestUtil.selectItrRloc(request);
             if (finalSourceAddress == null) {
                 throw new LispMalformedPacketException("Couldn't deserialize Map-Request, no ITR Rloc found!");
@@ -154,14 +134,9 @@ public class LispSouthboundHandler extends SimpleChannelInboundHandler<DatagramP
             TransportAddressBuilder transportAddressBuilder = new TransportAddressBuilder();
             transportAddressBuilder.setIpAddress(
                     LispNotificationHelper.getIpAddressBinaryFromInetAddress(finalSourceAddress));
-            transportAddressBuilder.setPort(new PortNumber(port));
+            transportAddressBuilder.setPort(new PortNumber(fromJava(port)));
             requestMappingBuilder.setTransportAddress(transportAddressBuilder.build());
-            if (notificationPublishService != null) {
-                notificationPublishService.putNotification(requestMappingBuilder.build());
-                LOG.trace("MapRequest was published!");
-            } else {
-                LOG.warn("Notification Provider is null!");
-            }
+            lispSbPlugin.sendNotificationIfPossible(requestMappingBuilder.build());
         } catch (RuntimeException re) {
             throw new LispMalformedPacketException("Couldn't deserialize Map-Request (len="
                     + inBuffer.capacity() + ")", re);
@@ -170,10 +145,11 @@ public class LispSouthboundHandler extends SimpleChannelInboundHandler<DatagramP
         }
     }
 
-    private int extractEncapsulatedSourcePort(ByteBuffer inBuffer) {
+    @SuppressWarnings("checkstyle:IllegalCatch")
+    private static int extractEncapsulatedSourcePort(ByteBuffer inBuffer) {
         try {
             inBuffer.position(PacketHeader.Length.LISP_ENCAPSULATION);
-            int ipType = (inBuffer.get() >> 4);
+            int ipType = inBuffer.get() >> 4;
             if (ipType == 4) {
                 inBuffer.position(inBuffer.position() + PacketHeader.Length.IPV4 - 1);
             } else if (ipType == 6) {
@@ -192,59 +168,66 @@ public class LispSouthboundHandler extends SimpleChannelInboundHandler<DatagramP
         }
     }
 
+    @SuppressWarnings("checkstyle:IllegalCatch")
     private void handleMapRegister(ByteBuffer inBuffer, InetAddress sourceAddress, int port) {
         try {
             Map.Entry<MapRegisterCacheKey, byte[]> artificialEntry = null;
             MapRegisterCacheKey cacheKey = null;
             MapRegisterCacheValue cacheValue = null;
-            if (mapRegisterCacheEnabled) {
+            if (lispSbPlugin.isMapRegisterCacheEnabled()) {
                 artificialEntry = MapRegisterPartialDeserializer.deserializePartially(inBuffer, sourceAddress);
                 cacheKey = artificialEntry == null ? null : artificialEntry.getKey();
                 cacheValue = resolveCacheValue(artificialEntry);
             }
             if (cacheValue != null) {
+                lispSbPlugin.getStats().incrementCacheHits();
                 MapRegisterCacheMetadata mapRegisterMeta = cacheValue.getMapRegisterCacheMetadata();
                 LOG.debug("Map register message site-ID: {} xTR-ID: {} from cache.", mapRegisterMeta.getSiteId(),
                         mapRegisterMeta.getXtrId());
-                mapRegisterMeta = refreshEntry(cacheKey);
-                sendNotificationIfPossible(createMappingKeepAlive(cacheValue));
-
-                if (mapRegisterMeta.isWantMapNotify()) {
-                    sendMapNotifyMsg(inBuffer, sourceAddress, port, cacheValue);
+                cacheValue = refreshEntry(cacheKey);
+                if (cacheValue != null) {
+                    lispSbPlugin.sendNotificationIfPossible(createMappingKeepAlive(cacheValue));
+                    if (cacheValue.getMapRegisterCacheMetadata().getWantMapNotify()) {
+                        sendMapNotifyMsg(inBuffer, sourceAddress, port, cacheValue);
+                    }
                 }
-                lispSbStats.incrementCacheHits();
             } else {
+                lispSbPlugin.getStats().incrementCacheMisses();
                 MapRegister mapRegister = MapRegisterSerializer.getInstance().deserialize(inBuffer, sourceAddress);
-                final MappingAuthkey mappingAuthkey = tryToAuthenticateMessage(mapRegister, inBuffer);
-                if (mappingAuthkey != null) {
-                    AddMappingBuilder addMappingBuilder = new AddMappingBuilder();
-                    addMappingBuilder.setMapRegister(LispNotificationHelper.convertMapRegister(mapRegister));
-                    TransportAddressBuilder transportAddressBuilder = new TransportAddressBuilder();
-                    transportAddressBuilder.setIpAddress(LispNotificationHelper.getIpAddressBinaryFromInetAddress(
-                            sourceAddress));
-                    transportAddressBuilder.setPort(new PortNumber(port));
-                    addMappingBuilder.setTransportAddress(transportAddressBuilder.build());
-                    sendNotificationIfPossible(addMappingBuilder.build());
-                    if (artificialEntry != null) {
-                        final MapRegisterCacheMetadataBuilder cacheMetadataBldNew = new
-                                MapRegisterCacheMetadataBuilder();
-                        cacheMetadataBldNew.setEidLispAddress(provideEidPrefixesFromMessage(mapRegister));
-                        cacheMetadataBldNew.setXtrId(mapRegister.getXtrId());
-                        cacheMetadataBldNew.setSiteId(mapRegister.getSiteId());
-                        cacheMetadataBldNew.setWantMapNotify(mapRegister.isWantMapNotify());
-                        cacheMetadataBldNew.setMergeEnabled(mapRegister.isMergeEnabled());
-                        cacheMetadataBldNew.setTimestamp(System.currentTimeMillis());
-
-                        final MapRegisterCacheValueBuilder cacheValueBldNew = new MapRegisterCacheValueBuilder();
-                        cacheValueBldNew.setPacketData(artificialEntry.getValue());
-                        cacheValueBldNew.setAuthKeyValue(mappingAuthkey.getKeyString());
-                        cacheValueBldNew.setAuthKeyType(mappingAuthkey.getKeyType());
-                        cacheValueBldNew.setMapRegisterCacheMetadata(cacheMetadataBldNew.build());
-
-                        mapRegisterCache.addEntry(cacheKey, cacheValueBldNew.build());
+
+                MappingAuthkey mappingAuthkey = null;
+                if (authenticationEnabled) {
+                    mappingAuthkey = tryToAuthenticateMessage(mapRegister, inBuffer);
+                    if (mappingAuthkey == null) {
+                        return;
                     }
                 }
-                lispSbStats.incrementCacheMisses();
+
+                AddMappingBuilder addMappingBuilder = new AddMappingBuilder();
+                addMappingBuilder.setMapRegister(LispNotificationHelper.convertMapRegister(mapRegister));
+                TransportAddressBuilder transportAddressBuilder = new TransportAddressBuilder();
+                transportAddressBuilder.setIpAddress(LispNotificationHelper.getIpAddressBinaryFromInetAddress(
+                        sourceAddress));
+                transportAddressBuilder.setPort(new PortNumber(fromJava(port)));
+                addMappingBuilder.setTransportAddress(transportAddressBuilder.build());
+                lispSbPlugin.sendNotificationIfPossible(addMappingBuilder.build());
+                if (artificialEntry != null) {
+                    final MapRegisterCacheMetadataBuilder cacheMetadataBldNew = new
+                            MapRegisterCacheMetadataBuilder();
+                    cacheMetadataBldNew.setEidLispAddress(provideEidPrefixesFromMessage(mapRegister));
+                    cacheMetadataBldNew.setXtrId(mapRegister.getXtrId());
+                    cacheMetadataBldNew.setSiteId(mapRegister.getSiteId());
+                    cacheMetadataBldNew.setWantMapNotify(mapRegister.getWantMapNotify());
+                    cacheMetadataBldNew.setMergeEnabled(mapRegister.getMergeEnabled());
+                    cacheMetadataBldNew.setTimestamp(System.currentTimeMillis());
+
+                    final MapRegisterCacheValueBuilder cacheValueBldNew = new MapRegisterCacheValueBuilder();
+                    cacheValueBldNew.setPacketData(artificialEntry.getValue());
+                    cacheValueBldNew.setMappingAuthkey(mappingAuthkey);
+                    cacheValueBldNew.setMapRegisterCacheMetadata(cacheMetadataBldNew.build());
+
+                    lispSbPlugin.getMapRegisterCache().addEntry(cacheKey, cacheValueBldNew.build());
+                }
             }
         } catch (RuntimeException re) {
             throw new LispMalformedPacketException("Couldn't deserialize Map-Register (len="
@@ -254,50 +237,45 @@ public class LispSouthboundHandler extends SimpleChannelInboundHandler<DatagramP
         }
     }
 
-    private MapRegisterCacheMetadata refreshEntry(final MapRegisterCacheKey cacheKey) {
-        MapRegisterCacheValue mapRegisterCacheValue = mapRegisterCache.refreshEntry(cacheKey);
+    private MapRegisterCacheValue refreshEntry(final MapRegisterCacheKey cacheKey) {
+        MapRegisterCacheValue mapRegisterCacheValue = lispSbPlugin.getMapRegisterCache().refreshEntry(cacheKey);
         if (mapRegisterCacheValue != null) {
             mapRegisterCacheValue = refreshAuthKeyIfNecessary(mapRegisterCacheValue);
-            mapRegisterCache.addEntry(cacheKey, mapRegisterCacheValue);
-            return mapRegisterCacheValue.getMapRegisterCacheMetadata();
+            lispSbPlugin.getMapRegisterCache().addEntry(cacheKey, mapRegisterCacheValue);
+            return mapRegisterCacheValue;
         }
         return null;
     }
 
     private MapRegisterCacheValue refreshAuthKeyIfNecessary(MapRegisterCacheValue mapRegisterCacheValue) {
-        if (authenticationKeyDataListener.isAuthKeyRefreshing()) {
-            final boolean shouldAuthKeyRefreshingStop = System.currentTimeMillis() - authenticationKeyDataListener
-                    .getAuthKeyRefreshingDate() > CACHE_RECORD_TIMEOUT;
-            if (shouldAuthKeyRefreshingStop) {
-                authenticationKeyDataListener.setAuthKeyRefreshing(false);
-            } else {
-                final MappingAuthkey mappingAuthkey = provideAuthenticateKey(mapRegisterCacheValue
-                        .getMapRegisterCacheMetadata().getEidLispAddress());
-
-                final MapRegisterCacheValueBuilder newMapRegisterCacheValueBuilder = new MapRegisterCacheValueBuilder
-                        (mapRegisterCacheValue);
-                final MapRegisterCacheMetadataBuilder newMapRegisterCacheMetadataBuilder =
-                        new MapRegisterCacheMetadataBuilder(mapRegisterCacheValue.getMapRegisterCacheMetadata());
-
-                newMapRegisterCacheValueBuilder.setAuthKeyValue(mappingAuthkey.getKeyString());
-                newMapRegisterCacheValueBuilder.setAuthKeyType(mappingAuthkey.getKeyType());
-                newMapRegisterCacheValueBuilder.setMapRegisterCacheMetadata(newMapRegisterCacheMetadataBuilder.build());
-                return newMapRegisterCacheValueBuilder.build();
-            }
+        final Map<EidLispAddressKey, EidLispAddress> eids = mapRegisterCacheValue.getMapRegisterCacheMetadata()
+                .getEidLispAddress();
+
+        if (lispSbPlugin.getAuthenticationKeyDataListener().authKeysForEidsUnchanged(
+                eids, lispSbPlugin.getMapRegisterCacheTimeout())) {
+            return mapRegisterCacheValue;
         }
 
-        return mapRegisterCacheValue;
+        final MappingAuthkey mappingAuthkey = provideAuthenticateKey(eids);
+        final MapRegisterCacheValueBuilder newMapRegisterCacheValueBuilder = new MapRegisterCacheValueBuilder(
+                mapRegisterCacheValue);
+        final MapRegisterCacheMetadataBuilder newMapRegisterCacheMetadataBuilder =
+                new MapRegisterCacheMetadataBuilder(mapRegisterCacheValue.getMapRegisterCacheMetadata());
 
+        newMapRegisterCacheValueBuilder.setMappingAuthkey(mappingAuthkey);
+        newMapRegisterCacheValueBuilder.setMapRegisterCacheMetadata(newMapRegisterCacheMetadataBuilder.build());
+        return newMapRegisterCacheValueBuilder.build();
     }
 
     private MapRegisterCacheValue resolveCacheValue(Map.Entry<MapRegisterCacheKey, byte[]> entry) {
         if (entry != null) {
-            final MapRegisterCacheValue mapRegisterCacheValue = mapRegisterCache.getEntry(entry.getKey());
+            final MapRegisterCacheValue mapRegisterCacheValue =
+                    lispSbPlugin.getMapRegisterCache().getEntry(entry.getKey());
             if (mapRegisterCacheValue != null) {
                 final long creationTime = mapRegisterCacheValue.getMapRegisterCacheMetadata().getTimestamp();
                 final long currentTime = System.currentTimeMillis();
-                if (currentTime - creationTime > CACHE_RECORD_TIMEOUT) {
-                    mapRegisterCache.removeEntry(entry.getKey());
+                if (currentTime - creationTime > lispSbPlugin.getMapRegisterCacheTimeout()) {
+                    lispSbPlugin.getMapRegisterCache().removeEntry(entry.getKey());
                     return null;
                 } else if (Arrays.equals(mapRegisterCacheValue.getPacketData(), entry.getValue())) {
                     return mapRegisterCacheValue;
@@ -307,32 +285,26 @@ public class LispSouthboundHandler extends SimpleChannelInboundHandler<DatagramP
         return null;
     }
 
-    private void sendNotificationIfPossible(final Notification notification) throws InterruptedException {
-        if (notificationPublishService != null) {
-            notificationPublishService.putNotification(notification);
-            LOG.trace("{} was published.", notification.getClass());
-        } else {
-            LOG.warn("Notification Provider is null!");
-        }
-    }
-
-    private MappingKeepAlive createMappingKeepAlive(final MapRegisterCacheValue value) {
+    private static MappingKeepAlive createMappingKeepAlive(final MapRegisterCacheValue value) {
         MappingKeepAliveBuilder mappingKeepAliveBuilder = new MappingKeepAliveBuilder();
         mappingKeepAliveBuilder.setMapRegisterCacheMetadata(value.getMapRegisterCacheMetadata());
         return mappingKeepAliveBuilder.build();
     }
 
     /**
-     * Returns null if not all of eids have the same value of authentication key
+     * Returns null if not all of eids have the same value of authentication key.
      */
-    private MappingAuthkey provideAuthenticateKey(final List<EidLispAddress> eidLispAddresses) {
+    private MappingAuthkey provideAuthenticateKey(final Map<EidLispAddressKey, EidLispAddress> eidLispAddresses) {
         MappingAuthkey firstAuthKey = null;
+        if (eidLispAddresses == null) {
+            return null;
+        }
         for (int i = 0; i < eidLispAddresses.size(); i++) {
-            final Eid eid = eidLispAddresses.get(i).getEid();
+            final Eid eid = eidLispAddresses.get(new EidLispAddressKey(Integer.toString(i))).getEid();
             if (i == 0) {
-                firstAuthKey = smc.getAuthenticationKey(eid);
+                firstAuthKey = lispSbPlugin.getAkdb().getAuthenticationKey(eid);
             } else {
-                final MappingAuthkey authKey = smc.getAuthenticationKey(eid);
+                final MappingAuthkey authKey = lispSbPlugin.getAkdb().getAuthenticationKey(eid);
                 if (!Objects.equals(firstAuthKey, authKey)) {
                     return null;
                 }
@@ -344,13 +316,14 @@ public class LispSouthboundHandler extends SimpleChannelInboundHandler<DatagramP
 
     private void sendMapNotifyMsg(final ByteBuffer inBuffer, final InetAddress inetAddress, int portNumber,
                                   MapRegisterCacheValue mapRegisterValue) {
-        if (mapRegisterValue.getAuthKeyType() != null) {
+        if (mapRegisterValue.getMappingAuthkey().getKeyType() != null) {
             ByteBuffer outBuffer = transformMapRegisterToMapNotify(inBuffer);
-            if (mapRegisterValue.getAuthKeyType() != 0) {
-                outBuffer = calculateAndSetNewMAC(outBuffer, mapRegisterValue.getAuthKeyValue());
+            if (mapRegisterValue.getMappingAuthkey().getKeyType().toJava() != 0) {
+                outBuffer = calculateAndSetNewMAC(outBuffer, mapRegisterValue.getMappingAuthkey().getKeyString());
             }
             outBuffer.position(0);
-            lispSbPlugin.handleSerializedLispBuffer(inetAddress, outBuffer, MessageType.MapNotify, portNumber);
+            lispSbPlugin.handleSerializedLispBuffer(inetAddress, outBuffer, MessageType.MapNotify, portNumber,
+                    this.channel);
         } else {
             LOG.error("Map-Register Cache: authentication succeeded, but can't find auth key for sending Map-Notify");
         }
@@ -358,22 +331,19 @@ public class LispSouthboundHandler extends SimpleChannelInboundHandler<DatagramP
 
     /**
      * Calculates new message authentication code (MAC) for notify message.
-     *
-     * @param buffer
-     * @return
      */
-    private ByteBuffer calculateAndSetNewMAC(final ByteBuffer buffer, final String authKey) {
+    private static ByteBuffer calculateAndSetNewMAC(final ByteBuffer buffer, final String authKey) {
         final byte[] authenticationData = LispAuthenticationUtil.createAuthenticationData(buffer, authKey);
         buffer.position(ILispAuthentication.MAP_REGISTER_AND_NOTIFY_AUTHENTICATION_POSITION);
         buffer.put(authenticationData);
         return buffer;
     }
 
-    private ByteBuffer transformMapRegisterToMapNotify(final ByteBuffer buffer) {
+    private static ByteBuffer transformMapRegisterToMapNotify(final ByteBuffer buffer) {
         buffer.position(0);
         byte typeAndFlags = buffer.get(0);
         // Shift the xTR-ID present and built for an RTR bits to their correct position
-        byte flags = (byte) ((typeAndFlags << 2) & 0x0F);
+        byte flags = (byte) (typeAndFlags << 2 & 0x0F);
         // Set control message type to 4 (Map-Notify)
         byte type = 0x40;
         // Combine the nibbles
@@ -384,14 +354,15 @@ public class LispSouthboundHandler extends SimpleChannelInboundHandler<DatagramP
         return buffer;
     }
 
-    private List<EidLispAddress> provideEidPrefixesFromMessage(final MapRegister mapRegister) {
-        List<EidLispAddress> eidsResult = new ArrayList<>();
+    private static Map<EidLispAddressKey, EidLispAddress> provideEidPrefixesFromMessage(final MapRegister mapRegister) {
+        Map<EidLispAddressKey, EidLispAddress> eidsResult = new LinkedHashMap<>();
+        int idx = 0;
         for (MappingRecordItem mappingRecordItem : mapRegister.getMappingRecordItem()) {
             final EidLispAddressBuilder eidLispAddressBuilder = new EidLispAddressBuilder();
             final Eid eid = mappingRecordItem.getMappingRecord().getEid();
             eidLispAddressBuilder.setEidLispAddressId(LispAddressStringifier.getString(eid));
             eidLispAddressBuilder.setEid(eid);
-            eidsResult.add(eidLispAddressBuilder.build());
+            eidsResult.put(new EidLispAddressKey(Integer.toString(idx)), eidLispAddressBuilder.build());
         }
         return eidsResult;
     }
@@ -399,21 +370,15 @@ public class LispSouthboundHandler extends SimpleChannelInboundHandler<DatagramP
     /**
      * Checks whether authentication data is valid.
      *
-     * Methods pass through all records from map register message. For the EID of the first record it gets
+     * <p>Methods pass through all records from map register message. For the EID of the first record it gets
      * authentication key and does validation of authentication data again this authentication key. If it pass
-     * it just checks for remaining records (and its EID) whether they have the same authenticatin key stored in
-     * simple map cache (smc).
+     * it just checks for remaining records (and its EID) whether they have the same authentication key stored in
+     * the authentication key database.
      *
-     * @param mapRegister
-     * @param byteBuffer
      * @return Returns authentication key if all of EIDs have the same authentication key or null otherwise
      */
     private MappingAuthkey tryToAuthenticateMessage(final MapRegister mapRegister, final ByteBuffer byteBuffer) {
-        if (!authenticationEnabled) {
-            return null;
-        }
-
-        if (smc == null) {
+        if (lispSbPlugin.getAkdb() == null) {
             LOG.debug("Simple map cache wasn't instantieted and set.");
             return null;
         }
@@ -424,16 +389,16 @@ public class LispSouthboundHandler extends SimpleChannelInboundHandler<DatagramP
             final MappingRecordItem recordItem = mappingRecords.get(i);
             final MappingRecord mappingRecord = recordItem.getMappingRecord();
             if (i == 0) {
-                firstAuthKey = smc.getAuthenticationKey(mappingRecord.getEid());
+                firstAuthKey = lispSbPlugin.getAkdb().getAuthenticationKey(mappingRecord.getEid());
                 if (!LispAuthenticationUtil.validate(mapRegister, byteBuffer, mappingRecord.getEid(), firstAuthKey)) {
                     return null;
                 }
             } else {
                 final Eid eid = mappingRecord.getEid();
-                final MappingAuthkey authKey = smc.getAuthenticationKey(eid);
+                final MappingAuthkey authKey = lispSbPlugin.getAkdb().getAuthenticationKey(eid);
                 if (!firstAuthKey.equals(authKey)) {
-                    LOG.debug("Map register packet contained several eids. Authentication keys for first one and for " +
-                            "{} are different.",LispAddressStringifier.getString(eid));
+                    LOG.debug("Map register packet contained several eids. Authentication keys for first one and for "
+                            "{} are different.",LispAddressStringifier.getString(eid));
                     return null;
                 }
             }
@@ -441,6 +406,7 @@ public class LispSouthboundHandler extends SimpleChannelInboundHandler<DatagramP
         return firstAuthKey;
     }
 
+    @SuppressWarnings("checkstyle:IllegalCatch")
     private void handleMapNotify(ByteBuffer inBuffer, InetAddress sourceAddress, int port) {
         try {
             MapNotify mapNotify = MapNotifySerializer.getInstance().deserialize(inBuffer);
@@ -449,14 +415,9 @@ public class LispSouthboundHandler extends SimpleChannelInboundHandler<DatagramP
             TransportAddressBuilder transportAddressBuilder = new TransportAddressBuilder();
             transportAddressBuilder.setIpAddress(LispNotificationHelper
                     .getIpAddressBinaryFromInetAddress(sourceAddress));
-            transportAddressBuilder.setPort(new PortNumber(port));
+            transportAddressBuilder.setPort(new PortNumber(fromJava(port)));
             gotMapNotifyBuilder.setTransportAddress(transportAddressBuilder.build());
-            if (notificationPublishService != null) {
-                notificationPublishService.putNotification(gotMapNotifyBuilder.build());
-                LOG.trace("MapNotify was published!");
-            } else {
-                LOG.warn("Notification Provider is null!");
-            }
+            lispSbPlugin.sendNotificationIfPossible(gotMapNotifyBuilder.build());
         } catch (RuntimeException re) {
             throw new LispMalformedPacketException("Couldn't deserialize Map-Notify (len="
                     + inBuffer.capacity() + ")", re);
@@ -465,7 +426,7 @@ public class LispSouthboundHandler extends SimpleChannelInboundHandler<DatagramP
         }
     }
 
-
+    @SuppressWarnings("checkstyle:IllegalCatch")
     private void handleMapReply(ByteBuffer inBuffer, InetAddress sourceAddress, int port) {
         try {
             MapReply mapReply = MapReplySerializer.getInstance().deserialize(inBuffer);
@@ -474,14 +435,9 @@ public class LispSouthboundHandler extends SimpleChannelInboundHandler<DatagramP
             TransportAddressBuilder transportAddressBuilder = new TransportAddressBuilder();
             transportAddressBuilder.setIpAddress(LispNotificationHelper
                     .getIpAddressBinaryFromInetAddress(sourceAddress));
-            transportAddressBuilder.setPort(new PortNumber(port));
+            transportAddressBuilder.setPort(new PortNumber(fromJava(port)));
             gotMapReplyBuilder.setTransportAddress(transportAddressBuilder.build());
-            if (notificationPublishService != null) {
-                notificationPublishService.putNotification(gotMapReplyBuilder.build());
-                LOG.trace("MapReply was published!");
-            } else {
-                LOG.warn("Notification Provider is null!");
-            }
+            lispSbPlugin.sendNotificationIfPossible(gotMapReplyBuilder.build());
         } catch (RuntimeException re) {
             throw new LispMalformedPacketException("Couldn't deserialize Map-Reply (len="
                     + inBuffer.capacity() + ")", re);
@@ -491,22 +447,25 @@ public class LispSouthboundHandler extends SimpleChannelInboundHandler<DatagramP
     }
 
     private void handleStats(int type) {
-        if (lispSbStats != null) {
-            if (type <= LispSouthboundStats.MAX_LISP_TYPES) {
-                lispSbStats.incrementRx(type);
+        if (lispSbPlugin.getStats() != null) {
+            if (type <= ConcurrentLispSouthboundStats.MAX_LISP_TYPES) {
+                lispSbPlugin.getStats().incrementRx(type);
             } else {
-                lispSbStats.incrementRxUnknown();
+                lispSbPlugin.getStats().incrementRxUnknown();
             }
         }
     }
 
     @Override
     protected void channelRead0(ChannelHandlerContext ctx, DatagramPacket msg) throws Exception {
-        if (LOG.isTraceEnabled()) {
-            LOG.trace("Received UDP packet from {}:{} with content:\n{}", msg.sender().getHostString(),
-                    msg.sender().getPort(), ByteBufUtil.prettyHexDump(msg.content()));
+        if (isReadFromChannelEnabled) {
+            if (LOG.isTraceEnabled()) {
+                LOG.trace("Received UDP packet from {}:{} with content:\n{}", msg.sender().getHostString(),
+                        msg.sender().getPort(), ByteBufUtil.prettyHexDump(msg.content()));
+            }
+            this.channel = ctx.channel();
+            handlePacket(msg);
         }
-        handlePacket(msg);
     }
 
     @Override
@@ -521,50 +480,5 @@ public class LispSouthboundHandler extends SimpleChannelInboundHandler<DatagramP
 
     @Override
     public void close() throws Exception {
-        authenticationKeyDataListener.closeDataChangeListener();
-    }
-
-    public void setSimpleMapCache(final SimpleMapCache smc) {
-        this.smc = smc;
-    }
-
-    public void setDataBroker(final DataBroker dataBroker) {
-        this.dataBroker = dataBroker;
-    }
-
-    public void setNotificationProvider(NotificationPublishService nps) {
-        this.notificationPublishService = nps;
-    }
-
-    public void setMapRegisterCache(final MapRegisterCache mapRegisterCache) {
-        this.mapRegisterCache = mapRegisterCache;
-    }
-
-    public void setMapRegisterCacheEnabled(final boolean mapRegisterCacheEnabled) {
-        this.mapRegisterCacheEnabled = mapRegisterCacheEnabled;
-    }
-
-    /**
-    * Restore all keys from MDSAL datastore
-    */
-   public void restoreDaoFromDatastore() {
-       final List<AuthenticationKey> authKeys = dsbe.getAllAuthenticationKeys();
-       LOG.info("Restoring {} keys from datastore into southbound DAO", authKeys.size());
-
-       for (AuthenticationKey authKey : authKeys) {
-           final Eid key = authKey.getEid();
-           final MappingAuthkey mappingAuthkey = authKey.getMappingAuthkey();
-           LOG.debug("Adding authentication key '{}' with key-ID {} for {}", mappingAuthkey.getKeyString(),
-                   mappingAuthkey.getKeyType(),
-                   LispAddressStringifier.getString(key));
-           smc.addAuthenticationKey(key, mappingAuthkey);
-       }
-    }
-
-    public void init() {
-        Preconditions.checkNotNull(dataBroker);
-        Preconditions.checkNotNull(smc);
-        this.authenticationKeyDataListener = new AuthenticationKeyDataListener(dataBroker, smc);
-        dsbe = new DataStoreBackEnd(dataBroker);
     }
 }