diff options
| author | Simon Horman <horms@verge.net.au> | 2012-06-11 09:56:12 -0700 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2012-06-11 10:02:13 -0700 |
| commit | b5ae8913b20df772ee484902c7def3b42b3871f6 (patch) | |
| tree | e554140167ef3ae68b3bf67d8846841a5857e7c0 /lib/nx-match.h | |
| parent | a9c34071edc8371b5a4d9eebf8256723ffe92df2 (diff) | |
nx-match: Add parsing and serialisation of OXM matches.
This code, which leverages the existing NXM implementation,
adds parsing and serialisation of OXM matches. Test cases
have also been provided.
This patch only implements parsing and serialisation of OXM fields that
are already handled by NXM.
It should be noted that in OXM ports are 32bit whereas in NXM they
are 16 bit. This has been handled as a special case as all other field
widths are the same in both OXM and NXM.
This patch does not address differences in wildcarding between OXM and NXM.
It is planned that liberal wildcarding policy dictated by either OXM or
NXM will be implemented.
This patch also does not address any (subtle?) differences between
OXM and NXM treatment of specific fields. It is envisages that his
can be handled by subsequent patches.
Signed-off-by: Simon Horman <horms@verge.net.au>
[blp@nicira.com adjusted style, added a comment, changed in_port special
case, enabled NXM extensions to OXM]
Signed-off-by: Ben Pfaff <blp@nicira.com>
Diffstat (limited to 'lib/nx-match.h')
| -rw-r--r-- | lib/nx-match.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/nx-match.h b/lib/nx-match.h index fd101b6c..22db4778 100644 --- a/lib/nx-match.h +++ b/lib/nx-match.h @@ -43,7 +43,7 @@ enum ofperr nx_pull_match(struct ofpbuf *, unsigned int match_len, enum ofperr nx_pull_match_loose(struct ofpbuf *, unsigned int match_len, uint16_t priority, struct cls_rule *, ovs_be64 *cookie, ovs_be64 *cookie_mask); -int nx_put_match(struct ofpbuf *, const struct cls_rule *, +int nx_put_match(struct ofpbuf *, bool oxm, const struct cls_rule *, ovs_be64 cookie, ovs_be64 cookie_mask); char *nx_match_to_string(const uint8_t *, unsigned int match_len); |