ofp-actions: Centralize all OpenFlow action code for maintainability.
Until now, knowledge about OpenFlow has been somewhat scattered around the
tree. Some of it is in ofp-actions, some of it is in ofp-util, some in
separate files for individual actions, and most of the wire format
declarations are in include/openflow. This commit centralizes all of that
in ofp-actions.
Encoding and decoding OpenFlow actions was previously broken up by OpenFlow
version. This was OK with only OpenFlow 1.0 and 1.1, but each additional
version added a new wrapper around the existing ones, which started to
become hard to understand. This commit merges all of the processing for
the different versions, to the extent that they are similar, making the
version differences clearer.
Previously, ofp-actions contained OpenFlow encoding and decoding, plus
ofpact formatting, but OpenFlow parsing was separated into ofp-parse, which
seems an odd division. This commit moves the parsing code into ofp-actions
with the rest of the code.
Before this commit, the four main bits of code associated with a particular
ofpact--OpenFlow encoding and decoding, ofpact formatting and parsing--were
all found far away from each other. This often made it hard to see what
was going on for a particular ofpact, since you had to search around to
many different pieces of code. This commit reorganizes so that all of the
code for a given ofpact is in a single place.
As a code refactoring, this commit has little visible behavioral change.
The update to ofproto-dpif.at illustrates one minor bug fix as a side
effect: a flow that was added with the action "dec_ttl" (a standard
OpenFlow action) was previously formatted as "dec_ttl(0)" (using a Nicira
extension to specifically direct packets bounced to the controller because
of too-low TTL), but after this commit it is correctly formatted as
"dec_ttl".
The other visible effect is to drop support for the Nicira extension
dec_ttl action in OpenFlow 1.1 and later in favor of the equivalent
standard action. It seems unlikely that anyone was really using the
Nicira extension in OF1.1 or later.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Jarno Rajahalme <jrajahalme@nicira.com>
2014-08-11 12:50:36 -07:00
|
|
|
/* Copyright (c) 2011, 2012, 2013, 2014 Nicira, Inc.
|
2011-06-10 17:45:45 -07:00
|
|
|
*
|
|
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
|
|
* you may not use this file except in compliance with the License.
|
|
|
|
* You may obtain a copy of the License at:
|
|
|
|
*
|
|
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
*
|
|
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
|
|
* See the License for the specific language governing permissions and
|
|
|
|
* limitations under the License.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#ifndef BUNDLE_H
|
|
|
|
#define BUNDLE_H 1
|
|
|
|
|
|
|
|
#include <arpa/inet.h>
|
|
|
|
#include <stdbool.h>
|
|
|
|
#include <stddef.h>
|
|
|
|
#include <stdint.h>
|
|
|
|
|
2013-07-08 10:15:00 -07:00
|
|
|
#include "compiler.h"
|
2012-01-12 15:48:19 -08:00
|
|
|
#include "ofp-errors.h"
|
2011-06-10 17:45:45 -07:00
|
|
|
#include "openflow/nicira-ext.h"
|
|
|
|
#include "openvswitch/types.h"
|
|
|
|
|
|
|
|
struct ds;
|
|
|
|
struct flow;
|
2013-05-14 18:24:43 -07:00
|
|
|
struct flow_wildcards;
|
2012-07-03 22:17:14 -07:00
|
|
|
struct ofpact_bundle;
|
2011-06-10 17:45:45 -07:00
|
|
|
struct ofpbuf;
|
|
|
|
|
|
|
|
/* NXAST_BUNDLE helper functions.
|
|
|
|
*
|
|
|
|
* See include/openflow/nicira-ext.h for NXAST_BUNDLE specification. */
|
|
|
|
|
ofp-actions: Centralize all OpenFlow action code for maintainability.
Until now, knowledge about OpenFlow has been somewhat scattered around the
tree. Some of it is in ofp-actions, some of it is in ofp-util, some in
separate files for individual actions, and most of the wire format
declarations are in include/openflow. This commit centralizes all of that
in ofp-actions.
Encoding and decoding OpenFlow actions was previously broken up by OpenFlow
version. This was OK with only OpenFlow 1.0 and 1.1, but each additional
version added a new wrapper around the existing ones, which started to
become hard to understand. This commit merges all of the processing for
the different versions, to the extent that they are similar, making the
version differences clearer.
Previously, ofp-actions contained OpenFlow encoding and decoding, plus
ofpact formatting, but OpenFlow parsing was separated into ofp-parse, which
seems an odd division. This commit moves the parsing code into ofp-actions
with the rest of the code.
Before this commit, the four main bits of code associated with a particular
ofpact--OpenFlow encoding and decoding, ofpact formatting and parsing--were
all found far away from each other. This often made it hard to see what
was going on for a particular ofpact, since you had to search around to
many different pieces of code. This commit reorganizes so that all of the
code for a given ofpact is in a single place.
As a code refactoring, this commit has little visible behavioral change.
The update to ofproto-dpif.at illustrates one minor bug fix as a side
effect: a flow that was added with the action "dec_ttl" (a standard
OpenFlow action) was previously formatted as "dec_ttl(0)" (using a Nicira
extension to specifically direct packets bounced to the controller because
of too-low TTL), but after this commit it is correctly formatted as
"dec_ttl".
The other visible effect is to drop support for the Nicira extension
dec_ttl action in OpenFlow 1.1 and later in favor of the equivalent
standard action. It seems unlikely that anyone was really using the
Nicira extension in OF1.1 or later.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Jarno Rajahalme <jrajahalme@nicira.com>
2014-08-11 12:50:36 -07:00
|
|
|
#define BUNDLE_MAX_SLAVES 2048
|
|
|
|
|
2013-06-19 16:58:44 -07:00
|
|
|
ofp_port_t bundle_execute(const struct ofpact_bundle *, const struct flow *,
|
2013-05-14 18:24:43 -07:00
|
|
|
struct flow_wildcards *wc,
|
2013-06-19 16:58:44 -07:00
|
|
|
bool (*slave_enabled)(ofp_port_t ofp_port, void *aux),
|
2011-06-10 17:45:45 -07:00
|
|
|
void *aux);
|
2013-06-19 16:58:44 -07:00
|
|
|
enum ofperr bundle_check(const struct ofpact_bundle *, ofp_port_t max_ports,
|
2012-01-12 15:48:19 -08:00
|
|
|
const struct flow *);
|
2014-12-15 14:10:38 +01:00
|
|
|
char *bundle_parse(const char *, struct ofpbuf *ofpacts) OVS_WARN_UNUSED_RESULT;
|
2013-07-08 10:15:00 -07:00
|
|
|
char *bundle_parse_load(const char *, struct ofpbuf *ofpacts)
|
2014-12-15 14:10:38 +01:00
|
|
|
OVS_WARN_UNUSED_RESULT;
|
2012-07-03 22:17:14 -07:00
|
|
|
void bundle_format(const struct ofpact_bundle *, struct ds *);
|
2011-06-10 17:45:45 -07:00
|
|
|
|
|
|
|
#endif /* bundle.h */
|