commit | 8a3d9fb444c2e7052613b65c83eb221ed550bdb9 | [log] [tgz] |
---|---|---|
author | abat <abat@bigswitch.com> | Mon Dec 08 13:55:40 2014 -0800 |
committer | abat <abat@bigswitch.com> | Mon Dec 08 13:55:40 2014 -0800 |
tree | da46a7c4894e78d3447877f04be81fd113875ed7 | |
parent | 781d1a98e9334173e4412ad455d07986f15c40cd [diff] | |
parent | cf53bb97b0a13b2b9deef47c13bfc390a4fa7b4e [diff] |
Merge into master from pull request #363: multiple pkt-in reason: fix version check to >= 1.3 (https://github.com/floodlight/loxigen/pull/363)
diff --git a/java_gen/pre-written/src/main/java/org/projectfloodlight/openflow/util/MultiplePktInReasonUtil.java b/java_gen/pre-written/src/main/java/org/projectfloodlight/openflow/util/MultiplePktInReasonUtil.java index a919f62..3ee588f 100644 --- a/java_gen/pre-written/src/main/java/org/projectfloodlight/openflow/util/MultiplePktInReasonUtil.java +++ b/java_gen/pre-written/src/main/java/org/projectfloodlight/openflow/util/MultiplePktInReasonUtil.java
@@ -22,10 +22,10 @@ * reasons in Match.MetaData field. * */ public static Set<OFBsnPktinFlag> getOFBsnPktinFlags(OFPacketIn pktIn) { - if(pktIn.getVersion() != OFVersion.OF_13) { + if(pktIn.getVersion().compareTo(OFVersion.OF_13) < 0) { throw new IllegalArgumentException("multiple pkt in reasons are " + "only supported by BVS using " - + "openflow 1.3"); + + "openflow version >= 1.3"); } Match match = pktIn.getMatch();