Fixed traffic selector builder to allow only one criterion.
Temporarily disabled flow rule time-out.
diff --git a/core/net/src/main/java/org/onlab/onos/net/flow/impl/FlowRuleManager.java b/core/net/src/main/java/org/onlab/onos/net/flow/impl/FlowRuleManager.java
index 00619b3..db82eed 100644
--- a/core/net/src/main/java/org/onlab/onos/net/flow/impl/FlowRuleManager.java
+++ b/core/net/src/main/java/org/onlab/onos/net/flow/impl/FlowRuleManager.java
@@ -242,15 +242,16 @@
}
private boolean checkRuleLiveness(FlowRule swRule, FlowRule storedRule) {
- int timeout = storedRule.timeout();
- if (storedRule.packets() != swRule.packets()) {
- deadRounds.get(swRule).set(0);
- return true;
- }
-
- return (deadRounds.get(swRule).getAndIncrement() *
- FlowRuleProvider.POLL_INTERVAL) <= timeout;
-
+ return true;
+// int timeout = storedRule.timeout();
+// if (storedRule.packets() != swRule.packets()) {
+// deadRounds.get(swRule).set(0);
+// return true;
+// }
+//
+// return (deadRounds.get(swRule).getAndIncrement() *
+// FlowRuleProvider.POLL_INTERVAL) <= timeout;
+//
}
// Posts the specified event to the local event dispatcher.