diff options
author | Simon Horman <horms@verge.net.au> | 2013-05-08 10:50:15 +0900 |
---|---|---|
committer | Ben Pfaff <blp@nicira.com> | 2013-05-08 10:46:25 -0700 |
commit | dd43a558597bbf99a62541bc77e85f86f63e2f12 (patch) | |
tree | 14ce765f66c844a01a266bacde742b55820af00e /lib/learn.h | |
parent | b019d34da6e6c185bb093984906adcb36c3f6686 (diff) |
Do not perform validation in learn_parse();
I believe this is consistent with the handling of all other action
parsing called from parse_named_action().
Verification of all actions, including learn actions, occurs separately
in ofpact_check__(). It also occurs via in a call to ofpacts_check()
in parse_ofp_str(),
This patch is larger than might otherwise be expected as the flow argument
of learn_parse() is now unused and thus removed. This propagates up the
call-chain some way.
This implementation was suggested by Jesse Gross in response to an
enhancement I made to the validation performed during parsing learn actions
to allow it to correctly account for changes to the dl_type due to MPLS
push and pop actions.
Tests have also been updated to check for the less specific messages
generated by the call to ofpacts_check() in parse_ofp_str() which at the
suggestion of Ben Pfaff was added by a prior patch for this purpose.
Cc: Jesse Gross <jesse@nicira.com>
Cc: Ben Pfaff <blp@nicira.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: Ben Pfaff <blp@nicira.com>
Diffstat (limited to 'lib/learn.h')
-rw-r--r-- | lib/learn.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/learn.h b/lib/learn.h index adf597e9..8ea8dcca 100644 --- a/lib/learn.h +++ b/lib/learn.h @@ -39,7 +39,7 @@ void learn_to_nxast(const struct ofpact_learn *, struct ofpbuf *openflow); void learn_execute(const struct ofpact_learn *, const struct flow *, struct ofputil_flow_mod *, struct ofpbuf *ofpacts); -void learn_parse(char *, const struct flow *, struct ofpbuf *ofpacts); +void learn_parse(char *, struct ofpbuf *ofpacts); void learn_format(const struct ofpact_learn *, struct ds *); #endif /* learn.h */ |