X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fofp-parse.c;h=a80d45fe62608d12a653856dc8fbf233c6d54b5d;hb=6a885fd0589fdfa3b5d05ca3ff4af52b085a1816;hp=f0e715501dd199556cb1aa7df25f98c1256cebd0;hpb=a9a2da38941ea4d312559543a3fb813d8fe7fd4e;p=sliver-openvswitch.git diff --git a/lib/ofp-parse.c b/lib/ofp-parse.c index f0e715501..a80d45fe6 100644 --- a/lib/ofp-parse.c +++ b/lib/ofp-parse.c @@ -26,6 +26,7 @@ #include "bundle.h" #include "byte-order.h" #include "dynamic-string.h" +#include "meta-flow.h" #include "netdev.h" #include "multipath.h" #include "nx-match.h" @@ -85,479 +86,281 @@ 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]) +str_to_ip(const char *str, ovs_be32 *ip) { - 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) -{ - 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; - - if (maskp) { - *maskp = mask; - } else { - if (mask != htonl(UINT32_MAX)) { - ovs_fatal(0, "%s: netmask not allowed here", str_); - } - } +static struct ofp_action_output * +put_output_action(struct ofpbuf *b, uint16_t port) +{ + struct ofp_action_output *oao; - free(str); + oao = ofputil_put_OFPAT_OUTPUT(b); + oao->port = htons(port); + return oao; } static void -str_to_tun_id(const char *str, ovs_be64 *tun_idp, ovs_be64 *maskp) +parse_enqueue(struct ofpbuf *b, char *arg) { - uint64_t tun_id, mask; - char *tail; - - errno = 0; - tun_id = strtoull(str, &tail, 0); - if (errno || (*tail != '\0' && *tail != '/')) { - goto error; - } + char *sp = NULL; + char *port = strtok_r(arg, ":q", &sp); + char *queue = strtok_r(NULL, "", &sp); + struct ofp_action_enqueue *oae; - if (*tail == '/') { - mask = strtoull(tail + 1, &tail, 0); - if (errno || *tail != '\0') { - goto error; - } - } else { - mask = UINT64_MAX; + if (port == NULL || queue == NULL) { + ovs_fatal(0, "\"enqueue\" syntax is \"enqueue:PORT:QUEUE\""); } - *tun_idp = htonll(tun_id); - *maskp = htonll(mask); - return; - -error: - ovs_fatal(0, "%s: bad syntax for tunnel id", str); + oae = ofputil_put_OFPAT_ENQUEUE(b); + oae->port = htons(str_to_u32(port)); + oae->queue_id = htonl(str_to_u32(queue)); } static void -str_to_vlan_tci(const char *str, ovs_be16 *vlan_tcip, ovs_be16 *maskp) +parse_output(struct ofpbuf *b, char *arg) { - uint16_t vlan_tci, mask; - char *tail; + if (strchr(arg, '[')) { + struct nx_action_output_reg *naor; + int ofs, n_bits; + uint32_t src; - errno = 0; - vlan_tci = strtol(str, &tail, 0); - if (errno || (*tail != '\0' && *tail != '/')) { - goto error; - } + nxm_parse_field_bits(arg, &src, &ofs, &n_bits); - if (*tail == '/') { - mask = strtol(tail + 1, &tail, 0); - if (errno || *tail != '\0') { - goto error; - } + naor = ofputil_put_NXAST_OUTPUT_REG(b); + naor->ofs_nbits = nxm_encode_ofs_nbits(ofs, n_bits); + naor->src = htonl(src); + naor->max_len = htons(UINT16_MAX); } else { - mask = UINT16_MAX; + put_output_action(b, str_to_u32(arg)); } - - *vlan_tcip = htons(vlan_tci); - *maskp = htons(mask); - return; - -error: - ovs_fatal(0, "%s: bad syntax for vlan_tci", str); } static void -str_to_ipv6(const char *str_, struct in6_addr *addrp, struct in6_addr *maskp) +parse_resubmit(struct ofpbuf *b, char *arg) { - 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 nx_action_resubmit *nar; + char *in_port_s, *table_s; + uint16_t in_port; + uint8_t table; - 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); + 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); } } else { - mask = in6addr_exact; - } - *addrp = ipv6_addr_bitand(&addr, &mask); - - if (maskp) { - *maskp = mask; - } else { - if (!ipv6_mask_is_exact(&mask)) { - ovs_fatal(0, "%s: netmask not allowed here", str_); - } + in_port = OFPP_IN_PORT; } - free(str); -} + table_s = strsep(&arg, ","); + table = table_s && table_s[0] ? str_to_u32(table_s) : 255; -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; -} + if (in_port == OFPP_IN_PORT && table == 255) { + ovs_fatal(0, "at least one \"in_port\" or \"table\" must be specified " + " on resubmit"); + } -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; + if (in_port != OFPP_IN_PORT && table == 255) { + nar = ofputil_put_NXAST_RESUBMIT(b); + } else { + nar = ofputil_put_NXAST_RESUBMIT_TABLE(b); + nar->table = table; + } + nar->in_port = htons(in_port); } static void -put_enqueue_action(struct ofpbuf *b, uint16_t port, uint32_t queue) +parse_set_tunnel(struct ofpbuf *b, const char *arg) { - struct ofp_action_enqueue *oae = put_action(b, sizeof *oae, OFPAT_ENQUEUE); - oae->port = htons(port); - oae->queue_id = htonl(queue); + uint64_t tun_id = str_to_u64(arg); + if (tun_id > UINT32_MAX) { + ofputil_put_NXAST_SET_TUNNEL64(b)->tun_id = htonll(tun_id); + } else { + ofputil_put_NXAST_SET_TUNNEL(b)->tun_id = htonl(tun_id); + } } static void -put_dl_addr_action(struct ofpbuf *b, uint16_t type, const char *addr) +parse_note(struct ofpbuf *b, const char *arg) { - struct ofp_action_dl_addr *oada = put_action(b, sizeof *oada, type); - str_to_mac(addr, oada->dl_addr); -} + size_t start_ofs = b->size; + struct nx_action_note *nan; + int remainder; + size_t len; -static bool -parse_port_name(const char *name, uint16_t *port) -{ - struct pair { - const char *name; - uint16_t value; - }; - static const struct pair pairs[] = { -#define DEF_PAIR(NAME) {#NAME, OFPP_##NAME} - DEF_PAIR(IN_PORT), - DEF_PAIR(TABLE), - DEF_PAIR(NORMAL), - DEF_PAIR(FLOOD), - DEF_PAIR(ALL), - DEF_PAIR(CONTROLLER), - DEF_PAIR(LOCAL), - DEF_PAIR(NONE), -#undef DEF_PAIR - }; - static const int n_pairs = ARRAY_SIZE(pairs); - size_t i; + nan = ofputil_put_NXAST_NOTE(b); - for (i = 0; i < n_pairs; i++) { - if (!strcasecmp(name, pairs[i].name)) { - *port = pairs[i].value; - return true; + b->size -= sizeof nan->note; + while (*arg != '\0') { + uint8_t byte; + bool ok; + + if (*arg == '.') { + arg++; } + if (*arg == '\0') { + break; + } + + byte = hexits_value(arg, 2, &ok); + if (!ok) { + ovs_fatal(0, "bad hex digit in `note' argument"); + } + ofpbuf_put(b, &byte, 1); + + arg += 2; } - return false; + + 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); } static void -parse_resubmit(struct nx_action_resubmit *nar, char *arg) +parse_named_action(enum ofputil_action_code code, struct ofpbuf *b, char *arg) { - char *in_port_s, *table_s; - uint16_t in_port; - uint8_t table; + struct ofp_action_dl_addr *oada; + struct ofp_action_vlan_pcp *oavp; + struct ofp_action_vlan_vid *oavv; + struct ofp_action_nw_addr *oana; + struct ofp_action_tp_port *oata; + + switch (code) { + case OFPUTIL_OFPAT_OUTPUT: + parse_output(b, arg); + break; - in_port_s = strsep(&arg, ","); - if (in_port_s && in_port_s[0]) { - if (!parse_port_name(in_port_s, &in_port)) { - in_port = str_to_u32(in_port_s); - } - } else { - in_port = OFPP_IN_PORT; - } + case OFPUTIL_OFPAT_SET_VLAN_VID: + oavv = ofputil_put_OFPAT_SET_VLAN_VID(b); + oavv->vlan_vid = htons(str_to_u32(arg)); + break; - table_s = strsep(&arg, ","); - table = table_s && table_s[0] ? str_to_u32(table_s) : 255; + case OFPUTIL_OFPAT_SET_VLAN_PCP: + oavp = ofputil_put_OFPAT_SET_VLAN_PCP(b); + oavp->vlan_pcp = str_to_u32(arg); + break; - if (in_port == OFPP_IN_PORT && table == 255) { - ovs_fatal(0, "at least one \"in_port\" or \"table\" must be specified " - " on resubmit"); - } + case OFPUTIL_OFPAT_STRIP_VLAN: + ofputil_put_OFPAT_STRIP_VLAN(b); + break; - 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; + case OFPUTIL_OFPAT_SET_DL_SRC: + case OFPUTIL_OFPAT_SET_DL_DST: + oada = ofputil_put_action(code, b); + str_to_mac(arg, oada->dl_addr); + break; + + case OFPUTIL_OFPAT_SET_NW_SRC: + case OFPUTIL_OFPAT_SET_NW_DST: + oana = ofputil_put_action(code, b); + str_to_ip(arg, &oana->nw_addr); + break; + + case OFPUTIL_OFPAT_SET_NW_TOS: + ofputil_put_OFPAT_SET_NW_TOS(b)->nw_tos = str_to_u32(arg); + break; + + case OFPUTIL_OFPAT_SET_TP_SRC: + case OFPUTIL_OFPAT_SET_TP_DST: + oata = ofputil_put_action(code, b); + oata->tp_port = htons(str_to_u32(arg)); + break; + + case OFPUTIL_OFPAT_ENQUEUE: + parse_enqueue(b, arg); + break; + + case OFPUTIL_NXAST_RESUBMIT: + parse_resubmit(b, arg); + break; + + case OFPUTIL_NXAST_SET_TUNNEL: + parse_set_tunnel(b, arg); + break; + + case OFPUTIL_NXAST_SET_QUEUE: + ofputil_put_NXAST_SET_QUEUE(b)->queue_id = htonl(str_to_u32(arg)); + break; + + case OFPUTIL_NXAST_POP_QUEUE: + ofputil_put_NXAST_POP_QUEUE(b); + break; + + case OFPUTIL_NXAST_REG_MOVE: + nxm_parse_reg_move(ofputil_put_NXAST_REG_MOVE(b), arg); + break; + + case OFPUTIL_NXAST_REG_LOAD: + nxm_parse_reg_load(ofputil_put_NXAST_REG_LOAD(b), arg); + break; + + case OFPUTIL_NXAST_NOTE: + parse_note(b, arg); + break; + + case OFPUTIL_NXAST_SET_TUNNEL64: + ofputil_put_NXAST_SET_TUNNEL64(b)->tun_id = htonll(str_to_u64(arg)); + break; + + case OFPUTIL_NXAST_MULTIPATH: + multipath_parse(ofputil_put_NXAST_MULTIPATH(b), arg); + break; + + case OFPUTIL_NXAST_AUTOPATH: + autopath_parse(ofputil_put_NXAST_AUTOPATH(b), arg); + break; + + case OFPUTIL_NXAST_BUNDLE: + bundle_parse(b, arg); + break; + + case OFPUTIL_NXAST_BUNDLE_LOAD: + bundle_parse_load(b, arg); + break; + + case OFPUTIL_NXAST_RESUBMIT_TABLE: + case OFPUTIL_NXAST_OUTPUT_REG: + NOT_REACHED(); } } static void str_to_action(char *str, struct ofpbuf *b) { - bool drop = false; + char *pos, *act, *arg; int n_actions; - char *pos; pos = str; n_actions = 0; - for (;;) { - char empty_string[] = ""; - char *act, *arg; - size_t actlen; + while (ofputil_parse_key_value(&pos, &act, &arg)) { uint16_t port; + int code; - pos += strspn(pos, ", \t\r\n"); - if (*pos == '\0') { - break; - } - - if (drop) { - ovs_fatal(0, "Drop actions must not be followed by other actions"); - } - - 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'); - } - 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; - } - - byte = hexits_value(arg, 2, &ok); - if (!ok) { - ovs_fatal(0, "bad hex digit in `note' argument"); - } - ofpbuf_put(b, &byte, 1); - - arg += 2; - } - - 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")) { - put_output_action(b, str_to_u32(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)); + code = ofputil_action_code_from_name(act); + if (code >= 0) { + parse_named_action(code, b, arg); } 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"); } + break; } else if (!strcasecmp(act, "CONTROLLER")) { struct ofp_action_output *oao; oao = put_output_action(b, OFPP_CONTROLLER); @@ -569,10 +372,8 @@ str_to_action(char *str, struct ofpbuf *b) } else { oao->max_len = htons(UINT16_MAX); } - } else if (parse_port_name(act, &port)) { + } else if (ofputil_port_from_string(act, &port)) { put_output_action(b, port); - } else if (strspn(act, "0123456789") == strlen(act)) { - put_output_action(b, str_to_u32(act)); } else { ovs_fatal(0, "Unknown action: %s", act); } @@ -613,44 +414,6 @@ parse_protocol(const char *name, const struct protocol **p_out) return false; } -#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, ...) { @@ -664,167 +427,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 cls_rule *rule) { - 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 (!parse_port_name(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; + union mf_value value, mask; + char *error; - 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; - - 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) -{ - uint32_t reg_value, reg_mask; - - if (!strcmp(value, "ANY") || !strcmp(value, "*")) { - cls_rule_set_reg_masked(rule, reg_idx, 0, 0); - } else if (sscanf(value, "%"SCNi32"/%"SCNi32, - ®_value, ®_mask) == 2) { - cls_rule_set_reg_masked(rule, reg_idx, reg_value, reg_mask); - } else if (sscanf(value, "%"SCNi32, ®_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, rule); } /* Convert 'str_' (as described in the Flow Syntax section of the ovs-ofctl man @@ -923,7 +537,6 @@ parse_ofp_str(struct ofputil_flow_mod *fm, int command, const char *str_, cls_rule_set_nw_proto(&fm->cr, p->nw_proto); } } else { - const struct field *f; char *value; value = strtok_r(NULL, ", \t\r\n", &save_ptr); @@ -943,41 +556,8 @@ parse_ofp_str(struct ofputil_flow_mod *fm, int command, const char *str_, 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(); - } - } 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_); - } - ofp_fatal(str_, verbose, "only %d registers supported", FLOW_N_REGS); - } - parse_reg_value(&fm->cr, reg_idx, value); + } else if (mf_from_name(name)) { + parse_field(mf_from_name(name), value, &fm->cr); } else if (!strcmp(name, "duration") || !strcmp(name, "n_packets") || !strcmp(name, "n_bytes")) { @@ -1062,7 +642,7 @@ parse_ofp_flow_mod_file(struct list *packets, } void -parse_ofp_flow_stats_request_str(struct flow_stats_request *fsr, +parse_ofp_flow_stats_request_str(struct ofputil_flow_stats_request *fsr, bool aggregate, char *string) { struct ofputil_flow_mod fm;