X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fofp-parse.c;h=522bd95d16eb3ca6615c1842cf3671c782bac725;hb=4e0abe6e1a3bc49b11870a90dc5ebffa003e00a0;hp=609166cb41d3980f7e48e8be2456c0f341e23a16;hpb=bdda5aca7b376bcc8c88072d00011a9da04af65c;p=sliver-openvswitch.git diff --git a/lib/ofp-parse.c b/lib/ofp-parse.c index 609166cb4..522bd95d1 100644 --- a/lib/ofp-parse.c +++ b/lib/ofp-parse.c @@ -34,6 +34,7 @@ #include "ofp-util.h" #include "ofpbuf.h" #include "openflow/openflow.h" +#include "ovs-thread.h" #include "packets.h" #include "socket-util.h" #include "vconn.h" @@ -131,7 +132,7 @@ str_to_u64(const char *str, uint64_t *valuep) static char * WARN_UNUSED_RESULT str_to_be64(const char *str, ovs_be64 *valuep) { - uint64_t value; + uint64_t value = 0; char *error; error = str_to_u64(str, &value); @@ -245,7 +246,7 @@ parse_resubmit(char *arg, struct ofpbuf *ofpacts) table_s = strsep(&arg, ","); if (table_s && table_s[0]) { - uint32_t table_id; + uint32_t table_id = 0; char *error; error = str_to_u32(table_s, &table_id); @@ -463,7 +464,8 @@ 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); char *value; @@ -501,6 +503,7 @@ set_field_parse__(char *arg, struct ofpbuf *ofpacts) } ofpact_set_field_init(load, mf, &mf_value); + *usable_protocols &= mf->usable_protocols; return NULL; } @@ -510,10 +513,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; } @@ -540,7 +544,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); @@ -592,15 +596,16 @@ 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; struct ofpact_tunnel *tunnel; char *error = NULL; - uint16_t ethertype; - uint16_t vid; - uint8_t pcp; - uint8_t tos; + uint16_t ethertype = 0; + uint16_t vid = 0; + uint8_t tos = 0; + uint8_t pcp = 0; switch (code) { case OFPUTIL_ACTION_INVALID: @@ -638,7 +643,7 @@ parse_named_action(enum ofputil_action_code code, break; case OFPUTIL_OFPAT12_SET_FIELD: - return set_field_parse(arg, ofpacts); + return set_field_parse(arg, ofpacts, usable_protocols); case OFPUTIL_OFPAT10_STRIP_VLAN: case OFPUTIL_OFPAT11_POP_VLAN: @@ -646,6 +651,7 @@ parse_named_action(enum ofputil_action_code code, break; case OFPUTIL_OFPAT11_PUSH_VLAN: + *usable_protocols &= OFPUTIL_P_OF11_UP; error = str_to_u16(arg, "ethertype", ðertype); if (error) { return error; @@ -813,6 +819,10 @@ parse_named_action(enum ofputil_action_code code, } break; + case OFPUTIL_OFPAT11_GROUP: + error = str_to_u32(arg, &ofpact_put_GROUP(ofpacts)->group_id); + break; + case OFPUTIL_NXAST_STACK_PUSH: error = nxm_parse_stack_action(ofpact_put_STACK_PUSH(ofpacts), arg); break; @@ -841,11 +851,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 " @@ -871,7 +882,8 @@ 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; char *pos, *act, *arg; @@ -881,7 +893,8 @@ str_to_ofpacts(char *str, struct ofpbuf *ofpacts) 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; return error; @@ -906,11 +919,14 @@ 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() */ @@ -926,10 +942,12 @@ parse_named_instruction(enum ovs_instruction_type type, 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; @@ -962,7 +980,8 @@ 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; char *pos, *inst, *arg; @@ -975,7 +994,8 @@ 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; return error; @@ -991,7 +1011,8 @@ str_to_inst_ofpacts(char *str, struct ofpbuf *ofpacts) 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; return error; @@ -1033,11 +1054,13 @@ parse_protocol(const char *name, const struct protocol **p_out) { "icmp", ETH_TYPE_IP, IPPROTO_ICMP }, { "tcp", ETH_TYPE_IP, IPPROTO_TCP }, { "udp", ETH_TYPE_IP, IPPROTO_UDP }, + { "sctp", ETH_TYPE_IP, IPPROTO_SCTP }, { "ipv6", ETH_TYPE_IPV6, 0 }, { "ip6", ETH_TYPE_IPV6, 0 }, { "icmp6", ETH_TYPE_IPV6, IPPROTO_ICMPV6 }, { "tcp6", ETH_TYPE_IPV6, IPPROTO_TCP }, { "udp6", ETH_TYPE_IPV6, IPPROTO_UDP }, + { "sctp6", ETH_TYPE_IPV6, IPPROTO_SCTP }, { "rarp", ETH_TYPE_RARP, 0}, { "mpls", ETH_TYPE_MPLS, 0 }, { "mplsm", ETH_TYPE_MPLS_MCAST, 0 }, @@ -1055,25 +1078,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, @@ -1086,6 +1112,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; @@ -1121,10 +1149,11 @@ 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); } + fm->modify_cookie = false; fm->table_id = 0xff; fm->command = command; fm->idle_timeout = OFP_FLOW_PERMANENT; @@ -1132,6 +1161,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) { @@ -1157,15 +1187,18 @@ 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 { char *value; @@ -1176,13 +1209,16 @@ 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", value); } } else if (fields & F_PRIORITY && !strcmp(name, "priority")) { - uint16_t priority; + uint16_t priority = 0; error = str_to_u16(value, name, &priority); fm->priority = priority; @@ -1205,6 +1241,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 @@ -1212,9 +1254,11 @@ parse_ofp_str__(struct ofputil_flow_mod *fm, int command, char *string) return xstrdup("cannot set cookie"); } error = str_to_be64(value, &fm->new_cookie); + 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") @@ -1232,7 +1276,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 @@ -1244,7 +1302,7 @@ 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; @@ -1272,6 +1330,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 @@ -1280,12 +1339,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; @@ -1297,7 +1357,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, @@ -1308,6 +1369,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; @@ -1496,7 +1560,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; @@ -1505,7 +1569,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); @@ -1515,14 +1580,15 @@ 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 uint32_t id; - + static atomic_uint32_t id = ATOMIC_VAR_INIT(0); char *save_ptr = NULL; char *name; - fmr->id = id++; + atomic_add(&id, 1, &fmr->id); + fmr->flags = (NXFMF_INITIAL | NXFMF_ADD | NXFMF_DELETE | NXFMF_MODIFY | NXFMF_OWN | NXFMF_ACTIONS); fmr->out_port = OFPP_NONE; @@ -1568,7 +1634,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; } @@ -1587,10 +1654,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; } @@ -1601,10 +1670,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; @@ -1617,9 +1691,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 @@ -1631,6 +1706,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 = 255; + } 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'. @@ -1639,13 +1755,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; @@ -1660,11 +1779,13 @@ 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; @@ -1682,6 +1803,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; } @@ -1694,21 +1816,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; } @@ -1793,3 +1925,287 @@ exit: } 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 = ofpacts.data; + bucket->ofpacts_len = ofpacts.size; + + 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: + 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) { + *gms = x2nrealloc(*gms, &allocated_gms, sizeof **gms); + } + 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; +}