-/* 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 <config.h>
#include "lacp.h"
-#include <assert.h>
#include <stdlib.h>
#include "dynamic-string.h"
struct hmap slaves; /* Slaves this LACP object controls. */
struct slave *key_slave; /* Slave whose ID will be the aggregation key. */
- enum lacp_time lacp_time; /* Fast, Slow or Custom LACP time. */
- long long int custom_time; /* LACP_TIME_CUSTOM transmission rate. */
+ bool fast; /* True if using fast probe interval. */
bool negotiated; /* True if LACP negotiations were successful. */
bool update; /* True if lacp_update() needs to be called. */
- bool heartbeat; /* LACP heartbeat mode. */
};
struct slave {
void
lacp_configure(struct lacp *lacp, const struct lacp_settings *s)
{
- assert(!eth_addr_is_zero(s->id));
+ ovs_assert(!eth_addr_is_zero(s->id));
if (!lacp->name || strcmp(s->name, lacp->name)) {
free(lacp->name);
}
if (!eth_addr_equals(lacp->sys_id, s->id)
- || lacp->sys_priority != s->priority
- || lacp->heartbeat != s->heartbeat) {
+ || lacp->sys_priority != s->priority) {
memcpy(lacp->sys_id, s->id, ETH_ADDR_LEN);
lacp->sys_priority = s->priority;
- lacp->heartbeat = s->heartbeat;
lacp->update = true;
}
lacp->active = s->active;
- lacp->lacp_time = s->lacp_time;
- lacp->custom_time = (s->lacp_time == LACP_TIME_CUSTOM
- ? MAX(TIME_UPDATE_INTERVAL, s->custom_time)
- : 0);
+ lacp->fast = s->fast;
}
/* Returns true if 'lacp' is configured in active mode, false if 'lacp' is
return;
}
- switch (lacp->lacp_time) {
- case LACP_TIME_FAST:
- tx_rate = LACP_FAST_TIME_TX;
- break;
- case LACP_TIME_SLOW:
- tx_rate = LACP_SLOW_TIME_TX;
- break;
- case LACP_TIME_CUSTOM:
- tx_rate = lacp->custom_time;
- break;
- default: NOT_REACHED();
- }
-
slave->status = LACP_CURRENT;
+ tx_rate = lacp->fast ? LACP_FAST_TIME_TX : LACP_SLOW_TIME_TX;
timer_set_duration(&slave->rx, LACP_RX_MULTIPLIER * tx_rate);
slave->ntt_actor = pdu->partner;
}
/* This function should be called whenever the carrier status of 'slave_' has
- * changed. */
+ * changed. If 'lacp' is null, this function has no effect.*/
void
lacp_slave_carrier_changed(const struct lacp *lacp, const void *slave_)
{
- struct slave *slave = slave_lookup(lacp, slave_);
+ if (lacp) {
+ struct slave *slave = slave_lookup(lacp, slave_);
- if (slave->status == LACP_CURRENT || slave->lacp->active) {
- slave_set_expired(slave);
+ if (slave->status == LACP_CURRENT || slave->lacp->active) {
+ slave_set_expired(slave);
+ }
}
}
+static bool
+slave_may_enable__(struct slave *slave)
+{
+ /* The slave may be enabled if it's attached to an aggregator and its
+ * partner is synchronized.*/
+ return slave->attached && (slave->partner.state & LACP_STATE_SYNC);
+}
+
/* This function should be called before enabling 'slave_' to send or receive
* traffic. If it returns false, 'slave_' should not enabled. As a
* convenience, returns true if 'lacp' is NULL. */
lacp_slave_may_enable(const struct lacp *lacp, const void *slave_)
{
if (lacp) {
- struct slave *slave = slave_lookup(lacp, slave_);
-
- /* The slave may be enabled if it's attached to an aggregator and its
- * partner is synchronized.*/
- return slave->attached && (slave->partner.state & LACP_STATE_SYNC);
+ return slave_may_enable__(slave_lookup(lacp, slave_));
} else {
return true;
}
}
-/* Returns the port ID used for 'slave_' in LACP communications. */
-uint16_t
-lacp_slave_get_port_id(const struct lacp *lacp, const void *slave_)
-{
- struct slave *slave = slave_lookup(lacp, slave_);
- return slave->port_id;
-}
-
/* Returns true if partner information on 'slave_' is up to date. 'slave_'
* not being current, generally indicates a connectivity problem, or a
* misconfigured (or broken) partner. */
compose_lacp_pdu(&actor, &slave->partner, &pdu);
send_pdu(slave->aux, &pdu, sizeof pdu);
- if (lacp->lacp_time == LACP_TIME_CUSTOM) {
- duration = lacp->custom_time;
- } else {
- duration = (slave->partner.state & LACP_STATE_TIME
- ? LACP_FAST_TIME_TX
- : LACP_SLOW_TIME_TX);
- }
+ duration = (slave->partner.state & LACP_STATE_TIME
+ ? LACP_FAST_TIME_TX
+ : LACP_SLOW_TIME_TX);
timer_set_duration(&slave->tx, duration);
}
struct lacp_info lead_pri;
static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 10);
- if (lacp->heartbeat) {
- HMAP_FOR_EACH (slave, node, &lacp->slaves) {
- slave->attached = slave->status != LACP_DEFAULTED;
- }
- return;
- }
-
lacp->update = false;
lead = NULL;
static void
slave_set_expired(struct slave *slave)
{
- struct lacp *lacp = slave->lacp;
-
slave->status = LACP_EXPIRED;
slave->partner.state |= LACP_STATE_TIME;
slave->partner.state &= ~LACP_STATE_SYNC;
- /* The spec says we should wait LACP_RX_MULTIPLIER * LACP_FAST_TIME_TX.
- * This doesn't make sense when using custom times which can be much
- * smaller than LACP_FAST_TIME. */
- timer_set_duration(&slave->rx, (lacp->lacp_time == LACP_TIME_CUSTOM
- ? lacp->custom_time
- : LACP_RX_MULTIPLIER * LACP_FAST_TIME_TX));
+ timer_set_duration(&slave->rx, LACP_RX_MULTIPLIER * LACP_FAST_TIME_TX);
}
static void
state |= LACP_STATE_ACT;
}
- if (lacp->lacp_time != LACP_TIME_SLOW) {
+ if (lacp->fast) {
state |= LACP_STATE_TIME;
}
state |= LACP_STATE_EXP;
}
- if (lacp->heartbeat || hmap_count(&lacp->slaves) > 1) {
+ if (hmap_count(&lacp->slaves) > 1) {
state |= LACP_STATE_AGG;
}
ds_put_format(ds, "---- %s ----\n", lacp->name);
ds_put_format(ds, "\tstatus: %s", lacp->active ? "active" : "passive");
- if (lacp->heartbeat) {
- ds_put_cstr(ds, " heartbeat");
- }
if (lacp->negotiated) {
ds_put_cstr(ds, " negotiated");
}
ds_put_format(ds, "\tsys_priority: %u\n", lacp->sys_priority);
ds_put_cstr(ds, "\taggregation key: ");
if (lacp->key_slave) {
- ds_put_format(ds, "%u", lacp->key_slave->port_id);
+ ds_put_format(ds, "%u", lacp->key_slave->key
+ ? lacp->key_slave->key
+ : lacp->key_slave->port_id);
} else {
ds_put_cstr(ds, "none");
}
ds_put_cstr(ds, "\n");
ds_put_cstr(ds, "\tlacp_time: ");
- switch (lacp->lacp_time) {
- case LACP_TIME_FAST:
+ if (lacp->fast) {
ds_put_cstr(ds, "fast\n");
- break;
- case LACP_TIME_SLOW:
+ } else {
ds_put_cstr(ds, "slow\n");
- break;
- case LACP_TIME_CUSTOM:
- ds_put_format(ds, "custom (%lld)\n", lacp->custom_time);
- break;
- default:
- ds_put_cstr(ds, "unknown\n");
}
HMAP_FOR_EACH (slave, node, &lacp->slaves) {
slave->attached ? "attached" : "detached");
ds_put_format(ds, "\tport_id: %u\n", slave->port_id);
ds_put_format(ds, "\tport_priority: %u\n", slave->port_priority);
+ ds_put_format(ds, "\tmay_enable: %s\n", (slave_may_enable__(slave)
+ ? "true" : "false"));
ds_put_format(ds, "\n\tactor sys_id: " ETH_ADDR_FMT "\n",
ETH_ADDR_ARGS(actor.sys_id));
if (argc > 1) {
lacp = lacp_find(argv[1]);
if (!lacp) {
- unixctl_command_reply(conn, 501, "no such lacp object");
+ unixctl_command_reply_error(conn, "no such lacp object");
return;
}
lacp_print_details(&ds, lacp);
}
}
- unixctl_command_reply(conn, 200, ds_cstr(&ds));
+ unixctl_command_reply(conn, ds_cstr(&ds));
ds_destroy(&ds);
}
git://git.onelab.eu / sliver-openvswitch.git / blobdiff