aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorin Coras <fcoras@cisco.com>2017-11-22 19:22:48 -0800
committerChris Luke <chris_luke@comcast.com>2017-12-06 19:28:04 +0000
commit73e4f7965b7f6c0ff3c1217962f76ad586af6332 (patch)
treedc7a9f5da0ca30ec69448549cc965e1200477fcc
parent3288ed7234ad9b6d59d249f48dd1a2d06168bfd5 (diff)
session: support for rule tags overwriting
Change-Id: I0cf48b69042996afcb8b192f5fd98165058d9e1d Signed-off-by: Florin Coras <fcoras@cisco.com>
-rw-r--r--src/vnet/session/session_rules_table.c200
-rw-r--r--src/vnet/session/session_test.c23
2 files changed, 156 insertions, 67 deletions
diff --git a/src/vnet/session/session_rules_table.c b/src/vnet/session/session_rules_table.c
index abe2a2bb7af..dee445dd0ad 100644
--- a/src/vnet/session/session_rules_table.c
+++ b/src/vnet/session/session_rules_table.c
@@ -50,8 +50,7 @@ session_rules_table_rule_tag (session_rules_table_t * srt, u32 ri, u8 is_ip4)
}
void
-session_rules_table_add_del_tag (session_rules_table_t * srt, u8 * tag,
- u32 rule_index, u8 is_ip4, u8 is_add)
+session_rules_table_del_tag (session_rules_table_t * srt, u8 * tag, u8 is_ip4)
{
uword *rip, *rtip;
session_rule_tag_t *rt;
@@ -59,35 +58,44 @@ session_rules_table_add_del_tag (session_rules_table_t * srt, u8 * tag,
if (tag == 0)
return;
- if (is_add)
+ rip = hash_get_mem (srt->rules_by_tag, tag);
+ if (!rip)
{
- pool_get (srt->rule_tags, rt);
- rt->tag = vec_dup (tag);
- hash_set_mem (srt->rules_by_tag, rt->tag, rule_index);
- rti_key = session_rule_tag_key_index (rule_index, is_ip4);
- hash_set (srt->tags_by_rules, rti_key, rt - srt->rule_tags);
+ clib_warning ("tag has no rule associated");
+ return;
}
- else
+ rti_key = session_rule_tag_key_index (*rip, is_ip4);
+ rtip = hash_get (srt->tags_by_rules, rti_key);
+ if (!rtip)
{
- rip = hash_get_mem (srt->rules_by_tag, tag);
- if (!rip)
- {
- clib_warning ("tag has no rule associated");
- return;
- }
- rti_key = session_rule_tag_key_index (*rip, is_ip4);
- rtip = hash_get (srt->tags_by_rules, rti_key);
- if (!rtip)
- {
- clib_warning ("rule has no tag associated");
- return;
- }
- rt = pool_elt_at_index (srt->rule_tags, *rtip);
- ASSERT (rt);
- hash_unset_mem (srt->rules_by_tag, tag);
- hash_unset (srt->tags_by_rules, rti_key);
- pool_put (srt->rule_tags, rt);
+ clib_warning ("rule has no tag associated");
+ return;
}
+ rt = pool_elt_at_index (srt->rule_tags, *rtip);
+ ASSERT (rt);
+ hash_unset_mem (srt->rules_by_tag, tag);
+ hash_unset (srt->tags_by_rules, rti_key);
+ pool_put (srt->rule_tags, rt);
+}
+
+void
+session_rules_table_add_tag (session_rules_table_t * srt, u8 * tag,
+ u32 rule_index, u8 is_ip4)
+{
+ uword *rip;
+ session_rule_tag_t *rt;
+ u32 rti_key;
+
+ if (tag == 0)
+ return;
+ rip = hash_get_mem (srt->rules_by_tag, tag);
+ if (rip)
+ session_rules_table_del_tag (srt, tag, is_ip4);
+ pool_get (srt->rule_tags, rt);
+ rt->tag = vec_dup (tag);
+ hash_set_mem (srt->rules_by_tag, rt->tag, rule_index);
+ rti_key = session_rule_tag_key_index (rule_index, is_ip4);
+ hash_set (srt->tags_by_rules, rti_key, rt - srt->rule_tags);
}
u32
@@ -302,6 +310,74 @@ session_rules_table_alloc_rule_40 (mma_rules_table_40_t * srt,
return rule;
}
+u32
+session_rules_table_lookup_rule4 (session_rules_table_t * srt,
+ ip4_address_t * lcl_ip,
+ ip4_address_t * rmt_ip, u16 lcl_port,
+ u16 rmt_port)
+{
+ mma_rules_table_16_t *srt4 = &srt->session_rules_tables_16;
+ session_mask_or_match_4_t key = {
+ .lcl_ip.as_u32 = lcl_ip->as_u32,
+ .rmt_ip.as_u32 = rmt_ip->as_u32,
+ .lcl_port = lcl_port,
+ .rmt_port = rmt_port,
+ };
+ return mma_rules_table_lookup_rule_16 (srt4,
+ (mma_mask_or_match_16_t *) & key,
+ srt4->root_index);
+}
+
+u32
+session_rules_table_lookup4 (session_rules_table_t * srt,
+ ip4_address_t * lcl_ip, ip4_address_t * rmt_ip,
+ u16 lcl_port, u16 rmt_port)
+{
+ mma_rules_table_16_t *srt4 = &srt->session_rules_tables_16;
+ session_mask_or_match_4_t key = {
+ .lcl_ip.as_u32 = lcl_ip->as_u32,
+ .rmt_ip.as_u32 = rmt_ip->as_u32,
+ .lcl_port = lcl_port,
+ .rmt_port = rmt_port,
+ };
+ return mma_rules_table_lookup_16 (srt4, (mma_mask_or_match_16_t *) & key,
+ srt4->root_index);
+}
+
+u32
+session_rules_table_lookup_rule6 (session_rules_table_t * srt,
+ ip6_address_t * lcl_ip,
+ ip6_address_t * rmt_ip, u16 lcl_port,
+ u16 rmt_port)
+{
+ mma_rules_table_40_t *srt6 = &srt->session_rules_tables_40;
+ session_mask_or_match_6_t key = {
+ .lcl_port = lcl_port,
+ .rmt_port = rmt_port,
+ };
+ clib_memcpy (&key.lcl_ip, lcl_ip, sizeof (*lcl_ip));
+ clib_memcpy (&key.rmt_ip, rmt_ip, sizeof (*rmt_ip));
+ return mma_rules_table_lookup_rule_40 (srt6,
+ (mma_mask_or_match_40_t *) & key,
+ srt6->root_index);
+}
+
+u32
+session_rules_table_lookup6 (session_rules_table_t * srt,
+ ip6_address_t * lcl_ip, ip6_address_t * rmt_ip,
+ u16 lcl_port, u16 rmt_port)
+{
+ mma_rules_table_40_t *srt6 = &srt->session_rules_tables_40;
+ session_mask_or_match_6_t key = {
+ .lcl_port = lcl_port,
+ .rmt_port = rmt_port,
+ };
+ clib_memcpy (&key.lcl_ip, lcl_ip, sizeof (*lcl_ip));
+ clib_memcpy (&key.rmt_ip, rmt_ip, sizeof (*rmt_ip));
+ return mma_rules_table_lookup_40 (srt6, (mma_mask_or_match_40_t *) & key,
+ srt6->root_index);
+}
+
/**
* Add/delete session rule
*
@@ -314,7 +390,7 @@ clib_error_t *
session_rules_table_add_del (session_rules_table_t * srt,
session_rule_table_add_del_args_t * args)
{
- u8 fib_proto = args->rmt.fp_proto;
+ u8 fib_proto = args->rmt.fp_proto, *rt;
u32 ri_from_tag, ri;
int rv;
@@ -339,7 +415,21 @@ session_rules_table_add_del (session_rules_table_t * srt,
if (!rv)
{
ri = mma_rules_table_rule_index_16 (srt4, rule4);
- session_rules_table_add_del_tag (srt, args->tag, ri, 1, 1);
+ session_rules_table_add_tag (srt, args->tag, ri, 1);
+ }
+ else
+ {
+ ri = session_rules_table_lookup_rule4 (srt,
+ &args->lcl.fp_addr.ip4,
+ &args->rmt.fp_addr.ip4,
+ args->lcl_port,
+ args->rmt_port);
+ if (ri != SESSION_RULES_TABLE_INVALID_INDEX)
+ {
+ rt = session_rules_table_rule_tag (srt, ri, 1);
+ session_rules_table_del_tag (srt, rt, 1);
+ session_rules_table_add_tag (srt, args->tag, ri, 1);
+ }
}
}
else
@@ -349,7 +439,7 @@ session_rules_table_add_del (session_rules_table_t * srt,
{
rule = mma_rules_table_get_rule_16 (srt4, ri_from_tag);
mma_rules_table_del_rule_16 (srt4, rule, srt4->root_index);
- session_rules_table_add_del_tag (srt, args->tag, 0, 1, 0);
+ session_rules_table_del_tag (srt, args->tag, 1);
}
else
{
@@ -379,7 +469,21 @@ session_rules_table_add_del (session_rules_table_t * srt,
if (!rv)
{
ri = mma_rules_table_rule_index_40 (srt6, rule6);
- session_rules_table_add_del_tag (srt, args->tag, ri, 0, 1);
+ session_rules_table_add_tag (srt, args->tag, ri, 0);
+ }
+ else
+ {
+ ri = session_rules_table_lookup_rule6 (srt,
+ &args->lcl.fp_addr.ip6,
+ &args->rmt.fp_addr.ip6,
+ args->lcl_port,
+ args->rmt_port);
+ if (ri != SESSION_RULES_TABLE_INVALID_INDEX)
+ {
+ rt = session_rules_table_rule_tag (srt, ri, 0);
+ session_rules_table_del_tag (srt, rt, 1);
+ session_rules_table_add_tag (srt, args->tag, ri, 0);
+ }
}
}
else
@@ -389,7 +493,7 @@ session_rules_table_add_del (session_rules_table_t * srt,
{
rule = mma_rules_table_get_rule_40 (srt6, ri_from_tag);
mma_rules_table_del_rule_40 (srt6, rule, srt6->root_index);
- session_rules_table_add_del_tag (srt, args->tag, 0, 0, 0);
+ session_rules_table_del_tag (srt, args->tag, 0);
}
else
{
@@ -409,38 +513,6 @@ session_rules_table_add_del (session_rules_table_t * srt,
return 0;
}
-u32
-session_rules_table_lookup4 (session_rules_table_t * srt,
- ip4_address_t * lcl_ip, ip4_address_t * rmt_ip,
- u16 lcl_port, u16 rmt_port)
-{
- mma_rules_table_16_t *srt4 = &srt->session_rules_tables_16;
- session_mask_or_match_4_t key = {
- .lcl_ip.as_u32 = lcl_ip->as_u32,
- .rmt_ip.as_u32 = rmt_ip->as_u32,
- .lcl_port = lcl_port,
- .rmt_port = rmt_port,
- };
- return mma_rules_table_lookup_16 (srt4, (mma_mask_or_match_16_t *) & key,
- srt4->root_index);
-}
-
-u32
-session_rules_table_lookup6 (session_rules_table_t * srt,
- ip6_address_t * lcl_ip, ip6_address_t * rmt_ip,
- u16 lcl_port, u16 rmt_port)
-{
- mma_rules_table_40_t *srt6 = &srt->session_rules_tables_40;
- session_mask_or_match_6_t key = {
- .lcl_port = lcl_port,
- .rmt_port = rmt_port,
- };
- clib_memcpy (&key.lcl_ip, lcl_ip, sizeof (*lcl_ip));
- clib_memcpy (&key.rmt_ip, rmt_ip, sizeof (*rmt_ip));
- return mma_rules_table_lookup_40 (srt6, (mma_mask_or_match_40_t *) & key,
- srt6->root_index);
-}
-
void
session_rules_table_init (session_rules_table_t * srt)
{
diff --git a/src/vnet/session/session_test.c b/src/vnet/session/session_test.c
index bf3cea2a97c..1303e8b9fdf 100644
--- a/src/vnet/session/session_test.c
+++ b/src/vnet/session/session_test.c
@@ -1136,7 +1136,7 @@ session_test_rules (vlib_main_t * vm, unformat_input_t * input)
" not work (no-rule)");
/*
- * Test tags. Add/del rule with tag
+ * Test tags. Add/overwrite/del rule with tag
*/
args.table_args.is_add = 1;
args.table_args.lcl_port = 1234;
@@ -1164,9 +1164,28 @@ session_test_rules (vlib_main_t * vm, unformat_input_t * input)
SESSION_TEST ((tc->c_index == listener->connection_index),
"lookup 1.2.3.4/32 1234 5.6.7.8/16 4321 should work");
+ vec_free (args.table_args.tag);
+ args.table_args.lcl_port = 1234;
+ args.table_args.lcl.fp_addr.ip4 = lcl_ip;
+ args.table_args.lcl.fp_len = 16;
+ args.table_args.tag = format (0, "test_rule_overwrite");
+ error = vnet_session_rule_add_del (&args);
+ SESSION_TEST ((error == 0),
+ "Overwrite 1.2.3.4/16 1234 5.6.7.8/16 4321 deny tag test_rule"
+ " should work");
+ if (verbose)
+ {
+ session_lookup_dump_rules_table (0, FIB_PROTOCOL_IP4,
+ TRANSPORT_PROTO_TCP);
+ session_lookup_dump_local_rules_table (local_ns_index, FIB_PROTOCOL_IP4,
+ TRANSPORT_PROTO_TCP);
+ }
+
args.table_args.is_add = 0;
args.table_args.lcl_port += 1;
error = vnet_session_rule_add_del (&args);
+ SESSION_TEST ((error == 0), "Del 1.2.3.4/32 1234 5.6.7.8/32 4321 deny "
+ "tag %v", args.table_args.tag);
if (verbose)
{
session_lookup_dump_rules_table (0, FIB_PROTOCOL_IP4,
@@ -1174,8 +1193,6 @@ session_test_rules (vlib_main_t * vm, unformat_input_t * input)
session_lookup_dump_local_rules_table (local_ns_index, FIB_PROTOCOL_IP4,
TRANSPORT_PROTO_TCP);
}
- SESSION_TEST ((error == 0), "Del 1.2.3.4/32 1234 5.6.7.8/32 4321 deny "
- "tag test_rule");
tc = session_lookup_connection_wt4 (0, &lcl_pref.fp_addr.ip4,
&rmt_pref.fp_addr.ip4, lcl_port,
rmt_port, TRANSPORT_PROTO_TCP, 0,