/*
- * Copyright (c) 2010, 2011 Nicira Networks.
+ * Copyright (c) 2010, 2011, 2012, 2013 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 "packets.h"
#include "poll-loop.h"
#include "shash.h"
+#include "sset.h"
#include "unixctl.h"
#include "vlog.h"
static struct shash dummy_netdev_devs = SHASH_INITIALIZER(&dummy_netdev_devs);
+static unixctl_cb_func netdev_dummy_set_admin_state;
static int netdev_dummy_create(const struct netdev_class *, const char *,
struct netdev_dev **);
-static void netdev_dummy_poll_notify(const struct netdev *);
+static void netdev_dev_dummy_poll_notify(struct netdev_dev_dummy *);
+static int netdev_dev_dummy_update_flags(struct netdev_dev_dummy *,
+ enum netdev_flags off,
+ enum netdev_flags on,
+ enum netdev_flags *old_flagsp);
static bool
is_dummy_class(const struct netdev_class *class)
static struct netdev_dev_dummy *
netdev_dev_dummy_cast(const struct netdev_dev *netdev_dev)
{
- assert(is_dummy_class(netdev_dev_get_class(netdev_dev)));
+ ovs_assert(is_dummy_class(netdev_dev_get_class(netdev_dev)));
return CONTAINER_OF(netdev_dev, struct netdev_dev_dummy, netdev_dev);
}
netdev_dummy_cast(const struct netdev *netdev)
{
struct netdev_dev *netdev_dev = netdev_get_dev(netdev);
- assert(is_dummy_class(netdev_dev_get_class(netdev_dev)));
+ ovs_assert(is_dummy_class(netdev_dev_get_class(netdev_dev)));
return CONTAINER_OF(netdev, struct netdev_dummy, netdev);
}
{
struct netdev_dummy *netdev = netdev_dummy_cast(netdev_);
struct ofpbuf *packet;
+ size_t packet_size;
if (list_is_empty(&netdev->recv_queue)) {
return -EAGAIN;
if (packet->size > size) {
return -EMSGSIZE;
}
+ packet_size = packet->size;
memcpy(buffer, packet->data, packet->size);
ofpbuf_delete(packet);
- return packet->size;
+ return packet_size;
}
static void
if (!eth_addr_equals(dev->hwaddr, mac)) {
memcpy(dev->hwaddr, mac, ETH_ADDR_LEN);
- netdev_dummy_poll_notify(netdev);
+ netdev_dev_dummy_poll_notify(dev);
}
return 0;
struct netdev_dev_dummy *dev =
netdev_dev_dummy_cast(netdev_get_dev(netdev));
+ return netdev_dev_dummy_update_flags(dev, off, on, old_flagsp);
+}
+
+static int
+netdev_dev_dummy_update_flags(struct netdev_dev_dummy *dev,
+ enum netdev_flags off, enum netdev_flags on,
+ enum netdev_flags *old_flagsp)
+{
if ((off | on) & ~(NETDEV_UP | NETDEV_PROMISC)) {
return EINVAL;
}
dev->flags |= on;
dev->flags &= ~off;
if (*old_flagsp != dev->flags) {
- netdev_dummy_poll_notify(netdev);
+ netdev_dev_dummy_poll_notify(dev);
}
return 0;
}
/* Helper functions. */
static void
-netdev_dummy_poll_notify(const struct netdev *netdev)
+netdev_dev_dummy_poll_notify(struct netdev_dev_dummy *dev)
{
- struct netdev_dev_dummy *dev =
- netdev_dev_dummy_cast(netdev_get_dev(netdev));
-
dev->change_seq++;
if (!dev->change_seq) {
dev->change_seq++;
netdev_dummy_destroy,
NULL, /* get_config */
NULL, /* set_config */
+ NULL, /* get_tunnel_config */
netdev_dummy_open,
netdev_dummy_close,
dummy_dev = shash_find_data(&dummy_netdev_devs, argv[1]);
if (!dummy_dev) {
- unixctl_command_reply(conn, 501, "no such dummy netdev");
+ unixctl_command_reply_error(conn, "no such dummy netdev");
return;
}
packet = eth_from_packet_or_flow(argv[i]);
if (!packet) {
- unixctl_command_reply(conn, 501, "bad packet syntax");
+ unixctl_command_reply_error(conn, "bad packet syntax");
return;
}
}
if (!n_listeners) {
- unixctl_command_reply(conn, 202, "packets queued but nobody listened");
+ unixctl_command_reply(conn, "packets queued but nobody listened");
+ } else {
+ unixctl_command_reply(conn, "success");
+ }
+}
+
+static void
+netdev_dev_dummy_set_admin_state(struct netdev_dev_dummy *dev,
+ bool admin_state)
+{
+ enum netdev_flags old_flags;
+
+ if (admin_state) {
+ netdev_dev_dummy_update_flags(dev, 0, NETDEV_UP, &old_flags);
} else {
- unixctl_command_reply(conn, 200, "success");
+ netdev_dev_dummy_update_flags(dev, NETDEV_UP, 0, &old_flags);
}
}
+static void
+netdev_dummy_set_admin_state(struct unixctl_conn *conn, int argc,
+ const char *argv[], void *aux OVS_UNUSED)
+{
+ bool up;
+
+ if (!strcasecmp(argv[argc - 1], "up")) {
+ up = true;
+ } else if ( !strcasecmp(argv[argc - 1], "down")) {
+ up = false;
+ } else {
+ unixctl_command_reply_error(conn, "Invalid Admin State");
+ return;
+ }
+
+ if (argc > 2) {
+ struct netdev_dev_dummy *dummy_dev;
+
+ dummy_dev = shash_find_data(&dummy_netdev_devs, argv[1]);
+ if (dummy_dev) {
+ netdev_dev_dummy_set_admin_state(dummy_dev, up);
+ } else {
+ unixctl_command_reply_error(conn, "Unknown Dummy Interface");
+ return;
+ }
+ } else {
+ struct shash_node *node;
+
+ SHASH_FOR_EACH (node, &dummy_netdev_devs) {
+ netdev_dev_dummy_set_admin_state(node->data, up);
+ }
+ }
+ unixctl_command_reply(conn, "OK");
+}
+
void
-netdev_dummy_register(void)
+netdev_dummy_register(bool override)
{
- netdev_register_provider(&dummy_class);
unixctl_command_register("netdev-dummy/receive", "NAME PACKET|FLOW...",
2, INT_MAX, netdev_dummy_receive, NULL);
+ unixctl_command_register("netdev-dummy/set-admin-state",
+ "[netdev] up|down", 1, 2,
+ netdev_dummy_set_admin_state, NULL);
+
+ if (override) {
+ struct sset types;
+ const char *type;
+
+ sset_init(&types);
+ netdev_enumerate_types(&types);
+ SSET_FOR_EACH (type, &types) {
+ if (!netdev_unregister_provider(type)) {
+ struct netdev_class *class;
+
+ class = xmalloc(sizeof *class);
+ *class = dummy_class;
+ class->type = xstrdup(type);
+ netdev_register_provider(class);
+ }
+ }
+ sset_destroy(&types);
+ }
+ netdev_register_provider(&dummy_class);
}