commit | 7b2748fa984fb5d0dc81ee403f5047e0fbd8f880 | [log] [tgz] |
---|---|---|
author | alshabib <alshabibi.ali@gmail.com> | Tue Sep 16 20:21:11 2014 -0700 |
committer | alshabib <alshabibi.ali@gmail.com> | Tue Sep 16 20:21:11 2014 -0700 |
tree | 641bcbdc0c224fc683789f9c883ee269783d2aeb | |
parent | f1cd879934fd966210784485ab895128bd2980da [diff] |
flowrules are pushed: we still have an intermittent hang though
diff --git a/of/api/src/main/java/org/onlab/onos/of/controller/DefaultOpenFlowPacketContext.java b/of/api/src/main/java/org/onlab/onos/of/controller/DefaultOpenFlowPacketContext.java index efb41b8..fd47ad3 100644 --- a/of/api/src/main/java/org/onlab/onos/of/controller/DefaultOpenFlowPacketContext.java +++ b/of/api/src/main/java/org/onlab/onos/of/controller/DefaultOpenFlowPacketContext.java
@@ -32,7 +32,7 @@ @Override public void send() { - if (blocked() && isBuilt) { + if (block() && isBuilt) { sw.sendMsg(pktout); } } @@ -109,8 +109,13 @@ } @Override - public boolean blocked() { + public boolean block() { return free.getAndSet(false); } + @Override + public boolean isHandled() { + return !free.get(); + } + }
diff --git a/of/api/src/main/java/org/onlab/onos/of/controller/OpenFlowPacketContext.java b/of/api/src/main/java/org/onlab/onos/of/controller/OpenFlowPacketContext.java index e1360e2..0e90f95 100644 --- a/of/api/src/main/java/org/onlab/onos/of/controller/OpenFlowPacketContext.java +++ b/of/api/src/main/java/org/onlab/onos/of/controller/OpenFlowPacketContext.java
@@ -16,7 +16,13 @@ * Blocks further responses (ie. send() calls) on this * packet in event. */ - public boolean blocked(); + public boolean block(); + + /** + * Checks whether the packet has been handled. + * @return true if handled, false otherwise. + */ + public boolean isHandled(); /** * Provided build has been called send the packet