<div dir="ltr">Looks good to me.<div><br></div><div style>Curious about what do OFPBAC and ONFBIC stand for?</div></div><div class="gmail_extra"><br><br><div class="gmail_quote">On Mon, Jun 24, 2013 at 1:58 PM, Ben Pfaff <span dir="ltr"><<a href="mailto:blp@nicira.com" target="_blank">blp@nicira.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">This is a prototype of OpenFlow enhancement proposal EXT-260 "Add error<br>
code for duplicate instruction." It uses the error code proposed there.<br>
<br>
Signed-off-by: Ben Pfaff <<a href="mailto:blp@nicira.com">blp@nicira.com</a>><br>
---<br>
v3->v4: Fold in change to <a href="http://ofp-actions.at" target="_blank">ofp-actions.at</a> that was (and<br>
incorrectly) in the previous patch in older versions.<br>
<br>
lib/ofp-actions.c | 4 +---<br>
lib/ofp-errors.h | 3 +++<br>
tests/<a href="http://ofp-actions.at" target="_blank">ofp-actions.at</a> | 4 ++--<br>
3 files changed, 6 insertions(+), 5 deletions(-)<br>
<br>
diff --git a/lib/ofp-actions.c b/lib/ofp-actions.c<br>
index 5339811..35d0936 100644<br>
--- a/lib/ofp-actions.c<br>
+++ b/lib/ofp-actions.c<br>
@@ -1003,9 +1003,7 @@ decode_openflow11_instructions(const struct ofp11_instruction insts[],<br>
}<br>
<br>
if (out[type]) {<br>
- return OFPERR_OFPBAC_UNSUPPORTED_ORDER; /* No specific code for<br>
- * a duplicate instruction<br>
- * exist */<br>
+ return OFPERR_ONFBIC_DUP_INSTRUCTION;<br>
}<br>
out[type] = inst;<br>
}<br>
diff --git a/lib/ofp-errors.h b/lib/ofp-errors.h<br>
index d144793..17f8bce 100644<br>
--- a/lib/ofp-errors.h<br>
+++ b/lib/ofp-errors.h<br>
@@ -268,6 +268,9 @@ enum ofperr {<br>
/* OF1.2+(3,8). Permissions error. */<br>
OFPERR_OFPBIC_EPERM,<br>
<br>
+ /* ONF1.1+(2600). Duplicate instruction. */<br>
+ OFPERR_ONFBIC_DUP_INSTRUCTION,<br>
+<br>
/* ## --------------- ## */<br>
/* ## OFPET_BAD_MATCH ## */<br>
/* ## --------------- ## */<br>
diff --git a/tests/<a href="http://ofp-actions.at" target="_blank">ofp-actions.at</a> b/tests/<a href="http://ofp-actions.at" target="_blank">ofp-actions.at</a><br>
index b455bb9..ebad040 100644<br>
--- a/tests/<a href="http://ofp-actions.at" target="_blank">ofp-actions.at</a><br>
+++ b/tests/<a href="http://ofp-actions.at" target="_blank">ofp-actions.at</a><br>
@@ -339,7 +339,7 @@ dnl Check that an empty Apply-Actions instruction gets dropped.<br>
0004 0008 00000000<br>
<br>
dnl Duplicate instruction type:<br>
-# bad OF1.1 instructions: OFPBAC_UNSUPPORTED_ORDER<br>
+# bad OF1.1 instructions: ONFBIC_DUP_INSTRUCTION<br>
0004 0008 00000000 0004 0008 00000000<br>
<br>
dnl Instructions not multiple of 8 in length.<br>
@@ -381,7 +381,7 @@ dnl Write-Metadata too long.<br>
0002 0020 00000000 fedcba9876543210 ffffffffffffffff 0000000000000000<br>
<br>
dnl Write-Metadata duplicated.<br>
-# bad OF1.1 instructions: OFPBAC_UNSUPPORTED_ORDER<br>
+# bad OF1.1 instructions: ONFBIC_DUP_INSTRUCTION<br>
0002 0018 00000000 fedcba9876543210 ff00ff00ff00ff00 0002 0018 00000000 fedcba9876543210 ff00ff00ff00ff00<br>
<br>
dnl Write-Metadata in wrong position (OpenFlow 1.1+ disregards the order<br>
<span class="HOEnZb"><font color="#888888">--<br>
1.7.2.5<br>
<br>
_______________________________________________<br>
dev mailing list<br>
<a href="mailto:dev@openvswitch.org">dev@openvswitch.org</a><br>
<a href="http://openvswitch.org/mailman/listinfo/dev" target="_blank">http://openvswitch.org/mailman/listinfo/dev</a><br>
</font></span></blockquote></div><br></div>