/*
- * Copyright (c) 2010, 2011, 2012, 2013 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. */
-static 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. */
-static 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. */
-static 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. */
-static 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. */
-static 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. */
-static char * WARN_UNUSED_RESULT
-str_to_mac(const char *str, uint8_t mac[6])
+char * OVS_WARN_UNUSED_RESULT
+str_to_mac(const char *str, struct eth_addr *mac)
{
- if (sscanf(str, ETH_ADDR_SCAN_FMT, ETH_ADDR_SCAN_ARGS(mac))
- != ETH_ADDR_SCAN_COUNT) {
+ 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. */
-static 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 'arg' as the argument to an "enqueue" action, and appends such an
- * action to 'ofpacts'.
+/* 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. */
-static char * WARN_UNUSED_RESULT
-parse_enqueue(char *arg, struct ofpbuf *ofpacts)
+char * OVS_WARN_UNUSED_RESULT
+str_to_connhelper(const char *str, uint16_t *alg)
{
- char *sp = NULL;
- char *port = strtok_r(arg, ":q", &sp);
- char *queue = strtok_r(NULL, "", &sp);
- struct ofpact_enqueue *enqueue;
-
- if (port == NULL || queue == NULL) {
- return xstrdup("\"enqueue\" syntax is \"enqueue:PORT:QUEUE\"");
- }
-
- enqueue = ofpact_put_ENQUEUE(ofpacts);
- if (!ofputil_port_from_string(port, &enqueue->port)) {
- return xasprintf("%s: enqueue to unknown port", port);
- }
- return str_to_u32(queue, &enqueue->queue);
-}
-
-/* Parses 'arg' as the argument to an "output" action, and appends such an
- * action to 'ofpacts'.
- *
- * 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
-parse_output(const char *arg, struct ofpbuf *ofpacts)
-{
- if (strchr(arg, '[')) {
- struct ofpact_output_reg *output_reg;
-
- output_reg = ofpact_put_OUTPUT_REG(ofpacts);
- output_reg->max_len = UINT16_MAX;
- return mf_parse_subfield(&output_reg->src, arg);
- } else {
- struct ofpact_output *output;
-
- output = ofpact_put_OUTPUT(ofpacts);
- output->max_len = output->port == OFPP_CONTROLLER ? UINT16_MAX : 0;
- if (!ofputil_port_from_string(arg, &output->port)) {
- return xasprintf("%s: output to unknown port", arg);
- }
- return NULL;
- }
-}
-
-/* Parses 'arg' as the argument to an "resubmit" action, and appends such an
- * action to 'ofpacts'.
- *
- * 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
-parse_resubmit(char *arg, struct ofpbuf *ofpacts)
-{
- 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]) {
- if (!ofputil_port_from_string(in_port_s, &resubmit->in_port)) {
- return xasprintf("%s: resubmit to unknown port", in_port_s);
- }
- } else {
- resubmit->in_port = OFPP_IN_PORT;
- }
-
- table_s = strsep(&arg, ",");
- if (table_s && table_s[0]) {
- uint32_t table_id = 0;
- char *error;
-
- error = str_to_u32(table_s, &table_id);
- if (error) {
- return error;
- }
- resubmit->table_id = table_id;
- } else {
- resubmit->table_id = 255;
- }
-
- if (resubmit->in_port == OFPP_IN_PORT && resubmit->table_id == 255) {
- return xstrdup("at least one \"in_port\" or \"table\" must be "
- "specified on resubmit");
- }
- return NULL;
-}
-
-/* Parses 'arg' as the argument to a "note" action, and appends such an action
- * to 'ofpacts'.
- *
- * 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
-parse_note(const char *arg, struct ofpbuf *ofpacts)
-{
- 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) {
- return xstrdup("bad hex digit in `note' argument");
- }
- ofpbuf_put(ofpacts, &byte, 1);
-
- note = ofpacts->l2;
- note->length++;
-
- arg += 2;
- }
- ofpact_update_len(ofpacts, ¬e->ofpact);
- return NULL;
-}
-
-/* Parses 'arg' as the argument to a "fin_timeout" action, and appends such an
- * action to 'ofpacts'.
- *
- * 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
-parse_fin_timeout(struct ofpbuf *b, char *arg)
-{
- struct ofpact_fin_timeout *oft = ofpact_put_FIN_TIMEOUT(b);
- char *key, *value;
-
- while (ofputil_parse_key_value(&arg, &key, &value)) {
- char *error;
-
- if (!strcmp(key, "idle_timeout")) {
- error = str_to_u16(value, key, &oft->fin_idle_timeout);
- } else if (!strcmp(key, "hard_timeout")) {
- error = str_to_u16(value, key, &oft->fin_hard_timeout);
- } else {
- error = xasprintf("invalid key '%s' in 'fin_timeout' argument",
- key);
- }
-
- if (error) {
- return error;
- }
- }
- return NULL;
-}
-
-/* Parses 'arg' as the argument to a "controller" action, and appends such an
- * action to 'ofpacts'.
- *
- * 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
-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)) {
- char *error = str_to_u16(arg, "max_len", &max_len);
- if (error) {
- return error;
- }
- } else {
- char *name, *value;
-
- while (ofputil_parse_key_value(&arg, &name, &value)) {
- if (!strcmp(name, "reason")) {
- if (!ofputil_packet_in_reason_from_string(value, &reason)) {
- return xasprintf("unknown reason \"%s\"", value);
- }
- } else if (!strcmp(name, "max_len")) {
- char *error = str_to_u16(value, "max_len", &max_len);
- if (error) {
- return error;
- }
- } else if (!strcmp(name, "id")) {
- char *error = str_to_u16(value, "id", &controller_id);
- if (error) {
- return error;
- }
- } else {
- return xasprintf("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;
- }
-
- return NULL;
-}
-
-static void
-parse_noargs_dec_ttl(struct ofpbuf *b)
-{
- struct ofpact_cnt_ids *ids;
- uint16_t id = 0;
-
- ids = ofpact_put_DEC_TTL(b);
- ofpbuf_put(b, &id, sizeof id);
- ids = b->l2;
- ids->n_controllers++;
- ofpact_update_len(b, &ids->ofpact);
-}
-
-/* Parses 'arg' as the argument to a "dec_ttl" action, and appends such an
- * action to 'ofpacts'.
- *
- * 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
-parse_dec_ttl(struct ofpbuf *b, char *arg)
-{
- if (*arg == '\0') {
- parse_noargs_dec_ttl(b);
- } else {
- struct ofpact_cnt_ids *ids;
- char *cntr;
-
- ids = ofpact_put_DEC_TTL(b);
- 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) {
- return xstrdup("dec_ttl_cnt_ids: expected at least one controller "
- "id.");
- }
- ofpact_update_len(b, &ids->ofpact);
- }
- return NULL;
-}
-
-/* Parses 'arg' as the argument to a "set_mpls_ttl" action, and appends such an
- * action to 'ofpacts'.
- *
- * 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
-parse_set_mpls_ttl(struct ofpbuf *b, const char *arg)
-{
- struct ofpact_mpls_ttl *mpls_ttl = ofpact_put_SET_MPLS_TTL(b);
-
- if (*arg == '\0') {
- return xstrdup("parse_set_mpls_ttl: expected ttl.");
- }
-
- mpls_ttl->ttl = atoi(arg);
- return NULL;
-}
-
-/* Parses a "set_field" action with argument 'arg', appending the parsed
- * action to 'ofpacts'.
- *
- * 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
-set_field_parse__(char *arg, struct ofpbuf *ofpacts,
- enum ofputil_protocol *usable_protocols)
-{
- struct ofpact_reg_load *load = ofpact_put_REG_LOAD(ofpacts);
- char *value;
- char *delim;
- char *key;
- const struct mf_field *mf;
- char *error;
- union mf_value mf_value;
-
- value = arg;
- delim = strstr(arg, "->");
- if (!delim) {
- return xasprintf("%s: missing `->'", arg);
- }
- if (strlen(delim) <= strlen("->")) {
- return xasprintf("%s: missing field name following `->'", arg);
- }
-
- key = delim + strlen("->");
- mf = mf_from_name(key);
- if (!mf) {
- return xasprintf("%s is not a valid OXM field name", key);
- }
- if (!mf->writable) {
- return xasprintf("%s is read-only", key);
- }
-
- delim[0] = '\0';
- error = mf_parse_value(mf, value, &mf_value);
- if (error) {
- return error;
- }
- if (!mf_is_value_valid(mf, &mf_value)) {
- return xasprintf("%s is not a valid value for field %s", value, key);
- }
- ofpact_set_field_init(load, mf, &mf_value);
-
- *usable_protocols &= mf->usable_protocols;
- return NULL;
-}
-
-/* Parses 'arg' as the argument to a "set_field" action, and appends such an
- * action to 'ofpacts'.
- *
- * 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
-set_field_parse(const char *arg, struct ofpbuf *ofpacts,
- enum ofputil_protocol *usable_protocols)
-{
- char *copy = xstrdup(arg);
- char *error = set_field_parse__(copy, ofpacts, usable_protocols);
- free(copy);
- return error;
-}
-
-/* Parses 'arg' as the argument to a "write_metadata" instruction, and appends
- * such an action to 'ofpacts'.
- *
- * 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
-parse_metadata(struct ofpbuf *b, char *arg)
-{
- struct ofpact_metadata *om;
- char *mask = strchr(arg, '/');
-
- om = ofpact_put_WRITE_METADATA(b);
-
- if (mask) {
- char *error;
-
- *mask = '\0';
- error = str_to_be64(mask + 1, &om->mask);
- if (error) {
- return error;
- }
- } else {
- om->mask = OVS_BE64_MAX;
- }
-
- return str_to_be64(arg, &om->metadata);
-}
-
-/* Parses 'arg' as the argument to a "sample" action, and appends such an
- * action to 'ofpacts'.
- *
- * 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
-parse_sample(struct ofpbuf *b, char *arg)
-{
- struct ofpact_sample *os = ofpact_put_SAMPLE(b);
- char *key, *value;
-
- while (ofputil_parse_key_value(&arg, &key, &value)) {
- char *error = NULL;
-
- if (!strcmp(key, "probability")) {
- error = str_to_u16(value, "probability", &os->probability);
- if (!error && os->probability == 0) {
- error = xasprintf("invalid probability value \"%s\"", value);
- }
- } else if (!strcmp(key, "collector_set_id")) {
- error = str_to_u32(value, &os->collector_set_id);
- } else if (!strcmp(key, "obs_domain_id")) {
- error = str_to_u32(value, &os->obs_domain_id);
- } else if (!strcmp(key, "obs_point_id")) {
- error = str_to_u32(value, &os->obs_point_id);
- } else {
- error = xasprintf("invalid key \"%s\" in \"sample\" argument",
- key);
- }
- if (error) {
- return error;
- }
- }
- if (os->probability == 0) {
- return xstrdup("non-zero \"probability\" must be specified on sample");
- }
- return NULL;
-}
-
-/* Parses 'arg' as the argument to action 'code', and appends such an action to
- * 'ofpacts'.
- *
- * 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
-parse_named_action(enum ofputil_action_code code,
- char *arg, struct ofpbuf *ofpacts,
- enum ofputil_protocol *usable_protocols)
-{
- size_t orig_size = ofpacts->size;
- struct ofpact_tunnel *tunnel;
- struct ofpact_vlan_vid *vlan_vid;
- struct ofpact_vlan_pcp *vlan_pcp;
- char *error = NULL;
- uint16_t ethertype = 0;
- uint16_t vid = 0;
- uint8_t tos = 0, ecn, ttl;
- uint8_t pcp = 0;
-
- switch (code) {
- case OFPUTIL_ACTION_INVALID:
- NOT_REACHED();
-
- case OFPUTIL_OFPAT10_OUTPUT:
- case OFPUTIL_OFPAT11_OUTPUT:
- error = parse_output(arg, ofpacts);
- break;
-
- case OFPUTIL_OFPAT10_SET_VLAN_VID:
- case OFPUTIL_OFPAT11_SET_VLAN_VID:
- error = str_to_u16(arg, "VLAN VID", &vid);
- if (error) {
- return error;
- }
-
- if (vid & ~VLAN_VID_MASK) {
- return xasprintf("%s: not a valid VLAN VID", arg);
- }
- vlan_vid = ofpact_put_SET_VLAN_VID(ofpacts);
- vlan_vid->vlan_vid = vid;
- vlan_vid->ofpact.compat = code;
- vlan_vid->push_vlan_if_needed = code == OFPUTIL_OFPAT10_SET_VLAN_VID;
- break;
-
- case OFPUTIL_OFPAT10_SET_VLAN_PCP:
- case OFPUTIL_OFPAT11_SET_VLAN_PCP:
- error = str_to_u8(arg, "VLAN PCP", &pcp);
- if (error) {
- return error;
- }
-
- if (pcp & ~7) {
- return xasprintf("%s: not a valid VLAN PCP", arg);
- }
- vlan_pcp = ofpact_put_SET_VLAN_PCP(ofpacts);
- vlan_pcp->vlan_pcp = pcp;
- vlan_pcp->ofpact.compat = code;
- vlan_pcp->push_vlan_if_needed = code == OFPUTIL_OFPAT10_SET_VLAN_PCP;
- break;
-
- case OFPUTIL_OFPAT12_SET_FIELD:
- return set_field_parse(arg, ofpacts, usable_protocols);
-
- case OFPUTIL_OFPAT10_STRIP_VLAN:
- case OFPUTIL_OFPAT11_POP_VLAN:
- ofpact_put_STRIP_VLAN(ofpacts)->ofpact.compat = code;
- break;
-
- case OFPUTIL_OFPAT11_PUSH_VLAN:
- *usable_protocols &= OFPUTIL_P_OF11_UP;
- error = str_to_u16(arg, "ethertype", ðertype);
- if (error) {
- return error;
- }
-
- if (ethertype != ETH_TYPE_VLAN_8021Q) {
- /* XXX ETH_TYPE_VLAN_8021AD case isn't supported */
- return xasprintf("%s: not a valid VLAN ethertype", arg);
- }
-
- ofpact_put_PUSH_VLAN(ofpacts);
- break;
-
- case OFPUTIL_OFPAT11_SET_QUEUE:
- error = str_to_u32(arg, &ofpact_put_SET_QUEUE(ofpacts)->queue_id);
- break;
-
- case OFPUTIL_OFPAT10_SET_DL_SRC:
- case OFPUTIL_OFPAT11_SET_DL_SRC:
- error = str_to_mac(arg, ofpact_put_SET_ETH_SRC(ofpacts)->mac);
- break;
-
- case OFPUTIL_OFPAT10_SET_DL_DST:
- case OFPUTIL_OFPAT11_SET_DL_DST:
- error = str_to_mac(arg, ofpact_put_SET_ETH_DST(ofpacts)->mac);
- break;
-
- case OFPUTIL_OFPAT10_SET_NW_SRC:
- case OFPUTIL_OFPAT11_SET_NW_SRC:
- error = str_to_ip(arg, &ofpact_put_SET_IPV4_SRC(ofpacts)->ipv4);
- break;
-
- case OFPUTIL_OFPAT10_SET_NW_DST:
- case OFPUTIL_OFPAT11_SET_NW_DST:
- error = str_to_ip(arg, &ofpact_put_SET_IPV4_DST(ofpacts)->ipv4);
- break;
-
- case OFPUTIL_OFPAT10_SET_NW_TOS:
- case OFPUTIL_OFPAT11_SET_NW_TOS:
- error = str_to_u8(arg, "TOS", &tos);
- if (error) {
- return error;
- }
-
- if (tos & ~IP_DSCP_MASK) {
- return xasprintf("%s: not a valid TOS", arg);
- }
- ofpact_put_SET_IP_DSCP(ofpacts)->dscp = tos;
- break;
-
- case OFPUTIL_OFPAT11_SET_NW_ECN:
- error = str_to_u8(arg, "ECN", &ecn);
- if (error) {
- return error;
- }
-
- if (ecn & ~IP_ECN_MASK) {
- return xasprintf("%s: not a valid ECN", arg);
- }
- ofpact_put_SET_IP_ECN(ofpacts)->ecn = ecn;
- break;
-
- case OFPUTIL_OFPAT11_SET_NW_TTL:
- error = str_to_u8(arg, "TTL", &ttl);
- if (error) {
- return error;
- }
-
- ofpact_put_SET_IP_TTL(ofpacts)->ttl = ttl;
- break;
-
- case OFPUTIL_OFPAT11_DEC_NW_TTL:
- NOT_REACHED();
-
- case OFPUTIL_OFPAT10_SET_TP_SRC:
- case OFPUTIL_OFPAT11_SET_TP_SRC:
- error = str_to_u16(arg, "source port",
- &ofpact_put_SET_L4_SRC_PORT(ofpacts)->port);
- break;
-
- case OFPUTIL_OFPAT10_SET_TP_DST:
- case OFPUTIL_OFPAT11_SET_TP_DST:
- error = str_to_u16(arg, "destination port",
- &ofpact_put_SET_L4_DST_PORT(ofpacts)->port);
- break;
-
- case OFPUTIL_OFPAT10_ENQUEUE:
- error = parse_enqueue(arg, ofpacts);
- break;
-
- case OFPUTIL_NXAST_RESUBMIT:
- error = 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;
- error = str_to_u64(arg, &tunnel->tun_id);
- break;
-
- case OFPUTIL_NXAST_WRITE_METADATA:
- error = parse_metadata(ofpacts, arg);
- break;
-
- case OFPUTIL_NXAST_SET_QUEUE:
- error = str_to_u32(arg, &ofpact_put_SET_QUEUE(ofpacts)->queue_id);
- break;
-
- case OFPUTIL_NXAST_POP_QUEUE:
- ofpact_put_POP_QUEUE(ofpacts);
- break;
-
- case OFPUTIL_NXAST_REG_MOVE:
- error = nxm_parse_reg_move(ofpact_put_REG_MOVE(ofpacts), arg);
- break;
-
- case OFPUTIL_NXAST_REG_LOAD:
- error = nxm_parse_reg_load(ofpact_put_REG_LOAD(ofpacts), arg);
- break;
-
- case OFPUTIL_NXAST_NOTE:
- error = parse_note(arg, ofpacts);
- break;
-
- case OFPUTIL_NXAST_MULTIPATH:
- error = multipath_parse(ofpact_put_MULTIPATH(ofpacts), arg);
- break;
-
- case OFPUTIL_NXAST_BUNDLE:
- error = bundle_parse(arg, ofpacts);
- break;
-
- case OFPUTIL_NXAST_BUNDLE_LOAD:
- error = 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:
- error = learn_parse(arg, ofpacts);
- break;
-
- case OFPUTIL_NXAST_EXIT:
- ofpact_put_EXIT(ofpacts);
- break;
-
- case OFPUTIL_NXAST_DEC_TTL:
- error = parse_dec_ttl(ofpacts, arg);
- break;
-
- case OFPUTIL_NXAST_SET_MPLS_TTL:
- case OFPUTIL_OFPAT11_SET_MPLS_TTL:
- error = parse_set_mpls_ttl(ofpacts, arg);
- break;
-
- case OFPUTIL_OFPAT11_DEC_MPLS_TTL:
- case OFPUTIL_NXAST_DEC_MPLS_TTL:
- ofpact_put_DEC_MPLS_TTL(ofpacts);
- break;
-
- case OFPUTIL_NXAST_FIN_TIMEOUT:
- error = parse_fin_timeout(ofpacts, arg);
- break;
-
- case OFPUTIL_NXAST_CONTROLLER:
- error = parse_controller(ofpacts, arg);
- break;
-
- case OFPUTIL_OFPAT11_PUSH_MPLS:
- case OFPUTIL_NXAST_PUSH_MPLS:
- error = str_to_u16(arg, "push_mpls", ðertype);
- if (!error) {
- ofpact_put_PUSH_MPLS(ofpacts)->ethertype = htons(ethertype);
- }
- break;
-
- case OFPUTIL_OFPAT11_POP_MPLS:
- case OFPUTIL_NXAST_POP_MPLS:
- error = str_to_u16(arg, "pop_mpls", ðertype);
- if (!error) {
- ofpact_put_POP_MPLS(ofpacts)->ethertype = htons(ethertype);
- }
- break;
-
- case OFPUTIL_OFPAT11_GROUP:
- error = str_to_u32(arg, &ofpact_put_GROUP(ofpacts)->group_id);
- break;
-
- case OFPUTIL_NXAST_STACK_PUSH:
- error = nxm_parse_stack_action(ofpact_put_STACK_PUSH(ofpacts), arg);
- break;
- case OFPUTIL_NXAST_STACK_POP:
- error = nxm_parse_stack_action(ofpact_put_STACK_POP(ofpacts), arg);
- break;
-
- case OFPUTIL_NXAST_SAMPLE:
- error = parse_sample(ofpacts, arg);
- break;
- }
-
- if (error) {
- ofpacts->size = orig_size;
- }
- return error;
-}
-
-/* Parses action 'act', with argument 'arg', and appends a parsed version to
- * 'ofpacts'.
- *
- * 'n_actions' specifies the number of actions already parsed (for proper
- * handling of "drop" actions).
- *
- * 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
-str_to_ofpact__(char *pos, char *act, char *arg,
- struct ofpbuf *ofpacts, int n_actions,
- enum ofputil_protocol *usable_protocols)
-{
- int code = ofputil_action_code_from_name(act);
- if (code >= 0) {
- return parse_named_action(code, arg, ofpacts, usable_protocols);
- } else if (!strcasecmp(act, "drop")) {
- if (n_actions) {
- return xstrdup("Drop actions must not be preceded by other "
- "actions");
- } else if (ofputil_parse_key_value(&pos, &act, &arg)) {
- return xstrdup("Drop actions must not be followed by other "
- "actions");
- }
- } else {
- ofp_port_t port;
- if (ofputil_port_from_string(act, &port)) {
- ofpact_put_OUTPUT(ofpacts)->port = port;
- } else {
- return xasprintf("Unknown action: %s", act);
- }
- }
-
- return NULL;
-}
-
-/* Parses 'str' as a series of actions, and appends them to 'ofpacts'.
- *
- * 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
-str_to_ofpacts__(char *str, struct ofpbuf *ofpacts,
- enum ofputil_protocol *usable_protocols)
-{
- size_t orig_size = ofpacts->size;
- char *pos, *act, *arg;
- int n_actions;
-
- pos = str;
- n_actions = 0;
- while (ofputil_parse_key_value(&pos, &act, &arg)) {
- char *error = str_to_ofpact__(pos, act, arg, ofpacts, n_actions,
- usable_protocols);
- if (error) {
- ofpacts->size = orig_size;
- return error;
- }
- n_actions++;
- }
-
- ofpact_pad(ofpacts);
- return NULL;
-}
-
-
-/* Parses 'str' as a series of actions, and appends them to 'ofpacts'.
- *
- * 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
-str_to_ofpacts(char *str, struct ofpbuf *ofpacts,
- enum ofputil_protocol *usable_protocols)
-{
- size_t orig_size = ofpacts->size;
- char *error_s;
- enum ofperr error;
-
- error_s = str_to_ofpacts__(str, ofpacts, usable_protocols);
- if (error_s) {
- return error_s;
- }
-
- error = ofpacts_verify(ofpacts->data, ofpacts->size);
- if (error) {
- ofpacts->size = orig_size;
- return xstrdup("Incorrect action ordering");
- }
-
- return NULL;
-}
-
-/* Parses 'arg' as the argument to instruction 'type', and appends such an
- * instruction to 'ofpacts'.
- *
- * 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
-parse_named_instruction(enum ovs_instruction_type type,
- char *arg, struct ofpbuf *ofpacts,
- enum ofputil_protocol *usable_protocols)
-{
- char *error_s = NULL;
- enum ofperr error;
-
- *usable_protocols &= OFPUTIL_P_OF11_UP;
-
- switch (type) {
- case OVSINST_OFPIT11_APPLY_ACTIONS:
- NOT_REACHED(); /* This case is handled by str_to_inst_ofpacts() */
- break;
-
- case OVSINST_OFPIT11_WRITE_ACTIONS: {
- struct ofpact_nest *on;
- size_t ofs;
-
- ofpact_pad(ofpacts);
- ofs = ofpacts->size;
- on = ofpact_put(ofpacts, OFPACT_WRITE_ACTIONS,
- offsetof(struct ofpact_nest, actions));
- error_s = str_to_ofpacts__(arg, ofpacts, usable_protocols);
-
- on = ofpbuf_at_assert(ofpacts, ofs, sizeof *on);
- on->ofpact.len = ofpacts->size - ofs;
-
- if (error_s) {
- ofpacts->size = ofs;
- }
- break;
- }
-
- case OVSINST_OFPIT11_CLEAR_ACTIONS:
- ofpact_put_CLEAR_ACTIONS(ofpacts);
- break;
-
- case OVSINST_OFPIT13_METER:
- *usable_protocols &= OFPUTIL_P_OF13_UP;
- error_s = str_to_u32(arg, &ofpact_put_METER(ofpacts)->meter_id);
- break;
-
- case OVSINST_OFPIT11_WRITE_METADATA:
- *usable_protocols &= OFPUTIL_P_NXM_OF11_UP;
- error_s = parse_metadata(ofpacts, arg);
- break;
-
- case OVSINST_OFPIT11_GOTO_TABLE: {
- struct ofpact_goto_table *ogt = ofpact_put_GOTO_TABLE(ofpacts);
- char *table_s = strsep(&arg, ",");
- if (!table_s || !table_s[0]) {
- return xstrdup("instruction goto-table needs table id");
- }
- error_s = str_to_u8(table_s, "table", &ogt->table_id);
- break;
- }
- }
-
- if (error_s) {
- return error_s;
- }
-
- /* If write_metadata is specified as an action AND an instruction, ofpacts
- could be invalid. */
- error = ofpacts_verify(ofpacts->data, ofpacts->size);
- if (error) {
- return xstrdup("Incorrect instruction ordering");
- }
- return NULL;
-}
-
-/* Parses 'str' as a series of instructions, and appends them to 'ofpacts'.
- *
- * 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
-str_to_inst_ofpacts(char *str, struct ofpbuf *ofpacts,
- enum ofputil_protocol *usable_protocols)
-{
- size_t orig_size = ofpacts->size;
- char *pos, *inst, *arg;
- int type;
- const char *prev_inst = NULL;
- int prev_type = -1;
- int n_actions = 0;
-
- pos = str;
- while (ofputil_parse_key_value(&pos, &inst, &arg)) {
- type = ovs_instruction_type_from_name(inst);
- if (type < 0) {
- char *error = str_to_ofpact__(pos, inst, arg, ofpacts, n_actions,
- usable_protocols);
- if (error) {
- ofpacts->size = orig_size;
- return error;
- }
-
- type = OVSINST_OFPIT11_APPLY_ACTIONS;
- if (prev_type == type) {
- n_actions++;
- continue;
- }
- } else if (type == OVSINST_OFPIT11_APPLY_ACTIONS) {
- ofpacts->size = orig_size;
- return xasprintf("%s isn't supported. Just write actions then "
- "it is interpreted as apply_actions", inst);
- } else {
- char *error = parse_named_instruction(type, arg, ofpacts,
- usable_protocols);
- if (error) {
- ofpacts->size = orig_size;
- return error;
- }
- }
-
- if (type <= prev_type) {
- ofpacts->size = orig_size;
- if (type == prev_type) {
- return xasprintf("instruction %s may be specified only once",
- inst);
- } else {
- return xasprintf("instruction %s must be specified before %s",
- inst, prev_inst);
- }
- }
-
- prev_inst = inst;
- prev_type = type;
- n_actions++;
+ if (!strcmp(str, "ftp")) {
+ *alg = IPPORT_FTP;
+ return NULL;
}
- ofpact_pad(ofpacts);
-
- return NULL;
+ return xasprintf("invalid conntrack helper \"%s\"", str);
}
struct protocol {
{
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 *
+extract_actions(char *s)
+{
+ s = strstr(s, "action");
+ if (s) {
+ *s = '\0';
+ s = strchr(s + 1, '=');
+ return s ? s + 1 : NULL;
+ } else {
+ return NULL;
+ }
+}
+
+
+static char * OVS_WARN_UNUSED_RESULT
parse_ofp_str__(struct ofputil_flow_mod *fm, int command, char *string,
- enum ofputil_protocol *usable_protocols,
- bool enforce_consistency)
+ 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:
break;
default:
- NOT_REACHED();
- }
-
- match_init_catchall(&fm->match);
- fm->priority = OFP_DEFAULT_PRIORITY;
- fm->cookie = htonll(0);
- fm->cookie_mask = htonll(0);
+ OVS_NOT_REACHED();
+ }
+
+ *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;
- if (fields & F_ACTIONS) {
- act_str = strstr(string, "action");
- if (!act_str) {
- return xstrdup("must specify an action");
- }
- *act_str = '\0';
- act_str = strchr(act_str + 1, '=');
+ if (fields & F_ACTIONS) {
+ act_str = extract_actions(string);
if (!act_str) {
return xstrdup("must specify an action");
}
-
- act_str++;
}
- 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 (fields & F_FLAGS && !strcmp(name, "no_byte_counts")) {
fm->flags |= OFPUTIL_FF_NO_BYT_COUNTS;
*usable_protocols &= OFPUTIL_P_OF13_UP;
+ } 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. */
fm->new_cookie = htonll(0);
}
if (fields & F_ACTIONS) {
+ enum ofputil_protocol action_usable_protocols;
struct ofpbuf ofpacts;
char *error;
ofpbuf_init(&ofpacts, 32);
- error = str_to_inst_ofpacts(act_str, &ofpacts, usable_protocols);
+ error = ofpacts_parse_instructions(act_str, &ofpacts,
+ &action_usable_protocols);
+ *usable_protocols &= action_usable_protocols;
if (!error) {
enum ofperr err;
err = ofpacts_check(ofpacts.data, ofpacts.size, &fm->match.flow,
- OFPP_MAX, 0, true);
+ OFPP_MAX, fm->table_id, 255, usable_protocols);
+ if (!err && !*usable_protocols) {
+ err = OFPERR_OFPBAC_MATCH_INCONSISTENT;
+ }
if (err) {
- if (!enforce_consistency &&
- err == OFPERR_OFPBAC_MATCH_INCONSISTENT) {
- /* Allow inconsistent actions to be used with OF 1.0. */
- *usable_protocols &= OFPUTIL_P_OF10_ANY;
- /* Try again, allowing for inconsistency.
- * XXX: As a side effect, logging may be duplicated. */
- err = ofpacts_check(ofpacts.data, ofpacts.size,
- &fm->match.flow, OFPP_MAX, 0, false);
- }
- if (err) {
- error = xasprintf("actions are invalid with specified match "
- "(%s)", ofperr_to_string(err));
- }
+ error = xasprintf("actions are invalid with specified match "
+ "(%s)", ofperr_to_string(err));
}
+
}
if (error) {
ofpbuf_uninit(&ofpacts);
* 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,
- bool enforce_consistency)
+ enum ofputil_protocol *usable_protocols)
{
char *string = xstrdup(str_);
char *error;
- error = parse_ofp_str__(fm, command, string, usable_protocols,
- enforce_consistency);
+ error = parse_ofp_str__(fm, command, string, usable_protocols);
if (error) {
fm->ofpacts = NULL;
fm->ofpacts_len = 0;
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)
break;
default:
- NOT_REACHED();
+ OVS_NOT_REACHED();
}
mm->command = command;
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_uint32_t id = ATOMIC_VAR_INIT(0);
- char *save_ptr = NULL;
- char *name;
+ static atomic_count id = ATOMIC_COUNT_INIT(0);
+ char *name, *value;
- atomic_add(&id, 1, &fmr->id);
+ fmr->id = atomic_count_inc(&id);
fmr->flags = (NXFMF_INITIAL | NXFMF_ADD | NXFMF_DELETE | NXFMF_MODIFY
| NXFMF_OWN | NXFMF_ACTIONS);
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)
return error;
}
-/* Parses 's' as a set of OpenFlow actions and appends the actions to
- * 'actions'.
- *
- * 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_ofpacts(const char *s_, struct ofpbuf *ofpacts,
- enum ofputil_protocol *usable_protocols)
-{
- char *s = xstrdup(s_);
- char *error;
-
- *usable_protocols = OFPUTIL_P_ANY;
-
- error = str_to_ofpacts(s, ofpacts, usable_protocols);
- free(s);
-
- return error;
-}
-
/* 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,
- enum ofputil_protocol *usable_protocols,
- bool enforce_consistency)
+ int command,
+ enum ofputil_protocol *usable_protocols)
{
- char *error = parse_ofp_str(fm, command, string, usable_protocols,
- enforce_consistency);
+ 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 = 255;
+ tm->table_id = OFPTT_ALL;
} else {
char *error = str_to_u8(table_id, "table_id", &tm->table_id);
if (error) {
}
}
- if (strcmp(flow_miss_handling, "controller") == 0) {
- tm->config = OFPTC11_TABLE_MISS_CONTROLLER;
- } else if (strcmp(flow_miss_handling, "continue") == 0) {
- tm->config = OFPTC11_TABLE_MISS_CONTINUE;
- } else if (strcmp(flow_miss_handling, "drop") == 0) {
- tm->config = OFPTC11_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->config == OFPTC11_TABLE_MISS_CONTINUE) {
+ if (tm->table_id == 0xfe
+ && 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,
- bool enforce_consistency)
+ enum ofputil_protocol *usable_protocols)
{
size_t allocated_fms;
int line_number;
*fms = x2nrealloc(*fms, &allocated_fms, sizeof **fms);
}
error = parse_ofp_flow_mod_str(&(*fms)[*n_fms], ds_cstr(&s), command,
- &usable, enforce_consistency);
+ &usable);
if (error) {
+ char *err_msg;
size_t i;
for (i = 0; i < *n_fms; i++) {
- free((*fms)[i].ofpacts);
+ free(CONST_CAST(struct ofpact *, (*fms)[i].ofpacts));
}
free(*fms);
*fms = NULL;
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,
- bool enforce_consistency)
+ enum ofputil_protocol *usable_protocols)
{
struct ofputil_flow_mod fm;
char *error;
- error = parse_ofp_str(&fm, -1, string, usable_protocols,
- enforce_consistency);
+ error = parse_ofp_str(&fm, -1, string, usable_protocols);
if (error) {
return error;
}
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 ofpbuf ofpacts;
- char *pos, *act, *arg;
- int n_actions;
+ 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;
- pos = str_;
- n_actions = 0;
- ofpbuf_init(&ofpacts, 64);
- while (ofputil_parse_key_value(&pos, &act, &arg)) {
- char *error = NULL;
+ ds_init(&actions);
- if (!strcasecmp(act, "weight")) {
- error = str_to_u16(arg, "weight", &bucket->weight);
- } else if (!strcasecmp(act, "watch_port")) {
- if (!ofputil_port_from_string(arg, &bucket->watch_port)
+ pos = str_;
+ error = NULL;
+ while (ofputil_parse_key_value(&pos, &key, &value)) {
+ if (!strcasecmp(key, "weight")) {
+ error = str_to_u16(value, "weight", &bucket->weight);
+ } else if (!strcasecmp(key, "watch_port")) {
+ if (!ofputil_port_from_string(value, &bucket->watch_port)
|| (ofp_to_u16(bucket->watch_port) >= ofp_to_u16(OFPP_MAX)
&& bucket->watch_port != OFPP_ANY)) {
- error = xasprintf("%s: invalid watch_port", arg);
+ error = xasprintf("%s: invalid watch_port", value);
}
- } else if (!strcasecmp(act, "watch_group")) {
- error = str_to_u32(arg, &bucket->watch_group);
+ } else if (!strcasecmp(key, "watch_group")) {
+ error = str_to_u32(value, &bucket->watch_group);
if (!error && bucket->watch_group > OFPG_MAX) {
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 {
- error = str_to_ofpact__(pos, act, arg, &ofpacts, n_actions,
- usable_protocols);
- n_actions++;
+ ds_put_format(&actions, "%s(%s),", key, value);
}
if (error) {
- ofpbuf_uninit(&ofpacts);
+ ds_destroy(&actions);
return error;
}
}
- ofpact_pad(&ofpacts);
+ if (!actions.length) {
+ return xstrdup("bucket must specify actions");
+ }
+ ds_chomp(&actions, ',');
+
+ ofpbuf_init(&ofpacts, 0);
+ error = ofpacts_parse_actions(ds_cstr(&actions), &ofpacts,
+ usable_protocols);
+ ds_destroy(&actions);
+ if (error) {
+ ofpbuf_uninit(&ofpacts);
+ return error;
+ }
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:
- NOT_REACHED();
+ 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) {
- *gms = x2nrealloc(*gms, &allocated_gms, sizeof **gms);
+ struct ofputil_group_mod *new_gms;
+ size_t i;
+
+ new_gms = x2nrealloc(*gms, &allocated_gms, sizeof **gms);
+ for (i = 0; i < *n_gms; i++) {
+ 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