Merge pull request #23 from yu-iwata/master

Flow entries are deleted although out_port does not match
CPqD · Apr 11, 2013 · 31704b1 · 31704b1
2 parents b0a3915 + 10fe635
commit 31704b1
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/udatapath/flow_table.c b/udatapath/flow_table.c
@@ -160,7 +160,9 @@ flow_table_delete(struct flow_table *table, struct ofl_msg_flow_mod *mod, bool s
     struct flow_entry *entry, *next;
 
     LIST_FOR_EACH_SAFE (entry, next, struct flow_entry, match_node, &table->match_entries) {
-        if (flow_entry_matches(entry, mod, strict, true/*check_cookie*/)) {
+        if ((mod->out_port == OFPP_ANY || flow_entry_has_out_port(entry, mod->out_port)) &&
+            (mod->out_group == OFPG_ANY || flow_entry_has_out_group(entry, mod->out_group)) &&
+            flow_entry_matches(entry, mod, strict, true/*check_cookie*/)) {
              flow_entry_remove(entry, OFPRR_DELETE);
         }
     }