git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
netdev-bsd: Fix memory leak on error path.
[sliver-openvswitch.git]
/
lib
/
odp-util.h
diff --git
a/lib/odp-util.h
b/lib/odp-util.h
index
6213418
..
7e27888
100644
(file)
--- a/
lib/odp-util.h
+++ b/
lib/odp-util.h
@@
-29,11
+29,13
@@
struct ds;
struct flow;
struct flow_tnl;
struct ds;
struct flow;
struct flow_tnl;
+struct flow_wildcards;
struct nlattr;
struct ofpbuf;
struct simap;
struct nlattr;
struct ofpbuf;
struct simap;
-#define OVSP_NONE UINT32_MAX
+#define ODPP_LOCAL ODP_PORT_C(OVSP_LOCAL)
+#define ODPP_NONE ODP_PORT_C(UINT32_MAX)
void format_odp_actions(struct ds *, const struct nlattr *odp_actions,
size_t actions_len);
void format_odp_actions(struct ds *, const struct nlattr *odp_actions,
size_t actions_len);
@@
-90,12
+92,18
@@
struct odputil_keybuf {
enum odp_key_fitness odp_tun_key_from_attr(const struct nlattr *,
struct flow_tnl *);
enum odp_key_fitness odp_tun_key_from_attr(const struct nlattr *,
struct flow_tnl *);
+void odp_flow_format(const struct nlattr *key, size_t key_len,
+ const struct nlattr *mask, size_t mask_len,
+ struct ds *, bool verbose);
void odp_flow_key_format(const struct nlattr *, size_t, struct ds *);
void odp_flow_key_format(const struct nlattr *, size_t, struct ds *);
-int odp_flow_key_from_string(const char *s, const struct simap *port_names,
- struct ofpbuf *);
+int odp_flow_from_string(const char *s,
+ const struct simap *port_names,
+ struct ofpbuf *, struct ofpbuf *);
void odp_flow_key_from_flow(struct ofpbuf *, const struct flow *,
void odp_flow_key_from_flow(struct ofpbuf *, const struct flow *,
- uint32_t odp_in_port);
+ odp_port_t odp_in_port);
+void odp_flow_key_from_mask(struct ofpbuf *, const struct flow *mask,
+ const struct flow *flow, uint32_t odp_in_port);
uint32_t odp_flow_key_hash(const struct nlattr *, size_t);
uint32_t odp_flow_key_hash(const struct nlattr *, size_t);
@@
-119,7
+127,8
@@
const char *odp_key_fitness_to_string(enum odp_key_fitness);
void commit_odp_tunnel_action(const struct flow *, struct flow *base,
struct ofpbuf *odp_actions);
void commit_odp_actions(const struct flow *, struct flow *base,
void commit_odp_tunnel_action(const struct flow *, struct flow *base,
struct ofpbuf *odp_actions);
void commit_odp_actions(const struct flow *, struct flow *base,
- struct ofpbuf *odp_actions);
+ struct ofpbuf *odp_actions,
+ struct flow_wildcards *wc);
\f
/* ofproto-dpif interface.
*
\f
/* ofproto-dpif interface.
*