diff options
| author | Ben Pfaff <blp@nicira.com> | 2011-12-28 12:42:14 -0800 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2012-02-01 14:15:11 -0800 |
| commit | 816fd533f85923c03cf8d9d6450bd9a0845d5160 (patch) | |
| tree | 2e74c39e3bbe7e80388f76d7d1ef68f91c3141fa /lib/nx-match.h | |
| parent | 6cc7ea5ea05a71f01526577439ebedcc133f99cd (diff) | |
meta-flow: New "subfield" data structure.
Until now, parts of a field have been dealt with in a fairly ad-hoc way.
struct mf_subfield and the supporting functions added by this commit make
their use more systematic.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Diffstat (limited to 'lib/nx-match.h')
| -rw-r--r-- | lib/nx-match.h | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/lib/nx-match.h b/lib/nx-match.h index c1892873..3406e046 100644 --- a/lib/nx-match.h +++ b/lib/nx-match.h @@ -26,6 +26,7 @@ struct cls_rule; struct ds; struct flow; +struct mf_subfield; struct ofpbuf; struct nx_action_reg_load; struct nx_action_reg_move; @@ -47,37 +48,24 @@ int nx_put_match(struct ofpbuf *, 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 *); -uint64_t nxm_read_field_bits(ovs_be32 header, ovs_be16 ofs_nbits, - const struct flow *); - 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_format_reg_move(const struct nx_action_reg_move *, struct ds *); void nxm_format_reg_load(const struct nx_action_reg_load *, struct ds *); -int nxm_check_reg_move(const struct nx_action_reg_move *, const struct flow *); +enum ofperr nxm_check_reg_move(const struct nx_action_reg_move *, + const struct flow *); enum ofperr nxm_check_reg_load(const struct nx_action_reg_load *, const struct flow *); -enum ofperr nxm_src_check(ovs_be32 src, unsigned int ofs, unsigned int n_bits, - const struct flow *); -enum ofperr nxm_dst_check(ovs_be32 dst, unsigned int ofs, unsigned int n_bits, - 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_load(ovs_be32 dst, ovs_be16 ofs_nbits, uint64_t src_data, - struct flow *); int nxm_field_bytes(uint32_t header); int nxm_field_bits(uint32_t header); -const char *nxm_parse_field_bits(const char *s, - uint32_t *headerp, int *ofsp, int *n_bitsp); -void nxm_format_field_bits(struct ds *, uint32_t header, int ofs, int n_bits); - -/* Dealing with the 'ofs_nbits' members of struct nx_action_reg_load and struct - * nx_action_multipath. */ +/* Dealing with the 'ofs_nbits' members in several Nicira extensions. */ static inline ovs_be16 nxm_encode_ofs_nbits(int ofs, int n_bits) @@ -96,6 +84,10 @@ 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); /* Upper bound on the length of an nx_match. The longest nx_match (an * IPV6 neighbor discovery message using 5 registers) would be: |