/*
- * Copyright (c) 2011 Nicira Networks.
+ * Copyright (c) 2011, 2012 Nicira, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
#include <stdlib.h>
#include "flow.h"
+#include "meta-flow.h"
#include "nx-match.h"
+#include "ofp-actions.h"
#include "ofp-errors.h"
#include "ofp-util.h"
#include "openflow/nicira-ext.h"
VLOG_DEFINE_THIS_MODULE(autopath);
-/* Loads 'ofp_port' into the appropriate register in accordance with the
- * autopath action. */
void
-autopath_execute(const struct nx_action_autopath *ap, struct flow *flow,
- uint16_t ofp_port)
-{
- nxm_reg_load(ap->dst, ap->ofs_nbits, ofp_port, flow);
-}
-
-void
-autopath_parse(struct nx_action_autopath *ap, const char *s_)
+autopath_parse(struct ofpact_autopath *ap, const char *s_)
{
char *s;
- uint32_t reg;
- int id_int, ofs, n_bits;
char *id_str, *dst, *save_ptr;
+ uint16_t port;
+
+ ofpact_init_AUTOPATH(ap);
s = xstrdup(s_);
save_ptr = NULL;
ovs_fatal(0, "%s: not enough arguments to autopath action", s_);
}
- id_int = atoi(id_str);
- if (id_int < 1 || id_int > UINT32_MAX) {
- ovs_fatal(0, "%s: autopath id %d is not in valid range "
- "1 to %"PRIu32, s_, id_int, UINT32_MAX);
+ if (!ofputil_port_from_string(id_str, &port)) {
+ ovs_fatal(0, "%s: bad port number", s_);
}
+ ap->port = port;
- nxm_parse_field_bits(dst, ®, &ofs, &n_bits);
- if (n_bits < 16) {
+ mf_parse_subfield(&ap->dst, dst);
+ if (ap->dst.n_bits < 16) {
ovs_fatal(0, "%s: %d-bit destination field has %u possible values, "
- "less than required 65536", s_, n_bits, 1u << n_bits);
+ "less than required 65536",
+ s_, ap->dst.n_bits, 1u << ap->dst.n_bits);
}
- ofputil_init_NXAST_AUTOPATH(ap);
- ap->id = htonl(id_int);
- ap->ofs_nbits = nxm_encode_ofs_nbits(ofs, n_bits);
- ap->dst = htonl(reg);
-
free(s);
}
enum ofperr
-autopath_check(const struct nx_action_autopath *ap, const struct flow *flow)
+autopath_from_openflow(const struct nx_action_autopath *nap,
+ struct ofpact_autopath *autopath)
{
- int n_bits = nxm_decode_n_bits(ap->ofs_nbits);
- int ofs = nxm_decode_ofs(ap->ofs_nbits);
+ ofpact_init_AUTOPATH(autopath);
+ autopath->dst.field = mf_from_nxm_header(ntohl(nap->dst));
+ autopath->dst.ofs = nxm_decode_ofs(nap->ofs_nbits);
+ autopath->dst.n_bits = nxm_decode_n_bits(nap->ofs_nbits);
+ autopath->port = ntohl(nap->id);
- if (n_bits < 16) {
+ if (autopath->dst.n_bits < 16) {
VLOG_WARN("at least 16 bit destination is required for autopath "
"action.");
return OFPERR_OFPBAC_BAD_ARGUMENT;
}
- return nxm_dst_check(ap->dst, ofs, n_bits, flow);
+ return autopath_check(autopath, NULL);
+}
+
+enum ofperr
+autopath_check(const struct ofpact_autopath *autopath, const struct flow *flow)
+{
+ VLOG_WARN_ONCE("The autopath action is deprecated and may be removed in"
+ " February 2013. Please email dev@openvswitch.org with"
+ " concerns.");
+ return mf_check_dst(&autopath->dst, flow);
+}
+
+void
+autopath_to_nxast(const struct ofpact_autopath *autopath,
+ struct ofpbuf *openflow)
+{
+ struct nx_action_autopath *ap;
+
+ ap = ofputil_put_NXAST_AUTOPATH__DEPRECATED(openflow);
+ ap->ofs_nbits = nxm_encode_ofs_nbits(autopath->dst.ofs,
+ autopath->dst.n_bits);
+ ap->dst = htonl(autopath->dst.field->nxm_header);
+ ap->id = htonl(autopath->port);
}