From: Isaku Yamahata Date: Fri, 5 Oct 2012 06:56:57 +0000 (+0900) Subject: instruction/clear-actions: string parser/formater, of packet decoder/encoder X-Git-Tag: v1.9.0~119 X-Git-Url: http://git.cascardo.eti.br/?a=commitdiff_plain;h=b19e8793390f788a4e394d049ea64ce0161ad923;p=cascardo%2Fovs.git instruction/clear-actions: string parser/formater, of packet decoder/encoder Signed-off-by: Isaku Yamahata Signed-off-by: Ben Pfaff --- diff --git a/lib/ofp-actions.c b/lib/ofp-actions.c index 0370a31ff..4a72e29cd 100644 --- a/lib/ofp-actions.c +++ b/lib/ofp-actions.c @@ -958,7 +958,11 @@ ofpacts_pull_openflow11_instructions(struct ofpbuf *openflow, goto exit; } } - /* TODO:XXX Clear-Actions */ + if (insts[OVSINST_OFPIT11_CLEAR_ACTIONS]) { + instruction_get_OFPIT11_CLEAR_ACTIONS( + insts[OVSINST_OFPIT11_CLEAR_ACTIONS]); + ofpact_put_CLEAR_ACTIONS(ofpacts); + } /* TODO:XXX Write-Actions */ /* TODO:XXX Write-Metadata */ if (insts[OVSINST_OFPIT11_GOTO_TABLE]) { @@ -972,8 +976,7 @@ ofpacts_pull_openflow11_instructions(struct ofpbuf *openflow, } if (insts[OVSINST_OFPIT11_WRITE_METADATA] || - insts[OVSINST_OFPIT11_WRITE_ACTIONS] || - insts[OVSINST_OFPIT11_CLEAR_ACTIONS]) { + insts[OVSINST_OFPIT11_WRITE_ACTIONS]) { error = OFPERR_OFPBIC_UNSUP_INST; goto exit; } @@ -1051,6 +1054,7 @@ ofpact_check__(const struct ofpact *a, const struct flow *flow, int max_ports) case OFPACT_EXIT: return 0; + case OFPACT_CLEAR_ACTIONS: case OFPACT_GOTO_TABLE: return 0; @@ -1269,6 +1273,7 @@ ofpact_to_nxast(const struct ofpact *a, struct ofpbuf *out) case OFPACT_SET_IPV4_DSCP: case OFPACT_SET_L4_SRC_PORT: case OFPACT_SET_L4_DST_PORT: + case OFPACT_CLEAR_ACTIONS: case OFPACT_GOTO_TABLE: NOT_REACHED(); } @@ -1359,6 +1364,7 @@ ofpact_to_openflow10(const struct ofpact *a, struct ofpbuf *out) = htons(ofpact_get_SET_L4_DST_PORT(a)->port); break; + case OFPACT_CLEAR_ACTIONS: case OFPACT_GOTO_TABLE: /* TODO:XXX */ break; @@ -1471,6 +1477,7 @@ ofpact_to_openflow11(const struct ofpact *a, struct ofpbuf *out) = htons(ofpact_get_SET_L4_DST_PORT(a)->port); break; + case OFPACT_CLEAR_ACTIONS: case OFPACT_GOTO_TABLE: NOT_REACHED(); @@ -1534,10 +1541,12 @@ ofpacts_put_openflow11_instructions(const struct ofpact ofpacts[], const struct ofpact *a; OFPACT_FOR_EACH (a, ofpacts, ofpacts_len) { - /* TODO:XXX Clear-Actions */ /* TODO:XXX Write-Actions */ /* TODO:XXX Write-Metadata */ - if (a->type == OFPACT_GOTO_TABLE) { + if (a->type == OFPACT_CLEAR_ACTIONS) { + struct ofp11_instruction *oi; + oi = instruction_put_OFPIT11_CLEAR_ACTIONS(openflow); + } else if (a->type == OFPACT_GOTO_TABLE) { struct ofp11_instruction_goto_table *oigt; oigt = instruction_put_OFPIT11_GOTO_TABLE(openflow); @@ -1602,6 +1611,7 @@ ofpact_outputs_to_port(const struct ofpact *ofpact, uint16_t port) case OFPACT_AUTOPATH: case OFPACT_NOTE: case OFPACT_EXIT: + case OFPACT_CLEAR_ACTIONS: case OFPACT_GOTO_TABLE: default: return false; @@ -1870,6 +1880,12 @@ ofpact_format(const struct ofpact *a, struct ds *s) ds_put_cstr(s, "exit"); break; + case OFPACT_CLEAR_ACTIONS: + ds_put_format(s, "%s", + ofpact_instruction_name_from_type( + OVSINST_OFPIT11_CLEAR_ACTIONS)); + break; + case OFPACT_GOTO_TABLE: ds_put_format(s, "%s:%"PRIu8, ofpact_instruction_name_from_type( @@ -1896,7 +1912,6 @@ ofpacts_format(const struct ofpact *ofpacts, size_t ofpacts_len, ds_put_cstr(string, ","); } - /* TODO:XXX clear-actions */ /* TODO:XXX write-actions */ /* TODO:XXX write-metadata */ ofpact_format(a, string); diff --git a/lib/ofp-actions.h b/lib/ofp-actions.h index a81116789..c62020de1 100644 --- a/lib/ofp-actions.h +++ b/lib/ofp-actions.h @@ -90,7 +90,8 @@ DEFINE_OFPACT(EXIT, ofpact_null, ofpact) \ \ /* Instructions */ \ - /* TODO:XXX Clear-Actions, Write-Actions, Write-Metadata */ \ + /* TODO:XXX Write-Actions, Write-Metadata */ \ + DEFINE_OFPACT(CLEAR_ACTIONS, ofpact_null, ofpact) \ DEFINE_OFPACT(GOTO_TABLE, ofpact_goto_table, ofpact) /* enum ofpact_type, with a member OFPACT_ for each action. */ @@ -173,9 +174,10 @@ ofpact_end(const struct ofpact *ofpacts, size_t ofpacts_len) /* Action structure for each OFPACT_*. */ -/* OFPACT_STRIP_VLAN, OFPACT_POP_QUEUE, OFPACT_EXIT. +/* OFPACT_STRIP_VLAN, OFPACT_POP_QUEUE, OFPACT_EXIT, OFPACT_CLEAR_ACTIONS. * - * Used for OFPAT10_STRIP_VLAN, NXAST_DEC_TTL, NXAST_POP_QUEUE, NXAST_EXIT. + * Used for OFPAT10_STRIP_VLAN, NXAST_DEC_TTL, NXAST_POP_QUEUE, NXAST_EXIT, + * OFPIT11_CLEAR_ACTIONS. * * Action structure for actions that do not have any extra data beyond the * action type. */ @@ -581,8 +583,9 @@ enum { static inline bool ofpact_is_instruction(const struct ofpact *a) { - /* TODO:XXX Clear-Actions, Write-Actions, Write-Metadata */ - return a->type == OFPACT_GOTO_TABLE; + /* TODO:XXX Write-Actions, Write-Metadata */ + return a->type == OFPACT_CLEAR_ACTIONS + || a->type == OFPACT_GOTO_TABLE; } const char *ofpact_instruction_name_from_type(enum ovs_instruction_type type); diff --git a/lib/ofp-parse.c b/lib/ofp-parse.c index 557c95d80..8941e1759 100644 --- a/lib/ofp-parse.c +++ b/lib/ofp-parse.c @@ -580,8 +580,7 @@ parse_named_instruction(enum ovs_instruction_type type, break; case OVSINST_OFPIT11_CLEAR_ACTIONS: - /* TODO:XXX */ - ovs_fatal(0, "instruction clear-actions is not supported yet"); + ofpact_put_CLEAR_ACTIONS(ofpacts); break; case OVSINST_OFPIT11_WRITE_METADATA: diff --git a/ofproto/ofproto-dpif.c b/ofproto/ofproto-dpif.c index 8d8a250bc..0c954df17 100644 --- a/ofproto/ofproto-dpif.c +++ b/ofproto/ofproto-dpif.c @@ -5600,6 +5600,14 @@ do_xlate_actions(const struct ofpact *ofpacts, size_t ofpacts_len, xlate_fin_timeout(ctx, ofpact_get_FIN_TIMEOUT(a)); break; + case OFPACT_CLEAR_ACTIONS: + /* TODO:XXX + * Nothing to do because writa-actions is not supported for now. + * When writa-actions is supported, clear-actions also must + * be supported at the same time. + */ + break; + case OFPACT_GOTO_TABLE: { /* TODO:XXX remove recursion */ /* It is assumed that goto-table is last action */ diff --git a/tests/ofp-actions.at b/tests/ofp-actions.at index 3e868411d..68b51823c 100644 --- a/tests/ofp-actions.at +++ b/tests/ofp-actions.at @@ -311,10 +311,24 @@ dnl Write-Actions not supported yet. # bad OF1.1 instructions: OFPBIC_UNSUP_INST 0003 0008 01 000000 -dnl Clear-Actions not supported yet. -# bad OF1.1 instructions: OFPBIC_UNSUP_INST +dnl Clear-Actions too-long +# bad OF1.1 instructions: OFPBIC_BAD_LEN +0005 0010 00000000 0000000000000000 + +dnl Clear-Actions non-zero padding +# actions=clear_actions +# 7: 01 -> 00 +0005 0008 00000001 + +dnl Clear-Actions non-zero padding +# actions=clear_actions +# 4: 01 -> 00 0005 0008 01 000000 +dnl Clear-Actions +# actions=clear_actions +0005 0008 00000000 + dnl Experimenter actions not supported yet. # bad OF1.1 instructions: OFPBIC_BAD_EXPERIMENTER ffff 0008 01 000000 diff --git a/utilities/ovs-ofctl.8.in b/utilities/ovs-ofctl.8.in index eb6fb4d7c..63aa65973 100644 --- a/utilities/ovs-ofctl.8.in +++ b/utilities/ovs-ofctl.8.in @@ -1145,6 +1145,9 @@ keep the learned flows separate from the primary flow table 0.) Applies the specific action(s) immediately. The syntax of actions are same to \fBactions=\fR field. . +.IP \fBclear_actions\fR +Clears all the actions in the action set immediately. +. .IP \fBgoto_table\fR:\fItable\fR Indicates the next table in the process pipeline. .RE