X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fsession%2Fsession_rules_table.h;h=8679cb8a0c704b56b893a4f8bbb8c3acaf50b659;hb=e5d34919b;hp=27b0f8856f538417b2ea0057c08c99179c3de28d;hpb=f0c1c96b0be1552deff0fbfc62db4ce510cb700d;p=vpp.git

diff --git a/src/vnet/session/session_rules_table.h b/src/vnet/session/session_rules_table.h
index 27b0f8856f5..8679cb8a0c7 100644
--- a/src/vnet/session/session_rules_table.h
+++ b/src/vnet/session/session_rules_table.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 Cisco and/or its affiliates.
+ * Copyright (c) 2017-2019 Cisco and/or its affiliates.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at:
@@ -54,50 +54,67 @@ typedef CLIB_PACKED (struct
 }) session_mask_or_match_6_t;
 /* *INDENT-ON* */
 
+#define SESSION_RULE_TAG_MAX_LEN 64
+#define SESSION_RULES_TABLE_INVALID_INDEX MMA_TABLE_INVALID_INDEX
+#define SESSION_RULES_TABLE_ACTION_DROP (MMA_TABLE_INVALID_INDEX - 1)
+#define SESSION_RULES_TABLE_ACTION_ALLOW (MMA_TABLE_INVALID_INDEX - 2)
+
 typedef struct _session_rules_table_add_del_args
 {
-  u8 transport_proto;
   fib_prefix_t lcl;
   fib_prefix_t rmt;
   u16 lcl_port;
   u16 rmt_port;
   u32 action_index;
+  u8 *tag;
   u8 is_add;
 } session_rule_table_add_del_args_t;
 
-#define SESSION_RULES_TABLE_ACTION_DROP (((u32)~0) - 1)
+typedef struct _rule_tag
+{
+  u8 *tag;
+} session_rule_tag_t;
 
 typedef struct _session_rules_table_t
 {
   /**
-   * Per fib proto and transport proto session rules tables
+   * Per fib proto session rules tables
+   */
+  mma_rules_table_16_t session_rules_tables_16;
+  mma_rules_table_40_t session_rules_tables_40;
+  /**
+   * Hash table that maps tags to rules
+   */
+  uword *rules_by_tag;
+  /**
+   * Pool of rules tags
+   */
+  session_rule_tag_t *rule_tags;
+  /**
+   * Hash table that maps rule indices to tags
    */
-  mma_rules_table_16_t session_rules_tables_16[TRANSPORT_N_PROTO];
-  mma_rules_table_40_t session_rules_tables_40[TRANSPORT_N_PROTO];
+  uword *tags_by_rules;
 } session_rules_table_t;
 
-void *session_rules_table_get (session_rules_table_t * srt,
-			       u8 transport_proto, u8 fib_proto);
 u32 session_rules_table_lookup4 (session_rules_table_t * srt,
-				 u8 transport_proto, ip4_address_t * lcl_ip,
+				 ip4_address_t * lcl_ip,
 				 ip4_address_t * rmt_ip, u16 lcl_port,
 				 u16 rmt_port);
 u32 session_rules_table_lookup6 (session_rules_table_t * srt,
-				 u8 transport_proto, ip6_address_t * lcl_ip,
+				 ip6_address_t * lcl_ip,
 				 ip6_address_t * rmt_ip, u16 lcl_port,
 				 u16 rmt_port);
 void session_rules_table_cli_dump (vlib_main_t * vm,
-				   session_rules_table_t * srt, u8 fib_proto,
-				   u8 transport_proto);
+				   session_rules_table_t * srt, u8 fib_proto);
 void session_rules_table_show_rule (vlib_main_t * vm,
 				    session_rules_table_t * srt,
-				    u8 transport_proto,
 				    ip46_address_t * lcl_ip, u16 lcl_port,
 				    ip46_address_t * rmt_ip, u16 rmt_port,
 				    u8 is_ip4);
-clib_error_t *session_rules_table_add_del (session_rules_table_t * srt,
-					   session_rule_table_add_del_args_t *
-					   args);
+int session_rules_table_add_del (session_rules_table_t * srt,
+				 session_rule_table_add_del_args_t * args);
+u8 *session_rules_table_rule_tag (session_rules_table_t * srt, u32 ri,
+				  u8 is_ip4);
 void session_rules_table_init (session_rules_table_t * srt);
 #endif /* SRC_VNET_SESSION_SESSION_RULES_TABLE_H_ */
 /*