mir/openvswitch
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-10-17 14:28:02 +00:00
Code Issues Releases Wiki Activity

Introduce ofpacts, an abstraction of OpenFlow actions.

Browse Source 
OpenFlow actions have always been somewhat awkward to handle.
Moreover, over time we've started creating actions that require more
complicated parsing.  When we maintain those actions internally in
their wire format, we end up parsing them multiple times, whenever
we have to look at the set of actions.

When we add support for OpenFlow 1.1 or later protocols, the situation
will get worse, because these newer protocols support many of the same
actions but with different representations.  It becomes unrealistic to
handle each protocol in its wire format.

This commit adopts a new strategy, by converting OpenFlow actions into
an internal form from the wire format when they are read, and converting
them back to the wire format when flows are dumped.  I believe that this
will be more maintainable over time.

Thanks to Simon Horman and Pravin Shelar for reviews.

Signed-off-by: Ben Pfaff <blp@nicira.com>
This commit is contained in:
Ben Pfaff
2012-07-03 22:17:14 -07:00
parent 690a61c50a
commit f25d0cf3c3
36 changed files with 3380 additions and 2112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
lib/nx-match.h
View File

@@ -21,6 +21,7 @@
#include <sys/types.h>
#include <netinet/in.h>
#include "flow.h"
#include "ofp-errors.h"
#include "openvswitch/types.h"
#include "ofp-errors.h"
@@ -28,6 +29,8 @@ struct cls_rule;
struct ds;
struct flow;
struct mf_subfield;
struct ofpact_reg_move;
struct ofpact_reg_load;
struct ofpbuf;
struct nx_action_reg_load;
struct nx_action_reg_move;
@@ -49,19 +52,31 @@ int nx_put_match(struct ofpbuf *, bool oxm, const struct cls_rule *,
char *nx_match_to_string(const uint8_t *, unsigned int match_len);
int nx_match_from_string(const char *, struct ofpbuf *);
void nxm_parse_reg_move(struct nx_action_reg_move *, const char *);
void nxm_parse_reg_load(struct nx_action_reg_load *, const char *);
void nxm_parse_reg_move(struct ofpact_reg_move *, const char *);
void nxm_parse_reg_load(struct ofpact_reg_load *, const char *);
void nxm_format_reg_move(const struct nx_action_reg_move *, struct ds *);
void nxm_format_reg_load(const struct nx_action_reg_load *, struct ds *);
void nxm_format_reg_move(const struct ofpact_reg_move *, struct ds *);
void nxm_format_reg_load(const struct ofpact_reg_load *, struct ds *);
enum ofperr nxm_check_reg_move(const struct nx_action_reg_move *,
enum ofperr nxm_reg_move_from_openflow(const struct nx_action_reg_move *,
struct ofpbuf *ofpacts);
enum ofperr nxm_reg_load_from_openflow(const struct nx_action_reg_load *,
struct ofpbuf *ofpacts);
enum ofperr nxm_reg_move_check(const struct ofpact_reg_move *,
const struct flow *);
enum ofperr nxm_check_reg_load(const struct nx_action_reg_load *,
enum ofperr nxm_reg_load_check(const struct ofpact_reg_load *,
const struct flow *);
void nxm_execute_reg_move(const struct nx_action_reg_move *, struct flow *);
void nxm_execute_reg_load(const struct nx_action_reg_load *, struct flow *);
void nxm_reg_move_to_nxast(const struct ofpact_reg_move *,
struct ofpbuf *openflow);
void nxm_reg_load_to_nxast(const struct ofpact_reg_load *,
struct ofpbuf *openflow);
void nxm_execute_reg_move(const struct ofpact_reg_move *, struct flow *);
void nxm_execute_reg_load(const struct ofpact_reg_load *, struct flow *);
void nxm_reg_load(const struct mf_subfield *, uint64_t src_data,
struct flow *);
int nxm_field_bytes(uint32_t header);
int nxm_field_bits(uint32_t header);
@@ -85,10 +100,6 @@ nxm_decode_n_bits(ovs_be16 ofs_nbits)
{
return (ntohs(ofs_nbits) & 0x3f) + 1;
}
void nxm_decode(struct mf_subfield *, ovs_be32 header, ovs_be16 ofs_nbits);
void nxm_decode_discrete(struct mf_subfield *, ovs_be32 header,
ovs_be16 ofs, ovs_be16 n_bits);
BUILD_ASSERT_DECL(FLOW_WC_SEQ == 12);
/* Upper bound on the length of an nx_match. The longest nx_match (an