git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
flow: Fully separate flow_wildcards from OpenFlow wildcard bits.
[sliver-openvswitch.git]
/
lib
/
classifier.h
diff --git
a/lib/classifier.h
b/lib/classifier.h
index
233893b
..
e4b7f5f
100644
(file)
--- a/
lib/classifier.h
+++ b/
lib/classifier.h
@@
-44,7
+44,6
@@
struct cls_table {
struct hmap rules; /* Contains "struct cls_rule"s. */
struct flow_wildcards wc; /* Wildcards for fields. */
int n_table_rules; /* Number of rules, including duplicates. */
struct hmap rules; /* Contains "struct cls_rule"s. */
struct flow_wildcards wc; /* Wildcards for fields. */
int n_table_rules; /* Number of rules, including duplicates. */
- int n_refs; /* Reference count used during iteration. */
};
/* A flow classification rule.
};
/* A flow classification rule.
@@
-71,8
+70,6
@@
void cls_rule_init(const struct flow *, const struct flow_wildcards *,
unsigned int priority, struct cls_rule *);
void cls_rule_init_exact(const struct flow *, unsigned int priority,
struct cls_rule *);
unsigned int priority, struct cls_rule *);
void cls_rule_init_exact(const struct flow *, unsigned int priority,
struct cls_rule *);
-void cls_rule_from_match(const struct ofp_match *, unsigned int priority,
- int flow_format, uint64_t cookie, struct cls_rule *);
void cls_rule_init_catchall(struct cls_rule *, unsigned int priority);
void cls_rule_zero_wildcarded_fields(struct cls_rule *);
void cls_rule_init_catchall(struct cls_rule *, unsigned int priority);
void cls_rule_zero_wildcarded_fields(struct cls_rule *);
@@
-97,6
+94,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_code(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);
+bool cls_rule_equal(const struct cls_rule *, const struct cls_rule *);
+
char *cls_rule_to_string(const struct cls_rule *);
void cls_rule_print(const struct cls_rule *);
char *cls_rule_to_string(const struct cls_rule *);
void cls_rule_print(const struct cls_rule *);
@@
-104,9
+103,7
@@
void classifier_init(struct classifier *);
void classifier_destroy(struct classifier *);
bool classifier_is_empty(const struct classifier *);
int classifier_count(const struct classifier *);
void classifier_destroy(struct classifier *);
bool classifier_is_empty(const struct classifier *);
int classifier_count(const struct classifier *);
-int classifier_count_exact(const struct classifier *);
struct cls_rule *classifier_insert(struct classifier *, struct cls_rule *);
struct cls_rule *classifier_insert(struct classifier *, struct cls_rule *);
-void classifier_insert_exact(struct classifier *, struct cls_rule *);
void classifier_remove(struct classifier *, struct cls_rule *);
struct cls_rule *classifier_lookup(const struct classifier *,
const struct flow *);
void classifier_remove(struct classifier *, struct cls_rule *);
struct cls_rule *classifier_lookup(const struct classifier *,
const struct flow *);
@@
-115,30
+112,38
@@
bool classifier_rule_overlaps(const struct classifier *,
typedef void cls_cb_func(struct cls_rule *, void *aux);
typedef void cls_cb_func(struct cls_rule *, void *aux);
-void classifier_for_each(const struct classifier *,
- cls_cb_func *, void *aux);
-void classifier_for_each_match(const struct classifier *,
- const struct cls_rule *,
- cls_cb_func *, void *aux);
struct cls_rule *classifier_find_rule_exactly(const struct classifier *,
const struct cls_rule *);
struct cls_rule *classifier_find_rule_exactly(const struct classifier *,
const struct cls_rule *);
+
\f
+/* Iteration. */
-/* Iteration shorthands. */
+struct cls_cursor {
+ const struct classifier *cls;
+ const struct cls_table *table;
+ const struct cls_rule *target;
+};
-struct cls_table *classifier_exact_table(const struct classifier *);
-
struct cls_rule *cls_table_first_rule(const struct cls_table *
);
-struct cls_rule *cls_
table_next_rule(const struct cls_table *,
-
const
struct cls_rule *);
+void cls_cursor_init(struct cls_cursor *, const struct classifier *,
+
const struct cls_rule *match
);
+struct cls_rule *cls_
cursor_first(struct cls_cursor *);
+
struct cls_rule *cls_cursor_next(struct cls_cursor *,
struct cls_rule *);
-#define CLS_
TABLE_FOR_EACH_RULE(RULE, MEMBER, TABLE)
\
- for ((RULE) = OBJECT_CONTAINING(cls_
table_first_rule(TABLE),
\
+#define CLS_
CURSOR_FOR_EACH(RULE, MEMBER, CURSOR)
\
+ for ((RULE) = OBJECT_CONTAINING(cls_
cursor_first(CURSOR),
\
RULE, MEMBER); \
&(RULE)->MEMBER != NULL; \
RULE, MEMBER); \
&(RULE)->MEMBER != NULL; \
- (RULE) = OBJECT_CONTAINING(cls_
table_next_rule(TABLE,
\
-
&(RULE)->MEMBER),
\
+ (RULE) = OBJECT_CONTAINING(cls_
cursor_next(CURSOR,
\
+
&(RULE)->MEMBER),
\
RULE, MEMBER))
RULE, MEMBER))
-#define CLASSIFIER_FOR_EACH_EXACT_RULE(RULE, MEMBER, CLS) \
- CLS_TABLE_FOR_EACH_RULE (RULE, MEMBER, classifier_exact_table(CLS))
+#define CLS_CURSOR_FOR_EACH_SAFE(RULE, NEXT, MEMBER, CURSOR) \
+ for ((RULE) = OBJECT_CONTAINING(cls_cursor_first(CURSOR), \
+ RULE, MEMBER); \
+ (&(RULE)->MEMBER != NULL \
+ ? ((NEXT) = OBJECT_CONTAINING(cls_cursor_next(CURSOR, \
+ &(RULE)->MEMBER), \
+ RULE, MEMBER), 1) \
+ : 0); \
+ (RULE) = (NEXT))
#endif /* classifier.h */
#endif /* classifier.h */