X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fofp-parse.c;h=40215511dad0729fc2a5d2070e60e0c616d71a37;hb=a61680c6d15fa1f1ae3072a83c0e3d7ed08f6048;hp=1c7ce4fcff83ca9c594daee0790401b3a6e78562;hpb=f393f81e425658cdfddf29ca23086bf66d6b733c;p=sliver-openvswitch.git diff --git a/lib/ofp-parse.c b/lib/ofp-parse.c index 1c7ce4fcf..40215511d 100644 --- a/lib/ofp-parse.c +++ b/lib/ofp-parse.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010 Nicira Networks. + * Copyright (c) 2010, 2011 Nicira Networks. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,9 +22,14 @@ #include #include +#include "autopath.h" +#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" #include "ofp-util.h" #include "ofpbuf.h" @@ -36,13 +41,35 @@ 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) { char *tail; uint32_t value; - if (!str) { + if (!str[0]) { ovs_fatal(0, "missing required numeric argument"); } @@ -60,6 +87,10 @@ str_to_u64(const char *str) char *tail; uint64_t value; + if (!str[0]) { + ovs_fatal(0, "missing required numeric argument"); + } + errno = 0; value = strtoull(str, &tail, 0); if (errno == EINVAL || errno == ERANGE || *tail) { @@ -78,288 +109,307 @@ str_to_mac(const char *str, uint8_t mac[6]) } 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 struct ofp_action_output * +put_output_action(struct ofpbuf *b, uint16_t port) +{ + struct ofp_action_output *oao; - if (maskp) { - *maskp = mask; - } else { - if (mask != htonl(UINT32_MAX)) { - ovs_fatal(0, "%s: netmask not allowed here", str_); - } + oao = ofputil_put_OFPAT_OUTPUT(b); + oao->port = htons(port); + return oao; +} + +static void +parse_enqueue(struct ofpbuf *b, char *arg) +{ + char *sp = NULL; + char *port = strtok_r(arg, ":q", &sp); + char *queue = strtok_r(NULL, "", &sp); + struct ofp_action_enqueue *oae; + + if (port == NULL || queue == NULL) { + ovs_fatal(0, "\"enqueue\" syntax is \"enqueue:PORT:QUEUE\""); } - free(str); + oae = ofputil_put_OFPAT_ENQUEUE(b); + oae->port = htons(str_to_u32(port)); + oae->queue_id = htonl(str_to_u32(queue)); } -static void * -put_action(struct ofpbuf *b, size_t size, uint16_t type) +static void +parse_output(struct ofpbuf *b, char *arg) { - struct ofp_action_header *ah = ofpbuf_put_zeros(b, size); - ah->type = htons(type); - ah->len = htons(size); - return ah; + 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 = 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 { + put_output_action(b, str_to_u32(arg)); + } } -static struct ofp_action_output * -put_output_action(struct ofpbuf *b, uint16_t port) +static void +parse_resubmit(struct ofpbuf *b, char *arg) { - struct ofp_action_output *oao = put_action(b, sizeof *oao, OFPAT_OUTPUT); - oao->port = htons(port); - return oao; + struct nx_action_resubmit *nar; + char *in_port_s, *table_s; + uint16_t in_port; + uint8_t table; + + 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 { + in_port = OFPP_IN_PORT; + } + + table_s = strsep(&arg, ","); + table = table_s && table_s[0] ? str_to_u32(table_s) : 255; + + if (in_port == OFPP_IN_PORT && table == 255) { + ovs_fatal(0, "at least one \"in_port\" or \"table\" must be specified " + " on resubmit"); + } + + 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; + nan = ofputil_put_NXAST_NOTE(b); -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; + b->size -= sizeof nan->note; + while (*arg != '\0') { + uint8_t byte; + bool ok; - for (i = 0; i < n_pairs; i++) { - if (!strcasecmp(name, pairs[i].name)) { - *port = pairs[i].value; - return true; + 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 -str_to_action(char *str, struct ofpbuf *b) +parse_named_action(enum ofputil_action_code code, const struct flow *flow, + struct ofpbuf *b, char *arg) { - char *act, *arg; - char *saveptr = NULL; - bool drop = false; - int n_actions; + 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; - for (act = strtok_r(str, ", \t\r\n", &saveptr), n_actions = 0; act; - act = strtok_r(NULL, ", \t\r\n", &saveptr), n_actions++) - { - uint16_t port; + case OFPUTIL_OFPAT_SET_VLAN_VID: + oavv = ofputil_put_OFPAT_SET_VLAN_VID(b); + oavv->vlan_vid = htons(str_to_u32(arg)); + break; - if (drop) { - ovs_fatal(0, "Drop actions must not be followed by other actions"); - } + case OFPUTIL_OFPAT_SET_VLAN_PCP: + oavp = ofputil_put_OFPAT_SET_VLAN_PCP(b); + oavp->vlan_pcp = str_to_u32(arg); + break; - /* Arguments are separated by colons */ - arg = strchr(act, ':'); - if (arg) { - *arg = '\0'; - arg++; - } + case OFPUTIL_OFPAT_STRIP_VLAN: + ofputil_put_OFPAT_STRIP_VLAN(b); + break; - 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); - nar->vendor = htonl(NX_VENDOR_ID); - nar->subtype = htons(NXAST_RESUBMIT); - nar->in_port = htons(str_to_u32(arg)); - } else if (!strcasecmp(act, "set_tunnel")) { - 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(str_to_u32(arg)); - } else if (!strcasecmp(act, "drop_spoofed_arp")) { - struct nx_action_header *nah; - nah = put_action(b, sizeof *nah, OFPAT_VENDOR); - nah->vendor = htonl(NX_VENDOR_ID); - nah->subtype = htons(NXAST_DROP_SPOOFED_ARP); - } 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 && *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; - } + 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; - len = b->size - start_ofs; - remainder = len % OFP_ACTION_ALIGN; - if (remainder) { - ofpbuf_put_zeros(b, OFP_ACTION_ALIGN - remainder); - } - 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, "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)); + 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(); + + case OFPUTIL_NXAST_LEARN: + learn_parse(b, arg, flow); + break; + + case OFPUTIL_NXAST_EXIT: + ofputil_put_NXAST_EXIT(b); + break; + } +} + +static void +str_to_action(const struct flow *flow, char *str, struct ofpbuf *b) +{ + char *pos, *act, *arg; + int n_actions; + + pos = str; + n_actions = 0; + while (ofputil_parse_key_value(&pos, &act, &arg)) { + uint16_t port; + int code; + + code = ofputil_action_code_from_name(act); + if (code >= 0) { + 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); /* Unless a numeric argument is specified, we send the whole * packet to the controller. */ - if (arg && (strspn(arg, "0123456789") == strlen(arg))) { + if (arg[0] && (strspn(arg, "0123456789") == strlen(arg))) { oao->max_len = htons(str_to_u32(arg)); } 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); } + n_actions++; } } @@ -375,9 +425,14 @@ parse_protocol(const char *name, const struct protocol **p_out) static const struct protocol protocols[] = { { "ip", ETH_TYPE_IP, 0 }, { "arp", ETH_TYPE_ARP, 0 }, - { "icmp", ETH_TYPE_IP, IP_TYPE_ICMP }, - { "tcp", ETH_TYPE_IP, IP_TYPE_TCP }, - { "udp", ETH_TYPE_IP, IP_TYPE_UDP }, + { "icmp", ETH_TYPE_IP, IPPROTO_ICMP }, + { "tcp", ETH_TYPE_IP, IPPROTO_TCP }, + { "udp", ETH_TYPE_IP, IPPROTO_UDP }, + { "ipv6", ETH_TYPE_IPV6, 0 }, + { "ip6", ETH_TYPE_IPV6, 0 }, + { "icmp6", ETH_TYPE_IPV6, IPPROTO_ICMPV6 }, + { "tcp6", ETH_TYPE_IPV6, IPPROTO_TCP }, + { "udp6", ETH_TYPE_IPV6, IPPROTO_UDP }, }; const struct protocol *p; @@ -391,199 +446,108 @@ parse_protocol(const char *name, const struct protocol **p_out) return false; } -#define FIELDS \ - FIELD(F_TUN_ID, "tun_id", FWW_TUN_ID) \ - 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_DL_SRC, "dl_src", FWW_DL_SRC) \ - FIELD(F_DL_DST, "dl_dst", FWW_DL_DST) \ - 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) - -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 bool -parse_field_name(const char *name, const struct field **f_out) +static void +ofp_fatal(const char *flow, bool verbose, const char *format, ...) { - static const struct field fields[N_FIELDS] = { -#define FIELD(ENUM, NAME, WILDCARD) { ENUM, NAME, WILDCARD }, - FIELDS -#undef FIELD - }; - const struct field *f; + va_list args; - for (f = fields; f < &fields[ARRAY_SIZE(fields)]; f++) { - if (!strcmp(f->name, name)) { - *f_out = f; - return true; - } + if (verbose) { + fprintf(stderr, "%s:\n", flow); } - *f_out = NULL; - return false; + + va_start(args, format); + ovs_fatal_valist(0, format, args); } 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]; - ovs_be32 ip, mask; - uint16_t port_no; - - switch (index) { - case F_TUN_ID: - cls_rule_set_tun_id(rule, htonl(str_to_u32(value))); - break; - - case F_IN_PORT: - if (!parse_port_name(value, &port_no)) { - port_no = atoi(value); - } - if (port_no == OFPP_LOCAL) { - port_no = ODPP_LOCAL; - } - 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; + union mf_value value, mask; + char *error; - case F_DL_SRC: - str_to_mac(value, mac); - cls_rule_set_dl_src(rule, mac); - break; - - case F_DL_DST: - str_to_mac(value, mac); - cls_rule_set_dl_dst(rule, mac); - break; - - case F_DL_TYPE: - cls_rule_set_dl_type(rule, htons(str_to_u32(value))); - break; + error = mf_parse(mf, s, &value, &mask); + if (error) { + ovs_fatal(0, "%s", error); + } - case F_NW_SRC: - str_to_ip(value, &ip, &mask); - cls_rule_set_nw_src_masked(rule, ip, mask); - break; + mf_set(mf, &value, &mask, rule); +} - case F_NW_DST: - str_to_ip(value, &ip, &mask); - cls_rule_set_nw_dst_masked(rule, ip, mask); - break; +/* Convert 'str_' (as described in the Flow Syntax section of the ovs-ofctl man + * page) into 'fm' for sending the specified flow_mod 'command' to a switch. + * If 'actions' is specified, an action must be in 'string' and may be expanded + * or reallocated. + * + * To parse syntax for an OFPT_FLOW_MOD (or NXT_FLOW_MOD), use an OFPFC_* + * constant for 'command'. To parse syntax for an OFPST_FLOW or + * OFPST_AGGREGATE (or NXST_FLOW or NXST_AGGREGATE), use -1 for 'command'. */ +void +parse_ofp_str(struct ofputil_flow_mod *fm, int command, const char *str_, + bool verbose) +{ + enum { + F_OUT_PORT = 1 << 0, + F_ACTIONS = 1 << 1, + F_COOKIE = 1 << 2, + F_TIMEOUT = 1 << 3, + F_PRIORITY = 1 << 4 + } fields; + char *string = xstrdup(str_); + char *save_ptr = NULL; + char *act_str = NULL; + char *name; - case F_NW_PROTO: - cls_rule_set_nw_proto(rule, str_to_u32(value)); + switch (command) { + case -1: + fields = F_OUT_PORT; break; - case F_NW_TOS: - cls_rule_set_nw_tos(rule, str_to_u32(value)); + case OFPFC_ADD: + fields = F_ACTIONS | F_COOKIE | F_TIMEOUT | F_PRIORITY; break; - case F_TP_SRC: - cls_rule_set_tp_src(rule, htons(str_to_u32(value))); + case OFPFC_DELETE: + fields = F_OUT_PORT; break; - case F_TP_DST: - cls_rule_set_tp_dst(rule, htons(str_to_u32(value))); + case OFPFC_DELETE_STRICT: + fields = F_OUT_PORT | F_PRIORITY; break; - case F_ICMP_TYPE: - cls_rule_set_icmp_type(rule, str_to_u32(value)); + case OFPFC_MODIFY: + fields = F_ACTIONS | F_COOKIE; break; - case F_ICMP_CODE: - cls_rule_set_icmp_code(rule, str_to_u32(value)); + case OFPFC_MODIFY_STRICT: + fields = F_ACTIONS | F_COOKIE | F_PRIORITY; break; - case N_FIELDS: + default: NOT_REACHED(); } -} - -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 /"); - } -} - -/* Convert 'string' (as described in the Flow Syntax section of the ovs-ofctl - * man page) into 'pf'. If 'actions' is specified, an action must be in - * 'string' and may be expanded or reallocated. */ -static void -parse_ofp_str(struct flow_mod *fm, uint8_t *table_idx, - struct ofpbuf *actions, char *string) -{ - char *save_ptr = NULL; - char *name; - if (table_idx) { - *table_idx = 0xff; - } cls_rule_init_catchall(&fm->cr, OFP_DEFAULT_PRIORITY); fm->cookie = htonll(0); - fm->command = UINT16_MAX; + fm->table_id = 0xff; + fm->command = command; fm->idle_timeout = OFP_FLOW_PERMANENT; fm->hard_timeout = OFP_FLOW_PERMANENT; fm->buffer_id = UINT32_MAX; fm->out_port = OFPP_NONE; fm->flags = 0; - if (actions) { - char *act_str = strstr(string, "action"); + if (fields & F_ACTIONS) { + act_str = strstr(string, "action"); if (!act_str) { - ovs_fatal(0, "must specify an action"); + ofp_fatal(str_, verbose, "must specify an action"); } *act_str = '\0'; act_str = strchr(act_str + 1, '='); if (!act_str) { - ovs_fatal(0, "must specify an action"); + ofp_fatal(str_, verbose, "must specify an action"); } act_str++; - - str_to_action(act_str, actions); - fm->actions = actions->data; - 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)) { @@ -595,56 +559,51 @@ parse_ofp_str(struct flow_mod *fm, uint8_t *table_idx, 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); if (!value) { - ovs_fatal(0, "field %s missing value", name); + ofp_fatal(str_, verbose, "field %s missing value", name); } - if (table_idx && !strcmp(name, "table")) { - *table_idx = atoi(value); + if (!strcmp(name, "table")) { + fm->table_id = str_to_table_id(value); } else if (!strcmp(name, "out_port")) { fm->out_port = atoi(value); - } else if (!strcmp(name, "priority")) { - fm->cr.priority = atoi(value); - } else if (!strcmp(name, "idle_timeout")) { - fm->idle_timeout = atoi(value); - } else if (!strcmp(name, "hard_timeout")) { - fm->hard_timeout = atoi(value); - } else if (!strcmp(name, "cookie")) { + } else if (fields & F_PRIORITY && !strcmp(name, "priority")) { + fm->cr.priority = str_to_u16(value, name); + } else if (fields & F_TIMEOUT && !strcmp(name, "idle_timeout")) { + fm->idle_timeout = str_to_u16(value, name); + } else if (fields & F_TIMEOUT && !strcmp(name, "hard_timeout")) { + fm->hard_timeout = str_to_u16(value, name); + } 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_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(name[3])) { - unsigned int reg_idx = atoi(name + 3); - if (reg_idx >= FLOW_N_REGS) { - ovs_fatal(0, "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")) { + /* Ignore these, so that users can feed the output of + * "ovs-ofctl dump-flows" back into commands that parse + * flows. */ } else { - ovs_fatal(0, "unknown keyword %s", name); + ofp_fatal(str_, verbose, "unknown keyword %s", name); } } } + 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 'string' as an OFPT_FLOW_MOD or NXT_FLOW_MOD with command 'command' @@ -655,19 +614,17 @@ parse_ofp_str(struct flow_mod *fm, uint8_t *table_idx, * flow. */ void parse_ofp_flow_mod_str(struct list *packets, enum nx_flow_format *cur_format, - char *string, uint16_t command) + bool *flow_mod_table_id, char *string, uint16_t command, + bool verbose) { - bool is_del = command == OFPFC_DELETE || command == OFPFC_DELETE_STRICT; enum nx_flow_format min_format, next_format; - struct ofpbuf actions; + struct cls_rule rule_copy; struct ofpbuf *ofm; - struct flow_mod fm; + struct ofputil_flow_mod fm; - ofpbuf_init(&actions, 64); - parse_ofp_str(&fm, NULL, is_del ? NULL : &actions, string); - fm.command = command; + parse_ofp_str(&fm, command, string, verbose); - min_format = ofputil_min_flow_format(&fm.cr, true, fm.cookie); + 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); @@ -675,40 +632,38 @@ parse_ofp_flow_mod_str(struct list *packets, enum nx_flow_format *cur_format, *cur_format = next_format; } - ofm = ofputil_encode_flow_mod(&fm, *cur_format); - list_push_back(packets, &ofm->list_node); + /* 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); - ofpbuf_uninit(&actions); + 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; + } + + ofm = ofputil_encode_flow_mod(&fm, *cur_format, *flow_mod_table_id); + list_push_back(packets, &ofm->list_node); } /* 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_add_flow_file(struct list *packets, enum nx_flow_format *cur, - FILE *stream) +parse_ofp_flow_mod_file(struct list *packets, + enum nx_flow_format *cur, bool *flow_mod_table_id, + FILE *stream, uint16_t command) { - struct ds s = DS_EMPTY_INITIALIZER; - bool ok = false; - - while (!ds_get_line(&s, stream)) { - char *line = ds_cstr(&s); - char *comment; - - /* Delete comments. */ - comment = strchr(line, '#'); - if (comment) { - *comment = '\0'; - } - - /* Drop empty lines. */ - if (line[strspn(line, " \t\n")] == '\0') { - continue; - } - - parse_ofp_flow_mod_str(packets, cur, line, OFPFC_ADD); - ok = true; - break; + struct ds s; + bool ok; + + 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); } ds_destroy(&s); @@ -716,16 +671,14 @@ parse_ofp_add_flow_file(struct list *packets, enum nx_flow_format *cur, } 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 flow_mod fm; - uint8_t table_id; + struct ofputil_flow_mod fm; - parse_ofp_str(&fm, &table_id, NULL, string); + parse_ofp_str(&fm, -1, string, false); fsr->aggregate = aggregate; fsr->match = fm.cr; fsr->out_port = fm.out_port; - fsr->table_id = table_id; + fsr->table_id = fm.table_id; } -