From e38c9de5db32342b86f177e9fbd4e1dab77a2a1f Mon Sep 17 00:00:00 2001 From: Simon Horman Date: Tue, 4 Sep 2012 15:51:59 +0900 Subject: [PATCH] ofp-errors: Remove OFPERR_NXBIC_DUP_TYPE OFPERR_NXBIC_DUP_TYPE is currently only used in decode_openflow11_instructions() which is part of a non-NX extension portion of the Open Flow 1.1+ implementation. After recent discussion it has been decided to attempt to only use standardised, albeit less-specific, errors unless errors arise from use of an NX extension. With the above in mind it seems appropriate to: * Use OFPERR_OFPIT_BAD_INSTRUCTION in place of OFPERR_NXBIC_DUP_TYPE. * Remove OFPERR_NXBIC_DUP_TYPE as it is no longer used. An unfortunate side-effect of this change is that the error for the case in question is now less-specific. Signed-off-by: Simon Horman Signed-off-by: Ben Pfaff --- lib/ofp-actions.c | 2 +- lib/ofp-errors.h | 3 --- tests/ofp-actions.at | 3 ++- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/lib/ofp-actions.c b/lib/ofp-actions.c index 898455ebe..6fcfba853 100644 --- a/lib/ofp-actions.c +++ b/lib/ofp-actions.c @@ -857,7 +857,7 @@ decode_openflow11_instructions(const struct ofp11_instruction insts[], } if (out[type]) { - return OFPERR_NXBIC_DUP_TYPE; + return OFPERR_OFPIT_BAD_INSTRUCTION; } out[type] = inst; } diff --git a/lib/ofp-errors.h b/lib/ofp-errors.h index 2f28a4207..4d17ba95a 100644 --- a/lib/ofp-errors.h +++ b/lib/ofp-errors.h @@ -238,9 +238,6 @@ enum ofperr { /* OF1.2+(3,8). Permissions error. */ OFPERR_OFPBIC_EPERM, - /* NX1.1+(3,256). Duplicate instruction type in set of instructions. */ - OFPERR_NXBIC_DUP_TYPE, - /* ## --------------- ## */ /* ## OFPET_BAD_MATCH ## */ /* ## --------------- ## */ diff --git a/tests/ofp-actions.at b/tests/ofp-actions.at index ba5003a9d..7ba927787 100644 --- a/tests/ofp-actions.at +++ b/tests/ofp-actions.at @@ -261,7 +261,8 @@ dnl Check that an empty Apply-Actions instruction gets dropped. # 7: 00 -> (none) 0004 0008 00000000 -# bad OF1.1 instructions: NXBIC_DUP_TYPE +dnl Duplicate instruction type: +# bad OF1.1 instructions: OFPIT_BAD_INSTRUCTION 0004 0008 00000000 0004 0008 00000000 dnl Instructions not multiple of 8 in length. -- 2.43.0