classifier-based ACL: refactor + add output ACL

[vpp.git] / src / vnet / classify / in_out_acl.h

diff --git a/src/vnet/classify/input_acl.h b/src/vnet/classify/in_out_acl.h
similarity index 55%
rename from src/vnet/classify/input_acl.h
rename to src/vnet/classify/in_out_acl.h
index a5f3bac..be03230 100644 (file)
--- a/src/vnet/classify/input_acl.h
+++ b/src/vnet/classify/in_out_acl.h
@@ -13,48 +13,68 @@
  * limitations under the License.
  */
 
-#ifndef __included_vnet_input_acl_h__
-#define __included_vnet_input_acl_h__
+#ifndef __included_vnet_in_out_acl_h__
+#define __included_vnet_in_out_acl_h__
 
 #include <vlib/vlib.h>
 #include <vnet/vnet.h>
 #include <vnet/classify/vnet_classify.h>
 
-typedef enum
-{
-  INPUT_ACL_TABLE_IP4,
-  INPUT_ACL_TABLE_IP6,
-  INPUT_ACL_TABLE_L2,
-  INPUT_ACL_N_TABLES,
-} input_acl_table_id_t;
-
 typedef enum
 {
   ACL_NEXT_INDEX_DENY,
   ACL_NEXT_INDEX_N_NEXT,
 } acl_next_index_t;
 
+typedef enum
+{
+  IN_OUT_ACL_TABLE_IP4,
+  IN_OUT_ACL_TABLE_IP6,
+  IN_OUT_ACL_TABLE_L2,
+  IN_OUT_ACL_N_TABLES,
+} in_out_acl_table_id_t;
+
+typedef enum
+{
+  IN_OUT_ACL_INPUT_TABLE_GROUP,
+  IN_OUT_ACL_OUTPUT_TABLE_GROUP,
+  IN_OUT_ACL_N_TABLE_GROUPS
+} in_out_acl_table_group_id_t;
+
 typedef struct
 {
 
   /* classifier table vectors */
-  u32 *classify_table_index_by_sw_if_index[INPUT_ACL_N_TABLES];
+  u32
+    * classify_table_index_by_sw_if_index[IN_OUT_ACL_N_TABLE_GROUPS]
+    [IN_OUT_ACL_N_TABLES];
 
   /* convenience variables */
   vlib_main_t *vlib_main;
   vnet_main_t *vnet_main;
   vnet_classify_main_t *vnet_classify_main;
-  vnet_config_main_t *vnet_config_main[INPUT_ACL_N_TABLES];
-} input_acl_main_t;
+    vnet_config_main_t
+    * vnet_config_main[IN_OUT_ACL_N_TABLE_GROUPS][IN_OUT_ACL_N_TABLES];
+} in_out_acl_main_t;
 
-extern input_acl_main_t input_acl_main;
+extern in_out_acl_main_t in_out_acl_main;
+
+int vnet_set_in_out_acl_intfc (vlib_main_t * vm, u32 sw_if_index,
+                              u32 ip4_table_index,
+                              u32 ip6_table_index,
+                              u32 l2_table_index, u32 is_add, u32 is_output);
 
 int vnet_set_input_acl_intfc (vlib_main_t * vm, u32 sw_if_index,
                              u32 ip4_table_index,
                              u32 ip6_table_index,
                              u32 l2_table_index, u32 is_add);
 
-#endif /* __included_vnet_input_acl_h__ */
+int vnet_set_output_acl_intfc (vlib_main_t * vm, u32 sw_if_index,
+                              u32 ip4_table_index,
+                              u32 ip6_table_index,
+                              u32 l2_table_index, u32 is_add);
+
+#endif /* __included_vnet_in_out_acl_h__ */
 
 /*
  * fd.io coding-style-patch-verification: ON