projects
/
cascardo
/
ovs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Implement Vacancy Events for OFPMP_TABLE_DESC.
[cascardo/ovs.git]
/
ofproto
/
bundles.h
diff --git
a/ofproto/bundles.h
b/ofproto/bundles.h
index
65717df
..
1b2e333
100644
(file)
--- a/
ofproto/bundles.h
+++ b/
ofproto/bundles.h
@@
-34,18
+34,11
@@
extern "C" {
struct ofp_bundle_entry {
struct ovs_list node;
enum ofptype type; /* OFPTYPE_FLOW_MOD or OFPTYPE_PORT_MOD. */
struct ofp_bundle_entry {
struct ovs_list node;
enum ofptype type; /* OFPTYPE_FLOW_MOD or OFPTYPE_PORT_MOD. */
- long long version; /* Version in which the changes take
- * effect. */
union {
union {
- struct ofp
util_flow_mod fm; /* 'fm.ofpacts'
must be malloced. */
- struct ofp
util_port_mod
pm;
+ struct ofp
roto_flow_mod ofm; /* ofm.fm.ofpacts
must be malloced. */
+ struct ofp
roto_port_mod o
pm;
};
};
- /* Used during commit. */
- struct ofport *port; /* Affected port. */
- struct rule_collection old_rules; /* Affected rules. */
- struct rule_collection new_rules; /* Replacement rules. */
-
/* OpenFlow header and some of the message contents for error reporting. */
struct ofp_header ofp_msg[DIV_ROUND_UP(64, sizeof(struct ofp_header))];
};
/* OpenFlow header and some of the message contents for error reporting. */
struct ofp_header ofp_msg[DIV_ROUND_UP(64, sizeof(struct ofp_header))];
};
@@
-83,7
+76,6
@@
ofp_bundle_entry_alloc(enum ofptype type, const struct ofp_header *oh)
struct ofp_bundle_entry *entry = xmalloc(sizeof *entry);
entry->type = type;
struct ofp_bundle_entry *entry = xmalloc(sizeof *entry);
entry->type = type;
- entry->version = 0;
/* Max 64 bytes for error reporting. */
memcpy(entry->ofp_msg, oh, MIN(ntohs(oh->length), sizeof entry->ofp_msg));
/* Max 64 bytes for error reporting. */
memcpy(entry->ofp_msg, oh, MIN(ntohs(oh->length), sizeof entry->ofp_msg));
@@
-96,7
+88,7
@@
ofp_bundle_entry_free(struct ofp_bundle_entry *entry)
{
if (entry) {
if (entry->type == OFPTYPE_FLOW_MOD) {
{
if (entry) {
if (entry->type == OFPTYPE_FLOW_MOD) {
- free(entry->fm.ofpacts);
+ free(entry->
ofm.
fm.ofpacts);
}
free(entry);
}
}
free(entry);
}