commit 7b8a9217630c2aaa956420d3e472b573dbea0403
author Charles M.C. Chan <rascov@gmail.com> Sun Apr 26 01:25:53 2015 +0800
committer Gerrit Code Review <gerrit@onlab.us> Sun Apr 26 21:44:32 2015 +0000
tree 0aa25c506bdf251ea5267fea8db4204a176b2537
parent 9148d2d15df19ee306e3a93441438ad07a01e815

Bugfix: matching IP address without ethType will result in OFPT_ERROR_MSG (type=OFPET_BAD_MATCH, code=OFPBMC_BAD_PREREQ)

Change-Id: I4edc82cdc920b7c92048119c61b70bbce704cbf6

apps/fwd/src/main/java/org/onosproject/fwd/ReactiveForwarding.java

diff --git a/apps/fwd/src/main/java/org/onosproject/fwd/ReactiveForwarding.java b/apps/fwd/src/main/java/org/onosproject/fwd/ReactiveForwarding.java
index 7b5f126..c0c36c9 100644
--- a/apps/fwd/src/main/java/org/onosproject/fwd/ReactiveForwarding.java
+++ b/apps/fwd/src/main/java/org/onosproject/fwd/ReactiveForwarding.java
@@ -509,7 +509,7 @@
                 Ip4Prefix matchIp4DstPrefix =
                     Ip4Prefix.valueOf(ipv4Packet.getDestinationAddress(),
                                       Ip4Prefix.MAX_MASK_LENGTH);
-                selectorBuilder.matchEthType(inPkt.getEtherType())
+                selectorBuilder.matchEthType(Ethernet.TYPE_IPV4)
                         .matchIPSrc(matchIp4SrcPrefix)
                         .matchIPDst(matchIp4DstPrefix);
 
@@ -552,7 +552,8 @@
                 Ip6Prefix matchIp6DstPrefix =
                     Ip6Prefix.valueOf(ipv6Packet.getDestinationAddress(),
                                       Ip6Prefix.MAX_MASK_LENGTH);
-                selectorBuilder.matchIPv6Src(matchIp6SrcPrefix)
+                selectorBuilder.matchEthType(Ethernet.TYPE_IPV6)
+                        .matchIPv6Src(matchIp6SrcPrefix)
                         .matchIPv6Dst(matchIp6DstPrefix);
 
                 if (matchIpv6FlowLabel) {