/*
- * 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:
}
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;
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
s = format (s, "[%d] rule: %U/%d %d %U/%d %d action: %d tag: %v", ri,
format_ip4_address, &match->lcl_ip,
- ip4_mask_to_preflen (&mask->lcl_ip), match->lcl_port,
- format_ip4_address, &match->rmt_ip,
- ip4_mask_to_preflen (&mask->rmt_ip), match->rmt_port,
- sr->action_index, tag ? tag : null_tag);
+ ip4_mask_to_preflen (&mask->lcl_ip),
+ clib_net_to_host_u16 (match->lcl_port), format_ip4_address,
+ &match->rmt_ip, ip4_mask_to_preflen (&mask->rmt_ip),
+ clib_net_to_host_u16 (match->rmt_port), sr->action_index,
+ tag ? tag : null_tag);
if (vec_len (sr->next_indices))
{
s = format (s, "\n children: ");
s = format (s, "[%d] rule: %U/%d %d %U/%d %d action: %d tag: %v", ri,
format_ip6_address, &match->lcl_ip,
- ip6_mask_to_preflen (&mask->lcl_ip), match->lcl_port,
- format_ip6_address, &match->rmt_ip,
- ip6_mask_to_preflen (&mask->rmt_ip), match->rmt_port,
- sr->action_index, tag ? tag : null_tag);
+ ip6_mask_to_preflen (&mask->lcl_ip),
+ clib_net_to_host_u16 (match->lcl_port), format_ip6_address,
+ &match->rmt_ip, ip6_mask_to_preflen (&mask->rmt_ip),
+ clib_net_to_host_u16 (match->rmt_port), sr->action_index,
+ tag ? tag : null_tag);
if (vec_len (sr->next_indices))
{
s = format (s, "\n children: ");
fib_pref_normalize (lcl);
fib_pref_normalize (rmt);
match = (session_mask_or_match_6_t *) & rule->match;
- clib_memcpy (&match->lcl_ip, &lcl->fp_addr.ip6, sizeof (match->lcl_ip));
- clib_memcpy (&match->rmt_ip, &rmt->fp_addr.ip6, sizeof (match->rmt_ip));
+ clib_memcpy_fast (&match->lcl_ip, &lcl->fp_addr.ip6,
+ sizeof (match->lcl_ip));
+ clib_memcpy_fast (&match->rmt_ip, &rmt->fp_addr.ip6,
+ sizeof (match->rmt_ip));
match->lcl_port = lcl_port;
match->rmt_port = rmt_port;
mask = (session_mask_or_match_6_t *) & rule->mask;
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_fast (&key.lcl_ip, lcl_ip, sizeof (*lcl_ip));
+ clib_memcpy_fast (&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_fast (&key.lcl_ip, lcl_ip, sizeof (*lcl_ip));
+ clib_memcpy_fast (&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
*
*
* @return 0 if success, clib_error_t error otherwise
*/
-clib_error_t *
+int
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;
ri_from_tag = session_rules_table_rule_for_tag (srt, args->tag);
if (args->is_add && ri_from_tag != SESSION_RULES_TABLE_INVALID_INDEX)
- return clib_error_return_code (0, VNET_API_ERROR_INVALID_VALUE, 0,
- "tag exists");
+ return VNET_API_ERROR_INVALID_VALUE;
if (fib_proto == FIB_PROTOCOL_IP4)
{
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
{
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
{
mma_rule_16_t _rule;
rule = &_rule;
- memset (rule, 0, sizeof (*rule));
+ clib_memset (rule, 0, sizeof (*rule));
session_rules_table_init_rule_16 (rule, &args->lcl,
args->lcl_port, &args->rmt,
args->rmt_port);
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
{
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
{
mma_rule_40_t _rule;
rule = &_rule;
- memset (rule, 0, sizeof (*rule));
+ clib_memset (rule, 0, sizeof (*rule));
session_rules_table_init_rule_40 (rule, &args->lcl,
args->lcl_port, &args->rmt,
args->rmt_port);
}
}
else
- return clib_error_return_code (0, VNET_API_ERROR_INVALID_VALUE_2, 0,
- "invalid fib proto");
+ return VNET_API_ERROR_INVALID_VALUE_2;
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)
{
mma_rule_40_t *rule6;
fib_prefix_t null_prefix;
- memset (&null_prefix, 0, sizeof (null_prefix));
+ clib_memset (&null_prefix, 0, sizeof (null_prefix));
srt4 = &srt->session_rules_tables_16;
rule4 = session_rules_table_alloc_rule_16 (srt4, &null_prefix, 0,
.lcl_port = lcl_port,
.rmt_port = rmt_port,
};
- clib_memcpy (&key.lcl_ip, &lcl_ip->ip6, sizeof (lcl_ip->ip6));
- clib_memcpy (&key.rmt_ip, &rmt_ip->ip6, sizeof (rmt_ip->ip6));
+ clib_memcpy_fast (&key.lcl_ip, &lcl_ip->ip6, sizeof (lcl_ip->ip6));
+ clib_memcpy_fast (&key.rmt_ip, &rmt_ip->ip6, sizeof (rmt_ip->ip6));
ri = mma_rules_table_lookup_rule_40 (srt6,
(mma_mask_or_match_40_t *) & key,
srt6->root_index);
Code Review / vpp.git / blobdiff