X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fofp-parse.c;h=e3b7dc12269326bdfaa070e0c479fa57756d3cf3;hb=c6100d92142bc3dd325180cb4e10553eb4341731;hp=3d4718abef947911978152e9013b95c1c8f2c6b2;hpb=39dc90822efc67cee8485e3e410f239a2a9e6e00;p=sliver-openvswitch.git diff --git a/lib/ofp-parse.c b/lib/ofp-parse.c index 3d4718abe..e3b7dc122 100644 --- a/lib/ofp-parse.c +++ b/lib/ofp-parse.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, 2011 Nicira Networks. + * Copyright (c) 2010, 2011, 2012 Nicira, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,9 +26,12 @@ #include "bundle.h" #include "byte-order.h" #include "dynamic-string.h" -#include "netdev.h" +#include "learn.h" +#include "meta-flow.h" #include "multipath.h" +#include "netdev.h" #include "nx-match.h" +#include "ofp-actions.h" #include "ofp-util.h" #include "ofpbuf.h" #include "openflow/openflow.h" @@ -39,6 +42,31 @@ VLOG_DEFINE_THIS_MODULE(ofp_parse); +static void ofp_fatal(const char *flow, bool verbose, const char *format, ...) + NO_RETURN; + +static uint8_t +str_to_table_id(const char *str) +{ + int table_id; + + if (!str_to_int(str, 10, &table_id) || table_id < 0 || table_id > 255) { + ovs_fatal(0, "invalid table \"%s\"", str); + } + return table_id; +} + +static uint16_t +str_to_u16(const char *str, const char *name) +{ + int value; + + if (!str_to_int(str, 0, &value) || value < 0 || value > 65535) { + ovs_fatal(0, "invalid %s \"%s\"", name, str); + } + return value; +} + static uint32_t str_to_u32(const char *str) { @@ -85,487 +113,405 @@ str_to_mac(const char *str, uint8_t mac[6]) } static void -str_to_eth_dst(const char *str, - uint8_t mac[ETH_ADDR_LEN], uint8_t mask[ETH_ADDR_LEN]) -{ - if (sscanf(str, ETH_ADDR_SCAN_FMT"/"ETH_ADDR_SCAN_FMT, - ETH_ADDR_SCAN_ARGS(mac), ETH_ADDR_SCAN_ARGS(mask)) - == ETH_ADDR_SCAN_COUNT * 2) { - if (!flow_wildcards_is_dl_dst_mask_valid(mask)) { - ovs_fatal(0, "%s: invalid Ethernet destination mask (only " - "00:00:00:00:00:00, 01:00:00:00:00:00, " - "fe:ff:ff:ff:ff:ff, and ff:ff:ff:ff:ff:ff are allowed)", - str); - } - } else if (sscanf(str, ETH_ADDR_SCAN_FMT, ETH_ADDR_SCAN_ARGS(mac)) - == ETH_ADDR_SCAN_COUNT) { - memset(mask, 0xff, ETH_ADDR_LEN); - } else { - ovs_fatal(0, "invalid mac address %s", str); - } -} - -static void -str_to_ip(const char *str_, ovs_be32 *ip, ovs_be32 *maskp) +str_to_ip(const char *str, ovs_be32 *ip) { - char *str = xstrdup(str_); - char *save_ptr = NULL; - const char *name, *netmask; struct in_addr in_addr; - ovs_be32 mask; - int retval; - name = strtok_r(str, "/", &save_ptr); - retval = name ? lookup_ip(name, &in_addr) : EINVAL; - if (retval) { + if (lookup_ip(str, &in_addr)) { ovs_fatal(0, "%s: could not convert to IP address", str); } *ip = in_addr.s_addr; +} - netmask = strtok_r(NULL, "/", &save_ptr); - if (netmask) { - uint8_t o[4]; - if (sscanf(netmask, "%"SCNu8".%"SCNu8".%"SCNu8".%"SCNu8, - &o[0], &o[1], &o[2], &o[3]) == 4) { - mask = htonl((o[0] << 24) | (o[1] << 16) | (o[2] << 8) | o[3]); - } else { - int prefix = atoi(netmask); - if (prefix <= 0 || prefix > 32) { - ovs_fatal(0, "%s: network prefix bits not between 1 and 32", - str); - } else if (prefix == 32) { - mask = htonl(UINT32_MAX); - } else { - mask = htonl(((1u << prefix) - 1) << (32 - prefix)); - } - } - } else { - mask = htonl(UINT32_MAX); - } - *ip &= mask; +static void +parse_enqueue(char *arg, struct ofpbuf *ofpacts) +{ + char *sp = NULL; + char *port = strtok_r(arg, ":q", &sp); + char *queue = strtok_r(NULL, "", &sp); + struct ofpact_enqueue *enqueue; - if (maskp) { - *maskp = mask; - } else { - if (mask != htonl(UINT32_MAX)) { - ovs_fatal(0, "%s: netmask not allowed here", str_); - } + if (port == NULL || queue == NULL) { + ovs_fatal(0, "\"enqueue\" syntax is \"enqueue:PORT:QUEUE\""); } - free(str); + enqueue = ofpact_put_ENQUEUE(ofpacts); + enqueue->port = str_to_u32(port); + enqueue->queue = str_to_u32(queue); } static void -str_to_tun_id(const char *str, ovs_be64 *tun_idp, ovs_be64 *maskp) +parse_output(char *arg, struct ofpbuf *ofpacts) { - uint64_t tun_id, mask; - char *tail; - - errno = 0; - tun_id = strtoull(str, &tail, 0); - if (errno || (*tail != '\0' && *tail != '/')) { - goto error; - } + if (strchr(arg, '[')) { + struct ofpact_output_reg *output_reg; - if (*tail == '/') { - mask = strtoull(tail + 1, &tail, 0); - if (errno || *tail != '\0') { - goto error; - } + output_reg = ofpact_put_OUTPUT_REG(ofpacts); + mf_parse_subfield(&output_reg->src, arg); + output_reg->max_len = UINT16_MAX; } else { - mask = UINT64_MAX; - } - - *tun_idp = htonll(tun_id); - *maskp = htonll(mask); - return; + struct ofpact_output *output; -error: - ovs_fatal(0, "%s: bad syntax for tunnel id", str); + output = ofpact_put_OUTPUT(ofpacts); + output->port = str_to_u32(arg); + output->max_len = output->port == OFPP_CONTROLLER ? UINT16_MAX : 0; + } } static void -str_to_vlan_tci(const char *str, ovs_be16 *vlan_tcip, ovs_be16 *maskp) +parse_resubmit(char *arg, struct ofpbuf *ofpacts) { - uint16_t vlan_tci, mask; - char *tail; + struct ofpact_resubmit *resubmit; + char *in_port_s, *table_s; - errno = 0; - vlan_tci = strtol(str, &tail, 0); - if (errno || (*tail != '\0' && *tail != '/')) { - goto error; - } + resubmit = ofpact_put_RESUBMIT(ofpacts); - if (*tail == '/') { - mask = strtol(tail + 1, &tail, 0); - if (errno || *tail != '\0') { - goto error; + in_port_s = strsep(&arg, ","); + if (in_port_s && in_port_s[0]) { + resubmit->in_port = ofputil_port_from_string(in_port_s); + if (!resubmit->in_port) { + ovs_fatal(0, "%s: resubmit to unknown port", in_port_s); } } else { - mask = UINT16_MAX; + resubmit->in_port = OFPP_IN_PORT; } - *vlan_tcip = htons(vlan_tci); - *maskp = htons(mask); - return; + table_s = strsep(&arg, ","); + resubmit->table_id = table_s && table_s[0] ? str_to_u32(table_s) : 255; -error: - ovs_fatal(0, "%s: bad syntax for vlan_tci", str); + if (resubmit->in_port == OFPP_IN_PORT && resubmit->table_id == 255) { + ovs_fatal(0, "at least one \"in_port\" or \"table\" must be specified " + " on resubmit"); + } } static void -str_to_ipv6(const char *str_, struct in6_addr *addrp, struct in6_addr *maskp) +parse_note(const char *arg, struct ofpbuf *ofpacts) { - char *str = xstrdup(str_); - char *save_ptr = NULL; - const char *name, *netmask; - struct in6_addr addr, mask; - int retval; - - name = strtok_r(str, "/", &save_ptr); - retval = name ? lookup_ipv6(name, &addr) : EINVAL; - if (retval) { - ovs_fatal(0, "%s: could not convert to IPv6 address", str); - } + struct ofpact_note *note; - netmask = strtok_r(NULL, "/", &save_ptr); - if (netmask) { - int prefix = atoi(netmask); - if (prefix <= 0 || prefix > 128) { - ovs_fatal(0, "%s: network prefix bits not between 1 and 128", - str); - } else { - mask = ipv6_create_mask(prefix); - } - } else { - mask = in6addr_exact; - } - *addrp = ipv6_addr_bitand(&addr, &mask); + note = ofpact_put_NOTE(ofpacts); + while (*arg != '\0') { + uint8_t byte; + bool ok; - if (maskp) { - *maskp = mask; - } else { - if (!ipv6_mask_is_exact(&mask)) { - ovs_fatal(0, "%s: netmask not allowed here", str_); + if (*arg == '.') { + arg++; + } + if (*arg == '\0') { + break; } - } - free(str); -} + byte = hexits_value(arg, 2, &ok); + if (!ok) { + ovs_fatal(0, "bad hex digit in `note' argument"); + } + ofpbuf_put(ofpacts, &byte, 1); -static void * -put_action(struct ofpbuf *b, size_t size, uint16_t type) -{ - struct ofp_action_header *ah = ofpbuf_put_zeros(b, size); - ah->type = htons(type); - ah->len = htons(size); - return ah; -} + note = ofpacts->l2; + note->length++; -static struct ofp_action_output * -put_output_action(struct ofpbuf *b, uint16_t port) -{ - struct ofp_action_output *oao = put_action(b, sizeof *oao, OFPAT_OUTPUT); - oao->port = htons(port); - return oao; + arg += 2; + } + ofpact_update_len(ofpacts, ¬e->ofpact); } static void -put_enqueue_action(struct ofpbuf *b, uint16_t port, uint32_t queue) +parse_fin_timeout(struct ofpbuf *b, char *arg) { - struct ofp_action_enqueue *oae = put_action(b, sizeof *oae, OFPAT_ENQUEUE); - oae->port = htons(port); - oae->queue_id = htonl(queue); + struct ofpact_fin_timeout *oft = ofpact_put_FIN_TIMEOUT(b); + char *key, *value; + + while (ofputil_parse_key_value(&arg, &key, &value)) { + if (!strcmp(key, "idle_timeout")) { + oft->fin_idle_timeout = str_to_u16(value, key); + } else if (!strcmp(key, "hard_timeout")) { + oft->fin_hard_timeout = str_to_u16(value, key); + } else { + ovs_fatal(0, "invalid key '%s' in 'fin_timeout' argument", key); + } + } } static void -put_dl_addr_action(struct ofpbuf *b, uint16_t type, const char *addr) +parse_controller(struct ofpbuf *b, char *arg) { - struct ofp_action_dl_addr *oada = put_action(b, sizeof *oada, type); - str_to_mac(addr, oada->dl_addr); -} + enum ofp_packet_in_reason reason = OFPR_ACTION; + uint16_t controller_id = 0; + uint16_t max_len = UINT16_MAX; + + if (!arg[0]) { + /* Use defaults. */ + } else if (strspn(arg, "0123456789") == strlen(arg)) { + max_len = str_to_u16(arg, "max_len"); + } else { + char *name, *value; -static void -parse_output(struct ofpbuf *b, char *arg) -{ - if (strchr(arg, '[')) { - struct nx_action_output_reg *naor; - int ofs, n_bits; - uint32_t src; - - nxm_parse_field_bits(arg, &src, &ofs, &n_bits); - - naor = put_action(b, sizeof *naor, OFPAT_VENDOR); - naor->vendor = htonl(NX_VENDOR_ID); - naor->subtype = htons(NXAST_OUTPUT_REG); - naor->ofs_nbits = nxm_encode_ofs_nbits(ofs, n_bits); - naor->src = htonl(src); - naor->max_len = htons(UINT16_MAX); + while (ofputil_parse_key_value(&arg, &name, &value)) { + if (!strcmp(name, "reason")) { + if (!ofputil_packet_in_reason_from_string(value, &reason)) { + ovs_fatal(0, "unknown reason \"%s\"", value); + } + } else if (!strcmp(name, "max_len")) { + max_len = str_to_u16(value, "max_len"); + } else if (!strcmp(name, "id")) { + controller_id = str_to_u16(value, "id"); + } else { + ovs_fatal(0, "unknown key \"%s\" parsing controller action", + name); + } + } + } + + if (reason == OFPR_ACTION && controller_id == 0) { + struct ofpact_output *output; + + output = ofpact_put_OUTPUT(b); + output->port = OFPP_CONTROLLER; + output->max_len = max_len; } else { - put_output_action(b, str_to_u32(arg)); + struct ofpact_controller *controller; + + controller = ofpact_put_CONTROLLER(b); + controller->max_len = max_len; + controller->reason = reason; + controller->controller_id = controller_id; } } static void -parse_resubmit(struct nx_action_resubmit *nar, char *arg) +parse_dec_ttl(struct ofpbuf *b, char *arg) { - char *in_port_s, *table_s; - uint16_t in_port; - uint8_t table; + struct ofpact_cnt_ids *ids; - in_port_s = strsep(&arg, ","); - if (in_port_s && in_port_s[0]) { - if (!ofputil_port_from_string(in_port_s, &in_port)) { - in_port = str_to_u32(in_port_s); - } + ids = ofpact_put_DEC_TTL(b); + + if (*arg == '\0') { + uint16_t id = 0; + + ids->ofpact.compat = OFPUTIL_NXAST_DEC_TTL; + ofpbuf_put(b, &id, sizeof id); + ids = b->l2; + ids->n_controllers++; } else { - in_port = OFPP_IN_PORT; - } + char *cntr; - table_s = strsep(&arg, ","); - table = table_s && table_s[0] ? str_to_u32(table_s) : 255; + ids->ofpact.compat = OFPUTIL_NXAST_DEC_TTL_CNT_IDS; + for (cntr = strtok_r(arg, ", ", &arg); cntr != NULL; + cntr = strtok_r(NULL, ", ", &arg)) { + uint16_t id = atoi(cntr); - if (in_port == OFPP_IN_PORT && table == 255) { - ovs_fatal(0, "at least one \"in_port\" or \"table\" must be specified " - " on resubmit"); - } + ofpbuf_put(b, &id, sizeof id); + ids = b->l2; + ids->n_controllers++; + } + if (!ids->n_controllers) { + ovs_fatal(0, "dec_ttl_cnt_ids: expected at least one controller " + "id."); + } - nar->vendor = htonl(NX_VENDOR_ID); - nar->in_port = htons(in_port); - if (in_port != OFPP_IN_PORT && table == 255) { - nar->subtype = htons(NXAST_RESUBMIT); - } else { - nar->subtype = htons(NXAST_RESUBMIT_TABLE); - nar->table = table; } + ofpact_update_len(b, &ids->ofpact); } static void -str_to_action(char *str, struct ofpbuf *b) +parse_named_action(enum ofputil_action_code code, const struct flow *flow, + char *arg, struct ofpbuf *ofpacts) { - bool drop = false; - int n_actions; - char *pos; + struct ofpact_tunnel *tunnel; + uint16_t vid; + ovs_be32 ip; + uint8_t pcp; + uint8_t tos; + + switch (code) { + case OFPUTIL_ACTION_INVALID: + NOT_REACHED(); - pos = str; - n_actions = 0; - for (;;) { - char empty_string[] = ""; - char *act, *arg; - size_t actlen; - uint16_t port; - - pos += strspn(pos, ", \t\r\n"); - if (*pos == '\0') { - break; + case OFPUTIL_OFPAT10_OUTPUT: + case OFPUTIL_OFPAT11_OUTPUT: + parse_output(arg, ofpacts); + break; + + case OFPUTIL_OFPAT10_SET_VLAN_VID: + case OFPUTIL_OFPAT11_SET_VLAN_VID: + vid = str_to_u32(arg); + if (vid & ~VLAN_VID_MASK) { + ovs_fatal(0, "%s: not a valid VLAN VID", arg); } + ofpact_put_SET_VLAN_VID(ofpacts)->vlan_vid = vid; + break; - if (drop) { - ovs_fatal(0, "Drop actions must not be followed by other actions"); + case OFPUTIL_OFPAT10_SET_VLAN_PCP: + case OFPUTIL_OFPAT11_SET_VLAN_PCP: + pcp = str_to_u32(arg); + if (pcp & ~7) { + ovs_fatal(0, "%s: not a valid VLAN PCP", arg); } + ofpact_put_SET_VLAN_PCP(ofpacts)->vlan_pcp = pcp; + break; - act = pos; - actlen = strcspn(pos, ":(, \t\r\n"); - if (act[actlen] == ':') { - /* The argument can be separated by a colon. */ - size_t arglen; - - arg = act + actlen + 1; - arglen = strcspn(arg, ", \t\r\n"); - pos = arg + arglen + (arg[arglen] != '\0'); - arg[arglen] = '\0'; - } else if (act[actlen] == '(') { - /* The argument can be surrounded by balanced parentheses. The - * outermost set of parentheses is removed. */ - int level = 1; - size_t arglen; - - arg = act + actlen + 1; - for (arglen = 0; level > 0; arglen++) { - switch (arg[arglen]) { - case '\0': - ovs_fatal(0, "unbalanced parentheses in argument to %s " - "action", act); - - case '(': - level++; - break; - - case ')': - level--; - break; - } - } - arg[arglen - 1] = '\0'; - pos = arg + arglen; - } else { - /* There might be no argument at all. */ - arg = empty_string; - pos = act + actlen + (act[actlen] != '\0'); + case OFPUTIL_OFPAT12_SET_FIELD: + NOT_REACHED(); /* This will be implemented by later patch and + * enabled using a non-NULL name in + * OFPAT12_ACTION(OFPAT12_SET_FIELD, ...) */ + break; + + case OFPUTIL_OFPAT10_STRIP_VLAN: + ofpact_put_STRIP_VLAN(ofpacts); + break; + + case OFPUTIL_OFPAT10_SET_DL_SRC: + case OFPUTIL_OFPAT11_SET_DL_SRC: + str_to_mac(arg, ofpact_put_SET_ETH_SRC(ofpacts)->mac); + break; + + case OFPUTIL_OFPAT10_SET_DL_DST: + case OFPUTIL_OFPAT11_SET_DL_DST: + str_to_mac(arg, ofpact_put_SET_ETH_DST(ofpacts)->mac); + break; + + case OFPUTIL_OFPAT10_SET_NW_SRC: + case OFPUTIL_OFPAT11_SET_NW_SRC: + str_to_ip(arg, &ip); + ofpact_put_SET_IPV4_SRC(ofpacts)->ipv4 = ip; + break; + + case OFPUTIL_OFPAT10_SET_NW_DST: + case OFPUTIL_OFPAT11_SET_NW_DST: + str_to_ip(arg, &ip); + ofpact_put_SET_IPV4_DST(ofpacts)->ipv4 = ip; + break; + + case OFPUTIL_OFPAT10_SET_NW_TOS: + case OFPUTIL_OFPAT11_SET_NW_TOS: + tos = str_to_u32(arg); + if (tos & ~IP_DSCP_MASK) { + ovs_fatal(0, "%s: not a valid TOS", arg); } - act[actlen] = '\0'; - - if (!strcasecmp(act, "mod_vlan_vid")) { - struct ofp_action_vlan_vid *va; - va = put_action(b, sizeof *va, OFPAT_SET_VLAN_VID); - va->vlan_vid = htons(str_to_u32(arg)); - } else if (!strcasecmp(act, "mod_vlan_pcp")) { - struct ofp_action_vlan_pcp *va; - va = put_action(b, sizeof *va, OFPAT_SET_VLAN_PCP); - va->vlan_pcp = str_to_u32(arg); - } else if (!strcasecmp(act, "strip_vlan")) { - struct ofp_action_header *ah; - ah = put_action(b, sizeof *ah, OFPAT_STRIP_VLAN); - ah->type = htons(OFPAT_STRIP_VLAN); - } else if (!strcasecmp(act, "mod_dl_src")) { - put_dl_addr_action(b, OFPAT_SET_DL_SRC, arg); - } else if (!strcasecmp(act, "mod_dl_dst")) { - put_dl_addr_action(b, OFPAT_SET_DL_DST, arg); - } else if (!strcasecmp(act, "mod_nw_src")) { - struct ofp_action_nw_addr *na; - na = put_action(b, sizeof *na, OFPAT_SET_NW_SRC); - str_to_ip(arg, &na->nw_addr, NULL); - } else if (!strcasecmp(act, "mod_nw_dst")) { - struct ofp_action_nw_addr *na; - na = put_action(b, sizeof *na, OFPAT_SET_NW_DST); - str_to_ip(arg, &na->nw_addr, NULL); - } else if (!strcasecmp(act, "mod_tp_src")) { - struct ofp_action_tp_port *ta; - ta = put_action(b, sizeof *ta, OFPAT_SET_TP_SRC); - ta->tp_port = htons(str_to_u32(arg)); - } else if (!strcasecmp(act, "mod_tp_dst")) { - struct ofp_action_tp_port *ta; - ta = put_action(b, sizeof *ta, OFPAT_SET_TP_DST); - ta->tp_port = htons(str_to_u32(arg)); - } else if (!strcasecmp(act, "mod_nw_tos")) { - struct ofp_action_nw_tos *nt; - nt = put_action(b, sizeof *nt, OFPAT_SET_NW_TOS); - nt->nw_tos = str_to_u32(arg); - } else if (!strcasecmp(act, "resubmit")) { - struct nx_action_resubmit *nar; - nar = put_action(b, sizeof *nar, OFPAT_VENDOR); - parse_resubmit(nar, arg); - } else if (!strcasecmp(act, "set_tunnel") - || !strcasecmp(act, "set_tunnel64")) { - uint64_t tun_id = str_to_u64(arg); - if (!strcasecmp(act, "set_tunnel64") || tun_id > UINT32_MAX) { - struct nx_action_set_tunnel64 *nast64; - nast64 = put_action(b, sizeof *nast64, OFPAT_VENDOR); - nast64->vendor = htonl(NX_VENDOR_ID); - nast64->subtype = htons(NXAST_SET_TUNNEL64); - nast64->tun_id = htonll(tun_id); - } else { - struct nx_action_set_tunnel *nast; - nast = put_action(b, sizeof *nast, OFPAT_VENDOR); - nast->vendor = htonl(NX_VENDOR_ID); - nast->subtype = htons(NXAST_SET_TUNNEL); - nast->tun_id = htonl(tun_id); - } - } else if (!strcasecmp(act, "set_queue")) { - struct nx_action_set_queue *nasq; - nasq = put_action(b, sizeof *nasq, OFPAT_VENDOR); - nasq->vendor = htonl(NX_VENDOR_ID); - nasq->subtype = htons(NXAST_SET_QUEUE); - nasq->queue_id = htonl(str_to_u32(arg)); - } else if (!strcasecmp(act, "pop_queue")) { - struct nx_action_header *nah; - nah = put_action(b, sizeof *nah, OFPAT_VENDOR); - nah->vendor = htonl(NX_VENDOR_ID); - nah->subtype = htons(NXAST_POP_QUEUE); - } else if (!strcasecmp(act, "note")) { - size_t start_ofs = b->size; - struct nx_action_note *nan; - int remainder; - size_t len; - - nan = put_action(b, sizeof *nan, OFPAT_VENDOR); - nan->vendor = htonl(NX_VENDOR_ID); - nan->subtype = htons(NXAST_NOTE); - - b->size -= sizeof nan->note; - while (*arg != '\0') { - uint8_t byte; - bool ok; - - if (*arg == '.') { - arg++; - } - if (*arg == '\0') { - break; - } + ofpact_put_SET_IPV4_DSCP(ofpacts)->dscp = tos; + break; - byte = hexits_value(arg, 2, &ok); - if (!ok) { - ovs_fatal(0, "bad hex digit in `note' argument"); - } - ofpbuf_put(b, &byte, 1); + case OFPUTIL_OFPAT10_SET_TP_SRC: + case OFPUTIL_OFPAT11_SET_TP_SRC: + ofpact_put_SET_L4_SRC_PORT(ofpacts)->port = str_to_u32(arg); + break; - arg += 2; - } + case OFPUTIL_OFPAT10_SET_TP_DST: + case OFPUTIL_OFPAT11_SET_TP_DST: + ofpact_put_SET_L4_DST_PORT(ofpacts)->port = str_to_u32(arg); + break; - len = b->size - start_ofs; - remainder = len % OFP_ACTION_ALIGN; - if (remainder) { - ofpbuf_put_zeros(b, OFP_ACTION_ALIGN - remainder); - } - nan = (struct nx_action_note *)((char *)b->data + start_ofs); - nan->len = htons(b->size - start_ofs); - } else if (!strcasecmp(act, "move")) { - struct nx_action_reg_move *move; - move = ofpbuf_put_uninit(b, sizeof *move); - nxm_parse_reg_move(move, arg); - } else if (!strcasecmp(act, "load")) { - struct nx_action_reg_load *load; - load = ofpbuf_put_uninit(b, sizeof *load); - nxm_parse_reg_load(load, arg); - } else if (!strcasecmp(act, "multipath")) { - struct nx_action_multipath *nam; - nam = ofpbuf_put_uninit(b, sizeof *nam); - multipath_parse(nam, arg); - } else if (!strcasecmp(act, "autopath")) { - struct nx_action_autopath *naa; - naa = ofpbuf_put_uninit(b, sizeof *naa); - autopath_parse(naa, arg); - } else if (!strcasecmp(act, "bundle")) { - bundle_parse(b, arg); - } else if (!strcasecmp(act, "bundle_load")) { - bundle_parse_load(b, arg); - } else if (!strcasecmp(act, "output")) { - parse_output(b, arg); - } else if (!strcasecmp(act, "enqueue")) { - char *sp = NULL; - char *port_s = strtok_r(arg, ":q", &sp); - char *queue = strtok_r(NULL, "", &sp); - if (port_s == NULL || queue == NULL) { - ovs_fatal(0, "\"enqueue\" syntax is \"enqueue:PORT:QUEUE\""); - } - put_enqueue_action(b, str_to_u32(port_s), str_to_u32(queue)); + case OFPUTIL_OFPAT10_ENQUEUE: + parse_enqueue(arg, ofpacts); + break; + + case OFPUTIL_NXAST_RESUBMIT: + parse_resubmit(arg, ofpacts); + break; + + case OFPUTIL_NXAST_SET_TUNNEL: + case OFPUTIL_NXAST_SET_TUNNEL64: + tunnel = ofpact_put_SET_TUNNEL(ofpacts); + tunnel->ofpact.compat = code; + tunnel->tun_id = str_to_u64(arg); + break; + + case OFPUTIL_NXAST_SET_QUEUE: + ofpact_put_SET_QUEUE(ofpacts)->queue_id = str_to_u32(arg); + break; + + case OFPUTIL_NXAST_POP_QUEUE: + ofpact_put_POP_QUEUE(ofpacts); + break; + + case OFPUTIL_NXAST_REG_MOVE: + nxm_parse_reg_move(ofpact_put_REG_MOVE(ofpacts), arg); + break; + + case OFPUTIL_NXAST_REG_LOAD: + nxm_parse_reg_load(ofpact_put_REG_LOAD(ofpacts), arg); + break; + + case OFPUTIL_NXAST_NOTE: + parse_note(arg, ofpacts); + break; + + case OFPUTIL_NXAST_MULTIPATH: + multipath_parse(ofpact_put_MULTIPATH(ofpacts), arg); + break; + + case OFPUTIL_NXAST_AUTOPATH__DEPRECATED: + autopath_parse(ofpact_put_AUTOPATH(ofpacts), arg); + break; + + case OFPUTIL_NXAST_BUNDLE: + bundle_parse(arg, ofpacts); + break; + + case OFPUTIL_NXAST_BUNDLE_LOAD: + bundle_parse_load(arg, ofpacts); + break; + + case OFPUTIL_NXAST_RESUBMIT_TABLE: + case OFPUTIL_NXAST_OUTPUT_REG: + case OFPUTIL_NXAST_DEC_TTL_CNT_IDS: + NOT_REACHED(); + + case OFPUTIL_NXAST_LEARN: + learn_parse(arg, flow, ofpacts); + break; + + case OFPUTIL_NXAST_EXIT: + ofpact_put_EXIT(ofpacts); + break; + + case OFPUTIL_NXAST_DEC_TTL: + parse_dec_ttl(ofpacts, arg); + break; + + case OFPUTIL_NXAST_FIN_TIMEOUT: + parse_fin_timeout(ofpacts, arg); + break; + + case OFPUTIL_NXAST_CONTROLLER: + parse_controller(ofpacts, arg); + break; + } +} + +static void +str_to_ofpacts(const struct flow *flow, char *str, struct ofpbuf *ofpacts) +{ + char *pos, *act, *arg; + int n_actions; + + pos = str; + n_actions = 0; + while (ofputil_parse_key_value(&pos, &act, &arg)) { + int code = ofputil_action_code_from_name(act); + if (code >= 0) { + parse_named_action(code, flow, arg, ofpacts); } else if (!strcasecmp(act, "drop")) { - /* A drop action in OpenFlow occurs by just not setting - * an action. */ - drop = true; if (n_actions) { ovs_fatal(0, "Drop actions must not be preceded by other " "actions"); + } else if (ofputil_parse_key_value(&pos, &act, &arg)) { + ovs_fatal(0, "Drop actions must not be followed by other " + "actions"); } - } else if (!strcasecmp(act, "CONTROLLER")) { - struct ofp_action_output *oao; - oao = put_output_action(b, OFPP_CONTROLLER); - - /* Unless a numeric argument is specified, we send the whole - * packet to the controller. */ - if (arg[0] && (strspn(arg, "0123456789") == strlen(arg))) { - oao->max_len = htons(str_to_u32(arg)); + break; + } else { + uint16_t port = ofputil_port_from_string(act); + if (port) { + ofpact_put_OUTPUT(ofpacts)->port = port; } else { - oao->max_len = htons(UINT16_MAX); + ovs_fatal(0, "Unknown action: %s", act); } - } else if (ofputil_port_from_string(act, &port)) { - put_output_action(b, port); - } else { - ovs_fatal(0, "Unknown action: %s", act); } n_actions++; } + ofpact_pad(ofpacts); } struct protocol { @@ -601,45 +547,6 @@ parse_protocol(const char *name, const struct protocol **p_out) return false; } -BUILD_ASSERT_DECL(FLOW_WC_SEQ == 1); -#define FIELDS \ - FIELD(F_TUN_ID, "tun_id", 0) \ - FIELD(F_IN_PORT, "in_port", FWW_IN_PORT) \ - FIELD(F_DL_VLAN, "dl_vlan", 0) \ - FIELD(F_DL_VLAN_PCP, "dl_vlan_pcp", 0) \ - FIELD(F_VLAN_TCI, "vlan_tci", 0) \ - FIELD(F_DL_SRC, "dl_src", FWW_DL_SRC) \ - FIELD(F_DL_DST, "dl_dst", FWW_DL_DST | FWW_ETH_MCAST) \ - FIELD(F_DL_TYPE, "dl_type", FWW_DL_TYPE) \ - FIELD(F_NW_SRC, "nw_src", 0) \ - FIELD(F_NW_DST, "nw_dst", 0) \ - FIELD(F_NW_PROTO, "nw_proto", FWW_NW_PROTO) \ - FIELD(F_NW_TOS, "nw_tos", FWW_NW_TOS) \ - FIELD(F_TP_SRC, "tp_src", FWW_TP_SRC) \ - FIELD(F_TP_DST, "tp_dst", FWW_TP_DST) \ - FIELD(F_ICMP_TYPE, "icmp_type", FWW_TP_SRC) \ - FIELD(F_ICMP_CODE, "icmp_code", FWW_TP_DST) \ - FIELD(F_ARP_SHA, "arp_sha", FWW_ARP_SHA) \ - FIELD(F_ARP_THA, "arp_tha", FWW_ARP_THA) \ - FIELD(F_IPV6_SRC, "ipv6_src", 0) \ - FIELD(F_IPV6_DST, "ipv6_dst", 0) \ - FIELD(F_ND_TARGET, "nd_target", FWW_ND_TARGET) \ - FIELD(F_ND_SLL, "nd_sll", FWW_ARP_SHA) \ - FIELD(F_ND_TLL, "nd_tll", FWW_ARP_THA) - -enum field_index { -#define FIELD(ENUM, NAME, WILDCARD) ENUM, - FIELDS -#undef FIELD - N_FIELDS -}; - -struct field { - enum field_index index; - const char *name; - flow_wildcards_t wildcard; /* FWW_* bit. */ -}; - static void ofp_fatal(const char *flow, bool verbose, const char *format, ...) { @@ -653,173 +560,18 @@ ofp_fatal(const char *flow, bool verbose, const char *format, ...) ovs_fatal_valist(0, format, args); } -static bool -parse_field_name(const char *name, const struct field **f_out) -{ - static const struct field fields[N_FIELDS] = { -#define FIELD(ENUM, NAME, WILDCARD) { ENUM, NAME, WILDCARD }, - FIELDS -#undef FIELD - }; - const struct field *f; - - for (f = fields; f < &fields[ARRAY_SIZE(fields)]; f++) { - if (!strcmp(f->name, name)) { - *f_out = f; - return true; - } - } - *f_out = NULL; - return false; -} - static void -parse_field_value(struct cls_rule *rule, enum field_index index, - const char *value) +parse_field(const struct mf_field *mf, const char *s, struct match *match) { - uint8_t mac[ETH_ADDR_LEN], mac_mask[ETH_ADDR_LEN]; - ovs_be64 tun_id, tun_mask; - ovs_be32 ip, mask; - ovs_be16 tci, tci_mask; - struct in6_addr ipv6, ipv6_mask; - uint16_t port_no; - - switch (index) { - case F_TUN_ID: - str_to_tun_id(value, &tun_id, &tun_mask); - cls_rule_set_tun_id_masked(rule, tun_id, tun_mask); - break; - - case F_IN_PORT: - if (!ofputil_port_from_string(value, &port_no)) { - port_no = atoi(value); - } - cls_rule_set_in_port(rule, port_no); - break; - - case F_DL_VLAN: - cls_rule_set_dl_vlan(rule, htons(str_to_u32(value))); - break; - - case F_DL_VLAN_PCP: - cls_rule_set_dl_vlan_pcp(rule, str_to_u32(value)); - break; - - case F_VLAN_TCI: - str_to_vlan_tci(value, &tci, &tci_mask); - cls_rule_set_dl_tci_masked(rule, tci, tci_mask); - break; - - case F_DL_SRC: - str_to_mac(value, mac); - cls_rule_set_dl_src(rule, mac); - break; - - case F_DL_DST: - str_to_eth_dst(value, mac, mac_mask); - cls_rule_set_dl_dst_masked(rule, mac, mac_mask); - break; - - case F_DL_TYPE: - cls_rule_set_dl_type(rule, htons(str_to_u32(value))); - break; - - case F_NW_SRC: - str_to_ip(value, &ip, &mask); - cls_rule_set_nw_src_masked(rule, ip, mask); - break; - - case F_NW_DST: - str_to_ip(value, &ip, &mask); - cls_rule_set_nw_dst_masked(rule, ip, mask); - break; - - case F_NW_PROTO: - cls_rule_set_nw_proto(rule, str_to_u32(value)); - break; - - case F_NW_TOS: - cls_rule_set_nw_tos(rule, str_to_u32(value)); - break; - - case F_TP_SRC: - cls_rule_set_tp_src(rule, htons(str_to_u32(value))); - break; - - case F_TP_DST: - cls_rule_set_tp_dst(rule, htons(str_to_u32(value))); - break; - - case F_ICMP_TYPE: - cls_rule_set_icmp_type(rule, str_to_u32(value)); - break; + union mf_value value, mask; + char *error; - case F_ICMP_CODE: - cls_rule_set_icmp_code(rule, str_to_u32(value)); - break; - - case F_ARP_SHA: - str_to_mac(value, mac); - cls_rule_set_arp_sha(rule, mac); - break; - - case F_ARP_THA: - str_to_mac(value, mac); - cls_rule_set_arp_tha(rule, mac); - break; - - case F_IPV6_SRC: - str_to_ipv6(value, &ipv6, &ipv6_mask); - cls_rule_set_ipv6_src_masked(rule, &ipv6, &ipv6_mask); - break; - - case F_IPV6_DST: - str_to_ipv6(value, &ipv6, &ipv6_mask); - cls_rule_set_ipv6_dst_masked(rule, &ipv6, &ipv6_mask); - break; - - case F_ND_TARGET: - str_to_ipv6(value, &ipv6, NULL); - cls_rule_set_nd_target(rule, &ipv6); - break; - - case F_ND_SLL: - str_to_mac(value, mac); - cls_rule_set_arp_sha(rule, mac); - break; - - case F_ND_TLL: - str_to_mac(value, mac); - cls_rule_set_arp_tha(rule, mac); - break; - - case N_FIELDS: - NOT_REACHED(); + error = mf_parse(mf, s, &value, &mask); + if (error) { + ovs_fatal(0, "%s", error); } -} -static void -parse_reg_value(struct cls_rule *rule, int reg_idx, const char *value) -{ - /* This uses an oversized destination field (64 bits when 32 bits would do) - * because some sscanf() implementations truncate the range of %i - * directives, so that e.g. "%"SCNi16 interprets input of "0xfedc" as a - * value of 0x7fff. The other alternatives are to allow only a single - * radix (e.g. decimal or hexadecimal) or to write more sophisticated - * parsers. */ - unsigned long long int reg_value, reg_mask; - - if (!strcmp(value, "ANY") || !strcmp(value, "*")) { - cls_rule_set_reg_masked(rule, reg_idx, 0, 0); - } else if (sscanf(value, "%lli/%lli", - ®_value, ®_mask) == 2) { - cls_rule_set_reg_masked(rule, reg_idx, reg_value, reg_mask); - } else if (sscanf(value, "%lli", ®_value)) { - cls_rule_set_reg(rule, reg_idx, reg_value); - } else { - ovs_fatal(0, "register fields must take the form " - "or /"); - } + mf_set(mf, &value, &mask, match); } /* Convert 'str_' (as described in the Flow Syntax section of the ovs-ofctl man @@ -837,12 +589,13 @@ parse_ofp_str(struct ofputil_flow_mod *fm, int command, const char *str_, enum { F_OUT_PORT = 1 << 0, F_ACTIONS = 1 << 1, - F_COOKIE = 1 << 2, F_TIMEOUT = 1 << 3, - F_PRIORITY = 1 << 4 + F_PRIORITY = 1 << 4, + F_FLAGS = 1 << 5, } fields; char *string = xstrdup(str_); char *save_ptr = NULL; + char *act_str = NULL; char *name; switch (command) { @@ -851,7 +604,7 @@ parse_ofp_str(struct ofputil_flow_mod *fm, int command, const char *str_, break; case OFPFC_ADD: - fields = F_ACTIONS | F_COOKIE | F_TIMEOUT | F_PRIORITY; + fields = F_ACTIONS | F_TIMEOUT | F_PRIORITY | F_FLAGS; break; case OFPFC_DELETE: @@ -863,19 +616,27 @@ parse_ofp_str(struct ofputil_flow_mod *fm, int command, const char *str_, break; case OFPFC_MODIFY: - fields = F_ACTIONS | F_COOKIE; + fields = F_ACTIONS | F_TIMEOUT | F_PRIORITY | F_FLAGS; break; case OFPFC_MODIFY_STRICT: - fields = F_ACTIONS | F_COOKIE | F_PRIORITY; + fields = F_ACTIONS | F_TIMEOUT | F_PRIORITY | F_FLAGS; break; default: NOT_REACHED(); } - cls_rule_init_catchall(&fm->cr, OFP_DEFAULT_PRIORITY); + match_init_catchall(&fm->match); + fm->priority = OFP_DEFAULT_PRIORITY; fm->cookie = htonll(0); + 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); + } else{ + fm->new_cookie = htonll(0); + } fm->table_id = 0xff; fm->command = command; fm->idle_timeout = OFP_FLOW_PERMANENT; @@ -884,9 +645,6 @@ parse_ofp_str(struct ofputil_flow_mod *fm, int command, const char *str_, fm->out_port = OFPP_NONE; fm->flags = 0; if (fields & F_ACTIONS) { - struct ofpbuf actions; - char *act_str; - act_str = strstr(string, "action"); if (!act_str) { ofp_fatal(str_, verbose, "must specify an action"); @@ -899,26 +657,21 @@ parse_ofp_str(struct ofputil_flow_mod *fm, int command, const char *str_, } act_str++; - - ofpbuf_init(&actions, sizeof(union ofp_action)); - str_to_action(act_str, &actions); - fm->actions = ofpbuf_steal_data(&actions); - fm->n_actions = actions.size / sizeof(union ofp_action); - } else { - fm->actions = NULL; - fm->n_actions = 0; } for (name = strtok_r(string, "=, \t\r\n", &save_ptr); name; name = strtok_r(NULL, "=, \t\r\n", &save_ptr)) { const struct protocol *p; if (parse_protocol(name, &p)) { - cls_rule_set_dl_type(&fm->cr, htons(p->dl_type)); + match_set_dl_type(&fm->match, htons(p->dl_type)); if (p->nw_proto) { - cls_rule_set_nw_proto(&fm->cr, p->nw_proto); + 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; + } else if (fields & F_FLAGS && !strcmp(name, "check_overlap")) { + fm->flags |= OFPFF_CHECK_OVERLAP; } else { - const struct field *f; char *value; value = strtok_r(NULL, ", \t\r\n", &save_ptr); @@ -927,52 +680,41 @@ parse_ofp_str(struct ofputil_flow_mod *fm, int command, const char *str_, } if (!strcmp(name, "table")) { - fm->table_id = atoi(value); + fm->table_id = str_to_table_id(value); } else if (!strcmp(name, "out_port")) { - fm->out_port = atoi(value); + fm->out_port = ofputil_port_from_string(name); + if (!fm->out_port) { + ofp_fatal(str_, verbose, "%s is not a valid OpenFlow port", + name); + } } else if (fields & F_PRIORITY && !strcmp(name, "priority")) { - fm->cr.priority = atoi(value); + fm->priority = str_to_u16(value, name); } else if (fields & F_TIMEOUT && !strcmp(name, "idle_timeout")) { - fm->idle_timeout = atoi(value); + fm->idle_timeout = str_to_u16(value, name); } else if (fields & F_TIMEOUT && !strcmp(name, "hard_timeout")) { - fm->hard_timeout = atoi(value); - } else if (fields & F_COOKIE && !strcmp(name, "cookie")) { - fm->cookie = htonll(str_to_u64(value)); - } else if (parse_field_name(name, &f)) { - if (!strcmp(value, "*") || !strcmp(value, "ANY")) { - if (f->wildcard) { - fm->cr.wc.wildcards |= f->wildcard; - cls_rule_zero_wildcarded_fields(&fm->cr); - } else if (f->index == F_NW_SRC) { - cls_rule_set_nw_src_masked(&fm->cr, 0, 0); - } else if (f->index == F_NW_DST) { - cls_rule_set_nw_dst_masked(&fm->cr, 0, 0); - } else if (f->index == F_IPV6_SRC) { - cls_rule_set_ipv6_src_masked(&fm->cr, - &in6addr_any, &in6addr_any); - } else if (f->index == F_IPV6_DST) { - cls_rule_set_ipv6_dst_masked(&fm->cr, - &in6addr_any, &in6addr_any); - } else if (f->index == F_DL_VLAN) { - cls_rule_set_any_vid(&fm->cr); - } else if (f->index == F_DL_VLAN_PCP) { - cls_rule_set_any_pcp(&fm->cr); - } else { - NOT_REACHED(); + fm->hard_timeout = str_to_u16(value, name); + } else if (!strcmp(name, "cookie")) { + char *mask = strchr(value, '/'); + + if (mask) { + /* A mask means we're searching for a cookie. */ + if (command == OFPFC_ADD) { + ofp_fatal(str_, verbose, "flow additions cannot use " + "a cookie mask"); } + *mask = '\0'; + fm->cookie = htonll(str_to_u64(value)); + fm->cookie_mask = htonll(str_to_u64(mask+1)); } else { - parse_field_value(&fm->cr, f->index, value); - } - } else if (!strncmp(name, "reg", 3) - && isdigit((unsigned char) name[3])) { - unsigned int reg_idx = atoi(name + 3); - if (reg_idx >= FLOW_N_REGS) { - if (verbose) { - fprintf(stderr, "%s:\n", str_); + /* No mask means that the cookie is being set. */ + if (command != OFPFC_ADD && command != OFPFC_MODIFY + && command != OFPFC_MODIFY_STRICT) { + ofp_fatal(str_, verbose, "cannot set cookie"); } - ofp_fatal(str_, verbose, "only %d registers supported", FLOW_N_REGS); + fm->new_cookie = htonll(str_to_u64(value)); } - parse_reg_value(&fm->cr, reg_idx, value); + } else if (mf_from_name(name)) { + parse_field(mf_from_name(name), value, &fm->match); } else if (!strcmp(name, "duration") || !strcmp(name, "n_packets") || !strcmp(name, "n_bytes")) { @@ -984,87 +726,237 @@ parse_ofp_str(struct ofputil_flow_mod *fm, int command, const char *str_, } } } + if (!fm->cookie_mask && fm->new_cookie == htonll(UINT64_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 + * default of zero. */ + fm->new_cookie = htonll(0); + } + if (fields & F_ACTIONS) { + struct ofpbuf ofpacts; + + ofpbuf_init(&ofpacts, 32); + str_to_ofpacts(&fm->match.flow, act_str, &ofpacts); + fm->ofpacts_len = ofpacts.size; + fm->ofpacts = ofpbuf_steal_data(&ofpacts); + } else { + fm->ofpacts_len = 0; + fm->ofpacts = NULL; + } free(string); } -/* Parses 'string' as an OFPT_FLOW_MOD or NXT_FLOW_MOD with command 'command' - * (one of OFPFC_*) and appends the parsed OpenFlow message to 'packets'. - * '*cur_format' should initially contain the flow format currently configured - * on the connection; this function will add a message to change the flow - * format and update '*cur_format', if this is necessary to add the parsed - * flow. */ +/* Convert 'str_' (as described in the documentation for the "monitor" command + * in the ovs-ofctl man page) into 'fmr'. */ void -parse_ofp_flow_mod_str(struct list *packets, enum nx_flow_format *cur_format, - bool *flow_mod_table_id, char *string, uint16_t command, - bool verbose) +parse_flow_monitor_request(struct ofputil_flow_monitor_request *fmr, + const char *str_) { - enum nx_flow_format min_format, next_format; - struct cls_rule rule_copy; - struct ofpbuf actions; - struct ofpbuf *ofm; - struct ofputil_flow_mod fm; + static uint32_t id; - ofpbuf_init(&actions, 64); - parse_ofp_str(&fm, command, string, verbose); + char *string = xstrdup(str_); + char *save_ptr = NULL; + char *name; - min_format = ofputil_min_flow_format(&fm.cr); - next_format = MAX(*cur_format, min_format); - if (next_format != *cur_format) { - struct ofpbuf *sff = ofputil_make_set_flow_format(next_format); - list_push_back(packets, &sff->list_node); - *cur_format = next_format; - } + fmr->id = id++; + fmr->flags = (NXFMF_INITIAL | NXFMF_ADD | NXFMF_DELETE | NXFMF_MODIFY + | NXFMF_OWN | NXFMF_ACTIONS); + fmr->out_port = OFPP_NONE; + fmr->table_id = 0xff; + match_init_catchall(&fmr->match); - /* Normalize a copy of the rule. This ensures that non-normalized flows - * get logged but doesn't affect what gets sent to the switch, so that the - * switch can do whatever it likes with the flow. */ - rule_copy = fm.cr; - ofputil_normalize_rule(&rule_copy, next_format); + for (name = strtok_r(string, "=, \t\r\n", &save_ptr); name; + name = strtok_r(NULL, "=, \t\r\n", &save_ptr)) { + const struct protocol *p; + + if (!strcmp(name, "!initial")) { + fmr->flags &= ~NXFMF_INITIAL; + } else if (!strcmp(name, "!add")) { + fmr->flags &= ~NXFMF_ADD; + } else if (!strcmp(name, "!delete")) { + fmr->flags &= ~NXFMF_DELETE; + } else if (!strcmp(name, "!modify")) { + fmr->flags &= ~NXFMF_MODIFY; + } else if (!strcmp(name, "!actions")) { + fmr->flags &= ~NXFMF_ACTIONS; + } else if (!strcmp(name, "!own")) { + fmr->flags &= ~NXFMF_OWN; + } else if (parse_protocol(name, &p)) { + match_set_dl_type(&fmr->match, htons(p->dl_type)); + if (p->nw_proto) { + match_set_nw_proto(&fmr->match, p->nw_proto); + } + } else { + char *value; + + value = strtok_r(NULL, ", \t\r\n", &save_ptr); + if (!value) { + ovs_fatal(0, "%s: field %s missing value", str_, name); + } - if (fm.table_id != 0xff && !*flow_mod_table_id) { - struct ofpbuf *sff = ofputil_make_flow_mod_table_id(true); - list_push_back(packets, &sff->list_node); - *flow_mod_table_id = true; + if (!strcmp(name, "table")) { + fmr->table_id = str_to_table_id(value); + } else if (!strcmp(name, "out_port")) { + fmr->out_port = atoi(value); + } else if (mf_from_name(name)) { + parse_field(mf_from_name(name), value, &fmr->match); + } else { + ovs_fatal(0, "%s: unknown keyword %s", str_, name); + } + } } + free(string); +} + +/* Parses 's' as a set of OpenFlow actions and appends the actions to + * 'actions'. + * + * Prints an error on stderr and aborts the program if 's' syntax is + * invalid. */ +void +parse_ofpacts(const char *s_, struct ofpbuf *ofpacts) +{ + char *s = xstrdup(s_); + str_to_ofpacts(NULL, s, ofpacts); + free(s); +} - ofm = ofputil_encode_flow_mod(&fm, *cur_format, *flow_mod_table_id); - list_push_back(packets, &ofm->list_node); +/* Parses 'string' as an OFPT_FLOW_MOD or NXT_FLOW_MOD with command 'command' + * (one of OFPFC_*) into 'fm'. */ +void +parse_ofp_flow_mod_str(struct ofputil_flow_mod *fm, const char *string, + uint16_t command, bool verbose) +{ + struct match match_copy; + + parse_ofp_str(fm, command, string, verbose); - ofpbuf_uninit(&actions); + /* 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 that the + * switch can do whatever it likes with the flow. */ + match_copy = fm->match; + ofputil_normalize_match(&match_copy); } -/* Similar to parse_ofp_flow_mod_str(), except that the string is read from - * 'stream' and the command is always OFPFC_ADD. Returns false if end-of-file - * is reached before reading a flow, otherwise true. */ -bool -parse_ofp_flow_mod_file(struct list *packets, - enum nx_flow_format *cur, bool *flow_mod_table_id, - FILE *stream, uint16_t command) +void +parse_ofp_flow_mod_file(const char *file_name, uint16_t command, + struct ofputil_flow_mod **fms, size_t *n_fms) { + size_t allocated_fms; + FILE *stream; struct ds s; - bool ok; + stream = !strcmp(file_name, "-") ? stdin : fopen(file_name, "r"); + if (stream == NULL) { + ovs_fatal(errno, "%s: open", file_name); + } + + allocated_fms = *n_fms; ds_init(&s); - ok = ds_get_preprocessed_line(&s, stream) == 0; - if (ok) { - parse_ofp_flow_mod_str(packets, cur, flow_mod_table_id, - ds_cstr(&s), command, true); + while (!ds_get_preprocessed_line(&s, stream)) { + if (*n_fms >= allocated_fms) { + *fms = x2nrealloc(*fms, &allocated_fms, sizeof **fms); + } + parse_ofp_flow_mod_str(&(*fms)[*n_fms], ds_cstr(&s), command, false); + *n_fms += 1; } ds_destroy(&s); - return ok; + if (stream != stdin) { + fclose(stream); + } } void parse_ofp_flow_stats_request_str(struct ofputil_flow_stats_request *fsr, - bool aggregate, char *string) + bool aggregate, const char *string) { struct ofputil_flow_mod fm; parse_ofp_str(&fm, -1, string, false); fsr->aggregate = aggregate; - fsr->match = fm.cr; + fsr->cookie = fm.cookie; + fsr->cookie_mask = fm.cookie_mask; + fsr->match = fm.match; fsr->out_port = fm.out_port; fsr->table_id = fm.table_id; } + +/* 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. + * + * Returns NULL on success, otherwise a malloc()'d string that explains the + * problem. */ +char * +parse_ofp_exact_flow(struct flow *flow, const char *s) +{ + char *pos, *key, *value_s; + char *error = NULL; + char *copy; + + memset(flow, 0, sizeof *flow); + + pos = copy = xstrdup(s); + while (ofputil_parse_key_value(&pos, &key, &value_s)) { + const struct protocol *p; + if (parse_protocol(key, &p)) { + if (flow->dl_type) { + error = xasprintf("%s: Ethernet type set multiple times", s); + goto exit; + } + flow->dl_type = htons(p->dl_type); + + if (p->nw_proto) { + if (flow->nw_proto) { + error = xasprintf("%s: network protocol set " + "multiple times", s); + goto exit; + } + flow->nw_proto = p->nw_proto; + } + } else { + const struct mf_field *mf; + union mf_value value; + char *field_error; + + mf = mf_from_name(key); + if (!mf) { + error = xasprintf("%s: unknown field %s", s, key); + goto exit; + } + + if (!mf_are_prereqs_ok(mf, flow)) { + error = xasprintf("%s: prerequisites not met for setting %s", + s, key); + goto exit; + } + + if (!mf_is_zero(mf, flow)) { + error = xasprintf("%s: field %s set multiple times", s, key); + 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; + } + + mf_set_flow_value(mf, &value, flow); + } + } + +exit: + free(copy); + + if (error) { + memset(flow, 0, sizeof *flow); + } + return error; +}