From e3d81adedd2cc596b931ae5ba8590ff8d0e82c5f Mon Sep 17 00:00:00 2001
From: Russell Bryant <russell@ovn.org>
Date: Mon, 29 Feb 2016 09:32:26 -0500
Subject: [PATCH] ovn: Suppport ct_mark/ct_label in lflow matches.

Add support for matching on ct_mark and ct_label in OVN logical flows.

Signed-off-by: Russell Bryant <russell@ovn.org>
Acked-by: Ben Pfaff <blp@ovn.org>
---
 ovn/controller/lflow.c | 2 ++
 ovn/ovn-sb.xml         | 1 +
 2 files changed, 3 insertions(+)

diff --git a/ovn/controller/lflow.c b/ovn/controller/lflow.c
index d53213c0e..33dca9b05 100644
--- a/ovn/controller/lflow.c
+++ b/ovn/controller/lflow.c
@@ -60,6 +60,8 @@ symtab_init(void)
 #undef MFF_LOG_REG
 
     /* Connection tracking state. */
+    expr_symtab_add_field(&symtab, "ct_mark", MFF_CT_MARK, NULL, false);
+    expr_symtab_add_field(&symtab, "ct_label", MFF_CT_LABEL, NULL, false);
     expr_symtab_add_field(&symtab, "ct_state", MFF_CT_STATE, NULL, false);
     char ct_state_str[16];
     snprintf(ct_state_str, sizeof ct_state_str, "ct_state[%d]", CS_TRACKED_BIT);
diff --git a/ovn/ovn-sb.xml b/ovn/ovn-sb.xml
index a49a63ea6..f9ec691d3 100644
--- a/ovn/ovn-sb.xml
+++ b/ovn/ovn-sb.xml
@@ -699,6 +699,7 @@
         <li><code>icmp4.type</code> <code>icmp4.code</code></li>
         <li><code>icmp6.type</code> <code>icmp6.code</code></li>
         <li><code>nd.target</code> <code>nd.sll</code> <code>nd.tll</code></li>
+        <li><code>ct_mark</code> <code>ct_label</code></li>
         <li>
           <p>
             <code>ct_state</code>, which has the following Boolean subfields:
-- 
2.20.1