/*
- * 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.
#include "ofp-parse.h"
+#include <ctype.h>
#include <errno.h>
#include <stdlib.h>
+#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"
#include "openflow/openflow.h"
#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 uint32_t
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) {
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) {
}
}
-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;
-
- /* 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;
- }
-
- free(str);
- return n_wild;
-}
-
-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;
}
static void
-put_enqueue_action(struct ofpbuf *b, uint16_t port, uint32_t queue)
+parse_enqueue(struct ofpbuf *b, char *arg)
{
- struct ofp_action_enqueue *oae = put_action(b, sizeof *oae, OFPAT_ENQUEUE);
- oae->port = htons(port);
- oae->queue_id = htonl(queue);
+ 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\"");
+ }
+
+ 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)
+parse_output(struct ofpbuf *b, char *arg)
{
- struct ofp_action_dl_addr *oada = put_action(b, sizeof *oada, type);
- str_to_mac(addr, oada->dl_addr);
-}
+ 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);
-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;
+ 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));
+ }
+}
- for (i = 0; i < n_pairs; i++) {
- if (!strcasecmp(name, pairs[i].name)) {
- *port = pairs[i].value;
- return true;
+static void
+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;
+
+ 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;
}
- return false;
+
+ 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
-str_to_action(char *str, struct ofpbuf *b)
+parse_set_tunnel(struct ofpbuf *b, const char *arg)
{
- char *act, *arg;
- char *saveptr = NULL;
- bool drop = false;
- int n_actions;
+ 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);
+ }
+}
- 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;
+static void
+parse_note(struct ofpbuf *b, const char *arg)
+{
+ size_t start_ofs = b->size;
+ struct nx_action_note *nan;
+ int remainder;
+ size_t len;
- if (drop) {
- ovs_fatal(0, "Drop actions must not be followed by other actions");
- }
+ nan = ofputil_put_NXAST_NOTE(b);
+
+ b->size -= sizeof nan->note;
+ while (*arg != '\0') {
+ uint8_t byte;
+ bool ok;
- /* Arguments are separated by colons */
- arg = strchr(act, ':');
- if (arg) {
- *arg = '\0';
+ if (*arg == '.') {
arg++;
}
+ if (*arg == '\0') {
+ 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, "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));
+ byte = hexits_value(arg, 2, &ok);
+ if (!ok) {
+ ovs_fatal(0, "bad hex digit in `note' argument");
+ }
+ ofpbuf_put(b, &byte, 1);
+
+ arg += 2;
+ }
+
+ len = b->size - start_ofs;
+ remainder = len % OFP_ACTION_ALIGN;
+ if (remainder) {
+ ofpbuf_put_zeros(b, OFP_ACTION_ALIGN - remainder);
+ }
+ nan = (struct nx_action_note *)((char *)b->data + start_ofs);
+ nan->len = htons(b->size - start_ofs);
+}
+
+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_tp_port *oata;
+
+ switch (code) {
+ case OFPUTIL_OFPAT_OUTPUT:
+ parse_output(b, arg);
+ break;
+
+ case OFPUTIL_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 = ofputil_put_OFPAT_SET_VLAN_PCP(b);
+ oavp->vlan_pcp = str_to_u32(arg);
+ break;
+
+ case OFPUTIL_OFPAT_STRIP_VLAN:
+ ofputil_put_OFPAT_STRIP_VLAN(b);
+ break;
+
+ case OFPUTIL_OFPAT_SET_DL_SRC:
+ case OFPUTIL_OFPAT_SET_DL_DST:
+ oada = ofputil_put_action(code, b);
+ str_to_mac(arg, oada->dl_addr);
+ break;
+
+ case OFPUTIL_OFPAT_SET_NW_SRC:
+ case OFPUTIL_OFPAT_SET_NW_DST:
+ oana = ofputil_put_action(code, b);
+ str_to_ip(arg, &oana->nw_addr);
+ break;
+
+ case OFPUTIL_OFPAT_SET_NW_TOS:
+ ofputil_put_OFPAT_SET_NW_TOS(b)->nw_tos = str_to_u32(arg);
+ break;
+
+ case OFPUTIL_OFPAT_SET_TP_SRC:
+ case OFPUTIL_OFPAT_SET_TP_DST:
+ oata = ofputil_put_action(code, b);
+ oata->tp_port = htons(str_to_u32(arg));
+ break;
+
+ case OFPUTIL_OFPAT_ENQUEUE:
+ parse_enqueue(b, arg);
+ break;
+
+ case OFPUTIL_NXAST_RESUBMIT:
+ parse_resubmit(b, arg);
+ break;
+
+ case OFPUTIL_NXAST_SET_TUNNEL:
+ parse_set_tunnel(b, arg);
+ break;
+
+ case OFPUTIL_NXAST_SET_QUEUE:
+ ofputil_put_NXAST_SET_QUEUE(b)->queue_id = htonl(str_to_u32(arg));
+ break;
+
+ case OFPUTIL_NXAST_POP_QUEUE:
+ ofputil_put_NXAST_POP_QUEUE(b);
+ break;
+
+ case OFPUTIL_NXAST_REG_MOVE:
+ nxm_parse_reg_move(ofputil_put_NXAST_REG_MOVE(b), arg);
+ break;
+
+ case OFPUTIL_NXAST_REG_LOAD:
+ nxm_parse_reg_load(ofputil_put_NXAST_REG_LOAD(b), arg);
+ break;
+
+ case OFPUTIL_NXAST_NOTE:
+ parse_note(b, arg);
+ break;
+
+ case OFPUTIL_NXAST_SET_TUNNEL64:
+ ofputil_put_NXAST_SET_TUNNEL64(b)->tun_id = htonll(str_to_u64(arg));
+ break;
+
+ case OFPUTIL_NXAST_MULTIPATH:
+ multipath_parse(ofputil_put_NXAST_MULTIPATH(b), arg);
+ break;
+
+ case OFPUTIL_NXAST_AUTOPATH:
+ autopath_parse(ofputil_put_NXAST_AUTOPATH(b), arg);
+ break;
+
+ case OFPUTIL_NXAST_BUNDLE:
+ bundle_parse(b, arg);
+ break;
+
+ case OFPUTIL_NXAST_BUNDLE_LOAD:
+ bundle_parse_load(b, arg);
+ break;
+
+ case OFPUTIL_NXAST_RESUBMIT_TABLE:
+ case OFPUTIL_NXAST_OUTPUT_REG:
+ NOT_REACHED();
+
+ case OFPUTIL_NXAST_LEARN:
+ learn_parse(b, arg, flow);
+ 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++;
}
}
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;
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 cls_rule *rule)
{
-#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, rule);
}
-/* 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_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;
- 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;
- }
- if (cookie) {
- *cookie = 0;
+ switch (command) {
+ case -1:
+ fields = F_OUT_PORT;
+ break;
+
+ case OFPFC_ADD:
+ fields = F_ACTIONS | F_COOKIE | F_TIMEOUT | F_PRIORITY;
+ 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_COOKIE;
+ break;
+
+ case OFPFC_MODIFY_STRICT:
+ fields = F_ACTIONS | F_COOKIE | F_PRIORITY;
+ break;
+
+ default:
+ NOT_REACHED();
}
- if (actions) {
- char *act_str = strstr(string, "action");
+
+ cls_rule_init_catchall(&fm->cr, OFP_DEFAULT_PRIORITY);
+ fm->cookie = htonll(0);
+ 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);
+ cls_rule_set_dl_type(&fm->cr, htons(p->dl_type));
if (p->nw_proto) {
- wildcards &= ~OFPFW_NW_PROTO;
- match->nw_proto = p->nw_proto;
+ 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);
- } 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;
- } 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();
- }
- }
+ if (!strcmp(name, "table")) {
+ fm->table_id = atoi(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);
+ } else if (fields & F_TIMEOUT && !strcmp(name, "idle_timeout")) {
+ fm->idle_timeout = atoi(value);
+ } 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 (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);
}
}
}
- match->wildcards = htonl(wildcards);
-
- 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);
+ 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;
}
-}
-/* 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)
-{
- 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;
+ free(string);
}
-/* 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_*) and appends the parsed OpenFlow message to 'packets'.
+ * '*cur_format' should initially contain the flow format currently configured
+ * on the connection; this function will add a message to change the flow
+ * format and update '*cur_format', if this is necessary to add the parsed
+ * flow. */
+void
+parse_ofp_flow_mod_str(struct list *packets, enum nx_flow_format *cur_format,
+ bool *flow_mod_table_id, char *string, uint16_t command,
+ bool verbose)
{
- struct ofpbuf *b = NULL;
- struct ds s = DS_EMPTY_INITIALIZER;
+ 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);
+ next_format = MAX(*cur_format, min_format);
+ if (next_format != *cur_format) {
+ struct ofpbuf *sff = ofputil_make_set_flow_format(next_format);
+ list_push_back(packets, &sff->list_node);
+ *cur_format = next_format;
+ }
- while (!ds_get_line(&s, stream)) {
- char *line = ds_cstr(&s);
- char *comment;
+ /* 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);
- /* Delete comments. */
- comment = strchr(line, '#');
- if (comment) {
- *comment = '\0';
- }
+ 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;
+ }
- /* Drop empty lines. */
- if (line[strspn(line, " \t\n")] == '\0') {
- continue;
- }
+ ofm = ofputil_encode_flow_mod(&fm, *cur_format, *flow_mod_table_id);
+ list_push_back(packets, &ofm->list_node);
- b = parse_ofp_add_flow_str(line);
- break;
+ ofpbuf_uninit(&actions);
+}
+
+/* Similar to parse_ofp_flow_mod_str(), except that the string is read from
+ * 'stream' and the command is always OFPFC_ADD. Returns false if end-of-file
+ * is reached before reading a flow, otherwise true. */
+bool
+parse_ofp_flow_mod_file(struct list *packets,
+ enum nx_flow_format *cur, bool *flow_mod_table_id,
+ FILE *stream, uint16_t command)
+{
+ 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);
- return b;
+ return ok;
+}
+
+void
+parse_ofp_flow_stats_request_str(struct ofputil_flow_stats_request *fsr,
+ bool aggregate, char *string)
+{
+ struct ofputil_flow_mod fm;
+
+ parse_ofp_str(&fm, -1, string, false);
+ fsr->aggregate = aggregate;
+ fsr->match = fm.cr;
+ fsr->out_port = fm.out_port;
+ fsr->table_id = fm.table_id;
}