Magnesium platform upgrade
[lispflowmapping.git] / mappingservice / southbound / src / main / java / org / opendaylight / lispflowmapping / southbound / lisp / LispSouthboundHandler.java
index 347a835ddb7d79d17c4210a14d00111836bb2dbe..b6972db6d43fa39d2145221925224c434f1ecf53 100644 (file)
@@ -8,7 +8,10 @@
 
 package org.opendaylight.lispflowmapping.southbound.lisp;
 
+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;
@@ -19,7 +22,10 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
-import org.opendaylight.controller.md.sal.binding.api.NotificationPublishService;
+import java.util.Objects;
+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;
@@ -28,14 +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.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;
@@ -55,44 +60,27 @@ 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.map.register.cache.metadata.EidLispAddressBuilder;
 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.authkey.container.MappingAuthkey;
+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.transport.address.TransportAddressBuilder;
-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 {
-    private final MapRegisterCache mapRegisterCache;
-
-    /**
-     * 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 NotificationPublishService notificationPublishService;
+        implements ILispSouthboundService, AutoCloseable {
     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 = ConfigIni.getInstance().isAuthEnabled();
     private final LispSouthboundPlugin lispSbPlugin;
-    private LispSouthboundStats lispSbStats = null;
+    private boolean isReadFromChannelEnabled = true;
 
-    public LispSouthboundHandler(LispSouthboundPlugin lispSbPlugin, final MapRegisterCache mapRegisterCache) {
-        this.lispSbPlugin = lispSbPlugin;
-        if (lispSbPlugin != null) {
-            this.lispSbStats = lispSbPlugin.getStats();
-        }
-        this.mapRegisterCache = mapRegisterCache;
-    }
+    private Channel channel;
 
     public LispSouthboundHandler(LispSouthboundPlugin lispSbPlugin) {
-        this(lispSbPlugin, new MapRegisterCache());
-    }
-
-    public void setNotificationProvider(NotificationPublishService nps) {
-        this.notificationPublishService = nps;
+        this.lispSbPlugin = lispSbPlugin;
     }
 
     public void handlePacket(DatagramPacket msg) {
@@ -105,7 +93,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());
@@ -120,18 +108,20 @@ public class LispSouthboundHandler extends SimpleChannelInboundHandler<DatagramP
         }
     }
 
+    @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!");
@@ -142,14 +132,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);
@@ -158,6 +143,7 @@ public class LispSouthboundHandler extends SimpleChannelInboundHandler<DatagramP
         }
     }
 
+    @SuppressWarnings("checkstyle:IllegalCatch")
     private int extractEncapsulatedSourcePort(ByteBuffer inBuffer) {
         try {
             inBuffer.position(PacketHeader.Length.LISP_ENCAPSULATION);
@@ -180,34 +166,52 @@ public class LispSouthboundHandler extends SimpleChannelInboundHandler<DatagramP
         }
     }
 
+    @SuppressWarnings("checkstyle:IllegalCatch")
     private void handleMapRegister(ByteBuffer inBuffer, InetAddress sourceAddress, int port) {
         try {
-            final Map.Entry<MapRegisterCacheKey, byte[]> artificialEntry = MapRegisterPartialDeserializer
-                    .deserializePartially(inBuffer, sourceAddress);
-            final MapRegisterCacheKey cacheKey = artificialEntry == null ? null : artificialEntry.getKey();
-
-            final MapRegisterCacheValue cacheValue = resolveCacheValue(artificialEntry);
+            Map.Entry<MapRegisterCacheKey, byte[]> artificialEntry = null;
+            MapRegisterCacheKey cacheKey = null;
+            MapRegisterCacheValue cacheValue = null;
+            if (lispSbPlugin.isMapRegisterCacheEnabled()) {
+                artificialEntry = MapRegisterPartialDeserializer.deserializePartially(inBuffer, sourceAddress);
+                cacheKey = artificialEntry == null ? null : artificialEntry.getKey();
+                cacheValue = resolveCacheValue(artificialEntry);
+            }
             if (cacheValue != null) {
-                final MapRegisterCacheMetadata mapRegisterValue = cacheValue.getMapRegisterCacheMetadata();
-                LOG.debug("Map register message site-ID: {} xTR-ID: {} from cache.", mapRegisterValue.getSiteId(),
-                        mapRegisterValue.getXtrId());
-                mapRegisterCache.refreshEntry(cacheKey);
-                sendNotificationIfPossible(createMappingKeepAlive(cacheValue));
-                if (mapRegisterValue.isWantMapNotify()) {
-                    sendMapNotifyMsg(inBuffer, sourceAddress, port);
+                lispSbPlugin.getStats().incrementCacheHits();
+                MapRegisterCacheMetadata mapRegisterMeta = cacheValue.getMapRegisterCacheMetadata();
+                LOG.debug("Map register message site-ID: {} xTR-ID: {} from cache.", mapRegisterMeta.getSiteId(),
+                        mapRegisterMeta.getXtrId());
+                cacheValue = refreshEntry(cacheKey);
+                if (cacheValue != null) {
+                    lispSbPlugin.sendNotificationIfPossible(createMappingKeepAlive(cacheValue));
+                    if (cacheValue.getMapRegisterCacheMetadata().isWantMapNotify()) {
+                        sendMapNotifyMsg(inBuffer, sourceAddress, port, cacheValue);
+                    }
                 }
             } else {
+                lispSbPlugin.getStats().incrementCacheMisses();
                 MapRegister mapRegister = MapRegisterSerializer.getInstance().deserialize(inBuffer, sourceAddress);
+
+                MappingAuthkey mappingAuthkey = null;
+                if (authenticationEnabled) {
+                    mappingAuthkey = tryToAuthenticateMessage(mapRegister, inBuffer);
+                    if (mappingAuthkey == null) {
+                        return;
+                    }
+                }
+
                 AddMappingBuilder addMappingBuilder = new AddMappingBuilder();
                 addMappingBuilder.setMapRegister(LispNotificationHelper.convertMapRegister(mapRegister));
                 TransportAddressBuilder transportAddressBuilder = new TransportAddressBuilder();
                 transportAddressBuilder.setIpAddress(LispNotificationHelper.getIpAddressBinaryFromInetAddress(
                         sourceAddress));
-                transportAddressBuilder.setPort(new PortNumber(port));
+                transportAddressBuilder.setPort(new PortNumber(fromJava(port)));
                 addMappingBuilder.setTransportAddress(transportAddressBuilder.build());
-                sendNotificationIfPossible(addMappingBuilder.build());
+                lispSbPlugin.sendNotificationIfPossible(addMappingBuilder.build());
                 if (artificialEntry != null) {
-                    final MapRegisterCacheMetadataBuilder cacheMetadataBldNew = new MapRegisterCacheMetadataBuilder();
+                    final MapRegisterCacheMetadataBuilder cacheMetadataBldNew = new
+                            MapRegisterCacheMetadataBuilder();
                     cacheMetadataBldNew.setEidLispAddress(provideEidPrefixesFromMessage(mapRegister));
                     cacheMetadataBldNew.setXtrId(mapRegister.getXtrId());
                     cacheMetadataBldNew.setSiteId(mapRegister.getSiteId());
@@ -217,9 +221,10 @@ public class LispSouthboundHandler extends SimpleChannelInboundHandler<DatagramP
 
                     final MapRegisterCacheValueBuilder cacheValueBldNew = new MapRegisterCacheValueBuilder();
                     cacheValueBldNew.setPacketData(artificialEntry.getValue());
+                    cacheValueBldNew.setMappingAuthkey(mappingAuthkey);
                     cacheValueBldNew.setMapRegisterCacheMetadata(cacheMetadataBldNew.build());
 
-                    mapRegisterCache.addEntry(cacheKey, cacheValueBldNew.build());
+                    lispSbPlugin.getMapRegisterCache().addEntry(cacheKey, cacheValueBldNew.build());
                 }
             }
         } catch (RuntimeException re) {
@@ -230,14 +235,44 @@ public class LispSouthboundHandler extends SimpleChannelInboundHandler<DatagramP
         }
     }
 
+    private MapRegisterCacheValue refreshEntry(final MapRegisterCacheKey cacheKey) {
+        MapRegisterCacheValue mapRegisterCacheValue = lispSbPlugin.getMapRegisterCache().refreshEntry(cacheKey);
+        if (mapRegisterCacheValue != null) {
+            mapRegisterCacheValue = refreshAuthKeyIfNecessary(mapRegisterCacheValue);
+            lispSbPlugin.getMapRegisterCache().addEntry(cacheKey, mapRegisterCacheValue);
+            return mapRegisterCacheValue;
+        }
+        return null;
+    }
+
+    private MapRegisterCacheValue refreshAuthKeyIfNecessary(MapRegisterCacheValue mapRegisterCacheValue) {
+        final List<EidLispAddress> eids = mapRegisterCacheValue.getMapRegisterCacheMetadata().getEidLispAddress();
+
+        if (lispSbPlugin.getAuthenticationKeyDataListener().authKeysForEidsUnchanged(
+                eids, lispSbPlugin.getMapRegisterCacheTimeout())) {
+            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;
@@ -247,32 +282,69 @@ 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) {
         MappingKeepAliveBuilder mappingKeepAliveBuilder = new MappingKeepAliveBuilder();
         mappingKeepAliveBuilder.setMapRegisterCacheMetadata(value.getMapRegisterCacheMetadata());
         return mappingKeepAliveBuilder.build();
     }
 
-    private void sendMapNotifyMsg(final ByteBuffer inBuffer, final InetAddress inetAddress, int portNumber) {
-        ByteBuffer outBuffer = transformMapRegisterToMapNotify(inBuffer);
-        outBuffer.position(0);
-        lispSbPlugin.handleSerializedLispBuffer(inetAddress, outBuffer, MessageType.MapNotify, portNumber);
+    /**
+     * Returns null if not all of eids have the same value of authentication key.
+     */
+    private MappingAuthkey provideAuthenticateKey(final List<EidLispAddress> eidLispAddresses) {
+        MappingAuthkey firstAuthKey = null;
+        for (int i = 0; i < eidLispAddresses.size(); i++) {
+            final Eid eid = eidLispAddresses.get(i).getEid();
+            if (i == 0) {
+                firstAuthKey = lispSbPlugin.getAkdb().getAuthenticationKey(eid);
+            } else {
+                final MappingAuthkey authKey = lispSbPlugin.getAkdb().getAuthenticationKey(eid);
+                if (!Objects.equals(firstAuthKey, authKey)) {
+                    return null;
+                }
+            }
+        }
+        return firstAuthKey;
+
+    }
+
+    private void sendMapNotifyMsg(final ByteBuffer inBuffer, final InetAddress inetAddress, int portNumber,
+                                  MapRegisterCacheValue mapRegisterValue) {
+        if (mapRegisterValue.getMappingAuthkey().getKeyType() != null) {
+            ByteBuffer outBuffer = transformMapRegisterToMapNotify(inBuffer);
+            if (mapRegisterValue.getMappingAuthkey().getKeyType().toJava() != 0) {
+                outBuffer = calculateAndSetNewMAC(outBuffer, mapRegisterValue.getMappingAuthkey().getKeyString());
+            }
+            outBuffer.position(0);
+            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");
+        }
+    }
+
+    /**
+     * Calculates new message authentication code (MAC) for notify message.
+     */
+    private 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) {
         buffer.position(0);
-        //TODO: also reset of authentication data is required. other trello card is opened for this task.
-        byte[] byteReplacement = new byte[] {0x04, 0x00, 0x00};
+        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);
+        // Set control message type to 4 (Map-Notify)
+        byte type = 0x40;
+        // Combine the nibbles
+        typeAndFlags = (byte) (type | flags);
+        byte[] byteReplacement = new byte[] {typeAndFlags, 0x00, 0x00};
         buffer.put(byteReplacement);
