commit | 0e35863305b83ea4f51fd0110f690ac31932af82 | [log] [tgz] |
---|---|---|
author | Pier Luigi <pierventre@hotmail.com> | Tue Jan 31 09:35:05 2017 -0800 |
committer | Ray Milkey <ray@onlab.us> | Fri Feb 03 00:59:51 2017 +0000 |
tree | be459ab1fff8e7c561f1e09a9ec57c18bd0ccd71 | |
parent | a905c0c7bad427b4ef26520974d065606accffa3 [diff] |
Various fixes: - Adds the support for the filter obj of AppConfigHandler; - Fixes NPE on ICMP handler when rcving a packet from not configured ntw; Change-Id: I44b90420429ca05927426bdf9a9ce4b78846b566
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/IcmpHandler.java b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/IcmpHandler.java index 9675620..0e408bb 100644 --- a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/IcmpHandler.java +++ b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/IcmpHandler.java
@@ -315,7 +315,7 @@ IpPrefix subnet = config.getPortIPv6Subnet( connectPoint.deviceId(), connectPoint.port() - ).getIp6Prefix(); + ); return subnet != null && subnet.contains(pkt.sender()); }
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/SegmentRoutingManager.java b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/SegmentRoutingManager.java index 1316285..4f912f3 100644 --- a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/SegmentRoutingManager.java +++ b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/SegmentRoutingManager.java
@@ -999,9 +999,6 @@ * @param portToRegister connect point to register */ public void registerConnectPoint(ConnectPoint portToRegister) { - /* - * First we register the ARP handler. - */ this.neighbourResolutionService.registerNeighbourHandler( portToRegister, neighbourHandler,
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/config/DeviceConfiguration.java b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/config/DeviceConfiguration.java index 55562e0..6ceeb4b 100644 --- a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/config/DeviceConfiguration.java +++ b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/config/DeviceConfiguration.java
@@ -158,9 +158,7 @@ }); } }); - /* - * We register the connect point with the NRS. - */ + // We register the connect point with the NRS. srManager.registerConnectPoint(subject); }); }