commit 3217d1b5d62a4492c057209e6ca8201452156fdc
author Jonathan Hart <jono@onlab.us> Tue Jun 30 16:08:43 2015 -0700
committer Gerrit Code Review <gerrit@onlab.us> Wed Jul 01 03:31:53 2015 +0000
tree 13ab0a37d622c08d4fe54ffbde71691ea6c57090
parent 4a60bb31cd9bcd88f841d494fff9f3865efde24d

Add back EtherType switching based on named enums

Change-Id: I7351ca8ee7b80e7a072a6312357599889d6f1f57

apps/reactive-routing/src/main/java/org/onosproject/reactive/routing/SdnIpReactiveRouting.java

diff --git a/apps/reactive-routing/src/main/java/org/onosproject/reactive/routing/SdnIpReactiveRouting.java b/apps/reactive-routing/src/main/java/org/onosproject/reactive/routing/SdnIpReactiveRouting.java
index c75fd3b..b1defbd 100644
--- a/apps/reactive-routing/src/main/java/org/onosproject/reactive/routing/SdnIpReactiveRouting.java
+++ b/apps/reactive-routing/src/main/java/org/onosproject/reactive/routing/SdnIpReactiveRouting.java
@@ -14,16 +14,13 @@
  * limitations under the License.
  */
 package org.onosproject.reactive.routing;
-import static org.slf4j.LoggerFactory.getLogger;
-
-import java.nio.ByteBuffer;
-
 import org.apache.felix.scr.annotations.Activate;
 import org.apache.felix.scr.annotations.Component;
 import org.apache.felix.scr.annotations.Deactivate;
 import org.apache.felix.scr.annotations.Reference;
 import org.apache.felix.scr.annotations.ReferenceCardinality;
 import org.onlab.packet.ARP;
+import org.onlab.packet.EthType;
 import org.onlab.packet.Ethernet;
 import org.onlab.packet.IPv4;
 import org.onlab.packet.Ip4Address;
@@ -47,6 +44,10 @@
 import org.onosproject.routing.config.RoutingConfigurationService;
 import org.slf4j.Logger;
 
+import java.nio.ByteBuffer;
+
+import static org.slf4j.LoggerFactory.getLogger;
+
 /**
  * This is reactive routing to handle 3 cases:
  * (1) one host wants to talk to another host, both two hosts are in
@@ -113,8 +114,8 @@
             }
             ConnectPoint srcConnectPoint = pkt.receivedFrom();
 
-            switch (ethPkt.getEtherType()) {
-            case 0x806:
+            switch (EthType.EtherType.lookup(ethPkt.getEtherType())) {
+            case ARP:
                 ARP arpPacket = (ARP) ethPkt.getPayload();
                 Ip4Address targetIpAddress = Ip4Address
                         .valueOf(arpPacket.getTargetProtocolAddress());
@@ -141,7 +142,7 @@
                             ByteBuffer.wrap(eth.serialize())));
                 }
                 break;
-            case 0x800:
+            case IPV4:
                 // Parse packet
                 IPv4 ipv4Packet = (IPv4) ethPkt.getPayload();
                 IpAddress dstIp =