mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-08-31 06:15:47 +00:00
Code Issues Releases Wiki Activity

classifier: Change classifier_find_rule_exactly() to take a cls_rule *.

Browse Source 
There's no benefit to spelling out all of the components of a cls_rule
separately.  Just use cls_rule itself.
This commit is contained in:
Ben Pfaff
2010-10-14 13:25:36 -07:00
parent 48c3de13be
commit 76ecc72179
3 changed files with 25 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
lib/classifier.c
View File

@@ -266,31 +266,31 @@ classifier_lookup(const struct classifier *cls, const struct flow *flow,
struct cls_rule *
classifier_find_rule_exactly(const struct classifier *cls,
const struct flow *target, uint32_t wildcards,
unsigned int priority)
const struct cls_rule *target)
{
struct cls_bucket *bucket;
int table_idx;
uint32_t hash;
if (!wildcards) {
/* Ignores 'priority'. */
return search_exact_table(cls, flow_hash(target, 0), target);
if (!target->wc.wildcards) {
/* Ignores 'target->priority'. */
return search_exact_table(cls, flow_hash(&target->flow, 0),
&target->flow);
}
assert(wildcards == (wildcards & OVSFW_ALL));
table_idx = table_idx_from_wildcards(wildcards);
hash = hash_fields(target, table_idx);
assert(target->wc.wildcards == (target->wc.wildcards & OVSFW_ALL));
table_idx = table_idx_from_wildcards(target->wc.wildcards);
hash = hash_fields(&target->flow, table_idx);
HMAP_FOR_EACH_WITH_HASH (bucket, hmap_node, hash,
&cls->tables[table_idx]) {
if (equal_fields(&bucket->fixed, target, table_idx)) {
if (equal_fields(&bucket->fixed, &target->flow, table_idx)) {
struct cls_rule *pos;
LIST_FOR_EACH (pos, node.list, &bucket->rules) {
if (pos->priority < priority) {
if (pos->priority < target->priority) {
return NULL;
} else if (pos->priority == priority &&
pos->wc.wildcards == wildcards &&
flow_equal(target, &pos->flow)) {
} else if (pos->priority == target->priority &&
pos->wc.wildcards == target->wc.wildcards &&
flow_equal(&target->flow, &pos->flow)) {
return pos;
}
}