X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fofp-parse.c;h=e3b7dc12269326bdfaa070e0c479fa57756d3cf3;hb=c6100d92142bc3dd325180cb4e10553eb4341731;hp=7a888801e7159043743f2baf244ef4a214e49178;hpb=eedc0097f475a15297375a2aba39313c0f98f330;p=sliver-openvswitch.git diff --git a/lib/ofp-parse.c b/lib/ofp-parse.c index 7a888801e..e3b7dc122 100644 --- a/lib/ofp-parse.c +++ b/lib/ofp-parse.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010 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. @@ -18,11 +18,20 @@ #include "ofp-parse.h" +#include #include #include +#include "autopath.h" +#include "bundle.h" +#include "byte-order.h" #include "dynamic-string.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" @@ -30,9 +39,33 @@ #include "socket-util.h" #include "vconn.h" #include "vlog.h" -#include "xtoxll.h" -VLOG_DEFINE_THIS_MODULE(ofp_parse) +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) @@ -40,6 +73,10 @@ str_to_u32(const char *str) char *tail; uint32_t value; + if (!str[0]) { + ovs_fatal(0, "missing required numeric argument"); + } + errno = 0; value = strtoul(str, &tail, 0); if (errno == EINVAL || errno == ERANGE || *tail) { @@ -54,6 +91,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) { @@ -71,250 +112,406 @@ str_to_mac(const char *str, uint8_t mac[6]) } } -static uint32_t -str_to_ip(const char *str_, uint32_t *ip) +static void +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; - int n_wild, 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) { - uint32_t nm = (o[0] << 24) | (o[1] << 16) | (o[2] << 8) | o[3]; - int i; - - /* Find first 1-bit. */ - for (i = 0; i < 32; i++) { - if (nm & (1u << i)) { - break; - } - } - n_wild = i; +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; - /* Verify that the rest of the bits are 1-bits. */ - for (; i < 32; i++) { - if (!(nm & (1u << i))) { - ovs_fatal(0, "%s: %s is not a valid netmask", - str, netmask); - } - } - } else { - int prefix = atoi(netmask); - if (prefix <= 0 || prefix > 32) { - ovs_fatal(0, "%s: network prefix bits not between 1 and 32", - str); - } - n_wild = 32 - prefix; - } - } else { - n_wild = 0; + if (port == NULL || queue == NULL) { + ovs_fatal(0, "\"enqueue\" syntax is \"enqueue:PORT:QUEUE\""); } - free(str); - return n_wild; + enqueue = ofpact_put_ENQUEUE(ofpacts); + enqueue->port = str_to_u32(port); + enqueue->queue = str_to_u32(queue); } -static void * -put_action(struct ofpbuf *b, size_t size, uint16_t type) +static void +parse_output(char *arg, struct ofpbuf *ofpacts) { - struct ofp_action_header *ah = ofpbuf_put_zeros(b, size); - ah->type = htons(type); - ah->len = htons(size); - return ah; + if (strchr(arg, '[')) { + struct ofpact_output_reg *output_reg; + + output_reg = ofpact_put_OUTPUT_REG(ofpacts); + mf_parse_subfield(&output_reg->src, arg); + output_reg->max_len = UINT16_MAX; + } else { + struct ofpact_output *output; + + output = ofpact_put_OUTPUT(ofpacts); + output->port = str_to_u32(arg); + output->max_len = output->port == OFPP_CONTROLLER ? UINT16_MAX : 0; + } } -static struct ofp_action_output * -put_output_action(struct ofpbuf *b, uint16_t port) +static void +parse_resubmit(char *arg, struct ofpbuf *ofpacts) { - struct ofp_action_output *oao = put_action(b, sizeof *oao, OFPAT_OUTPUT); - oao->port = htons(port); - return oao; + struct ofpact_resubmit *resubmit; + char *in_port_s, *table_s; + + resubmit = ofpact_put_RESUBMIT(ofpacts); + + 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 { + resubmit->in_port = OFPP_IN_PORT; + } + + table_s = strsep(&arg, ","); + resubmit->table_id = table_s && table_s[0] ? str_to_u32(table_s) : 255; + + 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 -put_enqueue_action(struct ofpbuf *b, uint16_t port, uint32_t queue) +parse_note(const char *arg, struct ofpbuf *ofpacts) { - struct ofp_action_enqueue *oae = put_action(b, sizeof *oae, OFPAT_ENQUEUE); - oae->port = htons(port); - oae->queue_id = htonl(queue); + struct ofpact_note *note; + + note = ofpact_put_NOTE(ofpacts); + 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(ofpacts, &byte, 1); + + note = ofpacts->l2; + note->length++; + + arg += 2; + } + ofpact_update_len(ofpacts, ¬e->ofpact); } static void -put_dl_addr_action(struct ofpbuf *b, uint16_t type, const char *addr) +parse_fin_timeout(struct ofpbuf *b, char *arg) { - struct ofp_action_dl_addr *oada = put_action(b, sizeof *oada, type); - str_to_mac(addr, oada->dl_addr); + 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 +parse_controller(struct ofpbuf *b, char *arg) +{ + 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 bool -parse_port_name(const char *name, uint16_t *port) + 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 { + 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_dec_ttl(struct ofpbuf *b, char *arg) { - 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; + struct ofpact_cnt_ids *ids; - for (i = 0; i < n_pairs; i++) { - if (!strcasecmp(name, pairs[i].name)) { - *port = pairs[i].value; - return true; + 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 { + char *cntr; + + 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); + + 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."); } + } - return false; + 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) { - char *act, *arg; - char *saveptr = NULL; - bool drop = false; - int n_actions; + struct ofpact_tunnel *tunnel; + uint16_t vid; + ovs_be32 ip; + uint8_t pcp; + uint8_t tos; + + switch (code) { + case OFPUTIL_ACTION_INVALID: + NOT_REACHED(); + + case OFPUTIL_OFPAT10_OUTPUT: + case OFPUTIL_OFPAT11_OUTPUT: + parse_output(arg, ofpacts); + 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_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; - /* Arguments are separated by colons */ - arg = strchr(act, ':'); - if (arg) { - *arg = '\0'; - arg++; + 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); } + ofpact_put_SET_IPV4_DSCP(ofpacts)->dscp = tos; + 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); - } 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); - } 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, "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_OFPAT10_SET_TP_SRC: + case OFPUTIL_OFPAT11_SET_TP_SRC: + ofpact_put_SET_L4_SRC_PORT(ofpacts)->port = str_to_u32(arg); + break; + + 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; + + 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 && (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 (parse_port_name(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++; } + ofpact_pad(ofpacts); } struct protocol { @@ -329,9 +526,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; @@ -345,234 +547,416 @@ parse_protocol(const char *name, const struct protocol **p_out) return false; } -struct field { - const char *name; - uint32_t wildcard; - enum { F_U8, F_U16, F_MAC, F_IP } type; - size_t offset, shift; -}; +static void +ofp_fatal(const char *flow, bool verbose, const char *format, ...) +{ + va_list args; -static bool -parse_field(const char *name, const struct field **f_out) + if (verbose) { + fprintf(stderr, "%s:\n", flow); + } + + va_start(args, format); + ovs_fatal_valist(0, format, args); +} + +static void +parse_field(const struct mf_field *mf, const char *s, struct match *match) { -#define F_OFS(MEMBER) offsetof(struct ofp_match, MEMBER) - static const struct field fields[] = { - { "in_port", OFPFW_IN_PORT, F_U16, F_OFS(in_port), 0 }, - { "dl_vlan", OFPFW_DL_VLAN, F_U16, F_OFS(dl_vlan), 0 }, - { "dl_vlan_pcp", OFPFW_DL_VLAN_PCP, F_U8, F_OFS(dl_vlan_pcp), 0 }, - { "dl_src", OFPFW_DL_SRC, F_MAC, F_OFS(dl_src), 0 }, - { "dl_dst", OFPFW_DL_DST, F_MAC, F_OFS(dl_dst), 0 }, - { "dl_type", OFPFW_DL_TYPE, F_U16, F_OFS(dl_type), 0 }, - { "nw_src", OFPFW_NW_SRC_MASK, F_IP, - F_OFS(nw_src), OFPFW_NW_SRC_SHIFT }, - { "nw_dst", OFPFW_NW_DST_MASK, F_IP, - F_OFS(nw_dst), OFPFW_NW_DST_SHIFT }, - { "nw_proto", OFPFW_NW_PROTO, F_U8, F_OFS(nw_proto), 0 }, - { "nw_tos", OFPFW_NW_TOS, F_U8, F_OFS(nw_tos), 0 }, - { "tp_src", OFPFW_TP_SRC, F_U16, F_OFS(tp_src), 0 }, - { "tp_dst", OFPFW_TP_DST, F_U16, F_OFS(tp_dst), 0 }, - { "icmp_type", OFPFW_ICMP_TYPE, F_U16, F_OFS(icmp_type), 0 }, - { "icmp_code", OFPFW_ICMP_CODE, F_U16, F_OFS(icmp_code), 0 } - }; - const struct field *f; + union mf_value value, mask; + char *error; - for (f = fields; f < &fields[ARRAY_SIZE(fields)]; f++) { - if (!strcmp(f->name, name)) { - *f_out = f; - return true; - } + error = mf_parse(mf, s, &value, &mask); + if (error) { + ovs_fatal(0, "%s", error); } - *f_out = NULL; - return false; + + mf_set(mf, &value, &mask, match); } -/* Convert 'string' (as described in the Flow Syntax section of the - * ovs-ofctl man page) into 'match'. The other arguments are optional - * and may be NULL if their value is not needed. If 'actions' is - * specified, an action must be in 'string' and may be expanded or - * reallocated. */ +/* 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(char *string, struct ofp_match *match, struct ofpbuf *actions, - uint8_t *table_idx, uint16_t *out_port, uint16_t *priority, - uint16_t *idle_timeout, uint16_t *hard_timeout, - uint64_t *cookie) +parse_ofp_str(struct ofputil_flow_mod *fm, int command, const char *str_, + bool verbose) { - struct ofp_match normalized; + enum { + F_OUT_PORT = 1 << 0, + F_ACTIONS = 1 << 1, + F_TIMEOUT = 1 << 3, + F_PRIORITY = 1 << 4, + F_FLAGS = 1 << 5, + } fields; + char *string = xstrdup(str_); char *save_ptr = NULL; + char *act_str = NULL; char *name; - uint32_t wildcards; - if (table_idx) { - *table_idx = 0xff; - } - if (out_port) { - *out_port = OFPP_NONE; - } - if (priority) { - *priority = OFP_DEFAULT_PRIORITY; - } - if (idle_timeout) { - *idle_timeout = OFP_FLOW_PERMANENT; - } - if (hard_timeout) { - *hard_timeout = OFP_FLOW_PERMANENT; + switch (command) { + case -1: + fields = F_OUT_PORT; + break; + + case OFPFC_ADD: + fields = F_ACTIONS | F_TIMEOUT | F_PRIORITY | F_FLAGS; + break; + + case OFPFC_DELETE: + fields = F_OUT_PORT; + break; + + case OFPFC_DELETE_STRICT: + fields = F_OUT_PORT | F_PRIORITY; + break; + + case OFPFC_MODIFY: + fields = F_ACTIONS | F_TIMEOUT | F_PRIORITY | F_FLAGS; + break; + + case OFPFC_MODIFY_STRICT: + fields = F_ACTIONS | F_TIMEOUT | F_PRIORITY | F_FLAGS; + break; + + default: + NOT_REACHED(); } - if (cookie) { - *cookie = 0; + + 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); } - if (actions) { - char *act_str = strstr(string, "action"); + 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 (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); } - memset(match, 0, sizeof *match); - wildcards = OFPFW_ALL; 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)) { - wildcards &= ~OFPFW_DL_TYPE; - match->dl_type = htons(p->dl_type); + match_set_dl_type(&fm->match, htons(p->dl_type)); if (p->nw_proto) { - wildcards &= ~OFPFW_NW_PROTO; - match->nw_proto = 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); 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); - } else if (out_port && !strcmp(name, "out_port")) { - *out_port = atoi(value); - } else if (priority && !strcmp(name, "priority")) { - *priority = atoi(value); - } else if (idle_timeout && !strcmp(name, "idle_timeout")) { - *idle_timeout = atoi(value); - } else if (hard_timeout && !strcmp(name, "hard_timeout")) { - *hard_timeout = atoi(value); - } else if (cookie && !strcmp(name, "cookie")) { - *cookie = str_to_u64(value); - } else if (!strcmp(name, "tun_id_wild")) { - wildcards |= NXFW_TUN_ID; - } else if (parse_field(name, &f)) { - void *data = (char *) match + f->offset; - if (!strcmp(value, "*") || !strcmp(value, "ANY")) { - wildcards |= f->wildcard; + if (!strcmp(name, "table")) { + fm->table_id = str_to_table_id(value); + } else if (!strcmp(name, "out_port")) { + 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->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 (!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 { - uint16_t port_no; - - wildcards &= ~f->wildcard; - if (f->wildcard == OFPFW_IN_PORT - && parse_port_name(value, &port_no)) { - match->in_port = htons(port_no); - } else if (f->type == F_U8) { - *(uint8_t *) data = str_to_u32(value); - } else if (f->type == F_U16) { - *(uint16_t *) data = htons(str_to_u32(value)); - } else if (f->type == F_MAC) { - str_to_mac(value, data); - } else if (f->type == F_IP) { - wildcards |= str_to_ip(value, data) << f->shift; - } else { - NOT_REACHED(); + /* 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"); } + fm->new_cookie = htonll(str_to_u64(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")) { + /* 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); } } } - match->wildcards = htonl(wildcards); + 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); +} + +/* Convert 'str_' (as described in the documentation for the "monitor" command + * in the ovs-ofctl man page) into 'fmr'. */ +void +parse_flow_monitor_request(struct ofputil_flow_monitor_request *fmr, + const char *str_) +{ + static uint32_t id; + + char *string = xstrdup(str_); + char *save_ptr = NULL; + char *name; - normalized = *match; - normalize_match(&normalized); - if (memcmp(match, &normalized, sizeof normalized)) { - char *old = ofp_match_to_literal_string(match); - char *new = ofp_match_to_literal_string(&normalized); - VLOG_WARN("The specified flow is not in normal form:"); - VLOG_WARN(" as specified: %s", old); - VLOG_WARN("as normalized: %s", new); - free(old); - free(new); + 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); + + 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 (!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 'string' as a OFPT_FLOW_MOD with subtype OFPFC_ADD and returns an - * ofpbuf that contains it. */ -struct ofpbuf * -parse_ofp_add_flow_str(char *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) { - struct ofpbuf *buffer; - struct ofp_flow_mod *ofm; - uint16_t priority, idle_timeout, hard_timeout; - uint64_t cookie; - struct ofp_match match; - - /* parse_ofp_str() will expand and reallocate the data in 'buffer', so we - * can't keep pointers to across the parse_ofp_str() call. */ - make_openflow(sizeof *ofm, OFPT_FLOW_MOD, &buffer); - parse_ofp_str(string, &match, buffer, - NULL, NULL, &priority, &idle_timeout, &hard_timeout, - &cookie); - ofm = buffer->data; - ofm->match = match; - ofm->command = htons(OFPFC_ADD); - ofm->cookie = htonll(cookie); - ofm->idle_timeout = htons(idle_timeout); - ofm->hard_timeout = htons(hard_timeout); - ofm->buffer_id = htonl(UINT32_MAX); - ofm->priority = htons(priority); - update_openflow_length(buffer); - - return buffer; + char *s = xstrdup(s_); + str_to_ofpacts(NULL, s, ofpacts); + free(s); } -/* Parses an OFPT_FLOW_MOD with subtype OFPFC_ADD from 'stream' and returns an - * ofpbuf that contains it. Returns a null pointer if end-of-file is reached - * before reading a flow. */ -struct ofpbuf * -parse_ofp_add_flow_file(FILE *stream) +/* 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 ofpbuf *b = NULL; - struct ds s = DS_EMPTY_INITIALIZER; + struct match match_copy; - while (!ds_get_line(&s, stream)) { - char *line = ds_cstr(&s); - char *comment; + parse_ofp_str(fm, command, string, verbose); - /* Delete comments. */ - comment = strchr(line, '#'); - if (comment) { - *comment = '\0'; - } + /* 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); +} - /* Drop empty lines. */ - if (line[strspn(line, " \t\n")] == '\0') { - continue; - } +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; - b = parse_ofp_add_flow_str(line); - break; + 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); + 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 b; + if (stream != stdin) { + fclose(stream); + } +} + +void +parse_ofp_flow_stats_request_str(struct ofputil_flow_stats_request *fsr, + bool aggregate, const char *string) +{ + struct ofputil_flow_mod fm; + + parse_ofp_str(&fm, -1, string, false); + fsr->aggregate = aggregate; + 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; }