From 9aee07644c8eb70626da28d4ccb9da4b9e57cd74 Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Tue, 7 Dec 2010 16:57:12 -0800 Subject: [PATCH] ofp-util: Group everything related to actions together in header file. Cleanup. --- lib/ofp-util.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/ofp-util.h b/lib/ofp-util.h index ea7939c1..e121002a 100644 --- a/lib/ofp-util.h +++ b/lib/ofp-util.h @@ -29,9 +29,6 @@ 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, @@ -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 *); + +/* Actions. */ + +#define OFP_ACTION_ALIGN 8 /* Alignment of ofp_actions. */ 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 *); + 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); -- 2.30.2