Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
session: allow builtin apps to register names
[vpp.git]
/
src
/
vnet
/
session
/
mma_template.c
diff --git
a/src/vnet/session/mma_template.c
b/src/vnet/session/mma_template.c
index
81333a7
..
248ced6
100644
(file)
--- a/
src/vnet/session/mma_template.c
+++ b/
src/vnet/session/mma_template.c
@@
-94,16
+94,16
@@
RT (mma_rules_table_lookup) (RTT (mma_rules_table) * srt,
u32 rv;
int i;
u32 rv;
int i;
- ASSERT (rule_index !=
SESSION_RULES
_TABLE_INVALID_INDEX);
+ ASSERT (rule_index !=
MMA
_TABLE_INVALID_INDEX);
rp = RT (mma_rules_table_get_rule) (srt, rule_index);
ASSERT (rp);
if (!RT (rule_is_match_for_key) (key, rp))
rp = RT (mma_rules_table_get_rule) (srt, rule_index);
ASSERT (rp);
if (!RT (rule_is_match_for_key) (key, rp))
- return
~0
;
+ return
MMA_TABLE_INVALID_INDEX
;
for (i = 0; i < vec_len (rp->next_indices); i++)
{
rv = RT (mma_rules_table_lookup) (srt, key, rp->next_indices[i]);
for (i = 0; i < vec_len (rp->next_indices); i++)
{
rv = RT (mma_rules_table_lookup) (srt, key, rp->next_indices[i]);
- if (rv !=
~0
)
+ if (rv !=
MMA_TABLE_INVALID_INDEX
)
return (rv);
}
return (rp->action_index);
return (rv);
}
return (rp->action_index);
@@
-118,16
+118,16
@@
RT (mma_rules_table_lookup_rule) (RTT (mma_rules_table) * srt,
u32 rv;
int i;
u32 rv;
int i;
- ASSERT (rule_index !=
SESSION_RULES
_TABLE_INVALID_INDEX);
+ ASSERT (rule_index !=
MMA
_TABLE_INVALID_INDEX);
rp = RT (mma_rules_table_get_rule) (srt, rule_index);
ASSERT (rp);
if (!RT (rule_is_match_for_key) (key, rp))
rp = RT (mma_rules_table_get_rule) (srt, rule_index);
ASSERT (rp);
if (!RT (rule_is_match_for_key) (key, rp))
- return
~0
;
+ return
MMA_TABLE_INVALID_INDEX
;
for (i = 0; i < vec_len (rp->next_indices); i++)
{
rv = RT (mma_rules_table_lookup_rule) (srt, key, rp->next_indices[i]);
for (i = 0; i < vec_len (rp->next_indices); i++)
{
rv = RT (mma_rules_table_lookup_rule) (srt, key, rp->next_indices[i]);
- if (rv !=
~0
)
+ if (rv !=
MMA_TABLE_INVALID_INDEX
)
return (rv);
}
return rule_index;
return (rv);
}
return rule_index;
@@
-214,13
+214,17
@@
RT (mma_rules_table_del_rule) (RTT (mma_rules_table) * srt,
u32 rv;
int i;
u32 rv;
int i;
- ASSERT (rule_index !=
SESSION_RULES
_TABLE_INVALID_INDEX);
+ ASSERT (rule_index !=
MMA
_TABLE_INVALID_INDEX);
rp = RT (mma_rules_table_get_rule) (srt, rule_index);
if (!RT (rule_is_match_for_key) (&rule->match, rp))
rp = RT (mma_rules_table_get_rule) (srt, rule_index);
if (!RT (rule_is_match_for_key) (&rule->match, rp))
- return
~0
;
+ return
MMA_TABLE_INVALID_INDEX
;
if (RT (rule_is_exact_match) (rule, rp))
if (RT (rule_is_exact_match) (rule, rp))
- return 1;
+ {
+ if (rule_index == srt->root_index)
+ rp->action_index = MMA_TABLE_INVALID_INDEX;
+ return 1;
+ }
for (i = 0; i < vec_len (rp->next_indices); i++)
{
rv = RT (mma_rules_table_del_rule) (srt, rule, rp->next_indices[i]);
for (i = 0; i < vec_len (rp->next_indices); i++)
{
rv = RT (mma_rules_table_del_rule) (srt, rule, rp->next_indices[i]);
@@
-253,7
+257,7
@@
RT (mma_rules_table_del_rule) (RTT (mma_rules_table) * srt,
else if (rv == 0)
return rv;
}
else if (rv == 0)
return rv;
}
- return
~0
;
+ return
MMA_TABLE_INVALID_INDEX
;
}
/*
}
/*