Skip to content

Commit

Permalink
ofp-actions: Improve conjunction error message.
Browse files Browse the repository at this point in the history
Signed-off-by: Joe Stringer <[email protected]>
Acked-by: Ben Pfaff <[email protected]>
  • Loading branch information
joestringer committed May 28, 2015
1 parent 8909c56 commit 96775a1
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions lib/ofp-actions.c
Original file line number Diff line number Diff line change
Expand Up @@ -5721,8 +5721,9 @@ ofpacts_verify(const struct ofpact ofpacts[], size_t ofpacts_len,
if (a->type == OFPACT_CONJUNCTION) {
OFPACT_FOR_EACH (a, ofpacts, ofpacts_len) {
if (a->type != OFPACT_CONJUNCTION) {
VLOG_WARN("when %s action is present, it must be the only "
"kind of action used", ofpact_name(a->type));
VLOG_WARN("when conjunction action is present, it must be "
"the only kind of action used (saw '%s' action)",
ofpact_name(a->type));
return OFPERR_NXBAC_BAD_CONJUNCTION;
}
}
Expand Down

0 comments on commit 96775a1

Please sign in to comment.