mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-09-04 00:05:15 +00:00
Code Issues Releases Wiki Activity

ofp-errors: Remove OFPERR_NXBIC_DUP_TYPE

Browse Source 
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 <horms@verge.net.au>
Signed-off-by: Ben Pfaff <blp@nicira.com>
This commit is contained in:
Simon Horman
2012-09-04 15:51:59 +09:00
committed by Ben Pfaff
parent 5cb7a79840
commit e38c9de5db
3 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/ofp-actions.c
View File

@@ -857,7 +857,7 @@ decode_openflow11_instructions(const struct ofp11_instruction insts[],
} }
if (out[type]) { if (out[type]) {
return OFPERR_NXBIC_DUP_TYPE; return OFPERR_OFPIT_BAD_INSTRUCTION;
} }
out[type] = inst; out[type] = inst;
} }

3
lib/ofp-errors.h
View File

@@ -238,9 +238,6 @@ enum ofperr {
/* OF1.2+(3,8). Permissions error. */ /* OF1.2+(3,8). Permissions error. */
OFPERR_OFPBIC_EPERM, OFPERR_OFPBIC_EPERM,
/* NX1.1+(3,256). Duplicate instruction type in set of instructions. */
OFPERR_NXBIC_DUP_TYPE,
/* ## --------------- ## */ /* ## --------------- ## */
/* ## OFPET_BAD_MATCH ## */ /* ## OFPET_BAD_MATCH ## */
/* ## --------------- ## */ /* ## --------------- ## */

3
tests/ofp-actions.at
View File

@@ -261,7 +261,8 @@ dnl Check that an empty Apply-Actions instruction gets dropped.
# 7: 00 -> (none) # 7: 00 -> (none)
0004 0008 00000000 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 0004 0008 00000000 0004 0008 00000000
dnl Instructions not multiple of 8 in length. dnl Instructions not multiple of 8 in length.