mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-09-02 23:35:27 +00:00
Code Issues Releases Wiki Activity

classifier: New function cls_rule_equal().

Browse Source
This commit is contained in:
Ben Pfaff
2010-11-08 16:35:34 -08:00
parent 955f579d42
commit 193eb87453
3 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/classifier.c
View File

@@ -307,6 +307,16 @@ cls_rule_set_icmp_code(struct cls_rule *rule, uint8_t icmp_code)
rule->flow.icmp_code = htons(icmp_code); rule->flow.icmp_code = htons(icmp_code);
} }
/* Returns true if 'a' and 'b' have the same priority, wildcard the same
* fields, and have the same values for fixed fields, otherwise false. */
bool
cls_rule_equal(const struct cls_rule *a, const struct cls_rule *b)
{
return (a->priority == b->priority
&& flow_wildcards_equal(&a->wc, &b->wc)
&& flow_equal(&a->flow, &b->flow));
}
/* Converts 'rule' to a string and returns the string. The caller must free /* Converts 'rule' to a string and returns the string. The caller must free
* the string (with free()). */ * the string (with free()). */
char * char *

2
lib/classifier.h
View File

@@ -96,6 +96,8 @@ void cls_rule_set_nw_tos(struct cls_rule *, uint8_t);
void cls_rule_set_icmp_type(struct cls_rule *, uint8_t); void cls_rule_set_icmp_type(struct cls_rule *, uint8_t);
void cls_rule_set_icmp_code(struct cls_rule *, uint8_t); void cls_rule_set_icmp_code(struct cls_rule *, uint8_t);
bool cls_rule_equal(const struct cls_rule *, const struct cls_rule *);
char *cls_rule_to_string(const struct cls_rule *); char *cls_rule_to_string(const struct cls_rule *);
void cls_rule_print(const struct cls_rule *); void cls_rule_print(const struct cls_rule *);

13
tests/test-classifier.c
View File

@@ -139,11 +139,8 @@ tcls_insert(struct tcls *tcls, const struct test_rule *rule)
assert(rule->cls_rule.wc.wildcards || rule->cls_rule.priority == UINT_MAX); assert(rule->cls_rule.wc.wildcards || rule->cls_rule.priority == UINT_MAX);
for (i = 0; i < tcls->n_rules; i++) { for (i = 0; i < tcls->n_rules; i++) {
const struct cls_rule *pos = &tcls->rules[i]->cls_rule; const struct cls_rule *pos = &tcls->rules[i]->cls_rule;
if (pos->priority == rule->cls_rule.priority if (cls_rule_equal(pos, &rule->cls_rule)) {
&& pos->wc.wildcards == rule->cls_rule.wc.wildcards /* Exact match. */
&& flow_equal(&pos->flow, &rule->cls_rule.flow)) {
/* Exact match.
* XXX flow_equal should ignore wildcarded fields */
free(tcls->rules[i]); free(tcls->rules[i]);
tcls->rules[i] = xmemdup(rule, sizeof *rule); tcls->rules[i] = xmemdup(rule, sizeof *rule);
return tcls->rules[i]; return tcls->rules[i];
@@ -383,11 +380,7 @@ compare_classifiers(struct classifier *cls, struct tcls *tcls)
const struct test_rule *tr0 = test_rule_from_cls_rule(cr0); const struct test_rule *tr0 = test_rule_from_cls_rule(cr0);
const struct test_rule *tr1 = test_rule_from_cls_rule(cr1); const struct test_rule *tr1 = test_rule_from_cls_rule(cr1);
assert(flow_equal(&cr0->flow, &cr1->flow)); assert(cls_rule_equal(cr0, cr1));
assert(cr0->wc.wildcards == cr1->wc.wildcards);
assert(cr0->priority == cr1->priority);
/* Skip nw_src_mask and nw_dst_mask, because they are derived
* members whose values are used only for optimization. */
assert(tr0->aux == tr1->aux); assert(tr0->aux == tr1->aux);
} }
} }