X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fofp-parse.c;h=c759f036b7bab05f6dd7e08aeef57f47bb15e8f0;hb=dc723c447a797e555d400594133a35b9841eb1de;hp=dd0738ca25dc817673e5d8c47c474d5b10b5b9d4;hpb=0d56eaf2e00b9d0e4d9cbc5d5b360191e5c16ded;p=sliver-openvswitch.git diff --git a/lib/ofp-parse.c b/lib/ofp-parse.c index dd0738ca2..c759f036b 100644 --- a/lib/ofp-parse.c +++ b/lib/ofp-parse.c @@ -36,11 +36,9 @@ #include "openflow/openflow.h" #include "ovs-thread.h" #include "packets.h" +#include "simap.h" #include "socket-util.h" #include "vconn.h" -#include "vlog.h" - -VLOG_DEFINE_THIS_MODULE(ofp_parse); /* Parses 'str' as an 8-bit unsigned integer into '*valuep'. * @@ -149,8 +147,7 @@ str_to_be64(const char *str, ovs_be64 *valuep) static char * WARN_UNUSED_RESULT str_to_mac(const char *str, uint8_t mac[6]) { - if (sscanf(str, ETH_ADDR_SCAN_FMT, ETH_ADDR_SCAN_ARGS(mac)) - != ETH_ADDR_SCAN_COUNT) { + if (!ovs_scan(str, ETH_ADDR_SCAN_FMT, ETH_ADDR_SCAN_ARGS(mac))) { return xasprintf("invalid mac address %s", str); } return NULL; @@ -181,12 +178,13 @@ static char * WARN_UNUSED_RESULT parse_enqueue(char *arg, struct ofpbuf *ofpacts) { char *sp = NULL; - char *port = strtok_r(arg, ":q", &sp); + char *port = strtok_r(arg, ":q,", &sp); char *queue = strtok_r(NULL, "", &sp); struct ofpact_enqueue *enqueue; if (port == NULL || queue == NULL) { - return xstrdup("\"enqueue\" syntax is \"enqueue:PORT:QUEUE\""); + return xstrdup("\"enqueue\" syntax is \"enqueue:PORT:QUEUE\" or " + "\"enqueue(PORT,QUEUE)\""); } enqueue = ofpact_put_ENQUEUE(ofpacts); @@ -214,10 +212,10 @@ parse_output(const char *arg, struct ofpbuf *ofpacts) struct ofpact_output *output; output = ofpact_put_OUTPUT(ofpacts); - output->max_len = output->port == OFPP_CONTROLLER ? UINT16_MAX : 0; if (!ofputil_port_from_string(arg, &output->port)) { return xasprintf("%s: output to unknown port", arg); } + output->max_len = output->port == OFPP_CONTROLLER ? UINT16_MAX : 0; return NULL; } } @@ -293,7 +291,7 @@ parse_note(const char *arg, struct ofpbuf *ofpacts) } ofpbuf_put(ofpacts, &byte, 1); - note = ofpacts->l2; + note = ofpacts->frame; note->length++; arg += 2; @@ -402,7 +400,7 @@ parse_noargs_dec_ttl(struct ofpbuf *b) ids = ofpact_put_DEC_TTL(b); ofpbuf_put(b, &id, sizeof id); - ids = b->l2; + ids = b->frame; ids->n_controllers++; ofpact_update_len(b, &ids->ofpact); } @@ -428,7 +426,7 @@ parse_dec_ttl(struct ofpbuf *b, char *arg) uint16_t id = atoi(cntr); ofpbuf_put(b, &id, sizeof id); - ids = b->l2; + ids = b->frame; ids->n_controllers++; } if (!ids->n_controllers) { @@ -440,6 +438,42 @@ parse_dec_ttl(struct ofpbuf *b, char *arg) return NULL; } +/* Parses 'arg' as the argument to a "set_mpls_label" action, and appends such + * an action to 'b'. + * + * Returns NULL if successful, otherwise a malloc()'d string describing the + * error. The caller is responsible for freeing the returned string. */ +static char * WARN_UNUSED_RESULT +parse_set_mpls_label(struct ofpbuf *b, const char *arg) +{ + struct ofpact_mpls_label *mpls_label = ofpact_put_SET_MPLS_LABEL(b); + + if (*arg == '\0') { + return xstrdup("parse_set_mpls_label: expected label."); + } + + mpls_label->label = htonl(atoi(arg)); + return NULL; +} + +/* Parses 'arg' as the argument to a "set_mpls_tc" action, and appends such an + * action to 'b'. + * + * Returns NULL if successful, otherwise a malloc()'d string describing the + * error. The caller is responsible for freeing the returned string. */ +static char * WARN_UNUSED_RESULT +parse_set_mpls_tc(struct ofpbuf *b, const char *arg) +{ + struct ofpact_mpls_tc *mpls_tc = ofpact_put_SET_MPLS_TC(b); + + if (*arg == '\0') { + return xstrdup("parse_set_mpls_tc: expected tc."); + } + + mpls_tc->tc = atoi(arg); + return NULL; +} + /* Parses 'arg' as the argument to a "set_mpls_ttl" action, and appends such an * action to 'ofpacts'. * @@ -464,15 +498,15 @@ parse_set_mpls_ttl(struct ofpbuf *b, const char *arg) * Returns NULL if successful, otherwise a malloc()'d string describing the * error. The caller is responsible for freeing the returned string. */ static char * WARN_UNUSED_RESULT -set_field_parse__(char *arg, struct ofpbuf *ofpacts) +set_field_parse__(char *arg, struct ofpbuf *ofpacts, + enum ofputil_protocol *usable_protocols) { - struct ofpact_reg_load *load = ofpact_put_REG_LOAD(ofpacts); + struct ofpact_set_field *sf = ofpact_put_SET_FIELD(ofpacts); char *value; char *delim; char *key; const struct mf_field *mf; char *error; - union mf_value mf_value; value = arg; delim = strstr(arg, "->"); @@ -491,17 +525,18 @@ set_field_parse__(char *arg, struct ofpbuf *ofpacts) if (!mf->writable) { return xasprintf("%s is read-only", key); } - + sf->field = mf; delim[0] = '\0'; - error = mf_parse_value(mf, value, &mf_value); + error = mf_parse_value(mf, value, &sf->value); if (error) { return error; } - if (!mf_is_value_valid(mf, &mf_value)) { + + if (!mf_is_value_valid(mf, &sf->value)) { return xasprintf("%s is not a valid value for field %s", value, key); } - ofpact_set_field_init(load, mf, &mf_value); + *usable_protocols &= mf->usable_protocols; return NULL; } @@ -511,10 +546,11 @@ set_field_parse__(char *arg, struct ofpbuf *ofpacts) * Returns NULL if successful, otherwise a malloc()'d string describing the * error. The caller is responsible for freeing the returned string. */ static char * WARN_UNUSED_RESULT -set_field_parse(const char *arg, struct ofpbuf *ofpacts) +set_field_parse(const char *arg, struct ofpbuf *ofpacts, + enum ofputil_protocol *usable_protocols) { char *copy = xstrdup(arg); - char *error = set_field_parse__(copy, ofpacts); + char *error = set_field_parse__(copy, ofpacts, usable_protocols); free(copy); return error; } @@ -541,7 +577,7 @@ parse_metadata(struct ofpbuf *b, char *arg) return error; } } else { - om->mask = htonll(UINT64_MAX); + om->mask = OVS_BE64_MAX; } return str_to_be64(arg, &om->metadata); @@ -593,22 +629,28 @@ parse_sample(struct ofpbuf *b, char *arg) * error. The caller is responsible for freeing the returned string. */ static char * WARN_UNUSED_RESULT parse_named_action(enum ofputil_action_code code, - char *arg, struct ofpbuf *ofpacts) + char *arg, struct ofpbuf *ofpacts, + enum ofputil_protocol *usable_protocols) { - size_t orig_size = ofpacts->size; + size_t orig_size = ofpbuf_size(ofpacts); struct ofpact_tunnel *tunnel; + struct ofpact_vlan_vid *vlan_vid; + struct ofpact_vlan_pcp *vlan_pcp; char *error = NULL; uint16_t ethertype = 0; uint16_t vid = 0; uint8_t tos = 0; + uint8_t ecn = 0; + uint8_t ttl = 0; uint8_t pcp = 0; switch (code) { case OFPUTIL_ACTION_INVALID: - NOT_REACHED(); + OVS_NOT_REACHED(); case OFPUTIL_OFPAT10_OUTPUT: case OFPUTIL_OFPAT11_OUTPUT: + case OFPUTIL_OFPAT13_OUTPUT: error = parse_output(arg, ofpacts); break; @@ -622,7 +664,10 @@ parse_named_action(enum ofputil_action_code code, if (vid & ~VLAN_VID_MASK) { return xasprintf("%s: not a valid VLAN VID", arg); } - ofpact_put_SET_VLAN_VID(ofpacts)->vlan_vid = vid; + vlan_vid = ofpact_put_SET_VLAN_VID(ofpacts); + vlan_vid->vlan_vid = vid; + vlan_vid->ofpact.compat = code; + vlan_vid->push_vlan_if_needed = code == OFPUTIL_OFPAT10_SET_VLAN_VID; break; case OFPUTIL_OFPAT10_SET_VLAN_PCP: @@ -635,18 +680,25 @@ parse_named_action(enum ofputil_action_code code, if (pcp & ~7) { return xasprintf("%s: not a valid VLAN PCP", arg); } - ofpact_put_SET_VLAN_PCP(ofpacts)->vlan_pcp = pcp; + vlan_pcp = ofpact_put_SET_VLAN_PCP(ofpacts); + vlan_pcp->vlan_pcp = pcp; + vlan_pcp->ofpact.compat = code; + vlan_pcp->push_vlan_if_needed = code == OFPUTIL_OFPAT10_SET_VLAN_PCP; break; case OFPUTIL_OFPAT12_SET_FIELD: - return set_field_parse(arg, ofpacts); + case OFPUTIL_OFPAT13_SET_FIELD: + return set_field_parse(arg, ofpacts, usable_protocols); case OFPUTIL_OFPAT10_STRIP_VLAN: case OFPUTIL_OFPAT11_POP_VLAN: - ofpact_put_STRIP_VLAN(ofpacts); + case OFPUTIL_OFPAT13_POP_VLAN: + ofpact_put_STRIP_VLAN(ofpacts)->ofpact.compat = code; break; case OFPUTIL_OFPAT11_PUSH_VLAN: + case OFPUTIL_OFPAT13_PUSH_VLAN: + *usable_protocols &= OFPUTIL_P_OF11_UP; error = str_to_u16(arg, "ethertype", ðertype); if (error) { return error; @@ -661,6 +713,7 @@ parse_named_action(enum ofputil_action_code code, break; case OFPUTIL_OFPAT11_SET_QUEUE: + case OFPUTIL_OFPAT13_SET_QUEUE: error = str_to_u32(arg, &ofpact_put_SET_QUEUE(ofpacts)->queue_id); break; @@ -694,11 +747,34 @@ parse_named_action(enum ofputil_action_code code, if (tos & ~IP_DSCP_MASK) { return xasprintf("%s: not a valid TOS", arg); } - ofpact_put_SET_IPV4_DSCP(ofpacts)->dscp = tos; + ofpact_put_SET_IP_DSCP(ofpacts)->dscp = tos; + break; + + case OFPUTIL_OFPAT11_SET_NW_ECN: + error = str_to_u8(arg, "ECN", &ecn); + if (error) { + return error; + } + + if (ecn & ~IP_ECN_MASK) { + return xasprintf("%s: not a valid ECN", arg); + } + ofpact_put_SET_IP_ECN(ofpacts)->ecn = ecn; + break; + + case OFPUTIL_OFPAT11_SET_NW_TTL: + case OFPUTIL_OFPAT13_SET_NW_TTL: + error = str_to_u8(arg, "TTL", &ttl); + if (error) { + return error; + } + + ofpact_put_SET_IP_TTL(ofpacts)->ttl = ttl; break; case OFPUTIL_OFPAT11_DEC_NW_TTL: - NOT_REACHED(); + case OFPUTIL_OFPAT13_DEC_NW_TTL: + OVS_NOT_REACHED(); case OFPUTIL_OFPAT10_SET_TP_SRC: case OFPUTIL_OFPAT11_SET_TP_SRC: @@ -766,7 +842,7 @@ parse_named_action(enum ofputil_action_code code, case OFPUTIL_NXAST_RESUBMIT_TABLE: case OFPUTIL_NXAST_OUTPUT_REG: case OFPUTIL_NXAST_DEC_TTL_CNT_IDS: - NOT_REACHED(); + OVS_NOT_REACHED(); case OFPUTIL_NXAST_LEARN: error = learn_parse(arg, ofpacts); @@ -780,12 +856,24 @@ parse_named_action(enum ofputil_action_code code, error = parse_dec_ttl(ofpacts, arg); break; + case OFPUTIL_NXAST_SET_MPLS_LABEL: + case OFPUTIL_OFPAT11_SET_MPLS_LABEL: + error = parse_set_mpls_label(ofpacts, arg); + break; + + case OFPUTIL_NXAST_SET_MPLS_TC: + case OFPUTIL_OFPAT11_SET_MPLS_TC: + error = parse_set_mpls_tc(ofpacts, arg); + break; + case OFPUTIL_NXAST_SET_MPLS_TTL: case OFPUTIL_OFPAT11_SET_MPLS_TTL: + case OFPUTIL_OFPAT13_SET_MPLS_TTL: error = parse_set_mpls_ttl(ofpacts, arg); break; case OFPUTIL_OFPAT11_DEC_MPLS_TTL: + case OFPUTIL_OFPAT13_DEC_MPLS_TTL: case OFPUTIL_NXAST_DEC_MPLS_TTL: ofpact_put_DEC_MPLS_TTL(ofpacts); break; @@ -799,6 +887,7 @@ parse_named_action(enum ofputil_action_code code, break; case OFPUTIL_OFPAT11_PUSH_MPLS: + case OFPUTIL_OFPAT13_PUSH_MPLS: case OFPUTIL_NXAST_PUSH_MPLS: error = str_to_u16(arg, "push_mpls", ðertype); if (!error) { @@ -807,6 +896,7 @@ parse_named_action(enum ofputil_action_code code, break; case OFPUTIL_OFPAT11_POP_MPLS: + case OFPUTIL_OFPAT13_POP_MPLS: case OFPUTIL_NXAST_POP_MPLS: error = str_to_u16(arg, "pop_mpls", ðertype); if (!error) { @@ -814,6 +904,18 @@ parse_named_action(enum ofputil_action_code code, } break; + case OFPUTIL_OFPAT11_GROUP: + case OFPUTIL_OFPAT13_GROUP: + error = str_to_u32(arg, &ofpact_put_GROUP(ofpacts)->group_id); + break; + + /* FIXME when implement OFPAT13_* */ + case OFPUTIL_OFPAT13_COPY_TTL_OUT: + case OFPUTIL_OFPAT13_COPY_TTL_IN: + case OFPUTIL_OFPAT13_PUSH_PBB: + case OFPUTIL_OFPAT13_POP_PBB: + OVS_NOT_REACHED(); + case OFPUTIL_NXAST_STACK_PUSH: error = nxm_parse_stack_action(ofpact_put_STACK_PUSH(ofpacts), arg); break; @@ -827,7 +929,7 @@ parse_named_action(enum ofputil_action_code code, } if (error) { - ofpacts->size = orig_size; + ofpbuf_set_size(ofpacts, orig_size); } return error; } @@ -842,11 +944,12 @@ parse_named_action(enum ofputil_action_code code, * error. The caller is responsible for freeing the returned string. */ static char * WARN_UNUSED_RESULT str_to_ofpact__(char *pos, char *act, char *arg, - struct ofpbuf *ofpacts, int n_actions) + struct ofpbuf *ofpacts, int n_actions, + enum ofputil_protocol *usable_protocols) { int code = ofputil_action_code_from_name(act); if (code >= 0) { - return parse_named_action(code, arg, ofpacts); + return parse_named_action(code, arg, ofpacts, usable_protocols); } else if (!strcasecmp(act, "drop")) { if (n_actions) { return xstrdup("Drop actions must not be preceded by other " @@ -872,31 +975,53 @@ str_to_ofpact__(char *pos, char *act, char *arg, * Returns NULL if successful, otherwise a malloc()'d string describing the * error. The caller is responsible for freeing the returned string. */ static char * WARN_UNUSED_RESULT -str_to_ofpacts(char *str, struct ofpbuf *ofpacts) +str_to_ofpacts__(char *str, struct ofpbuf *ofpacts, + enum ofputil_protocol *usable_protocols) { - size_t orig_size = ofpacts->size; + size_t orig_size = ofpbuf_size(ofpacts); char *pos, *act, *arg; - enum ofperr error; int n_actions; pos = str; n_actions = 0; while (ofputil_parse_key_value(&pos, &act, &arg)) { - char *error = str_to_ofpact__(pos, act, arg, ofpacts, n_actions); + char *error = str_to_ofpact__(pos, act, arg, ofpacts, n_actions, + usable_protocols); if (error) { - ofpacts->size = orig_size; + ofpbuf_set_size(ofpacts, orig_size); return error; } n_actions++; } - error = ofpacts_verify(ofpacts->data, ofpacts->size); + ofpact_pad(ofpacts); + return NULL; +} + + +/* Parses 'str' as a series of actions, and appends them to 'ofpacts'. + * + * Returns NULL if successful, otherwise a malloc()'d string describing the + * error. The caller is responsible for freeing the returned string. */ +static char * WARN_UNUSED_RESULT +str_to_ofpacts(char *str, struct ofpbuf *ofpacts, + enum ofputil_protocol *usable_protocols) +{ + size_t orig_size = ofpbuf_size(ofpacts); + char *error_s; + enum ofperr error; + + error_s = str_to_ofpacts__(str, ofpacts, usable_protocols); + if (error_s) { + return error_s; + } + + error = ofpacts_verify(ofpbuf_data(ofpacts), ofpbuf_size(ofpacts)); if (error) { - ofpacts->size = orig_size; + ofpbuf_set_size(ofpacts, orig_size); return xstrdup("Incorrect action ordering"); } - ofpact_pad(ofpacts); return NULL; } @@ -907,30 +1032,49 @@ str_to_ofpacts(char *str, struct ofpbuf *ofpacts) * error. The caller is responsible for freeing the returned string. */ static char * WARN_UNUSED_RESULT parse_named_instruction(enum ovs_instruction_type type, - char *arg, struct ofpbuf *ofpacts) + char *arg, struct ofpbuf *ofpacts, + enum ofputil_protocol *usable_protocols) { char *error_s = NULL; enum ofperr error; + *usable_protocols &= OFPUTIL_P_OF11_UP; + switch (type) { case OVSINST_OFPIT11_APPLY_ACTIONS: - NOT_REACHED(); /* This case is handled by str_to_inst_ofpacts() */ + OVS_NOT_REACHED(); /* This case is handled by str_to_inst_ofpacts() */ break; - case OVSINST_OFPIT11_WRITE_ACTIONS: - /* XXX */ - error_s = xstrdup("instruction write-actions is not supported yet"); + case OVSINST_OFPIT11_WRITE_ACTIONS: { + struct ofpact_nest *on; + size_t ofs; + + ofpact_pad(ofpacts); + ofs = ofpbuf_size(ofpacts); + on = ofpact_put(ofpacts, OFPACT_WRITE_ACTIONS, + offsetof(struct ofpact_nest, actions)); + error_s = str_to_ofpacts__(arg, ofpacts, usable_protocols); + + on = ofpbuf_at_assert(ofpacts, ofs, sizeof *on); + on->ofpact.len = ofpbuf_size(ofpacts) - ofs; + + if (error_s) { + ofpbuf_set_size(ofpacts, ofs); + } break; + } case OVSINST_OFPIT11_CLEAR_ACTIONS: ofpact_put_CLEAR_ACTIONS(ofpacts); break; case OVSINST_OFPIT13_METER: + *usable_protocols &= OFPUTIL_P_OF13_UP; error_s = str_to_u32(arg, &ofpact_put_METER(ofpacts)->meter_id); break; case OVSINST_OFPIT11_WRITE_METADATA: + *usable_protocols &= OFPUTIL_P_NXM_OF11_UP; error_s = parse_metadata(ofpacts, arg); break; @@ -951,7 +1095,7 @@ parse_named_instruction(enum ovs_instruction_type type, /* If write_metadata is specified as an action AND an instruction, ofpacts could be invalid. */ - error = ofpacts_verify(ofpacts->data, ofpacts->size); + error = ofpacts_verify(ofpbuf_data(ofpacts), ofpbuf_size(ofpacts)); if (error) { return xstrdup("Incorrect instruction ordering"); } @@ -963,9 +1107,10 @@ parse_named_instruction(enum ovs_instruction_type type, * Returns NULL if successful, otherwise a malloc()'d string describing the * error. The caller is responsible for freeing the returned string. */ static char * WARN_UNUSED_RESULT -str_to_inst_ofpacts(char *str, struct ofpbuf *ofpacts) +str_to_inst_ofpacts(char *str, struct ofpbuf *ofpacts, + enum ofputil_protocol *usable_protocols) { - size_t orig_size = ofpacts->size; + size_t orig_size = ofpbuf_size(ofpacts); char *pos, *inst, *arg; int type; const char *prev_inst = NULL; @@ -976,9 +1121,10 @@ str_to_inst_ofpacts(char *str, struct ofpbuf *ofpacts) while (ofputil_parse_key_value(&pos, &inst, &arg)) { type = ovs_instruction_type_from_name(inst); if (type < 0) { - char *error = str_to_ofpact__(pos, inst, arg, ofpacts, n_actions); + char *error = str_to_ofpact__(pos, inst, arg, ofpacts, n_actions, + usable_protocols); if (error) { - ofpacts->size = orig_size; + ofpbuf_set_size(ofpacts, orig_size); return error; } @@ -988,19 +1134,20 @@ str_to_inst_ofpacts(char *str, struct ofpbuf *ofpacts) continue; } } else if (type == OVSINST_OFPIT11_APPLY_ACTIONS) { - ofpacts->size = orig_size; + ofpbuf_set_size(ofpacts, orig_size); return xasprintf("%s isn't supported. Just write actions then " "it is interpreted as apply_actions", inst); } else { - char *error = parse_named_instruction(type, arg, ofpacts); + char *error = parse_named_instruction(type, arg, ofpacts, + usable_protocols); if (error) { - ofpacts->size = orig_size; + ofpbuf_set_size(ofpacts, orig_size); return error; } } if (type <= prev_type) { - ofpacts->size = orig_size; + ofpbuf_set_size(ofpacts, orig_size); if (type == prev_type) { return xasprintf("instruction %s may be specified only once", inst); @@ -1058,25 +1205,28 @@ parse_protocol(const char *name, const struct protocol **p_out) } /* Parses 's' as the (possibly masked) value of field 'mf', and updates - * 'match' appropriately. + * 'match' appropriately. Restricts the set of usable protocols to ones + * supporting the parsed field. * * Returns NULL if successful, otherwise a malloc()'d string describing the * error. The caller is responsible for freeing the returned string. */ static char * WARN_UNUSED_RESULT -parse_field(const struct mf_field *mf, const char *s, struct match *match) +parse_field(const struct mf_field *mf, const char *s, struct match *match, + enum ofputil_protocol *usable_protocols) { union mf_value value, mask; char *error; error = mf_parse(mf, s, &value, &mask); if (!error) { - mf_set(mf, &value, &mask, match); + *usable_protocols &= mf_set(mf, &value, &mask, match); } return error; } static char * WARN_UNUSED_RESULT -parse_ofp_str__(struct ofputil_flow_mod *fm, int command, char *string) +parse_ofp_str__(struct ofputil_flow_mod *fm, int command, char *string, + enum ofputil_protocol *usable_protocols) { enum { F_OUT_PORT = 1 << 0, @@ -1089,6 +1239,8 @@ parse_ofp_str__(struct ofputil_flow_mod *fm, int command, char *string) char *act_str = NULL; char *name; + *usable_protocols = OFPUTIL_P_ANY; + switch (command) { case -1: fields = F_OUT_PORT; @@ -1115,7 +1267,7 @@ parse_ofp_str__(struct ofputil_flow_mod *fm, int command, char *string) break; default: - NOT_REACHED(); + OVS_NOT_REACHED(); } match_init_catchall(&fm->match); @@ -1124,7 +1276,7 @@ parse_ofp_str__(struct ofputil_flow_mod *fm, int command, char *string) fm->cookie_mask = htonll(0); if (command == OFPFC_MODIFY || command == OFPFC_MODIFY_STRICT) { /* For modify, by default, don't update the cookie. */ - fm->new_cookie = htonll(UINT64_MAX); + fm->new_cookie = OVS_BE64_MAX; } else{ fm->new_cookie = htonll(0); } @@ -1136,6 +1288,7 @@ parse_ofp_str__(struct ofputil_flow_mod *fm, int command, char *string) fm->buffer_id = UINT32_MAX; fm->out_port = OFPP_ANY; fm->flags = 0; + fm->out_group = OFPG11_ANY; if (fields & F_ACTIONS) { act_str = strstr(string, "action"); if (!act_str) { @@ -1161,15 +1314,21 @@ parse_ofp_str__(struct ofputil_flow_mod *fm, int command, char *string) match_set_nw_proto(&fm->match, p->nw_proto); } } else if (fields & F_FLAGS && !strcmp(name, "send_flow_rem")) { - fm->flags |= OFPFF_SEND_FLOW_REM; + fm->flags |= OFPUTIL_FF_SEND_FLOW_REM; } else if (fields & F_FLAGS && !strcmp(name, "check_overlap")) { - fm->flags |= OFPFF_CHECK_OVERLAP; + fm->flags |= OFPUTIL_FF_CHECK_OVERLAP; } else if (fields & F_FLAGS && !strcmp(name, "reset_counts")) { - fm->flags |= OFPFF12_RESET_COUNTS; + fm->flags |= OFPUTIL_FF_RESET_COUNTS; + *usable_protocols &= OFPUTIL_P_OF12_UP; } else if (fields & F_FLAGS && !strcmp(name, "no_packet_counts")) { - fm->flags |= OFPFF13_NO_PKT_COUNTS; + fm->flags |= OFPUTIL_FF_NO_PKT_COUNTS; + *usable_protocols &= OFPUTIL_P_OF13_UP; } else if (fields & F_FLAGS && !strcmp(name, "no_byte_counts")) { - fm->flags |= OFPFF13_NO_BYT_COUNTS; + fm->flags |= OFPUTIL_FF_NO_BYT_COUNTS; + *usable_protocols &= OFPUTIL_P_OF13_UP; + } else if (!strcmp(name, "no_readonly_table") + || !strcmp(name, "allow_hidden_fields")) { + /* ignore these fields. */ } else { char *value; @@ -1180,6 +1339,9 @@ parse_ofp_str__(struct ofputil_flow_mod *fm, int command, char *string) if (!strcmp(name, "table")) { error = str_to_u8(value, "table", &fm->table_id); + if (fm->table_id != 0xff) { + *usable_protocols &= OFPUTIL_P_TID; + } } else if (!strcmp(name, "out_port")) { if (!ofputil_port_from_string(value, &fm->out_port)) { error = xasprintf("%s is not a valid OpenFlow port", @@ -1209,6 +1371,12 @@ parse_ofp_str__(struct ofputil_flow_mod *fm, int command, char *string) return error; } error = str_to_be64(mask + 1, &fm->cookie_mask); + + /* Matching of the cookie is only supported through NXM or + * OF1.1+. */ + if (fm->cookie_mask != htonll(0)) { + *usable_protocols &= OFPUTIL_P_NXM_OF11_UP; + } } else { /* No mask means that the cookie is being set. */ if (command != OFPFC_ADD && command != OFPFC_MODIFY @@ -1219,7 +1387,8 @@ parse_ofp_str__(struct ofputil_flow_mod *fm, int command, char *string) fm->modify_cookie = true; } } else if (mf_from_name(name)) { - error = parse_field(mf_from_name(name), value, &fm->match); + error = parse_field(mf_from_name(name), value, &fm->match, + usable_protocols); } else if (!strcmp(name, "duration") || !strcmp(name, "n_packets") || !strcmp(name, "n_bytes") @@ -1237,7 +1406,21 @@ parse_ofp_str__(struct ofputil_flow_mod *fm, int command, char *string) } } } - if (!fm->cookie_mask && fm->new_cookie == htonll(UINT64_MAX) + /* Check for usable protocol interdependencies between match fields. */ + if (fm->match.flow.dl_type == htons(ETH_TYPE_IPV6)) { + const struct flow_wildcards *wc = &fm->match.wc; + /* Only NXM and OXM support matching L3 and L4 fields within IPv6. + * + * (IPv6 specific fields as well as arp_sha, arp_tha, nw_frag, and + * nw_ttl are covered elsewhere so they don't need to be included in + * this test too.) + */ + if (wc->masks.nw_proto || wc->masks.nw_tos + || wc->masks.tp_src || wc->masks.tp_dst) { + *usable_protocols &= OFPUTIL_P_NXM_OXM_ANY; + } + } + if (!fm->cookie_mask && fm->new_cookie == OVS_BE64_MAX && (command == OFPFC_MODIFY || command == OFPFC_MODIFY_STRICT)) { /* On modifies without a mask, we are supposed to add a flow if * one does not exist. If a cookie wasn't been specified, use a @@ -1249,23 +1432,27 @@ parse_ofp_str__(struct ofputil_flow_mod *fm, int command, char *string) char *error; ofpbuf_init(&ofpacts, 32); - error = str_to_inst_ofpacts(act_str, &ofpacts); + error = str_to_inst_ofpacts(act_str, &ofpacts, usable_protocols); if (!error) { enum ofperr err; - err = ofpacts_check(ofpacts.data, ofpacts.size, &fm->match.flow, - OFPP_MAX, 0); + err = ofpacts_check(ofpbuf_data(&ofpacts), ofpbuf_size(&ofpacts), &fm->match.flow, + OFPP_MAX, fm->table_id, 255, usable_protocols); + if (!err && !usable_protocols) { + err = OFPERR_OFPBAC_MATCH_INCONSISTENT; + } if (err) { error = xasprintf("actions are invalid with specified match " "(%s)", ofperr_to_string(err)); } + } if (error) { ofpbuf_uninit(&ofpacts); return error; } - fm->ofpacts_len = ofpacts.size; + fm->ofpacts_len = ofpbuf_size(&ofpacts); fm->ofpacts = ofpbuf_steal_data(&ofpacts); } else { fm->ofpacts_len = 0; @@ -1277,6 +1464,7 @@ parse_ofp_str__(struct ofputil_flow_mod *fm, int command, char *string) /* Convert 'str_' (as described in the Flow Syntax section of the ovs-ofctl man * page) into 'fm' for sending the specified flow_mod 'command' to a switch. + * Returns the set of usable protocols in '*usable_protocols'. * * To parse syntax for an OFPT_FLOW_MOD (or NXT_FLOW_MOD), use an OFPFC_* * constant for 'command'. To parse syntax for an OFPST_FLOW or @@ -1285,12 +1473,13 @@ parse_ofp_str__(struct ofputil_flow_mod *fm, int command, char *string) * Returns NULL if successful, otherwise a malloc()'d string describing the * error. The caller is responsible for freeing the returned string. */ char * WARN_UNUSED_RESULT -parse_ofp_str(struct ofputil_flow_mod *fm, int command, const char *str_) +parse_ofp_str(struct ofputil_flow_mod *fm, int command, const char *str_, + enum ofputil_protocol *usable_protocols) { char *string = xstrdup(str_); char *error; - error = parse_ofp_str__(fm, command, string); + error = parse_ofp_str__(fm, command, string, usable_protocols); if (error) { fm->ofpacts = NULL; fm->ofpacts_len = 0; @@ -1302,7 +1491,8 @@ parse_ofp_str(struct ofputil_flow_mod *fm, int command, const char *str_) static char * WARN_UNUSED_RESULT parse_ofp_meter_mod_str__(struct ofputil_meter_mod *mm, char *string, - struct ofpbuf *bands, int command) + struct ofpbuf *bands, int command, + enum ofputil_protocol *usable_protocols) { enum { F_METER = 1 << 0, @@ -1313,6 +1503,9 @@ parse_ofp_meter_mod_str__(struct ofputil_meter_mod *mm, char *string, char *band_str = NULL; char *name; + /* Meters require at least OF 1.3. */ + *usable_protocols = OFPUTIL_P_OF13_UP; + switch (command) { case -1: fields = F_METER; @@ -1331,7 +1524,7 @@ parse_ofp_meter_mod_str__(struct ofputil_meter_mod *mm, char *string, break; default: - NOT_REACHED(); + OVS_NOT_REACHED(); } mm->command = command; @@ -1501,7 +1694,7 @@ parse_ofp_meter_mod_str__(struct ofputil_meter_mod *mm, char *string, * error. The caller is responsible for freeing the returned string. */ char * WARN_UNUSED_RESULT parse_ofp_meter_mod_str(struct ofputil_meter_mod *mm, const char *str_, - int command) + int command, enum ofputil_protocol *usable_protocols) { struct ofpbuf bands; char *string; @@ -1510,7 +1703,8 @@ parse_ofp_meter_mod_str(struct ofputil_meter_mod *mm, const char *str_, ofpbuf_init(&bands, 64); string = xstrdup(str_); - error = parse_ofp_meter_mod_str__(mm, string, &bands, command); + error = parse_ofp_meter_mod_str__(mm, string, &bands, command, + usable_protocols); free(string); ofpbuf_uninit(&bands); @@ -1520,7 +1714,8 @@ parse_ofp_meter_mod_str(struct ofputil_meter_mod *mm, const char *str_, static char * WARN_UNUSED_RESULT parse_flow_monitor_request__(struct ofputil_flow_monitor_request *fmr, - const char *str_, char *string) + const char *str_, char *string, + enum ofputil_protocol *usable_protocols) { static atomic_uint32_t id = ATOMIC_VAR_INIT(0); char *save_ptr = NULL; @@ -1573,7 +1768,8 @@ parse_flow_monitor_request__(struct ofputil_flow_monitor_request *fmr, } else if (mf_from_name(name)) { char *error; - error = parse_field(mf_from_name(name), value, &fmr->match); + error = parse_field(mf_from_name(name), value, &fmr->match, + usable_protocols); if (error) { return error; } @@ -1592,10 +1788,12 @@ parse_flow_monitor_request__(struct ofputil_flow_monitor_request *fmr, * error. The caller is responsible for freeing the returned string. */ char * WARN_UNUSED_RESULT parse_flow_monitor_request(struct ofputil_flow_monitor_request *fmr, - const char *str_) + const char *str_, + enum ofputil_protocol *usable_protocols) { char *string = xstrdup(str_); - char *error = parse_flow_monitor_request__(fmr, str_, string); + char *error = parse_flow_monitor_request__(fmr, str_, string, + usable_protocols); free(string); return error; } @@ -1606,10 +1804,15 @@ parse_flow_monitor_request(struct ofputil_flow_monitor_request *fmr, * Returns NULL if successful, otherwise a malloc()'d string describing the * error. The caller is responsible for freeing the returned string. */ char * WARN_UNUSED_RESULT -parse_ofpacts(const char *s_, struct ofpbuf *ofpacts) +parse_ofpacts(const char *s_, struct ofpbuf *ofpacts, + enum ofputil_protocol *usable_protocols) { char *s = xstrdup(s_); - char *error = str_to_ofpacts(s, ofpacts); + char *error; + + *usable_protocols = OFPUTIL_P_ANY; + + error = str_to_ofpacts(s, ofpacts, usable_protocols); free(s); return error; @@ -1622,9 +1825,10 @@ parse_ofpacts(const char *s_, struct ofpbuf *ofpacts) * error. The caller is responsible for freeing the returned string. */ char * WARN_UNUSED_RESULT parse_ofp_flow_mod_str(struct ofputil_flow_mod *fm, const char *string, - uint16_t command) + uint16_t command, + enum ofputil_protocol *usable_protocols) { - char *error = parse_ofp_str(fm, command, string); + char *error = parse_ofp_str(fm, command, string, usable_protocols); if (!error) { /* Normalize a copy of the match. This ensures that non-normalized * flows get logged but doesn't affect what gets sent to the switch, so @@ -1636,6 +1840,47 @@ parse_ofp_flow_mod_str(struct ofputil_flow_mod *fm, const char *string, return error; } +/* Convert 'table_id' and 'flow_miss_handling' (as described for the + * "mod-table" command in the ovs-ofctl man page) into 'tm' for sending the + * specified table_mod 'command' to a switch. + * + * Returns NULL if successful, otherwise a malloc()'d string describing the + * error. The caller is responsible for freeing the returned string. */ +char * WARN_UNUSED_RESULT +parse_ofp_table_mod(struct ofputil_table_mod *tm, const char *table_id, + const char *flow_miss_handling, + enum ofputil_protocol *usable_protocols) +{ + /* Table mod requires at least OF 1.1. */ + *usable_protocols = OFPUTIL_P_OF11_UP; + + if (!strcasecmp(table_id, "all")) { + tm->table_id = OFPTT_ALL; + } else { + char *error = str_to_u8(table_id, "table_id", &tm->table_id); + if (error) { + return error; + } + } + + if (strcmp(flow_miss_handling, "controller") == 0) { + tm->config = OFPTC11_TABLE_MISS_CONTROLLER; + } else if (strcmp(flow_miss_handling, "continue") == 0) { + tm->config = OFPTC11_TABLE_MISS_CONTINUE; + } else if (strcmp(flow_miss_handling, "drop") == 0) { + tm->config = OFPTC11_TABLE_MISS_DROP; + } else { + return xasprintf("invalid flow_miss_handling %s", flow_miss_handling); + } + + if (tm->table_id == 0xfe && tm->config == OFPTC11_TABLE_MISS_CONTINUE) { + return xstrdup("last table's flow miss handling can not be continue"); + } + + return NULL; +} + + /* Opens file 'file_name' and reads each line as a flow_mod of the specified * type (one of OFPFC_*). Stores each flow_mod in '*fm', an array allocated * on the caller's behalf, and the number of flow_mods in '*n_fms'. @@ -1644,13 +1889,16 @@ parse_ofp_flow_mod_str(struct ofputil_flow_mod *fm, const char *string, * error. The caller is responsible for freeing the returned string. */ char * WARN_UNUSED_RESULT parse_ofp_flow_mod_file(const char *file_name, uint16_t command, - struct ofputil_flow_mod **fms, size_t *n_fms) + struct ofputil_flow_mod **fms, size_t *n_fms, + enum ofputil_protocol *usable_protocols) { size_t allocated_fms; int line_number; FILE *stream; struct ds s; + *usable_protocols = OFPUTIL_P_ANY; + *fms = NULL; *n_fms = 0; @@ -1665,16 +1913,18 @@ parse_ofp_flow_mod_file(const char *file_name, uint16_t command, line_number = 0; while (!ds_get_preprocessed_line(&s, stream, &line_number)) { char *error; + enum ofputil_protocol usable; if (*n_fms >= allocated_fms) { *fms = x2nrealloc(*fms, &allocated_fms, sizeof **fms); } - error = parse_ofp_flow_mod_str(&(*fms)[*n_fms], ds_cstr(&s), command); + error = parse_ofp_flow_mod_str(&(*fms)[*n_fms], ds_cstr(&s), command, + &usable); if (error) { size_t i; for (i = 0; i < *n_fms; i++) { - free((*fms)[i].ofpacts); + free(CONST_CAST(struct ofpact *, (*fms)[i].ofpacts)); } free(*fms); *fms = NULL; @@ -1687,6 +1937,7 @@ parse_ofp_flow_mod_file(const char *file_name, uint16_t command, return xasprintf("%s:%d: %s", file_name, line_number, error); } + *usable_protocols &= usable; /* Each line can narrow the set. */ *n_fms += 1; } @@ -1699,21 +1950,31 @@ parse_ofp_flow_mod_file(const char *file_name, uint16_t command, char * WARN_UNUSED_RESULT parse_ofp_flow_stats_request_str(struct ofputil_flow_stats_request *fsr, - bool aggregate, const char *string) + bool aggregate, const char *string, + enum ofputil_protocol *usable_protocols) { struct ofputil_flow_mod fm; char *error; - error = parse_ofp_str(&fm, -1, string); + error = parse_ofp_str(&fm, -1, string, usable_protocols); if (error) { return error; } + /* Special table ID support not required for stats requests. */ + if (*usable_protocols & OFPUTIL_P_OF10_STD_TID) { + *usable_protocols |= OFPUTIL_P_OF10_STD; + } + if (*usable_protocols & OFPUTIL_P_OF10_NXM_TID) { + *usable_protocols |= OFPUTIL_P_OF10_NXM; + } + fsr->aggregate = aggregate; fsr->cookie = fm.cookie; fsr->cookie_mask = fm.cookie_mask; fsr->match = fm.match; fsr->out_port = fm.out_port; + fsr->out_group = fm.out_group; fsr->table_id = fm.table_id; return NULL; } @@ -1721,18 +1982,24 @@ parse_ofp_flow_stats_request_str(struct ofputil_flow_stats_request *fsr, /* Parses a specification of a flow from 's' into 'flow'. 's' must take the * form FIELD=VALUE[,FIELD=VALUE]... where each FIELD is the name of a * mf_field. Fields must be specified in a natural order for satisfying - * prerequisites. + * prerequisites. If 'mask' is specified, fills the mask field for each of the + * field specified in flow. If the map, 'names_portno' is specfied, converts + * the in_port name into port no while setting the 'flow'. * * Returns NULL on success, otherwise a malloc()'d string that explains the * problem. */ char * -parse_ofp_exact_flow(struct flow *flow, const char *s) +parse_ofp_exact_flow(struct flow *flow, struct flow *mask, const char *s, + const struct simap *portno_names) { char *pos, *key, *value_s; char *error = NULL; char *copy; memset(flow, 0, sizeof *flow); + if (mask) { + memset(mask, 0, sizeof *mask); + } pos = copy = xstrdup(s); while (ofputil_parse_key_value(&pos, &key, &value_s)) { @@ -1743,6 +2010,9 @@ parse_ofp_exact_flow(struct flow *flow, const char *s) goto exit; } flow->dl_type = htons(p->dl_type); + if (mask) { + mask->dl_type = OVS_BE16_MAX; + } if (p->nw_proto) { if (flow->nw_proto) { @@ -1751,6 +2021,9 @@ parse_ofp_exact_flow(struct flow *flow, const char *s) goto exit; } flow->nw_proto = p->nw_proto; + if (mask) { + mask->nw_proto = UINT8_MAX; + } } } else { const struct mf_field *mf; @@ -1774,15 +2047,28 @@ parse_ofp_exact_flow(struct flow *flow, const char *s) goto exit; } - field_error = mf_parse_value(mf, value_s, &value); - if (field_error) { - error = xasprintf("%s: bad value for %s (%s)", - s, key, field_error); - free(field_error); - goto exit; - } + if (!strcmp(key, "in_port") + && portno_names + && simap_contains(portno_names, value_s)) { + flow->in_port.ofp_port = u16_to_ofp( + simap_get(portno_names, value_s)); + if (mask) { + mask->in_port.ofp_port = u16_to_ofp(ntohs(OVS_BE16_MAX)); + } + } else { + field_error = mf_parse_value(mf, value_s, &value); + if (field_error) { + error = xasprintf("%s: bad value for %s (%s)", + s, key, field_error); + free(field_error); + goto exit; + } - mf_set_flow_value(mf, &value, flow); + mf_set_flow_value(mf, &value, flow); + if (mask) { + mf_mask_field(mf, mask); + } + } } } @@ -1795,6 +2081,298 @@ exit: if (error) { memset(flow, 0, sizeof *flow); + if (mask) { + memset(mask, 0, sizeof *mask); + } } return error; } + +static char * WARN_UNUSED_RESULT +parse_bucket_str(struct ofputil_bucket *bucket, char *str_, + enum ofputil_protocol *usable_protocols) +{ + struct ofpbuf ofpacts; + char *pos, *act, *arg; + int n_actions; + + bucket->weight = 1; + bucket->watch_port = OFPP_ANY; + bucket->watch_group = OFPG11_ANY; + + pos = str_; + n_actions = 0; + ofpbuf_init(&ofpacts, 64); + while (ofputil_parse_key_value(&pos, &act, &arg)) { + char *error = NULL; + + if (!strcasecmp(act, "weight")) { + error = str_to_u16(arg, "weight", &bucket->weight); + } else if (!strcasecmp(act, "watch_port")) { + if (!ofputil_port_from_string(arg, &bucket->watch_port) + || (ofp_to_u16(bucket->watch_port) >= ofp_to_u16(OFPP_MAX) + && bucket->watch_port != OFPP_ANY)) { + error = xasprintf("%s: invalid watch_port", arg); + } + } else if (!strcasecmp(act, "watch_group")) { + error = str_to_u32(arg, &bucket->watch_group); + if (!error && bucket->watch_group > OFPG_MAX) { + error = xasprintf("invalid watch_group id %"PRIu32, + bucket->watch_group); + } + } else { + error = str_to_ofpact__(pos, act, arg, &ofpacts, n_actions, + usable_protocols); + n_actions++; + } + + if (error) { + ofpbuf_uninit(&ofpacts); + return error; + } + } + + ofpact_pad(&ofpacts); + bucket->ofpacts = ofpbuf_data(&ofpacts); + bucket->ofpacts_len = ofpbuf_size(&ofpacts); + + return NULL; +} + +static char * WARN_UNUSED_RESULT +parse_ofp_group_mod_str__(struct ofputil_group_mod *gm, uint16_t command, + char *string, + enum ofputil_protocol *usable_protocols) +{ + enum { + F_GROUP_TYPE = 1 << 0, + F_BUCKETS = 1 << 1, + } fields; + char *save_ptr = NULL; + bool had_type = false; + char *name; + struct ofputil_bucket *bucket; + char *error = NULL; + + *usable_protocols = OFPUTIL_P_OF11_UP; + + switch (command) { + case OFPGC11_ADD: + fields = F_GROUP_TYPE | F_BUCKETS; + break; + + case OFPGC11_DELETE: + fields = 0; + break; + + case OFPGC11_MODIFY: + fields = F_GROUP_TYPE | F_BUCKETS; + break; + + default: + OVS_NOT_REACHED(); + } + + memset(gm, 0, sizeof *gm); + gm->command = command; + gm->group_id = OFPG_ANY; + list_init(&gm->buckets); + if (command == OFPGC11_DELETE && string[0] == '\0') { + gm->group_id = OFPG_ALL; + return NULL; + } + + *usable_protocols = OFPUTIL_P_OF11_UP; + + if (fields & F_BUCKETS) { + char *bkt_str = strstr(string, "bucket"); + + if (bkt_str) { + *bkt_str = '\0'; + } + + while (bkt_str) { + char *next_bkt_str; + + bkt_str = strchr(bkt_str + 1, '='); + if (!bkt_str) { + error = xstrdup("must specify bucket content"); + goto out; + } + bkt_str++; + + next_bkt_str = strstr(bkt_str, "bucket"); + if (next_bkt_str) { + *next_bkt_str = '\0'; + } + + bucket = xzalloc(sizeof(struct ofputil_bucket)); + error = parse_bucket_str(bucket, bkt_str, usable_protocols); + if (error) { + free(bucket); + goto out; + } + list_push_back(&gm->buckets, &bucket->list_node); + + bkt_str = next_bkt_str; + } + } + + for (name = strtok_r(string, "=, \t\r\n", &save_ptr); name; + name = strtok_r(NULL, "=, \t\r\n", &save_ptr)) { + char *value; + + value = strtok_r(NULL, ", \t\r\n", &save_ptr); + if (!value) { + error = xasprintf("field %s missing value", name); + goto out; + } + + if (!strcmp(name, "group_id")) { + if(!strcmp(value, "all")) { + gm->group_id = OFPG_ALL; + } else { + char *error = str_to_u32(value, &gm->group_id); + if (error) { + goto out; + } + if (gm->group_id != OFPG_ALL && gm->group_id > OFPG_MAX) { + error = xasprintf("invalid group id %"PRIu32, + gm->group_id); + goto out; + } + } + } else if (!strcmp(name, "type")){ + if (!(fields & F_GROUP_TYPE)) { + error = xstrdup("type is not needed"); + goto out; + } + if (!strcmp(value, "all")) { + gm->type = OFPGT11_ALL; + } else if (!strcmp(value, "select")) { + gm->type = OFPGT11_SELECT; + } else if (!strcmp(value, "indirect")) { + gm->type = OFPGT11_INDIRECT; + } else if (!strcmp(value, "ff") || + !strcmp(value, "fast_failover")) { + gm->type = OFPGT11_FF; + } else { + error = xasprintf("invalid group type %s", value); + goto out; + } + had_type = true; + } else if (!strcmp(name, "bucket")) { + error = xstrdup("bucket is not needed"); + goto out; + } else { + error = xasprintf("unknown keyword %s", name); + goto out; + } + } + if (gm->group_id == OFPG_ANY) { + error = xstrdup("must specify a group_id"); + goto out; + } + if (fields & F_GROUP_TYPE && !had_type) { + error = xstrdup("must specify a type"); + goto out; + } + + /* Validate buckets. */ + LIST_FOR_EACH (bucket, list_node, &gm->buckets) { + if (bucket->weight != 1 && gm->type != OFPGT11_SELECT) { + error = xstrdup("Only select groups can have bucket weights."); + goto out; + } + } + if (gm->type == OFPGT11_INDIRECT && !list_is_short(&gm->buckets)) { + error = xstrdup("Indirect groups can have at most one bucket."); + goto out; + } + + return NULL; + out: + ofputil_bucket_list_destroy(&gm->buckets); + return error; +} + +char * WARN_UNUSED_RESULT +parse_ofp_group_mod_str(struct ofputil_group_mod *gm, uint16_t command, + const char *str_, + enum ofputil_protocol *usable_protocols) +{ + char *string = xstrdup(str_); + char *error = parse_ofp_group_mod_str__(gm, command, string, + usable_protocols); + free(string); + + if (error) { + ofputil_bucket_list_destroy(&gm->buckets); + } + return error; +} + +char * WARN_UNUSED_RESULT +parse_ofp_group_mod_file(const char *file_name, uint16_t command, + struct ofputil_group_mod **gms, size_t *n_gms, + enum ofputil_protocol *usable_protocols) +{ + size_t allocated_gms; + int line_number; + FILE *stream; + struct ds s; + + *gms = NULL; + *n_gms = 0; + + stream = !strcmp(file_name, "-") ? stdin : fopen(file_name, "r"); + if (stream == NULL) { + return xasprintf("%s: open failed (%s)", + file_name, ovs_strerror(errno)); + } + + allocated_gms = *n_gms; + ds_init(&s); + line_number = 0; + *usable_protocols = OFPUTIL_P_OF11_UP; + while (!ds_get_preprocessed_line(&s, stream, &line_number)) { + enum ofputil_protocol usable; + char *error; + + if (*n_gms >= allocated_gms) { + size_t i; + + *gms = x2nrealloc(*gms, &allocated_gms, sizeof **gms); + for (i = 0; i < *n_gms; i++) { + list_moved(&(*gms)[i].buckets); + } + } + error = parse_ofp_group_mod_str(&(*gms)[*n_gms], command, ds_cstr(&s), + &usable); + if (error) { + size_t i; + + for (i = 0; i < *n_gms; i++) { + ofputil_bucket_list_destroy(&(*gms)[i].buckets); + } + free(*gms); + *gms = NULL; + *n_gms = 0; + + ds_destroy(&s); + if (stream != stdin) { + fclose(stream); + } + + return xasprintf("%s:%d: %s", file_name, line_number, error); + } + *usable_protocols &= usable; + *n_gms += 1; + } + + ds_destroy(&s); + if (stream != stdin) { + fclose(stream); + } + return NULL; +}