#include "ofpbuf.h"
#include "packets.h"
#include "poll-loop.h"
+#include "shash.h"
#include "timer.h"
#include "timeval.h"
#include "unixctl.h"
static struct slave *slave_lookup(const struct lacp *, const void *slave);
static bool info_tx_equal(struct lacp_info *, struct lacp_info *);
-static void lacp_unixctl_show(struct unixctl_conn *, const char *args,
- void *aux);
+static unixctl_cb_func lacp_unixctl_show;
/* Populates 'pdu' with a LACP PDU comprised of 'actor' and 'partner'. */
static void
void
lacp_init(void)
{
- unixctl_command_register("lacp/show", "[port]", lacp_unixctl_show, NULL);
+ unixctl_command_register("lacp/show", "[port]", 0, 1,
+ lacp_unixctl_show, NULL);
}
/* Creates a LACP object. */
lacp->active = s->active;
lacp->lacp_time = s->lacp_time;
- lacp->custom_time = MAX(TIME_UPDATE_INTERVAL, s->custom_time);
+ lacp->custom_time = (s->lacp_time == LACP_TIME_CUSTOM
+ ? MAX(TIME_UPDATE_INTERVAL, s->custom_time)
+ : 0);
}
/* Returns true if 'lacp' is configured in active mode, false if 'lacp' is
static void
lacp_print_details(struct ds *ds, struct lacp *lacp)
{
+ struct shash slave_shash = SHASH_INITIALIZER(&slave_shash);
+ const struct shash_node **sorted_slaves = NULL;
+
struct slave *slave;
+ int i;
ds_put_format(ds, "---- %s ----\n", lacp->name);
ds_put_format(ds, "\tstatus: %s", lacp->active ? "active" : "passive");
}
HMAP_FOR_EACH (slave, node, &lacp->slaves) {
+ shash_add(&slave_shash, slave->name, slave);
+ }
+ sorted_slaves = shash_sort(&slave_shash);
+
+ for (i = 0; i < shash_count(&slave_shash); i++) {
char *status;
struct lacp_info actor;
+ slave = sorted_slaves[i]->data;
slave_get_actor(slave, &actor);
switch (slave->status) {
case LACP_CURRENT:
ds_put_lacp_state(ds, slave->partner.state);
ds_put_cstr(ds, "\n");
}
+
+ shash_destroy(&slave_shash);
+ free(sorted_slaves);
}
static void
-lacp_unixctl_show(struct unixctl_conn *conn,
- const char *args, void *aux OVS_UNUSED)
+lacp_unixctl_show(struct unixctl_conn *conn, int argc, const char *argv[],
+ void *aux OVS_UNUSED)
{
struct ds ds = DS_EMPTY_INITIALIZER;
struct lacp *lacp;
- if (strlen(args)) {
- lacp = lacp_find(args);
+ if (argc > 1) {
+ lacp = lacp_find(argv[1]);
if (!lacp) {
unixctl_command_reply(conn, 501, "no such lacp object");
return;