projects
/
cascardo
/
ovs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Makefile.am: Clean flake8-check too.
[cascardo/ovs.git]
/
lib
/
nx-match.h
diff --git
a/lib/nx-match.h
b/lib/nx-match.h
index
929b1db
..
c663e54
100644
(file)
--- a/
lib/nx-match.h
+++ b/
lib/nx-match.h
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 2010, 2011, 2012, 2013, 2014 Nicira, Inc.
+ * Copyright (c) 2010, 2011, 2012, 2013, 2014
, 2016
Nicira, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-43,10
+43,11
@@
struct nx_action_reg_move;
void mf_format_subfield(const struct mf_subfield *, struct ds *);
char *mf_parse_subfield__(struct mf_subfield *sf, const char **s)
void mf_format_subfield(const struct mf_subfield *, struct ds *);
char *mf_parse_subfield__(struct mf_subfield *sf, const char **s)
- WARN_UNUSED_RESULT;
+
OVS_
WARN_UNUSED_RESULT;
char *mf_parse_subfield(struct mf_subfield *, const char *s)
char *mf_parse_subfield(struct mf_subfield *, const char *s)
- WARN_UNUSED_RESULT;
+
OVS_
WARN_UNUSED_RESULT;
+/* Decoding matches. */
enum ofperr nx_pull_match(struct ofpbuf *, unsigned int match_len,
struct match *,
ovs_be64 *cookie, ovs_be64 *cookie_mask);
enum ofperr nx_pull_match(struct ofpbuf *, unsigned int match_len,
struct match *,
ovs_be64 *cookie, ovs_be64 *cookie_mask);
@@
-55,9
+56,18
@@
enum ofperr nx_pull_match_loose(struct ofpbuf *, unsigned int match_len,
ovs_be64 *cookie_mask);
enum ofperr oxm_pull_match(struct ofpbuf *, struct match *);
enum ofperr oxm_pull_match_loose(struct ofpbuf *, struct match *);
ovs_be64 *cookie_mask);
enum ofperr oxm_pull_match(struct ofpbuf *, struct match *);
enum ofperr oxm_pull_match_loose(struct ofpbuf *, struct match *);
+enum ofperr oxm_decode_match(const void *, size_t, struct match *);
+enum ofperr oxm_pull_field_array(const void *, size_t fields_len,
+ struct field_array *);
+
+/* Encoding matches. */
int nx_put_match(struct ofpbuf *, const struct match *,
ovs_be64 cookie, ovs_be64 cookie_mask);
int oxm_put_match(struct ofpbuf *, const struct match *, enum ofp_version);
int nx_put_match(struct ofpbuf *, const struct match *,
ovs_be64 cookie, ovs_be64 cookie_mask);
int oxm_put_match(struct ofpbuf *, const struct match *, enum ofp_version);
+void oxm_put_raw(struct ofpbuf *, const struct match *, enum ofp_version);
+void oxm_format_field_array(struct ds *, const struct field_array *);
+int oxm_put_field_array(struct ofpbuf *, const struct field_array *,
+ enum ofp_version version);
/* Decoding and encoding OXM/NXM headers (just a field ID) or entries (a field
* ID followed by a value and possibly a mask). */
/* Decoding and encoding OXM/NXM headers (just a field ID) or entries (a field
* ID followed by a value and possibly a mask). */
@@
-65,6
+75,9
@@
enum ofperr nx_pull_entry(struct ofpbuf *, const struct mf_field **,
union mf_value *value, union mf_value *mask);
enum ofperr nx_pull_header(struct ofpbuf *, const struct mf_field **,
bool *masked);
union mf_value *value, union mf_value *mask);
enum ofperr nx_pull_header(struct ofpbuf *, const struct mf_field **,
bool *masked);
+void nxm_put__(struct ofpbuf *b, enum mf_field_id field,
+ enum ofp_version version, const void *value,
+ const void *mask, size_t n_bytes);
void nx_put_entry(struct ofpbuf *, enum mf_field_id, enum ofp_version,
const union mf_value *value, const union mf_value *mask);
void nx_put_header(struct ofpbuf *, enum mf_field_id, enum ofp_version,
void nx_put_entry(struct ofpbuf *, enum mf_field_id, enum ofp_version,
const union mf_value *value, const union mf_value *mask);
void nx_put_header(struct ofpbuf *, enum mf_field_id, enum ofp_version,
@@
-76,7
+89,7
@@
void nx_put_header(struct ofpbuf *, enum mf_field_id, enum ofp_version,
* nx_put_entry/header() for decoding and encoding OXM/NXM. In those cases,
* the nx_*() functions should be preferred because they can support the 64-bit
* "experimenter" OXM format (even though it is not yet implemented). */
* nx_put_entry/header() for decoding and encoding OXM/NXM. In those cases,
* the nx_*() functions should be preferred because they can support the 64-bit
* "experimenter" OXM format (even though it is not yet implemented). */
-uint32_t mf_
oxm_header(enum mf_field_id, enum ofp_version oxm_version
);
+uint32_t mf_
nxm_header(enum mf_field_id
);
const struct mf_field *mf_from_nxm_header(uint32_t nxm_header);
char *nx_match_to_string(const uint8_t *, unsigned int match_len);
const struct mf_field *mf_from_nxm_header(uint32_t nxm_header);
char *nx_match_to_string(const uint8_t *, unsigned int match_len);
@@
-87,7
+100,7
@@
int oxm_match_from_string(const char *, struct ofpbuf *);
void nx_format_field_name(enum mf_field_id, enum ofp_version, struct ds *);
char *nxm_parse_reg_move(struct ofpact_reg_move *, const char *)
void nx_format_field_name(enum mf_field_id, enum ofp_version, struct ds *);
char *nxm_parse_reg_move(struct ofpact_reg_move *, const char *)
- WARN_UNUSED_RESULT;
+
OVS_
WARN_UNUSED_RESULT;
void nxm_format_reg_move(const struct ofpact_reg_move *, struct ds *);
void nxm_format_reg_move(const struct ofpact_reg_move *, struct ds *);
@@
-100,7
+113,7
@@
void nxm_reg_load(const struct mf_subfield *, uint64_t src_data,
struct flow *, struct flow_wildcards *);
char *nxm_parse_stack_action(struct ofpact_stack *, const char *)
struct flow *, struct flow_wildcards *);
char *nxm_parse_stack_action(struct ofpact_stack *, const char *)
- WARN_UNUSED_RESULT;
+
OVS_
WARN_UNUSED_RESULT;
void nxm_format_stack_push(const struct ofpact_stack *, struct ds *);
void nxm_format_stack_pop(const struct ofpact_stack *, struct ds *);
void nxm_format_stack_push(const struct ofpact_stack *, struct ds *);
void nxm_format_stack_pop(const struct ofpact_stack *, struct ds *);