From d6e95e998a37a98c70dc7e91a4765c777dbc66cb Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Fri, 25 Jan 2013 17:26:42 -0800 Subject: [PATCH] ofproto: Maintain "expirable" list for "add" flow_mod with replaced rule. Commit e503cc199 (ofproto: Optimise OpenFlow flow expiry) optimized OpenFlow flow expiration by putting expirable flows on a list, but it failed to remove flows from the list when they were replaced by a new flow with an OpenFlow flow_mod "add" operation. This commit fixes the problem. Found by valgrind. CC: Simon Horman Signed-off-by: Ben Pfaff --- ofproto/ofproto.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ofproto/ofproto.c b/ofproto/ofproto.c index 249f2d5d5..c0d94f72f 100644 --- a/ofproto/ofproto.c +++ b/ofproto/ofproto.c @@ -4858,6 +4858,9 @@ oftable_replace_rule(struct rule *rule) victim = rule_from_cls_rule(classifier_replace(&table->cls, &rule->cr)); if (victim) { + if (!list_is_empty(&victim->expirable)) { + list_remove(&victim->expirable); + } eviction_group_remove_rule(victim); } eviction_group_add_rule(rule); -- 2.43.0