X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fofp-parse.c;h=24f6876bc8ab5203f8f54a1c83ee6cf82c44fc29;hb=541bc79f73add327072470c9bc3febb4195cdb3c;hp=0fe4ac30ffd10d22b5bfaf21b8614ed3ac6779e0;hpb=333eba210b39a09a17c036335ed312ae123ba339;p=openvswitch diff --git a/lib/ofp-parse.c b/lib/ofp-parse.c index 0fe4ac30..24f6876b 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 Networks. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,6 +26,8 @@ #include "bundle.h" #include "byte-order.h" #include "dynamic-string.h" +#include "learn.h" +#include "meta-flow.h" #include "netdev.h" #include "multipath.h" #include "nx-match.h" @@ -39,6 +41,28 @@ VLOG_DEFINE_THIS_MODULE(ofp_parse); +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,187 +109,22 @@ 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; - - if (maskp) { - *maskp = mask; - } else { - if (mask != htonl(UINT32_MAX)) { - ovs_fatal(0, "%s: netmask not allowed here", str_); - } - } - - free(str); -} - -static void -str_to_tun_id(const char *str, ovs_be64 *tun_idp, ovs_be64 *maskp) -{ - uint64_t tun_id, mask; - char *tail; - - errno = 0; - tun_id = strtoull(str, &tail, 0); - if (errno || (*tail != '\0' && *tail != '/')) { - goto error; - } - - if (*tail == '/') { - mask = strtoull(tail + 1, &tail, 0); - if (errno || *tail != '\0') { - goto error; - } - } else { - mask = UINT64_MAX; - } - - *tun_idp = htonll(tun_id); - *maskp = htonll(mask); - return; - -error: - ovs_fatal(0, "%s: bad syntax for tunnel id", str); -} - -static void -str_to_vlan_tci(const char *str, ovs_be16 *vlan_tcip, ovs_be16 *maskp) -{ - uint16_t vlan_tci, mask; - char *tail; - - errno = 0; - vlan_tci = strtol(str, &tail, 0); - if (errno || (*tail != '\0' && *tail != '/')) { - goto error; - } - - if (*tail == '/') { - mask = strtol(tail + 1, &tail, 0); - if (errno || *tail != '\0') { - goto error; - } - } else { - mask = UINT16_MAX; - } - - *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) -{ - 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); - } - - 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); - - if (maskp) { - *maskp = mask; - } else { - if (!ipv6_mask_is_exact(&mask)) { - ovs_fatal(0, "%s: netmask not allowed here", str_); - } - } - - free(str); -} - -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; } 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); + struct ofp_action_output *oao; + + oao = ofputil_put_OFPAT_OUTPUT(b); oao->port = htons(port); return oao; } @@ -282,33 +141,23 @@ parse_enqueue(struct ofpbuf *b, char *arg) ovs_fatal(0, "\"enqueue\" syntax is \"enqueue:PORT:QUEUE\""); } - oae = put_action(b, sizeof *oae, OFPAT_ENQUEUE); + oae = ofputil_put_OFPAT_ENQUEUE(b); oae->port = htons(str_to_u32(port)); oae->queue_id = htonl(str_to_u32(queue)); } -static void -put_dl_addr_action(struct ofpbuf *b, uint16_t type, const char *addr) -{ - struct ofp_action_dl_addr *oada = put_action(b, sizeof *oada, type); - str_to_mac(addr, oada->dl_addr); -} - 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; + struct mf_subfield src; - nxm_parse_field_bits(arg, &src, &ofs, &n_bits); + mf_parse_subfield(&src, arg); - 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 = ofputil_put_NXAST_OUTPUT_REG(b); + naor->ofs_nbits = nxm_encode_ofs_nbits(src.ofs, src.n_bits); + naor->src = htonl(src.field->nxm_header); naor->max_len = htons(UINT16_MAX); } else { put_output_action(b, str_to_u32(arg)); @@ -316,8 +165,9 @@ parse_output(struct ofpbuf *b, char *arg) } static void -parse_resubmit(struct nx_action_resubmit *nar, char *arg) +parse_resubmit(struct ofpbuf *b, char *arg) { + struct nx_action_resubmit *nar; char *in_port_s, *table_s; uint16_t in_port; uint8_t table; @@ -339,33 +189,23 @@ parse_resubmit(struct nx_action_resubmit *nar, char *arg) " on resubmit"); } - 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); + nar = ofputil_put_NXAST_RESUBMIT(b); } else { - nar->subtype = htons(NXAST_RESUBMIT_TABLE); + nar = ofputil_put_NXAST_RESUBMIT_TABLE(b); nar->table = table; } + nar->in_port = htons(in_port); } static void -parse_set_tunnel(struct ofpbuf *b, enum ofputil_action_code code, - const char *arg) +parse_set_tunnel(struct ofpbuf *b, const char *arg) { uint64_t tun_id = str_to_u64(arg); - if (code == OFPUTIL_NXAST_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); + if (tun_id > UINT32_MAX) { + ofputil_put_NXAST_SET_TUNNEL64(b)->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); + ofputil_put_NXAST_SET_TUNNEL(b)->tun_id = htonl(tun_id); } } @@ -377,9 +217,7 @@ parse_note(struct ofpbuf *b, const char *arg) int remainder; size_t len; - nan = put_action(b, sizeof *nan, OFPAT_VENDOR); - nan->vendor = htonl(NX_VENDOR_ID); - nan->subtype = htons(NXAST_NOTE); + nan = ofputil_put_NXAST_NOTE(b); b->size -= sizeof nan->note; while (*arg != '\0') { @@ -412,20 +250,32 @@ parse_note(struct ofpbuf *b, const char *arg) } static void -parse_named_action(enum ofputil_action_code code, struct ofpbuf *b, char *arg) +parse_fin_timeout(struct ofpbuf *b, char *arg) +{ + struct nx_action_fin_timeout *naft; + char *key, *value; + + naft = ofputil_put_NXAST_FIN_TIMEOUT(b); + while (ofputil_parse_key_value(&arg, &key, &value)) { + if (!strcmp(key, "idle_timeout")) { + naft->fin_idle_timeout = htons(str_to_u16(value, key)); + } else if (!strcmp(key, "hard_timeout")) { + naft->fin_hard_timeout = htons(str_to_u16(value, key)); + } else { + ovs_fatal(0, "invalid key '%s' in 'fin_timeout' argument", key); + } + } +} + +static void +parse_named_action(enum ofputil_action_code code, const struct flow *flow, + struct ofpbuf *b, char *arg) { + 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_nw_tos *oant; struct ofp_action_tp_port *oata; - struct nx_action_header *nah; - struct nx_action_resubmit *nar; - struct nx_action_set_queue *nasq; - struct nx_action_reg_move *move; - struct nx_action_reg_load *load; - struct nx_action_multipath *nam; - struct nx_action_autopath *naa; switch (code) { case OFPUTIL_OFPAT_OUTPUT: @@ -433,49 +283,38 @@ parse_named_action(enum ofputil_action_code code, struct ofpbuf *b, char *arg) break; case OFPUTIL_OFPAT_SET_VLAN_VID: - oavv = put_action(b, sizeof *oavv, OFPAT_SET_VLAN_VID); + oavv = ofputil_put_OFPAT_SET_VLAN_VID(b); oavv->vlan_vid = htons(str_to_u32(arg)); break; case OFPUTIL_OFPAT_SET_VLAN_PCP: - oavp = put_action(b, sizeof *oavp, OFPAT_SET_VLAN_PCP); + oavp = ofputil_put_OFPAT_SET_VLAN_PCP(b); oavp->vlan_pcp = str_to_u32(arg); break; case OFPUTIL_OFPAT_STRIP_VLAN: - put_action(b, sizeof(struct ofp_action_header), OFPAT_STRIP_VLAN); + ofputil_put_OFPAT_STRIP_VLAN(b); break; case OFPUTIL_OFPAT_SET_DL_SRC: - put_dl_addr_action(b, OFPAT_SET_DL_SRC, arg); - break; - case OFPUTIL_OFPAT_SET_DL_DST: - put_dl_addr_action(b, OFPAT_SET_DL_DST, arg); + oada = ofputil_put_action(code, b); + str_to_mac(arg, oada->dl_addr); break; case OFPUTIL_OFPAT_SET_NW_SRC: - oana = put_action(b, sizeof *oana, OFPAT_SET_NW_SRC); - str_to_ip(arg, &oana->nw_addr, NULL); - break; - case OFPUTIL_OFPAT_SET_NW_DST: - oana = put_action(b, sizeof *oana, OFPAT_SET_NW_DST); - str_to_ip(arg, &oana->nw_addr, NULL); + oana = ofputil_put_action(code, b); + str_to_ip(arg, &oana->nw_addr); break; case OFPUTIL_OFPAT_SET_NW_TOS: - oant = put_action(b, sizeof *oant, OFPAT_SET_NW_TOS); - oant->nw_tos = str_to_u32(arg); + ofputil_put_OFPAT_SET_NW_TOS(b)->nw_tos = str_to_u32(arg); break; case OFPUTIL_OFPAT_SET_TP_SRC: - oata = put_action(b, sizeof *oata, OFPAT_SET_TP_SRC); - oata->tp_port = htons(str_to_u32(arg)); - break; - case OFPUTIL_OFPAT_SET_TP_DST: - oata = put_action(b, sizeof *oata, OFPAT_SET_TP_DST); + oata = ofputil_put_action(code, b); oata->tp_port = htons(str_to_u32(arg)); break; @@ -484,50 +323,43 @@ parse_named_action(enum ofputil_action_code code, struct ofpbuf *b, char *arg) break; case OFPUTIL_NXAST_RESUBMIT: - nar = put_action(b, sizeof *nar, OFPAT_VENDOR); - parse_resubmit(nar, arg); + parse_resubmit(b, arg); break; case OFPUTIL_NXAST_SET_TUNNEL: - case OFPUTIL_NXAST_SET_TUNNEL64: - parse_set_tunnel(b, code, arg); + parse_set_tunnel(b, arg); break; case OFPUTIL_NXAST_SET_QUEUE: - 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)); + ofputil_put_NXAST_SET_QUEUE(b)->queue_id = htonl(str_to_u32(arg)); break; case OFPUTIL_NXAST_POP_QUEUE: - nah = put_action(b, sizeof *nah, OFPAT_VENDOR); - nah->vendor = htonl(NX_VENDOR_ID); - nah->subtype = htons(NXAST_POP_QUEUE); + ofputil_put_NXAST_POP_QUEUE(b); break; case OFPUTIL_NXAST_REG_MOVE: - move = ofpbuf_put_uninit(b, sizeof *move); - nxm_parse_reg_move(move, arg); + nxm_parse_reg_move(ofputil_put_NXAST_REG_MOVE(b), arg); break; case OFPUTIL_NXAST_REG_LOAD: - load = ofpbuf_put_uninit(b, sizeof *load); - nxm_parse_reg_load(load, arg); + 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: - nam = ofpbuf_put_uninit(b, sizeof *nam); - multipath_parse(nam, arg); + multipath_parse(ofputil_put_NXAST_MULTIPATH(b), arg); break; case OFPUTIL_NXAST_AUTOPATH: - naa = ofpbuf_put_uninit(b, sizeof *naa); - autopath_parse(naa, arg); + autopath_parse(ofputil_put_NXAST_AUTOPATH(b), arg); break; case OFPUTIL_NXAST_BUNDLE: @@ -541,86 +373,51 @@ parse_named_action(enum ofputil_action_code code, struct ofpbuf *b, char *arg) case OFPUTIL_NXAST_RESUBMIT_TABLE: case OFPUTIL_NXAST_OUTPUT_REG: NOT_REACHED(); + + case OFPUTIL_NXAST_LEARN: + learn_parse(b, arg, flow); + break; + + case OFPUTIL_NXAST_EXIT: + ofputil_put_NXAST_EXIT(b); + break; + + case OFPUTIL_NXAST_DEC_TTL: + ofputil_put_NXAST_DEC_TTL(b); + break; + + case OFPUTIL_NXAST_FIN_TIMEOUT: + parse_fin_timeout(b, arg); + break; } } static void -str_to_action(char *str, struct ofpbuf *b) +str_to_action(const struct flow *flow, 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'; - code = ofputil_action_code_from_name(act); if (code >= 0) { - parse_named_action(code, b, arg); + parse_named_action(code, flow, 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); @@ -674,45 +471,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, ...) { @@ -726,173 +484,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 (!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; + union mf_value value, mask; + char *error; - 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; - - 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, rule); } /* Convert 'str_' (as described in the Flow Syntax section of the ovs-ofctl man @@ -910,12 +513,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) { @@ -924,7 +528,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: @@ -936,11 +540,11 @@ 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: @@ -949,6 +553,7 @@ parse_ofp_str(struct ofputil_flow_mod *fm, int command, const char *str_, cls_rule_init_catchall(&fm->cr, OFP_DEFAULT_PRIORITY); fm->cookie = htonll(0); + fm->cookie_mask = htonll(0); fm->table_id = 0xff; fm->command = command; fm->idle_timeout = OFP_FLOW_PERMANENT; @@ -957,9 +562,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"); @@ -972,14 +574,6 @@ 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)) { @@ -990,8 +584,11 @@ parse_ofp_str(struct ofputil_flow_mod *fm, int command, const char *str_, if (p->nw_proto) { cls_rule_set_nw_proto(&fm->cr, 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); @@ -1000,52 +597,30 @@ 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); } else if (fields & F_PRIORITY && !strcmp(name, "priority")) { - fm->cr.priority = atoi(value); + fm->cr.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) { + if (command == OFPFC_ADD) { + ofp_fatal(str_, verbose, "flow additions cannot use " + "a cookie mask"); } + *mask = '\0'; + fm->cookie_mask = htonll(str_to_u64(mask+1)); } else { - parse_field_value(&fm->cr, f->index, value); + fm->cookie_mask = htonll(UINT64_MAX); } - } 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); + fm->cookie = htonll(str_to_u64(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")) { @@ -1057,10 +632,34 @@ parse_ofp_str(struct ofputil_flow_mod *fm, int command, const char *str_, } } } + if (fields & F_ACTIONS) { + struct ofpbuf actions; + + ofpbuf_init(&actions, sizeof(union ofp_action)); + str_to_action(&fm->cr.flow, 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; + } 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_ofp_actions(const char *s_, struct ofpbuf *actions) +{ + char *s = xstrdup(s_); + str_to_action(NULL, s, actions); + free(s); +} + /* 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 @@ -1074,14 +673,15 @@ parse_ofp_flow_mod_str(struct list *packets, enum nx_flow_format *cur_format, { enum nx_flow_format min_format, next_format; struct cls_rule rule_copy; - struct ofpbuf actions; struct ofpbuf *ofm; struct ofputil_flow_mod fm; - ofpbuf_init(&actions, 64); parse_ofp_str(&fm, command, string, verbose); min_format = ofputil_min_flow_format(&fm.cr); + if (command != OFPFC_ADD && fm.cookie_mask != htonll(0)) { + min_format = NXFF_NXM; + } next_format = MAX(*cur_format, min_format); if (next_format != *cur_format) { struct ofpbuf *sff = ofputil_make_set_flow_format(next_format); @@ -1103,8 +703,6 @@ parse_ofp_flow_mod_str(struct list *packets, enum nx_flow_format *cur_format, ofm = ofputil_encode_flow_mod(&fm, *cur_format, *flow_mod_table_id); list_push_back(packets, &ofm->list_node); - - ofpbuf_uninit(&actions); } /* Similar to parse_ofp_flow_mod_str(), except that the string is read from @@ -1137,6 +735,8 @@ parse_ofp_flow_stats_request_str(struct ofputil_flow_stats_request *fsr, parse_ofp_str(&fm, -1, string, false); fsr->aggregate = aggregate; + fsr->cookie = fm.cookie; + fsr->cookie_mask = fm.cookie_mask; fsr->match = fm.cr; fsr->out_port = fm.out_port; fsr->table_id = fm.table_id;