From: Jesse Gross <jesse@nicira.com>
Date: Fri, 13 Nov 2009 01:41:58 +0000 (-0800)
Subject: ofproto: Don't send OpenFlow flow expirations hidden rules.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8fe1a59d281369829f474dc75eb5905c991ccd94;p=openvswitch

ofproto: Don't send OpenFlow flow expirations hidden rules.

We were reporting flow expirations for the hidden exact match flows
with the stats set to zero.  These are an implementation detail and
can confuse controllers, so don't report them.

CC: David Erickson <derickso@stanford.edu>
---

diff --git a/secchan/ofproto.c b/secchan/ofproto.c
index be1f5de6..a34120e8 100644
--- a/secchan/ofproto.c
+++ b/secchan/ofproto.c
@@ -3317,9 +3317,11 @@ expire_rule(struct cls_rule *cls_rule, void *p_)
         rule_uninstall(p, rule);
     }
 
-    send_flow_exp(p, rule, now,
-                  (now >= hard_expire
-                   ? OFPER_HARD_TIMEOUT : OFPER_IDLE_TIMEOUT));
+    if (!rule_is_hidden(rule)) {
+        send_flow_exp(p, rule, now,
+                      (now >= hard_expire
+                       ? OFPER_HARD_TIMEOUT : OFPER_IDLE_TIMEOUT));
+    }
     rule_remove(p, rule);
 }