/*
- * Copyright (c) 2010, 2011, 2012 Nicira, Inc.
+ * Copyright (c) 2010, 2011, 2012, 2013 Nicira, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
uint16_t link = multipath_algorithm(hash, mp->algorithm,
mp->max_link + 1, mp->arg);
- flow_mask_hash_fields(wc, mp->fields);
+ flow_mask_hash_fields(flow, wc, mp->fields);
nxm_reg_load(&mp->dst, link, flow);
}
/* Parses 's_' as a set of arguments to the "multipath" action and initializes
* 'mp' accordingly. ovs-ofctl(8) describes the format parsed.
*
- * Prints an error on stderr and aborts the program if 's_' syntax is
- * invalid. */
-void
-multipath_parse(struct ofpact_multipath *mp, const char *s_)
+ * 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
+multipath_parse__(struct ofpact_multipath *mp, const char *s_, char *s)
{
- char *s = xstrdup(s_);
char *save_ptr = NULL;
char *fields, *basis, *algorithm, *n_links_str, *arg, *dst;
+ char *error;
int n_links;
fields = strtok_r(s, ", ", &save_ptr);
arg = strtok_r(NULL, ", ", &save_ptr);
dst = strtok_r(NULL, ", ", &save_ptr);
if (!dst) {
- ovs_fatal(0, "%s: not enough arguments to multipath action", s_);
+ return xasprintf("%s: not enough arguments to multipath action", s_);
}
ofpact_init_MULTIPATH(mp);
} else if (!strcasecmp(fields, "symmetric_l4")) {
mp->fields = NX_HASH_FIELDS_SYMMETRIC_L4;
} else {
- ovs_fatal(0, "%s: unknown fields `%s'", s_, fields);
+ return xasprintf("%s: unknown fields `%s'", s_, fields);
}
mp->basis = atoi(basis);
if (!strcasecmp(algorithm, "modulo_n")) {
} else if (!strcasecmp(algorithm, "iter_hash")) {
mp->algorithm = NX_MP_ALG_ITER_HASH;
} else {
- ovs_fatal(0, "%s: unknown algorithm `%s'", s_, algorithm);
+ return xasprintf("%s: unknown algorithm `%s'", s_, algorithm);
}
n_links = atoi(n_links_str);
if (n_links < 1 || n_links > 65536) {
- ovs_fatal(0, "%s: n_links %d is not in valid range 1 to 65536",
- s_, n_links);
+ return xasprintf("%s: n_links %d is not in valid range 1 to 65536",
+ s_, n_links);
}
mp->max_link = n_links - 1;
mp->arg = atoi(arg);
- mf_parse_subfield(&mp->dst, dst);
+ error = mf_parse_subfield(&mp->dst, dst);
+ if (error) {
+ return error;
+ }
if (mp->dst.n_bits < 16 && n_links > (1u << mp->dst.n_bits)) {
- ovs_fatal(0, "%s: %d-bit destination field has %u possible values, "
- "less than specified n_links %d",
- s_, mp->dst.n_bits, 1u << mp->dst.n_bits, n_links);
+ return xasprintf("%s: %d-bit destination field has %u possible "
+ "values, less than specified n_links %d",
+ s_, mp->dst.n_bits, 1u << mp->dst.n_bits, n_links);
}
+ return NULL;
+}
+
+/* Parses 's_' as a set of arguments to the "multipath" action and initializes
+ * 'mp' accordingly. ovs-ofctl(8) describes the format parsed.
+ *
+ * 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
+multipath_parse(struct ofpact_multipath *mp, const char *s_)
+{
+ char *s = xstrdup(s_);
+ char *error = multipath_parse__(mp, s_, s);
free(s);
+ return error;
}
/* Appends a description of 'mp' to 's', in the format that ovs-ofctl(8)