+
         return buffer;
     }
 
@@ -288,6 +360,46 @@ public class LispSouthboundHandler extends SimpleChannelInboundHandler<DatagramP
         return eidsResult;
     }
 
+    /**
+     * Checks whether authentication data is valid.
+     *
+     * <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 authentication key stored in
+     * the authentication key database.
+     *
+     * @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 (lispSbPlugin.getAkdb() == null) {
+            LOG.debug("Simple map cache wasn't instantieted and set.");
+            return null;
+        }
+
+        MappingAuthkey firstAuthKey = null;
+        final List<MappingRecordItem> mappingRecords = mapRegister.getMappingRecordItem();
+        for (int i = 0; i < mappingRecords.size(); i++) {
+            final MappingRecordItem recordItem = mappingRecords.get(i);
+            final MappingRecord mappingRecord = recordItem.getMappingRecord();
+            if (i == 0) {
+                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 = 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));
+                    return null;
+                }
+            }
+        }
+        return firstAuthKey;
+    }
+
+    @SuppressWarnings("checkstyle:IllegalCatch")
     private void handleMapNotify(ByteBuffer inBuffer, InetAddress sourceAddress, int port) {
         try {
             MapNotify mapNotify = MapNotifySerializer.getInstance().deserialize(inBuffer);
@@ -296,14 +408,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);
@@ -312,6 +419,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);
@@ -320,14 +428,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);
@@ -337,22 +440,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
@@ -364,4 +470,8 @@ public class LispSouthboundHandler extends SimpleChannelInboundHandler<DatagramP
     public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
         LOG.error("Error on channel: " + cause, cause);
     }
+
+    @Override
+    public void close() throws Exception {
+    }
 }