Bugfix: matching IP address without ethType will result in OFPT_ERROR_MSG (type=…

…OFPET_BAD_MATCH, code=OFPBMC_BAD_PREREQ) Change-Id: I4edc82cdc920b7c92048119c61b70bbce704cbf6

Bugfix: matching IP address without ethType will result in OFPT_ERROR_MSG (type=…
…OFPET_BAD_MATCH, code=OFPBMC_BAD_PREREQ) Change-Id: I4edc82cdc920b7c92048119c61b70bbce704cbf6
Charles M.C. Chan · Gerrit Code Review
Commit 7b8a9217630c2aaa956420d3e472b573dbea0403 7b8a9217 1 parent 9148d2d1
Showing 1 changed file with 3 additions and 2 deletions
apps/fwd/src/main/java/org/onosproject/fwd/ReactiveForwarding.java
--- a/apps/fwd/src/main/java/org/onosproject/fwd/ReactiveForwarding.java
View file @7b8a921
+++ b/apps/fwd/src/main/java/org/onosproject/fwd/ReactiveForwarding.java
View file @7b8a921
@@ -509,7 +509,7 @@ public class ReactiveForwarding {
                 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 @@ public class ReactiveForwarding {
                 Ip6Prefix matchIp6DstPrefix =
                     Ip6Prefix.valueOf(ipv6Packet.getDestinationAddress(),
                                       Ip6Prefix.MAX_MASK_LENGTH);
-                 selectorBuilder.matchIPv6Src(matchIp6SrcPrefix)
+                 selectorBuilder.matchEthType(Ethernet.TYPE_IPV6)
+                         .matchIPv6Src(matchIp6SrcPrefix)
                         .matchIPv6Dst(matchIp6DstPrefix);
 
                 if (matchIpv6FlowLabel) {