X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fofp-parse.c;h=5b07d1457fa947a92b5495209a6cf3e6f3ec6d29;hb=ac60863f78e412004c5b69f5a64a49bc6f0bc46d;hp=522bd95d16eb3ca6615c1842cf3671c782bac725;hpb=b826639572ab3ef1ca2a0b1251b7980696a25c5b;p=sliver-openvswitch.git diff --git a/lib/ofp-parse.c b/lib/ofp-parse.c index 522bd95d1..5b07d1457 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); @@ -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'. * @@ -467,13 +501,12 @@ static char * WARN_UNUSED_RESULT 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, "->"); @@ -492,16 +525,16 @@ 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; @@ -601,10 +634,12 @@ parse_named_action(enum ofputil_action_code code, { size_t orig_size = ofpacts->size; 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 tos = 0, ecn, ttl; uint8_t pcp = 0; switch (code) { @@ -626,7 +661,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: @@ -639,7 +677,10 @@ 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: @@ -647,7 +688,7 @@ parse_named_action(enum ofputil_action_code code, case OFPUTIL_OFPAT10_STRIP_VLAN: case OFPUTIL_OFPAT11_POP_VLAN: - ofpact_put_STRIP_VLAN(ofpacts); + ofpact_put_STRIP_VLAN(ofpacts)->ofpact.compat = code; break; case OFPUTIL_OFPAT11_PUSH_VLAN: @@ -699,7 +740,28 @@ 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: + 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: @@ -785,6 +847,16 @@ 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: error = parse_set_mpls_ttl(ofpacts, arg); @@ -882,12 +954,11 @@ 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, - enum ofputil_protocol *usable_protocols) +str_to_ofpacts__(char *str, struct ofpbuf *ofpacts, + enum ofputil_protocol *usable_protocols) { size_t orig_size = ofpacts->size; char *pos, *act, *arg; - enum ofperr error; int n_actions; pos = str; @@ -902,13 +973,34 @@ str_to_ofpacts(char *str, struct ofpbuf *ofpacts, n_actions++; } + 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 = ofpacts->size; + char *error_s; + enum ofperr error; + + error_s = str_to_ofpacts__(str, ofpacts, usable_protocols); + if (error_s) { + return error_s; + } + error = ofpacts_verify(ofpacts->data, ofpacts->size); if (error) { ofpacts->size = orig_size; return xstrdup("Incorrect action ordering"); } - ofpact_pad(ofpacts); return NULL; } @@ -932,10 +1024,24 @@ parse_named_instruction(enum ovs_instruction_type type, 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 = ofpacts->size; + 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 = ofpacts->size - ofs; + + if (error_s) { + ofpacts->size = ofs; + } break; + } case OVSINST_OFPIT11_CLEAR_ACTIONS: ofpact_put_CLEAR_ACTIONS(ofpacts); @@ -1307,11 +1413,15 @@ parse_ofp_str__(struct ofputil_flow_mod *fm, int command, char *string, enum ofperr err; err = ofpacts_check(ofpacts.data, ofpacts.size, &fm->match.flow, - OFPP_MAX, 0); + 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); @@ -1721,7 +1831,7 @@ parse_ofp_table_mod(struct ofputil_table_mod *tm, const char *table_id, *usable_protocols = OFPUTIL_P_OF11_UP; if (!strcasecmp(table_id, "all")) { - tm->table_id = 255; + tm->table_id = OFPTT_ALL; } else { char *error = str_to_u8(table_id, "table_id", &tm->table_id); if (error) { @@ -1848,18 +1958,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)) { @@ -1870,6 +1986,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) { @@ -1878,6 +1997,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; @@ -1901,15 +2023,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); + } + } } } @@ -1922,6 +2057,9 @@ exit: if (error) { memset(flow, 0, sizeof *flow); + if (mask) { + memset(mask, 0, sizeof *mask); + } } return error; } @@ -2178,7 +2316,12 @@ parse_ofp_group_mod_file(const char *file_name, uint16_t command, 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);