commit d9a24edb0f5e66555090b6e9f64494a0a0ef8039
author Jian Li <pyguni@gmail.com> Wed Aug 29 20:53:25 2018 +0900
committer Jian Li <pyguni@gmail.com> Fri Sep 07 00:42:01 2018 +0000
tree 338be46821aa39dc588a9fdeebb75940bb1264a1
parent 634302085df3587fb25f65a0a41ff0319cfa325c

Fix: do not handle non-ip packet, do not block ICMP packet processing

Change-Id: Iecd92cfa5d82063b7a1b0c7563a21b7754372396

apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingIcmpHandler.java

diff --git a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingIcmpHandler.java b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingIcmpHandler.java
index a7e008a..17d9922 100644
--- a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingIcmpHandler.java
+++ b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingIcmpHandler.java
@@ -151,12 +151,12 @@
         log.info("Stopped");
     }
 
-    private void handleEchoRequest(DeviceId srcDevice, MacAddress srcMac, IPv4 ipPacket,
+    private boolean handleEchoRequest(DeviceId srcDevice, MacAddress srcMac, IPv4 ipPacket,
                                    ICMP icmp) {
         InstancePort instPort = instancePortService.instancePort(srcMac);
         if (instPort == null) {
             log.warn(ERR_REQ + "unknown source host(MAC:{})", srcMac);
-            return;
+            return false;
         }
 
         IpAddress srcIp = IpAddress.valueOf(ipPacket.getSourceAddress());
@@ -165,13 +165,13 @@
         Subnet srcSubnet = getSourceSubnet(instPort, srcIp);
         if (srcSubnet == null) {
             log.warn(ERR_REQ + "unknown source subnet(IP:{})", srcIp);
-            return;
+            return false;
         }
 
         if (Strings.isNullOrEmpty(srcSubnet.getGateway())) {
             log.warn(ERR_REQ + "source subnet(ID:{}, CIDR:{}) has no gateway",
                     srcSubnet.getId(), srcSubnet.getCidr());
-            return;
+            return false;
         }
 
         if (isForSubnetGateway(IpAddress.valueOf(ipPacket.getDestinationAddress()),
@@ -186,25 +186,25 @@
             RouterInterface routerInterface = routerInterface(srcSubnet);
             if (routerInterface == null) {
                 log.warn(ERR_REQ + "failed to get router interface");
-                return;
+                return false;
             }
 
             ExternalGateway externalGateway = externalGateway(routerInterface);
             if (externalGateway == null) {
                 log.warn(ERR_REQ + "failed to get external gateway");
-                return;
+                return false;
             }
 
             ExternalPeerRouter externalPeerRouter = osNetworkService.externalPeerRouter(externalGateway);
             if (externalPeerRouter == null) {
                 log.warn(ERR_REQ + "failed to get external peer router");
-                return;
+                return false;
             }
 
             IpAddress externalIp = getExternalIp(externalGateway, routerInterface);
             if (externalIp == null) {
                 log.warn(ERR_REQ + "failed to get external ip");
-                return;
+                return false;
             }
 
             sendRequestForExternal(ipPacket, srcDevice, externalIp, externalPeerRouter);
@@ -221,8 +221,10 @@
                 });
             } catch (IllegalArgumentException e) {
                 log.warn("IllegalArgumentException occurred because of {}", e.toString());
+                return false;
             }
         }
+        return true;
     }
 
     private String icmpInfoKey(ICMP icmp, String srcIp, String dstIp) {
@@ -444,7 +446,7 @@
 
             InboundPacket pkt = context.inPacket();
             Ethernet ethernet = pkt.parsed();
-            if (ethernet == null || ethernet.getEtherType() == Ethernet.TYPE_ARP) {
+            if (ethernet == null || ethernet.getEtherType() != Ethernet.TYPE_IPV4) {
                 return;
             }
 
@@ -466,11 +468,12 @@
 
             switch (icmp.getIcmpType()) {
                 case TYPE_ECHO_REQUEST:
-                    handleEchoRequest(context.inPacket().receivedFrom().deviceId(),
+                    if (handleEchoRequest(context.inPacket().receivedFrom().deviceId(),
                             ethernet.getSourceMAC(),
                             ipPacket,
-                            icmp);
-                    context.block();
+                            icmp)) {
+                        context.block();
+                    }
                     break;
                 case TYPE_ECHO_REPLY:
                     if (handleEchoReply(ipPacket, icmp)) {