/*
- * Copyright (c) 2010, 2011, 2012, 2013, 2014 Nicira, Inc.
+ * Copyright (c) 2010, 2011, 2012, 2013, 2014, 2015, 2016 Nicira, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
#include <ctype.h>
#include <errno.h>
#include <stdlib.h>
+#include <netinet/in.h>
-#include "bundle.h"
#include "byte-order.h"
#include "dynamic-string.h"
#include "learn.h"
#include "packets.h"
#include "simap.h"
#include "socket-util.h"
-#include "vconn.h"
+#include "openvswitch/vconn.h"
/* Parses 'str' as an 8-bit unsigned integer into '*valuep'.
*
*
* Returns NULL if successful, otherwise a malloc()'d string describing the
* error. The caller is responsible for freeing the returned string. */
-char * WARN_UNUSED_RESULT
+char * OVS_WARN_UNUSED_RESULT
str_to_u8(const char *str, const char *name, uint8_t *valuep)
{
int value;
*
* Returns NULL if successful, otherwise a malloc()'d string describing the
* error. The caller is responsible for freeing the returned string. */
-char * WARN_UNUSED_RESULT
+char * OVS_WARN_UNUSED_RESULT
str_to_u16(const char *str, const char *name, uint16_t *valuep)
{
int value;
*
* Returns NULL if successful, otherwise a malloc()'d string describing the
* error. The caller is responsible for freeing the returned string. */
-char * WARN_UNUSED_RESULT
+char * OVS_WARN_UNUSED_RESULT
str_to_u32(const char *str, uint32_t *valuep)
{
char *tail;
*
* Returns NULL if successful, otherwise a malloc()'d string describing the
* error. The caller is responsible for freeing the returned string. */
-char * WARN_UNUSED_RESULT
+char * OVS_WARN_UNUSED_RESULT
str_to_u64(const char *str, uint64_t *valuep)
{
char *tail;
*
* Returns NULL if successful, otherwise a malloc()'d string describing the
* error. The caller is responsible for freeing the returned string. */
-char * WARN_UNUSED_RESULT
+char * OVS_WARN_UNUSED_RESULT
str_to_be64(const char *str, ovs_be64 *valuep)
{
uint64_t value = 0;
*
* Returns NULL if successful, otherwise a malloc()'d string describing the
* error. The caller is responsible for freeing the returned string. */
-char * WARN_UNUSED_RESULT
-str_to_mac(const char *str, uint8_t mac[ETH_ADDR_LEN])
+char * OVS_WARN_UNUSED_RESULT
+str_to_mac(const char *str, struct eth_addr *mac)
{
- if (!ovs_scan(str, ETH_ADDR_SCAN_FMT, ETH_ADDR_SCAN_ARGS(mac))) {
+ if (!ovs_scan(str, ETH_ADDR_SCAN_FMT, ETH_ADDR_SCAN_ARGS(*mac))) {
return xasprintf("invalid mac address %s", str);
}
return NULL;
*
* Returns NULL if successful, otherwise a malloc()'d string describing the
* error. The caller is responsible for freeing the returned string. */
-char * WARN_UNUSED_RESULT
+char * OVS_WARN_UNUSED_RESULT
str_to_ip(const char *str, ovs_be32 *ip)
{
struct in_addr in_addr;
return NULL;
}
+/* Parses 'str' as a conntrack helper into 'alg'.
+ *
+ * Returns NULL if successful, otherwise a malloc()'d string describing the
+ * error. The caller is responsible for freeing the returned string. */
+char * OVS_WARN_UNUSED_RESULT
+str_to_connhelper(const char *str, uint16_t *alg)
+{
+ if (!strcmp(str, "ftp")) {
+ *alg = IPPORT_FTP;
+ return NULL;
+ }
+ return xasprintf("invalid conntrack helper \"%s\"", str);
+}
+
struct protocol {
const char *name;
uint16_t dl_type;
{
static const struct protocol protocols[] = {
{ "ip", ETH_TYPE_IP, 0 },
+ { "ipv4", ETH_TYPE_IP, 0 },
+ { "ip4", ETH_TYPE_IP, 0 },
{ "arp", ETH_TYPE_ARP, 0 },
{ "icmp", ETH_TYPE_IP, IPPROTO_ICMP },
{ "tcp", ETH_TYPE_IP, IPPROTO_TCP },
*
* Returns NULL if successful, otherwise a malloc()'d string describing the
* error. The caller is responsible for freeing the returned string. */
-static char * WARN_UNUSED_RESULT
+static char * OVS_WARN_UNUSED_RESULT
parse_field(const struct mf_field *mf, const char *s, struct match *match,
enum ofputil_protocol *usable_protocols)
{
union mf_value value, mask;
char *error;
+ if (!*s) {
+ /* If there's no string, we're just trying to match on the
+ * existence of the field, so use a no-op value. */
+ s = "0/0";
+ }
+
error = mf_parse(mf, s, &value, &mask);
if (!error) {
- *usable_protocols &= mf_set(mf, &value, &mask, match);
+ *usable_protocols &= mf_set(mf, &value, &mask, match, &error);
}
return error;
}
}
-static char * WARN_UNUSED_RESULT
+static char * OVS_WARN_UNUSED_RESULT
parse_ofp_str__(struct ofputil_flow_mod *fm, int command, char *string,
enum ofputil_protocol *usable_protocols)
{
enum {
F_OUT_PORT = 1 << 0,
F_ACTIONS = 1 << 1,
+ F_IMPORTANCE = 1 << 2,
F_TIMEOUT = 1 << 3,
F_PRIORITY = 1 << 4,
F_FLAGS = 1 << 5,
} fields;
- char *save_ptr = NULL;
char *act_str = NULL;
- char *name;
+ char *name, *value;
*usable_protocols = OFPUTIL_P_ANY;
+ if (command == -2) {
+ size_t len;
+
+ string += strspn(string, " \t\r\n"); /* Skip white space. */
+ len = strcspn(string, ", \t\r\n"); /* Get length of the first token. */
+
+ if (!strncmp(string, "add", len)) {
+ command = OFPFC_ADD;
+ } else if (!strncmp(string, "delete", len)) {
+ command = OFPFC_DELETE;
+ } else if (!strncmp(string, "delete_strict", len)) {
+ command = OFPFC_DELETE_STRICT;
+ } else if (!strncmp(string, "modify", len)) {
+ command = OFPFC_MODIFY;
+ } else if (!strncmp(string, "modify_strict", len)) {
+ command = OFPFC_MODIFY_STRICT;
+ } else {
+ len = 0;
+ command = OFPFC_ADD;
+ }
+ string += len;
+ }
+
switch (command) {
case -1:
fields = F_OUT_PORT;
break;
case OFPFC_ADD:
- fields = F_ACTIONS | F_TIMEOUT | F_PRIORITY | F_FLAGS;
+ fields = F_ACTIONS | F_TIMEOUT | F_PRIORITY | F_FLAGS | F_IMPORTANCE;
break;
case OFPFC_DELETE:
OVS_NOT_REACHED();
}
- match_init_catchall(&fm->match);
- fm->priority = OFP_DEFAULT_PRIORITY;
- fm->cookie = htonll(0);
- fm->cookie_mask = htonll(0);
+ *fm = (struct ofputil_flow_mod) {
+ .match = MATCH_CATCHALL_INITIALIZER,
+ .priority = OFP_DEFAULT_PRIORITY,
+ .table_id = 0xff,
+ .command = command,
+ .buffer_id = UINT32_MAX,
+ .out_port = OFPP_ANY,
+ .out_group = OFPG_ANY,
+ .delete_reason = OFPRR_DELETE,
+ };
+ /* For modify, by default, don't update the cookie. */
if (command == OFPFC_MODIFY || command == OFPFC_MODIFY_STRICT) {
- /* For modify, by default, don't update the cookie. */
fm->new_cookie = OVS_BE64_MAX;
- } else{
- fm->new_cookie = htonll(0);
}
- fm->modify_cookie = false;
- 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_ANY;
- fm->flags = 0;
- fm->out_group = OFPG11_ANY;
- fm->delete_reason = OFPRR_DELETE;
+
if (fields & F_ACTIONS) {
act_str = extract_actions(string);
if (!act_str) {
return xstrdup("must specify an action");
}
}
- for (name = strtok_r(string, "=, \t\r\n", &save_ptr); name;
- name = strtok_r(NULL, "=, \t\r\n", &save_ptr)) {
+
+ while (ofputil_parse_key_value(&string, &name, &value)) {
const struct protocol *p;
char *error = NULL;
} else if (!strcmp(name, "no_readonly_table")
|| !strcmp(name, "allow_hidden_fields")) {
/* ignore these fields. */
+ } else if (mf_from_name(name)) {
+ error = parse_field(mf_from_name(name), value, &fm->match,
+ usable_protocols);
} else {
- char *value;
-
- value = strtok_r(NULL, ", \t\r\n", &save_ptr);
- if (!value) {
+ if (!*value) {
return xasprintf("field %s missing value", name);
}
if (fm->table_id != 0xff) {
*usable_protocols &= OFPUTIL_P_TID;
}
- } else if (!strcmp(name, "out_port")) {
+ } else if (fields & F_OUT_PORT && !strcmp(name, "out_port")) {
if (!ofputil_port_from_string(value, &fm->out_port)) {
error = xasprintf("%s is not a valid OpenFlow port",
value);
}
+ } else if (fields & F_OUT_PORT && !strcmp(name, "out_group")) {
+ *usable_protocols &= OFPUTIL_P_OF11_UP;
+ if (!ofputil_group_from_string(value, &fm->out_group)) {
+ error = xasprintf("%s is not a valid OpenFlow group",
+ value);
+ }
} else if (fields & F_PRIORITY && !strcmp(name, "priority")) {
uint16_t priority = 0;
error = str_to_u16(value, name, &fm->idle_timeout);
} else if (fields & F_TIMEOUT && !strcmp(name, "hard_timeout")) {
error = str_to_u16(value, name, &fm->hard_timeout);
+ } else if (fields & F_IMPORTANCE && !strcmp(name, "importance")) {
+ error = str_to_u16(value, name, &fm->importance);
} else if (!strcmp(name, "cookie")) {
char *mask = strchr(value, '/');
error = str_to_be64(value, &fm->new_cookie);
fm->modify_cookie = true;
}
- } else if (mf_from_name(name)) {
- error = parse_field(mf_from_name(name), value, &fm->match,
- usable_protocols);
} else if (!strcmp(name, "duration")
|| !strcmp(name, "n_packets")
|| !strcmp(name, "n_bytes")
} else {
error = xasprintf("unknown keyword %s", name);
}
+ }
- if (error) {
- return error;
- }
+ if (error) {
+ return error;
}
}
/* Check for usable protocol interdependencies between match fields. */
if (!error) {
enum ofperr err;
- err = ofpacts_check(ofpbuf_data(&ofpacts), ofpbuf_size(&ofpacts), &fm->match.flow,
+ err = ofpacts_check(ofpacts.data, ofpacts.size, &fm->match.flow,
OFPP_MAX, fm->table_id, 255, usable_protocols);
- if (!err && !usable_protocols) {
+ if (!err && !*usable_protocols) {
err = OFPERR_OFPBAC_MATCH_INCONSISTENT;
}
if (err) {
return error;
}
- fm->ofpacts_len = ofpbuf_size(&ofpacts);
+ fm->ofpacts_len = ofpacts.size;
fm->ofpacts = ofpbuf_steal_data(&ofpacts);
} else {
fm->ofpacts_len = 0;
* constant for 'command'. To parse syntax for an OFPST_FLOW or
* OFPST_AGGREGATE (or NXST_FLOW or NXST_AGGREGATE), use -1 for 'command'.
*
+ * If 'command' is given as -2, 'str_' may begin with a command name ("add",
+ * "modify", "delete", "modify_strict", or "delete_strict"). A missing command
+ * name is treated as "add".
+ *
* Returns NULL if successful, otherwise a malloc()'d string describing the
* error. The caller is responsible for freeing the returned string. */
-char * WARN_UNUSED_RESULT
+char * OVS_WARN_UNUSED_RESULT
parse_ofp_str(struct ofputil_flow_mod *fm, int command, const char *str_,
enum ofputil_protocol *usable_protocols)
{
return error;
}
-static char * WARN_UNUSED_RESULT
+static char * OVS_WARN_UNUSED_RESULT
parse_ofp_meter_mod_str__(struct ofputil_meter_mod *mm, char *string,
struct ofpbuf *bands, int command,
enum ofputil_protocol *usable_protocols)
if (error) {
return error;
}
- if (mm->meter.meter_id > OFPM13_MAX) {
+ if (mm->meter.meter_id > OFPM13_MAX
+ || !mm->meter.meter_id) {
return xasprintf("invalid value for %s", name);
}
}
*
* Returns NULL if successful, otherwise a malloc()'d string describing the
* error. The caller is responsible for freeing the returned string. */
-char * WARN_UNUSED_RESULT
+char * OVS_WARN_UNUSED_RESULT
parse_ofp_meter_mod_str(struct ofputil_meter_mod *mm, const char *str_,
int command, enum ofputil_protocol *usable_protocols)
{
return error;
}
-static char * WARN_UNUSED_RESULT
+static char * OVS_WARN_UNUSED_RESULT
parse_flow_monitor_request__(struct ofputil_flow_monitor_request *fmr,
const char *str_, char *string,
enum ofputil_protocol *usable_protocols)
{
static atomic_count id = ATOMIC_COUNT_INIT(0);
- char *save_ptr = NULL;
- char *name;
+ char *name, *value;
fmr->id = atomic_count_inc(&id);
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)) {
+ while (ofputil_parse_key_value(&string, &name, &value)) {
const struct protocol *p;
+ char *error = NULL;
if (!strcmp(name, "!initial")) {
fmr->flags &= ~NXFMF_INITIAL;
if (p->nw_proto) {
match_set_nw_proto(&fmr->match, p->nw_proto);
}
+ } else if (mf_from_name(name)) {
+ error = parse_field(mf_from_name(name), value, &fmr->match,
+ usable_protocols);
} else {
- char *value;
-
- value = strtok_r(NULL, ", \t\r\n", &save_ptr);
- if (!value) {
+ if (!*value) {
return xasprintf("%s: field %s missing value", str_, name);
}
if (!strcmp(name, "table")) {
- char *error = str_to_u8(value, "table", &fmr->table_id);
- if (error) {
- return error;
- }
+ error = str_to_u8(value, "table", &fmr->table_id);
} else if (!strcmp(name, "out_port")) {
fmr->out_port = u16_to_ofp(atoi(value));
- } else if (mf_from_name(name)) {
- char *error;
-
- error = parse_field(mf_from_name(name), value, &fmr->match,
- usable_protocols);
- if (error) {
- return error;
- }
} else {
return xasprintf("%s: unknown keyword %s", str_, name);
}
}
+
+ if (error) {
+ return error;
+ }
}
return NULL;
}
*
* Returns NULL if successful, otherwise a malloc()'d string describing the
* error. The caller is responsible for freeing the returned string. */
-char * WARN_UNUSED_RESULT
+char * OVS_WARN_UNUSED_RESULT
parse_flow_monitor_request(struct ofputil_flow_monitor_request *fmr,
const char *str_,
enum ofputil_protocol *usable_protocols)
/* Parses 'string' as an OFPT_FLOW_MOD or NXT_FLOW_MOD with command 'command'
* (one of OFPFC_*) into 'fm'.
*
+ * If 'command' is given as -2, 'string' may begin with a command name ("add",
+ * "modify", "delete", "modify_strict", or "delete_strict"). A missing command
+ * name is treated as "add".
+ *
* Returns NULL if successful, otherwise a malloc()'d string describing the
* error. The caller is responsible for freeing the returned string. */
-char * WARN_UNUSED_RESULT
+char * OVS_WARN_UNUSED_RESULT
parse_ofp_flow_mod_str(struct ofputil_flow_mod *fm, const char *string,
- uint16_t command,
+ int command,
enum ofputil_protocol *usable_protocols)
{
char *error = parse_ofp_str(fm, command, string, usable_protocols);
+
if (!error) {
/* 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
return error;
}
-/* Convert 'table_id' and 'flow_miss_handling' (as described for the
- * "mod-table" command in the ovs-ofctl man page) into 'tm' for sending the
- * specified table_mod 'command' to a switch.
+/* Convert 'setting' (as described for the "mod-table" command
+ * in ovs-ofctl man page) into 'tm->table_vacancy->vacancy_up' and
+ * 'tm->table_vacancy->vacancy_down' threshold values.
+ * For the two threshold values, value of vacancy_up is always greater
+ * than value of vacancy_down.
*
* Returns NULL if successful, otherwise a malloc()'d string describing the
* error. The caller is responsible for freeing the returned string. */
-char * WARN_UNUSED_RESULT
-parse_ofp_table_mod(struct ofputil_table_mod *tm, const char *table_id,
- const char *flow_miss_handling,
- enum ofputil_protocol *usable_protocols)
+char * OVS_WARN_UNUSED_RESULT
+parse_ofp_table_vacancy(struct ofputil_table_mod *tm, const char *setting)
{
- /* Table mod requires at least OF 1.1. */
- *usable_protocols = OFPUTIL_P_OF11_UP;
+ char *save_ptr = NULL;
+ char *vac_up, *vac_down;
+ char *value = xstrdup(setting);
+ char *ret_msg;
+ int vacancy_up, vacancy_down;
+
+ strtok_r(value, ":", &save_ptr);
+ vac_down = strtok_r(NULL, ",", &save_ptr);
+ if (!vac_down) {
+ ret_msg = xasprintf("Vacancy down value missing");
+ goto exit;
+ }
+ if (!str_to_int(vac_down, 0, &vacancy_down) ||
+ vacancy_down < 0 || vacancy_down > 100) {
+ ret_msg = xasprintf("Invalid vacancy down value \"%s\"", vac_down);
+ goto exit;
+ }
+ vac_up = strtok_r(NULL, ",", &save_ptr);
+ if (!vac_up) {
+ ret_msg = xasprintf("Vacancy up value missing");
+ goto exit;
+ }
+ if (!str_to_int(vac_up, 0, &vacancy_up) ||
+ vacancy_up < 0 || vacancy_up > 100) {
+ ret_msg = xasprintf("Invalid vacancy up value \"%s\"", vac_up);
+ goto exit;
+ }
+ if (vacancy_down > vacancy_up) {
+ ret_msg = xasprintf("Invalid vacancy range, vacancy up should be "
+ "greater than vacancy down (%s)",
+ ofperr_to_string(OFPERR_OFPBPC_BAD_VALUE));
+ goto exit;
+ }
+ free(value);
+ tm->table_vacancy.vacancy_down = vacancy_down;
+ tm->table_vacancy.vacancy_up = vacancy_up;
+ return NULL;
+
+exit:
+ free(value);
+ return ret_msg;
+}
+
+/* Convert 'table_id' and 'setting' (as described for the "mod-table" command
+ * in the ovs-ofctl man page) into 'tm' for sending a table_mod command to a
+ * switch.
+ *
+ * Stores a bitmap of the OpenFlow versions that are usable for 'tm' into
+ * '*usable_versions'.
+ *
+ * Returns NULL if successful, otherwise a malloc()'d string describing the
+ * error. The caller is responsible for freeing the returned string. */
+char * OVS_WARN_UNUSED_RESULT
+parse_ofp_table_mod(struct ofputil_table_mod *tm, const char *table_id,
+ const char *setting, uint32_t *usable_versions)
+{
+ *usable_versions = 0;
if (!strcasecmp(table_id, "all")) {
tm->table_id = OFPTT_ALL;
} else {
}
}
- if (strcmp(flow_miss_handling, "controller") == 0) {
- tm->miss_config = OFPUTIL_TABLE_MISS_CONTROLLER;
- } else if (strcmp(flow_miss_handling, "continue") == 0) {
- tm->miss_config = OFPUTIL_TABLE_MISS_CONTINUE;
- } else if (strcmp(flow_miss_handling, "drop") == 0) {
- tm->miss_config = OFPUTIL_TABLE_MISS_DROP;
+ tm->miss = OFPUTIL_TABLE_MISS_DEFAULT;
+ tm->eviction = OFPUTIL_TABLE_EVICTION_DEFAULT;
+ tm->eviction_flags = UINT32_MAX;
+ tm->vacancy = OFPUTIL_TABLE_VACANCY_DEFAULT;
+ tm->table_vacancy.vacancy_down = 0;
+ tm->table_vacancy.vacancy_up = 0;
+ tm->table_vacancy.vacancy = 0;
+ /* Only OpenFlow 1.1 and 1.2 can configure table-miss via table_mod.
+ * Only OpenFlow 1.4+ can configure eviction and vacancy events
+ * via table_mod.
+ */
+ if (!strcmp(setting, "controller")) {
+ tm->miss = OFPUTIL_TABLE_MISS_CONTROLLER;
+ *usable_versions = (1u << OFP11_VERSION) | (1u << OFP12_VERSION);
+ } else if (!strcmp(setting, "continue")) {
+ tm->miss = OFPUTIL_TABLE_MISS_CONTINUE;
+ *usable_versions = (1u << OFP11_VERSION) | (1u << OFP12_VERSION);
+ } else if (!strcmp(setting, "drop")) {
+ tm->miss = OFPUTIL_TABLE_MISS_DROP;
+ *usable_versions = (1u << OFP11_VERSION) | (1u << OFP12_VERSION);
+ } else if (!strcmp(setting, "evict")) {
+ tm->eviction = OFPUTIL_TABLE_EVICTION_ON;
+ *usable_versions = (1 << OFP14_VERSION) | (1u << OFP15_VERSION);
+ } else if (!strcmp(setting, "noevict")) {
+ tm->eviction = OFPUTIL_TABLE_EVICTION_OFF;
+ *usable_versions = (1 << OFP14_VERSION) | (1u << OFP15_VERSION);
+ } else if (!strncmp(setting, "vacancy", strcspn(setting, ":"))) {
+ tm->vacancy = OFPUTIL_TABLE_VACANCY_ON;
+ *usable_versions = (1 << OFP14_VERSION) | (1u << OFP15_VERSION);
+ char *error = parse_ofp_table_vacancy(tm, setting);
+ if (error) {
+ return error;
+ }
+ } else if (!strcmp(setting, "novacancy")) {
+ tm->vacancy = OFPUTIL_TABLE_VACANCY_OFF;
+ *usable_versions = (1 << OFP14_VERSION) | (1u << OFP15_VERSION);
} else {
- return xasprintf("invalid flow_miss_handling %s", flow_miss_handling);
+ return xasprintf("invalid table_mod setting %s", setting);
}
if (tm->table_id == 0xfe
- && tm->miss_config == OFPUTIL_TABLE_MISS_CONTINUE) {
+ && tm->miss == OFPUTIL_TABLE_MISS_CONTINUE) {
return xstrdup("last table's flow miss handling can not be continue");
}
* type (one of OFPFC_*). Stores each flow_mod in '*fm', an array allocated
* on the caller's behalf, and the number of flow_mods in '*n_fms'.
*
+ * If 'command' is given as -2, each line may start with a command name
+ * ("add", "modify", "delete", "modify_strict", or "delete_strict"). A missing
+ * command name is treated as "add".
+ *
* Returns NULL if successful, otherwise a malloc()'d string describing the
* error. The caller is responsible for freeing the returned string. */
-char * WARN_UNUSED_RESULT
-parse_ofp_flow_mod_file(const char *file_name, uint16_t command,
+char * OVS_WARN_UNUSED_RESULT
+parse_ofp_flow_mod_file(const char *file_name, int command,
struct ofputil_flow_mod **fms, size_t *n_fms,
enum ofputil_protocol *usable_protocols)
{
error = parse_ofp_flow_mod_str(&(*fms)[*n_fms], ds_cstr(&s), command,
&usable);
if (error) {
+ char *err_msg;
size_t i;
for (i = 0; i < *n_fms; i++) {
fclose(stream);
}
- return xasprintf("%s:%d: %s", file_name, line_number, error);
+ err_msg = xasprintf("%s:%d: %s", file_name, line_number, error);
+ free(error);
+ return err_msg;
}
*usable_protocols &= usable; /* Each line can narrow the set. */
*n_fms += 1;
return NULL;
}
-char * WARN_UNUSED_RESULT
+char * OVS_WARN_UNUSED_RESULT
parse_ofp_flow_stats_request_str(struct ofputil_flow_stats_request *fsr,
bool aggregate, const char *string,
enum ofputil_protocol *usable_protocols)
goto exit;
}
- if (!mf_is_zero(mf, flow)) {
+ if (mf_is_set(mf, flow)) {
error = xasprintf("%s: field %s set multiple times", s, key);
goto exit;
}
return error;
}
-static char * WARN_UNUSED_RESULT
-parse_bucket_str(struct ofputil_bucket *bucket, char *str_,
+static char * OVS_WARN_UNUSED_RESULT
+parse_bucket_str(struct ofputil_bucket *bucket, char *str_, uint8_t group_type,
enum ofputil_protocol *usable_protocols)
{
char *pos, *key, *value;
struct ds actions;
char *error;
- bucket->weight = 1;
+ bucket->weight = group_type == OFPGT11_SELECT ? 1 : 0;
+ bucket->bucket_id = OFPG15_BUCKET_ALL;
bucket->watch_port = OFPP_ANY;
- bucket->watch_group = OFPG11_ANY;
+ bucket->watch_group = OFPG_ANY;
ds_init(&actions);
error = xasprintf("invalid watch_group id %"PRIu32,
bucket->watch_group);
}
+ } else if (!strcasecmp(key, "bucket_id")) {
+ error = str_to_u32(value, &bucket->bucket_id);
+ if (!error && bucket->bucket_id > OFPG15_BUCKET_MAX) {
+ error = xasprintf("invalid bucket_id id %"PRIu32,
+ bucket->bucket_id);
+ }
+ *usable_protocols &= OFPUTIL_P_OF15_UP;
} else if (!strcasecmp(key, "action") || !strcasecmp(key, "actions")) {
ds_put_format(&actions, "%s,", value);
} else {
ofpbuf_uninit(&ofpacts);
return error;
}
- bucket->ofpacts = ofpbuf_data(&ofpacts);
- bucket->ofpacts_len = ofpbuf_size(&ofpacts);
+ bucket->ofpacts = ofpacts.data;
+ bucket->ofpacts_len = ofpacts.size;
return NULL;
}
-static char * WARN_UNUSED_RESULT
+static char * OVS_WARN_UNUSED_RESULT
+parse_select_group_field(char *s, struct field_array *fa,
+ enum ofputil_protocol *usable_protocols)
+{
+ char *name, *value_str;
+
+ while (ofputil_parse_key_value(&s, &name, &value_str)) {
+ const struct mf_field *mf = mf_from_name(name);
+
+ if (mf) {
+ char *error;
+ union mf_value value;
+
+ if (bitmap_is_set(fa->used.bm, mf->id)) {
+ return xasprintf("%s: duplicate field", name);
+ }
+
+ if (*value_str) {
+ error = mf_parse_value(mf, value_str, &value);
+ if (error) {
+ return error;
+ }
+
+ /* The mask cannot be all-zeros */
+ if (!mf_is_tun_metadata(mf) &&
+ is_all_zeros(&value, mf->n_bytes)) {
+ return xasprintf("%s: values are wildcards here "
+ "and must not be all-zeros", s);
+ }
+
+ /* The values parsed are masks for fields used
+ * by the selection method */
+ if (!mf_is_mask_valid(mf, &value)) {
+ return xasprintf("%s: invalid mask for field %s",
+ value_str, mf->name);
+ }
+ } else {
+ memset(&value, 0xff, mf->n_bytes);
+ }
+
+ field_array_set(mf->id, &value, fa);
+
+ if (is_all_ones(&value, mf->n_bytes)) {
+ *usable_protocols &= mf->usable_protocols_exact;
+ } else if (mf->usable_protocols_bitwise == mf->usable_protocols_cidr
+ || ip_is_cidr(value.be32)) {
+ *usable_protocols &= mf->usable_protocols_cidr;
+ } else {
+ *usable_protocols &= mf->usable_protocols_bitwise;
+ }
+ } else {
+ return xasprintf("%s: unknown field %s", s, name);
+ }
+ }
+
+ return NULL;
+}
+
+static char * OVS_WARN_UNUSED_RESULT
parse_ofp_group_mod_str__(struct ofputil_group_mod *gm, uint16_t command,
char *string,
enum ofputil_protocol *usable_protocols)
{
enum {
- F_GROUP_TYPE = 1 << 0,
- F_BUCKETS = 1 << 1,
+ F_GROUP_TYPE = 1 << 0,
+ F_BUCKETS = 1 << 1,
+ F_COMMAND_BUCKET_ID = 1 << 2,
+ F_COMMAND_BUCKET_ID_ALL = 1 << 3,
} fields;
- char *save_ptr = NULL;
bool had_type = false;
- char *name;
+ bool had_command_bucket_id = false;
struct ofputil_bucket *bucket;
char *error = NULL;
fields = F_GROUP_TYPE | F_BUCKETS;
break;
+ case OFPGC15_INSERT_BUCKET:
+ fields = F_BUCKETS | F_COMMAND_BUCKET_ID;
+ *usable_protocols &= OFPUTIL_P_OF15_UP;
+ break;
+
+ case OFPGC15_REMOVE_BUCKET:
+ fields = F_COMMAND_BUCKET_ID | F_COMMAND_BUCKET_ID_ALL;
+ *usable_protocols &= OFPUTIL_P_OF15_UP;
+ break;
+
default:
OVS_NOT_REACHED();
}
memset(gm, 0, sizeof *gm);
gm->command = command;
gm->group_id = OFPG_ANY;
+ gm->command_bucket_id = OFPG15_BUCKET_ALL;
list_init(&gm->buckets);
if (command == OFPGC11_DELETE && string[0] == '\0') {
gm->group_id = OFPG_ALL;
*usable_protocols = OFPUTIL_P_OF11_UP;
- if (fields & F_BUCKETS) {
- char *bkt_str = strstr(string, "bucket");
-
- if (bkt_str) {
- *bkt_str = '\0';
+ /* Strip the buckets off the end of 'string', if there are any, saving a
+ * pointer for later. We want to parse the buckets last because the bucket
+ * type influences bucket defaults. */
+ char *bkt_str = strstr(string, "bucket=");
+ if (bkt_str) {
+ if (!(fields & F_BUCKETS)) {
+ error = xstrdup("bucket is not needed");
+ goto out;
}
+ *bkt_str = '\0';
+ }
- while (bkt_str) {
- char *next_bkt_str;
-
- bkt_str = strchr(bkt_str + 1, '=');
- if (!bkt_str) {
- error = xstrdup("must specify bucket content");
+ /* Parse everything before the buckets. */
+ char *pos = string;
+ char *name, *value;
+ while (ofputil_parse_key_value(&pos, &name, &value)) {
+ if (!strcmp(name, "command_bucket_id")) {
+ if (!(fields & F_COMMAND_BUCKET_ID)) {
+ error = xstrdup("command bucket id is not needed");
goto out;
}
- bkt_str++;
-
- next_bkt_str = strstr(bkt_str, "bucket");
- if (next_bkt_str) {
- *next_bkt_str = '\0';
+ if (!strcmp(value, "all")) {
+ gm->command_bucket_id = OFPG15_BUCKET_ALL;
+ } else if (!strcmp(value, "first")) {
+ gm->command_bucket_id = OFPG15_BUCKET_FIRST;
+ } else if (!strcmp(value, "last")) {
+ gm->command_bucket_id = OFPG15_BUCKET_LAST;
+ } else {
+ error = str_to_u32(value, &gm->command_bucket_id);
+ if (error) {
+ goto out;
+ }
+ if (gm->command_bucket_id > OFPG15_BUCKET_MAX
+ && (gm->command_bucket_id != OFPG15_BUCKET_FIRST
+ && gm->command_bucket_id != OFPG15_BUCKET_LAST
+ && gm->command_bucket_id != OFPG15_BUCKET_ALL)) {
+ error = xasprintf("invalid command bucket id %"PRIu32,
+ gm->command_bucket_id);
+ goto out;
+ }
}
-
- bucket = xzalloc(sizeof(struct ofputil_bucket));
- error = parse_bucket_str(bucket, bkt_str, usable_protocols);
- if (error) {
- free(bucket);
+ if (gm->command_bucket_id == OFPG15_BUCKET_ALL
+ && !(fields & F_COMMAND_BUCKET_ID_ALL)) {
+ error = xstrdup("command_bucket_id=all is not permitted");
goto out;
}
- list_push_back(&gm->buckets, &bucket->list_node);
-
- bkt_str = next_bkt_str;
- }
- }
-
- for (name = strtok_r(string, "=, \t\r\n", &save_ptr); name;
- name = strtok_r(NULL, "=, \t\r\n", &save_ptr)) {
- char *value;
-
- value = strtok_r(NULL, ", \t\r\n", &save_ptr);
- if (!value) {
- error = xasprintf("field %s missing value", name);
- goto out;
- }
-
- if (!strcmp(name, "group_id")) {
+ had_command_bucket_id = true;
+ } else if (!strcmp(name, "group_id")) {
if(!strcmp(value, "all")) {
gm->group_id = OFPG_ALL;
} else {
- char *error = str_to_u32(value, &gm->group_id);
+ error = str_to_u32(value, &gm->group_id);
if (error) {
goto out;
}
goto out;
}
had_type = true;
- } else if (!strcmp(name, "bucket")) {
- error = xstrdup("bucket is not needed");
- goto out;
+ } else if (!strcmp(name, "selection_method")) {
+ if (!(fields & F_GROUP_TYPE)) {
+ error = xstrdup("selection method is not needed");
+ goto out;
+ }
+ if (strlen(value) >= NTR_MAX_SELECTION_METHOD_LEN) {
+ error = xasprintf("selection method is longer than %u"
+ " bytes long",
+ NTR_MAX_SELECTION_METHOD_LEN - 1);
+ goto out;
+ }
+ memset(gm->props.selection_method, '\0',
+ NTR_MAX_SELECTION_METHOD_LEN);
+ strcpy(gm->props.selection_method, value);
+ *usable_protocols &= OFPUTIL_P_OF15_UP;
+ } else if (!strcmp(name, "selection_method_param")) {
+ if (!(fields & F_GROUP_TYPE)) {
+ error = xstrdup("selection method param is not needed");
+ goto out;
+ }
+ error = str_to_u64(value, &gm->props.selection_method_param);
+ if (error) {
+ goto out;
+ }
+ *usable_protocols &= OFPUTIL_P_OF15_UP;
+ } else if (!strcmp(name, "fields")) {
+ if (!(fields & F_GROUP_TYPE)) {
+ error = xstrdup("fields are not needed");
+ goto out;
+ }
+ error = parse_select_group_field(value, &gm->props.fields,
+ usable_protocols);
+ if (error) {
+ goto out;
+ }
+ *usable_protocols &= OFPUTIL_P_OF15_UP;
} else {
error = xasprintf("unknown keyword %s", name);
goto out;
goto out;
}
- /* Validate buckets. */
- LIST_FOR_EACH (bucket, list_node, &gm->buckets) {
- if (bucket->weight != 1 && gm->type != OFPGT11_SELECT) {
+ if (fields & F_COMMAND_BUCKET_ID) {
+ if (!(fields & F_COMMAND_BUCKET_ID_ALL || had_command_bucket_id)) {
+ error = xstrdup("must specify a command bucket id");
+ goto out;
+ }
+ } else if (had_command_bucket_id) {
+ error = xstrdup("command bucket id is not needed");
+ goto out;
+ }
+
+ /* Now parse the buckets, if any. */
+ while (bkt_str) {
+ char *next_bkt_str;
+
+ bkt_str = strchr(bkt_str + 1, '=');
+ if (!bkt_str) {
+ error = xstrdup("must specify bucket content");
+ goto out;
+ }
+ bkt_str++;
+
+ next_bkt_str = strstr(bkt_str, "bucket=");
+ if (next_bkt_str) {
+ *next_bkt_str = '\0';
+ }
+
+ bucket = xzalloc(sizeof(struct ofputil_bucket));
+ error = parse_bucket_str(bucket, bkt_str, gm->type, usable_protocols);
+ if (error) {
+ free(bucket);
+ goto out;
+ }
+ list_push_back(&gm->buckets, &bucket->list_node);
+
+ if (gm->type != OFPGT11_SELECT && bucket->weight) {
error = xstrdup("Only select groups can have bucket weights.");
goto out;
}
+
+ bkt_str = next_bkt_str;
}
if (gm->type == OFPGT11_INDIRECT && !list_is_short(&gm->buckets)) {
error = xstrdup("Indirect groups can have at most one bucket.");
return error;
}
-char * WARN_UNUSED_RESULT
+char * OVS_WARN_UNUSED_RESULT
parse_ofp_group_mod_str(struct ofputil_group_mod *gm, uint16_t command,
const char *str_,
enum ofputil_protocol *usable_protocols)
return error;
}
-char * WARN_UNUSED_RESULT
+char * OVS_WARN_UNUSED_RESULT
parse_ofp_group_mod_file(const char *file_name, uint16_t command,
struct ofputil_group_mod **gms, size_t *n_gms,
enum ofputil_protocol *usable_protocols)
char *error;
if (*n_gms >= allocated_gms) {
+ struct ofputil_group_mod *new_gms;
size_t i;
- *gms = x2nrealloc(*gms, &allocated_gms, sizeof **gms);
+ new_gms = x2nrealloc(*gms, &allocated_gms, sizeof **gms);
for (i = 0; i < *n_gms; i++) {
- list_moved(&(*gms)[i].buckets);
+ list_moved(&new_gms[i].buckets, &(*gms)[i].buckets);
}
+ *gms = new_gms;
}
error = parse_ofp_group_mod_str(&(*gms)[*n_gms], command, ds_cstr(&s),
&usable);
}
return NULL;
}
+
+char * OVS_WARN_UNUSED_RESULT
+parse_ofp_tlv_table_mod_str(struct ofputil_tlv_table_mod *ttm,
+ uint16_t command, const char *s,
+ enum ofputil_protocol *usable_protocols)
+{
+ *usable_protocols = OFPUTIL_P_NXM_OXM_ANY;
+
+ ttm->command = command;
+ list_init(&ttm->mappings);
+
+ while (*s) {
+ struct ofputil_tlv_map *map = xmalloc(sizeof *map);
+ int n;
+
+ if (*s == ',') {
+ s++;
+ }
+
+ list_push_back(&ttm->mappings, &map->list_node);
+
+ if (!ovs_scan(s, "{class=%"SCNi16",type=%"SCNi8",len=%"SCNi8"}->tun_metadata%"SCNi16"%n",
+ &map->option_class, &map->option_type, &map->option_len,
+ &map->index, &n)) {
+ ofputil_uninit_tlv_table(&ttm->mappings);
+ return xstrdup("invalid tlv mapping");
+ }
+
+ s += n;
+ }
+
+ return NULL;
+}
projects / cascardo / ovs.git / blobdiff