git://git.onelab.eu
/
sliver-openvswitch.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e41a913
)
ofp-util: Group everything related to actions together in header file.
author
Ben Pfaff
<blp@nicira.com>
Wed, 8 Dec 2010 00:57:12 +0000
(16:57 -0800)
committer
Ben Pfaff
<blp@nicira.com>
Thu, 9 Dec 2010 18:41:33 +0000
(10:41 -0800)
Cleanup.
lib/ofp-util.h
patch
|
blob
|
history
diff --git
a/lib/ofp-util.h
b/lib/ofp-util.h
index
ea7939c
..
e121002
100644
(file)
--- a/
lib/ofp-util.h
+++ b/
lib/ofp-util.h
@@
-29,9
+29,6
@@
struct cls_rule;
struct ofpbuf;
struct cls_rule;
struct ofpbuf;
-/* Alignment of ofp_actions. */
-#define OFP_ACTION_ALIGN 8
-
/* Basic decoding and length validation of OpenFlow messages. */
enum ofputil_msg_code {
OFPUTIL_INVALID,
/* Basic decoding and length validation of OpenFlow messages. */
enum ofputil_msg_code {
OFPUTIL_INVALID,
@@
-229,6
+226,10
@@
struct flow_stats_iterator {
const struct ofp_flow_stats *flow_stats_first(struct flow_stats_iterator *,
const struct ofp_stats_reply *);
const struct ofp_flow_stats *flow_stats_next(struct flow_stats_iterator *);
const struct ofp_flow_stats *flow_stats_first(struct flow_stats_iterator *,
const struct ofp_stats_reply *);
const struct ofp_flow_stats *flow_stats_next(struct flow_stats_iterator *);
+
\f
+/* Actions. */
+
+#define OFP_ACTION_ALIGN 8 /* Alignment of ofp_actions. */
struct actions_iterator {
const union ofp_action *pos, *end;
struct actions_iterator {
const union ofp_action *pos, *end;
@@
-237,6
+238,7
@@
const union ofp_action *actions_first(struct actions_iterator *,
const union ofp_action *,
size_t n_actions);
const union ofp_action *actions_next(struct actions_iterator *);
const union ofp_action *,
size_t n_actions);
const union ofp_action *actions_next(struct actions_iterator *);
+
int validate_actions(const union ofp_action *, size_t n_actions,
const struct flow *, int max_ports);
bool action_outputs_to_port(const union ofp_action *, uint16_t port);
int validate_actions(const union ofp_action *, size_t n_actions,
const struct flow *, int max_ports);
bool action_outputs_to_port(const union ofp_action *, uint16_t port);