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
ofproto-dpif: Use sequence number to wake up main thread for
[sliver-openvswitch.git]
/
lib
/
ofp-parse.c
diff --git
a/lib/ofp-parse.c
b/lib/ofp-parse.c
index
92fb40f
..
d250042
100644
(file)
--- a/
lib/ofp-parse.c
+++ b/
lib/ofp-parse.c
@@
-291,6
+291,7
@@
parse_note(const char *arg, struct ofpbuf *ofpacts)
}
ofpbuf_put(ofpacts, &byte, 1);
}
ofpbuf_put(ofpacts, &byte, 1);
+ note = ofpacts->frame;
note->length++;
arg += 2;
note->length++;
arg += 2;
@@
-399,6
+400,7
@@
parse_noargs_dec_ttl(struct ofpbuf *b)
ids = ofpact_put_DEC_TTL(b);
ofpbuf_put(b, &id, sizeof id);
ids = ofpact_put_DEC_TTL(b);
ofpbuf_put(b, &id, sizeof id);
+ ids = b->frame;
ids->n_controllers++;
ofpact_update_len(b, &ids->ofpact);
}
ids->n_controllers++;
ofpact_update_len(b, &ids->ofpact);
}
@@
-424,6
+426,7
@@
parse_dec_ttl(struct ofpbuf *b, char *arg)
uint16_t id = atoi(cntr);
ofpbuf_put(b, &id, sizeof id);
uint16_t id = atoi(cntr);
ofpbuf_put(b, &id, sizeof id);
+ ids = b->frame;
ids->n_controllers++;
}
if (!ids->n_controllers) {
ids->n_controllers++;
}
if (!ids->n_controllers) {
@@
-1323,6
+1326,9
@@
parse_ofp_str__(struct ofputil_flow_mod *fm, int command, char *string,
} else if (fields & F_FLAGS && !strcmp(name, "no_byte_counts")) {
fm->flags |= OFPUTIL_FF_NO_BYT_COUNTS;
*usable_protocols &= OFPUTIL_P_OF13_UP;
} else if (fields & F_FLAGS && !strcmp(name, "no_byte_counts")) {
fm->flags |= OFPUTIL_FF_NO_BYT_COUNTS;
*usable_protocols &= OFPUTIL_P_OF13_UP;
+ } else if (!strcmp(name, "no_readonly_table")
+ || !strcmp(name, "allow_hidden_fields")) {
+ /* ignore these fields. */
} else {
char *value;
} else {
char *value;