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.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <config.h>
|
|
|
|
|
|
|
|
#include "bundle.h"
|
|
|
|
|
|
|
|
#include <arpa/inet.h>
|
|
|
|
#include <inttypes.h>
|
|
|
|
|
|
|
|
#include "dynamic-string.h"
|
|
|
|
#include "multipath.h"
|
2011-12-28 12:42:14 -08:00
|
|
|
#include "meta-flow.h"
|
2011-06-10 17:45:45 -07:00
|
|
|
#include "nx-match.h"
|
|
|
|
#include "ofpbuf.h"
|
2012-07-03 22:17:14 -07:00
|
|
|
#include "ofp-actions.h"
|
2012-01-12 15:48:19 -08:00
|
|
|
#include "ofp-errors.h"
|
2011-06-10 17:45:45 -07:00
|
|
|
#include "ofp-util.h"
|
|
|
|
#include "openflow/nicira-ext.h"
|
|
|
|
#include "vlog.h"
|
|
|
|
|
|
|
|
VLOG_DEFINE_THIS_MODULE(bundle);
|
|
|
|
|
2013-06-19 16:58:44 -07:00
|
|
|
static ofp_port_t
|
2012-07-03 22:17:14 -07:00
|
|
|
execute_ab(const struct ofpact_bundle *bundle,
|
2013-06-19 16:58:44 -07:00
|
|
|
bool (*slave_enabled)(ofp_port_t ofp_port, void *aux), void *aux)
|
2011-07-18 13:50:26 -07:00
|
|
|
{
|
|
|
|
size_t i;
|
|
|
|
|
2012-07-03 22:17:14 -07:00
|
|
|
for (i = 0; i < bundle->n_slaves; i++) {
|
2013-06-19 16:58:44 -07:00
|
|
|
ofp_port_t slave = bundle->slaves[i];
|
2011-07-18 13:50:26 -07:00
|
|
|
if (slave_enabled(slave, aux)) {
|
|
|
|
return slave;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return OFPP_NONE;
|
|
|
|
}
|
|
|
|
|
2013-06-19 16:58:44 -07:00
|
|
|
static ofp_port_t
|
2013-05-14 18:24:43 -07:00
|
|
|
execute_hrw(const struct ofpact_bundle *bundle,
|
|
|
|
const struct flow *flow, struct flow_wildcards *wc,
|
2013-06-19 16:58:44 -07:00
|
|
|
bool (*slave_enabled)(ofp_port_t ofp_port, void *aux), void *aux)
|
2011-06-10 17:45:45 -07:00
|
|
|
{
|
|
|
|
uint32_t flow_hash, best_hash;
|
|
|
|
int best, i;
|
|
|
|
|
2013-05-14 18:24:43 -07:00
|
|
|
if (bundle->n_slaves > 1) {
|
2013-06-26 16:37:16 -07:00
|
|
|
flow_mask_hash_fields(flow, wc, bundle->fields);
|
2013-05-14 18:24:43 -07:00
|
|
|
}
|
|
|
|
|
2012-07-03 22:17:14 -07:00
|
|
|
flow_hash = flow_hash_fields(flow, bundle->fields, bundle->basis);
|
2011-06-10 17:45:45 -07:00
|
|
|
best = -1;
|
2011-07-20 09:51:29 -07:00
|
|
|
best_hash = 0;
|
2011-06-10 17:45:45 -07:00
|
|
|
|
2012-07-03 22:17:14 -07:00
|
|
|
for (i = 0; i < bundle->n_slaves; i++) {
|
|
|
|
if (slave_enabled(bundle->slaves[i], aux)) {
|
2011-06-10 17:45:45 -07:00
|
|
|
uint32_t hash = hash_2words(i, flow_hash);
|
|
|
|
|
|
|
|
if (best < 0 || hash > best_hash) {
|
|
|
|
best_hash = hash;
|
|
|
|
best = i;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-07-03 22:17:14 -07:00
|
|
|
return best >= 0 ? bundle->slaves[best] : OFPP_NONE;
|
2011-06-10 17:45:45 -07:00
|
|
|
}
|
|
|
|
|
2013-05-14 18:24:43 -07:00
|
|
|
/* Executes 'bundle' on 'flow'. Sets fields in 'wc' that were used to
|
|
|
|
* calculate the result. Uses 'slave_enabled' to determine if the slave
|
|
|
|
* designated by 'ofp_port' is up. Returns the chosen slave, or
|
|
|
|
* OFPP_NONE if none of the slaves are acceptable. */
|
2013-06-19 16:58:44 -07:00
|
|
|
ofp_port_t
|
2013-05-14 18:24:43 -07:00
|
|
|
bundle_execute(const struct ofpact_bundle *bundle,
|
|
|
|
const struct flow *flow, struct flow_wildcards *wc,
|
2013-06-19 16:58:44 -07:00
|
|
|
bool (*slave_enabled)(ofp_port_t ofp_port, void *aux),
|
|
|
|
void *aux)
|
2011-07-18 13:50:26 -07:00
|
|
|
{
|
2012-07-03 22:17:14 -07:00
|
|
|
switch (bundle->algorithm) {
|
|
|
|
case NX_BD_ALG_HRW:
|
2013-05-14 18:24:43 -07:00
|
|
|
return execute_hrw(bundle, flow, wc, slave_enabled, aux);
|
2011-07-18 13:50:26 -07:00
|
|
|
|
2012-07-03 22:17:14 -07:00
|
|
|
case NX_BD_ALG_ACTIVE_BACKUP:
|
|
|
|
return execute_ab(bundle, slave_enabled, aux);
|
2011-12-28 12:42:14 -08:00
|
|
|
|
2012-07-03 22:17:14 -07:00
|
|
|
default:
|
2013-12-17 10:32:12 -08:00
|
|
|
OVS_NOT_REACHED();
|
2012-07-03 22:17:14 -07:00
|
|
|
}
|
2011-07-20 15:07:46 -07:00
|
|
|
}
|
|
|
|
|
2012-07-03 22:17:14 -07:00
|
|
|
enum ofperr
|
2013-06-19 16:58:44 -07:00
|
|
|
bundle_check(const struct ofpact_bundle *bundle, ofp_port_t max_ports,
|
2012-07-03 22:17:14 -07:00
|
|
|
const struct flow *flow)
|
|
|
|
{
|
|
|
|
static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 5);
|
|
|
|
size_t i;
|
|
|
|
|
|
|
|
if (bundle->dst.field) {
|
|
|
|
enum ofperr error = mf_check_dst(&bundle->dst, flow);
|
|
|
|
if (error) {
|
|
|
|
return error;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
for (i = 0; i < bundle->n_slaves; i++) {
|
2013-06-19 16:58:44 -07:00
|
|
|
ofp_port_t ofp_port = bundle->slaves[i];
|
2012-07-03 22:17:14 -07:00
|
|
|
enum ofperr error;
|
2011-06-10 17:45:45 -07:00
|
|
|
|
2013-10-30 16:31:28 -07:00
|
|
|
error = ofpact_check_output_port(ofp_port, max_ports);
|
2012-07-03 22:17:14 -07:00
|
|
|
if (error) {
|
2011-06-10 17:45:45 -07:00
|
|
|
VLOG_WARN_RL(&rl, "invalid slave %"PRIu16, ofp_port);
|
2012-07-03 22:17:14 -07:00
|
|
|
return error;
|
2011-06-10 17:45:45 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Controller slaves are unsupported due to the lack of a max_len
|
|
|
|
* argument. This may or may not change in the future. There doesn't
|
|
|
|
* seem to be a real-world use-case for supporting it. */
|
|
|
|
if (ofp_port == OFPP_CONTROLLER) {
|
|
|
|
VLOG_WARN_RL(&rl, "unsupported controller slave");
|
2012-07-03 22:17:14 -07:00
|
|
|
return OFPERR_OFPBAC_BAD_OUT_PORT;
|
2011-06-10 17:45:45 -07:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-07-03 22:17:14 -07:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2011-06-10 17:45:45 -07:00
|
|
|
|
2013-07-08 10:15:00 -07:00
|
|
|
/* Helper for bundle_parse and bundle_parse_load.
|
|
|
|
*
|
|
|
|
* Returns NULL if successful, otherwise a malloc()'d string describing the
|
|
|
|
* error. The caller is responsible for freeing the returned string.*/
|
2014-12-15 14:10:38 +01:00
|
|
|
static char * OVS_WARN_UNUSED_RESULT
|
2012-07-03 22:17:14 -07:00
|
|
|
bundle_parse__(const char *s, char **save_ptr,
|
2011-07-20 15:07:46 -07:00
|
|
|
const char *fields, const char *basis, const char *algorithm,
|
2012-07-03 22:17:14 -07:00
|
|
|
const char *slave_type, const char *dst,
|
|
|
|
const char *slave_delim, struct ofpbuf *ofpacts)
|
2011-06-10 17:45:45 -07:00
|
|
|
{
|
2012-07-03 22:17:14 -07:00
|
|
|
struct ofpact_bundle *bundle;
|
2011-06-10 17:45:45 -07:00
|
|
|
|
|
|
|
if (!slave_delim) {
|
2013-07-08 10:15:00 -07:00
|
|
|
return xasprintf("%s: not enough arguments to bundle action", s);
|
2011-06-10 17:45:45 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
if (strcasecmp(slave_delim, "slaves")) {
|
2013-07-08 10:15:00 -07:00
|
|
|
return xasprintf("%s: missing slave delimiter, expected `slaves' "
|
|
|
|
"got `%s'", s, slave_delim);
|
2011-06-10 17:45:45 -07:00
|
|
|
}
|
|
|
|
|
2012-07-03 22:17:14 -07:00
|
|
|
bundle = ofpact_put_BUNDLE(ofpacts);
|
2011-06-10 17:45:45 -07:00
|
|
|
|
|
|
|
for (;;) {
|
2013-06-19 16:58:44 -07:00
|
|
|
ofp_port_t slave_port;
|
2011-06-10 17:45:45 -07:00
|
|
|
char *slave;
|
|
|
|
|
2012-09-20 08:40:29 -07:00
|
|
|
slave = strtok_r(NULL, ", []", save_ptr);
|
2012-07-03 22:17:14 -07:00
|
|
|
if (!slave || bundle->n_slaves >= BUNDLE_MAX_SLAVES) {
|
2011-06-10 17:45:45 -07:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2012-10-17 13:10:08 -07:00
|
|
|
if (!ofputil_port_from_string(slave, &slave_port)) {
|
2013-07-08 10:15:00 -07:00
|
|
|
return xasprintf("%s: bad port number", slave);
|
2012-09-20 08:40:29 -07:00
|
|
|
}
|
2012-07-03 22:17:14 -07:00
|
|
|
ofpbuf_put(ofpacts, &slave_port, sizeof slave_port);
|
2011-06-10 17:45:45 -07:00
|
|
|
|
2014-04-02 15:44:21 -07:00
|
|
|
bundle = ofpacts->frame;
|
2012-07-03 22:17:14 -07:00
|
|
|
bundle->n_slaves++;
|
2011-06-10 17:45:45 -07:00
|
|
|
}
|
2012-07-03 22:17:14 -07:00
|
|
|
ofpact_update_len(ofpacts, &bundle->ofpact);
|
2011-06-10 17:45:45 -07:00
|
|
|
|
2012-07-03 22:17:14 -07:00
|
|
|
bundle->basis = atoi(basis);
|
2011-06-10 17:45:45 -07:00
|
|
|
|
|
|
|
if (!strcasecmp(fields, "eth_src")) {
|
2012-07-03 22:17:14 -07:00
|
|
|
bundle->fields = NX_HASH_FIELDS_ETH_SRC;
|
2011-06-10 17:45:45 -07:00
|
|
|
} else if (!strcasecmp(fields, "symmetric_l4")) {
|
2012-07-03 22:17:14 -07:00
|
|
|
bundle->fields = NX_HASH_FIELDS_SYMMETRIC_L4;
|
2011-06-10 17:45:45 -07:00
|
|
|
} else {
|
2013-07-08 10:15:00 -07:00
|
|
|
return xasprintf("%s: unknown fields `%s'", s, fields);
|
2011-06-10 17:45:45 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
if (!strcasecmp(algorithm, "active_backup")) {
|
2012-07-03 22:17:14 -07:00
|
|
|
bundle->algorithm = NX_BD_ALG_ACTIVE_BACKUP;
|
2011-06-10 17:45:45 -07:00
|
|
|
} else if (!strcasecmp(algorithm, "hrw")) {
|
2012-07-03 22:17:14 -07:00
|
|
|
bundle->algorithm = NX_BD_ALG_HRW;
|
2011-06-10 17:45:45 -07:00
|
|
|
} else {
|
2013-07-08 10:15:00 -07:00
|
|
|
return xasprintf("%s: unknown algorithm `%s'", s, algorithm);
|
2011-06-10 17:45:45 -07:00
|
|
|
}
|
|
|
|
|
2012-07-03 22:17:14 -07:00
|
|
|
if (strcasecmp(slave_type, "ofport")) {
|
2013-07-08 10:15:00 -07:00
|
|
|
return xasprintf("%s: unknown slave_type `%s'", s, slave_type);
|
2011-06-10 17:45:45 -07:00
|
|
|
}
|
|
|
|
|
2012-07-03 22:17:14 -07:00
|
|
|
if (dst) {
|
2013-07-08 10:15:00 -07:00
|
|
|
char *error = mf_parse_subfield(&bundle->dst, dst);
|
|
|
|
if (error) {
|
|
|
|
return error;
|
|
|
|
}
|
ofp-actions: Support experimenter OXMs in Nicira extensions.
Some of the Nicira extension actions include fixed-size 32-bit members that
designate NXM fields. These actions can't accommodate 64-bit experimenter
OXMs, so we need to figure out some kind of solution. This commit does
that, in different ways for different actions.
For some actions, I did not think it was worthwhile to worry about
experimenter OXM, so I just disabled use of them. This is what I did for
bundle, learn, and multipath actions.
Other actions could be gracefully reinterpreted to support experimenter
OXM. This is true of reg_move, which use NXM headers only at the end of
the action and such that using an experimenter OXM would make the action
longer (which unambigously signals to older OVS that the action is an
error, which is desired behavior since older OVS cannot interpret this
action). The stack push and pop actions are also in this category.
reg_load was the most frustrating case. In OpenFlow 1.5 we had already
eliminated this action in favor of OF1.5+ set_field. In other OpenFlow
versions, though, reg_load is more powerful than set_field because it
can modify partial fields. This commit therefore adds a new variant of
reg_load, called reg_load2, which is simply OF1.5+ set_field with a Nicira
extension header on it.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Jarno Rajahalme <jrajahalme@nicira.com>
2014-09-11 22:09:03 -07:00
|
|
|
|
|
|
|
if (!mf_nxm_header(bundle->dst.field->id)) {
|
|
|
|
return xasprintf("%s: experimenter OXM field '%s' not supported",
|
|
|
|
s, dst);
|
|
|
|
}
|
2011-07-20 15:07:46 -07:00
|
|
|
}
|
2013-07-08 10:15:00 -07:00
|
|
|
|
|
|
|
return NULL;
|
2011-07-20 15:07:46 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Converts a bundle action string contained in 's' to an nx_action_bundle and
|
2013-07-08 10:15:00 -07:00
|
|
|
* stores it in 'b'. Sets 'b''s l2 pointer to NULL.
|
|
|
|
*
|
|
|
|
* Returns NULL if successful, otherwise a malloc()'d string describing the
|
|
|
|
* error. The caller is responsible for freeing the returned string. */
|
2014-12-15 14:10:38 +01:00
|
|
|
char * OVS_WARN_UNUSED_RESULT
|
2012-07-03 22:17:14 -07:00
|
|
|
bundle_parse(const char *s, struct ofpbuf *ofpacts)
|
2011-07-20 15:07:46 -07:00
|
|
|
{
|
|
|
|
char *fields, *basis, *algorithm, *slave_type, *slave_delim;
|
|
|
|
char *tokstr, *save_ptr;
|
2013-07-08 10:15:00 -07:00
|
|
|
char *error;
|
2011-07-20 15:07:46 -07:00
|
|
|
|
|
|
|
save_ptr = NULL;
|
|
|
|
tokstr = xstrdup(s);
|
|
|
|
fields = strtok_r(tokstr, ", ", &save_ptr);
|
|
|
|
basis = strtok_r(NULL, ", ", &save_ptr);
|
|
|
|
algorithm = strtok_r(NULL, ", ", &save_ptr);
|
|
|
|
slave_type = strtok_r(NULL, ", ", &save_ptr);
|
|
|
|
slave_delim = strtok_r(NULL, ": ", &save_ptr);
|
|
|
|
|
2013-07-08 10:15:00 -07:00
|
|
|
error = bundle_parse__(s, &save_ptr, fields, basis, algorithm, slave_type,
|
|
|
|
NULL, slave_delim, ofpacts);
|
2011-07-20 15:07:46 -07:00
|
|
|
free(tokstr);
|
2013-07-08 10:15:00 -07:00
|
|
|
|
|
|
|
return error;
|
2011-07-20 15:07:46 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Converts a bundle_load action string contained in 's' to an nx_action_bundle
|
2013-07-08 10:15:00 -07:00
|
|
|
* and stores it in 'b'. Sets 'b''s l2 pointer to NULL.
|
|
|
|
*
|
|
|
|
* Returns NULL if successful, otherwise a malloc()'d string describing the
|
|
|
|
* error. The caller is responsible for freeing the returned string.*/
|
2014-12-15 14:10:38 +01:00
|
|
|
char * OVS_WARN_UNUSED_RESULT
|
2012-07-03 22:17:14 -07:00
|
|
|
bundle_parse_load(const char *s, struct ofpbuf *ofpacts)
|
2011-07-20 15:07:46 -07:00
|
|
|
{
|
|
|
|
char *fields, *basis, *algorithm, *slave_type, *dst, *slave_delim;
|
|
|
|
char *tokstr, *save_ptr;
|
2013-07-08 10:15:00 -07:00
|
|
|
char *error;
|
2011-07-20 15:07:46 -07:00
|
|
|
|
|
|
|
save_ptr = NULL;
|
|
|
|
tokstr = xstrdup(s);
|
|
|
|
fields = strtok_r(tokstr, ", ", &save_ptr);
|
|
|
|
basis = strtok_r(NULL, ", ", &save_ptr);
|
|
|
|
algorithm = strtok_r(NULL, ", ", &save_ptr);
|
|
|
|
slave_type = strtok_r(NULL, ", ", &save_ptr);
|
|
|
|
dst = strtok_r(NULL, ", ", &save_ptr);
|
|
|
|
slave_delim = strtok_r(NULL, ": ", &save_ptr);
|
|
|
|
|
2013-07-08 10:15:00 -07:00
|
|
|
error = bundle_parse__(s, &save_ptr, fields, basis, algorithm, slave_type,
|
|
|
|
dst, slave_delim, ofpacts);
|
2011-07-20 15:07:46 -07:00
|
|
|
|
2011-06-10 17:45:45 -07:00
|
|
|
free(tokstr);
|
2013-07-08 10:15:00 -07:00
|
|
|
|
|
|
|
return error;
|
2011-06-10 17:45:45 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Appends a human-readable representation of 'nab' to 's'. */
|
|
|
|
void
|
2012-07-03 22:17:14 -07:00
|
|
|
bundle_format(const struct ofpact_bundle *bundle, struct ds *s)
|
2011-06-10 17:45:45 -07:00
|
|
|
{
|
2012-07-03 22:17:14 -07:00
|
|
|
const char *action, *fields, *algorithm;
|
2011-06-10 17:45:45 -07:00
|
|
|
size_t i;
|
|
|
|
|
2012-07-03 22:17:14 -07:00
|
|
|
fields = flow_hash_fields_to_str(bundle->fields);
|
2011-06-10 17:45:45 -07:00
|
|
|
|
2012-07-03 22:17:14 -07:00
|
|
|
switch (bundle->algorithm) {
|
2011-06-10 17:45:45 -07:00
|
|
|
case NX_BD_ALG_HRW:
|
|
|
|
algorithm = "hrw";
|
|
|
|
break;
|
|
|
|
case NX_BD_ALG_ACTIVE_BACKUP:
|
|
|
|
algorithm = "active_backup";
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
algorithm = "<unknown>";
|
|
|
|
}
|
|
|
|
|
2012-07-03 22:17:14 -07:00
|
|
|
action = bundle->dst.field ? "bundle_load" : "bundle";
|
2011-07-20 15:07:46 -07:00
|
|
|
|
|
|
|
ds_put_format(s, "%s(%s,%"PRIu16",%s,%s,", action, fields,
|
2012-07-03 22:17:14 -07:00
|
|
|
bundle->basis, algorithm, "ofport");
|
2011-12-28 12:42:14 -08:00
|
|
|
|
2012-07-03 22:17:14 -07:00
|
|
|
if (bundle->dst.field) {
|
|
|
|
mf_format_subfield(&bundle->dst, s);
|
2011-07-20 15:07:46 -07:00
|
|
|
ds_put_cstr(s, ",");
|
|
|
|
}
|
|
|
|
|
|
|
|
ds_put_cstr(s, "slaves:");
|
2012-07-03 22:17:14 -07:00
|
|
|
for (i = 0; i < bundle->n_slaves; i++) {
|
2011-06-10 17:45:45 -07:00
|
|
|
if (i) {
|
|
|
|
ds_put_cstr(s, ",");
|
|
|
|
}
|
|
|
|
|
2012-09-20 08:40:29 -07:00
|
|
|
ofputil_format_port(bundle->slaves[i], s);
|
2011-06-10 17:45:45 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
ds_put_cstr(s, ")");
|
|
|
|
}
|