From: Justin Pettit <jpettit@nicira.com>
Date: Fri, 19 Dec 2008 20:51:42 +0000 (-0800)
Subject: Fix flag to indicate whether Flow End messages should be sent.
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=e211702195d109c1cb381ace5078a6840e9ffa7e;p=sliver-openvswitch.git

Fix flag to indicate whether Flow End messages should be sent.

The secchan code set whether Flow End messages should based on the last
configuration request.  This means that if NetFlow messages need to be
generated, but the cotnroller doesn't flow Flow Expiration messages, the
Flow End meta-message was disabled.
---

diff --git a/secchan/flow-end.c b/secchan/flow-end.c
index 56d177658..82b0186f2 100644
--- a/secchan/flow-end.c
+++ b/secchan/flow-end.c
@@ -222,7 +222,11 @@ send_nx_flow_end_config(const struct flow_end_data *fe)
     nfec = make_openflow(sizeof(*nfec), OFPT_VENDOR, &b);
     nfec->header.vendor  = htonl(NX_VENDOR_ID);
     nfec->header.subtype = htonl(NXT_FLOW_END_CONFIG);
-    nfec->enable = fe->send_ofp_exp ? 1 : 0;
+    if ((fe->send_ofp_exp == false) && (fe->netflow_fd < 0)) {
+        nfec->enable = 0;
+    } else {
+        nfec->enable = 1;
+    }
 
     rconn_send(fe->local_rconn, b, NULL);
 }