/*
- * Copyright (c) 2010, 2011, 2012 Nicira, Inc.
+ * 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 "flow.h"
#include "list.h"
#include "netdev-provider.h"
+#include "netdev-vport.h"
#include "odp-util.h"
#include "ofp-print.h"
#include "ofpbuf.h"
#include "poll-loop.h"
#include "shash.h"
#include "sset.h"
+#include "stream.h"
+#include "unaligned.h"
#include "unixctl.h"
#include "vlog.h"
VLOG_DEFINE_THIS_MODULE(netdev_dummy);
-struct netdev_dev_dummy {
- struct netdev_dev netdev_dev;
+struct dummy_stream {
+ struct stream *stream;
+ struct ofpbuf rxbuf;
+ struct list txq;
+};
+
+struct netdev_dummy {
+ struct netdev up;
uint8_t hwaddr[ETH_ADDR_LEN];
int mtu;
struct netdev_stats stats;
enum netdev_flags flags;
unsigned int change_seq;
+ int ifindex;
+
+ struct pstream *pstream;
+ struct dummy_stream *streams;
+ size_t n_streams;
- struct list devs; /* List of child "netdev_dummy"s. */
+ struct list rxes; /* List of child "netdev_rx_dummy"s. */
};
-struct netdev_dummy {
- struct netdev netdev;
- struct list node; /* In netdev_dev_dummy's "devs" list. */
+/* Max 'recv_queue_len' in struct netdev_dummy. */
+#define NETDEV_DUMMY_MAX_QUEUE 100
+
+struct netdev_rx_dummy {
+ struct netdev_rx up;
+ struct list node; /* In netdev_dummy's "rxes" list. */
struct list recv_queue;
+ int recv_queue_len; /* list_size(&recv_queue). */
bool listening;
};
-static struct shash dummy_netdev_devs = SHASH_INITIALIZER(&dummy_netdev_devs);
+static struct shash dummy_netdevs = SHASH_INITIALIZER(&dummy_netdevs);
+
+static const struct netdev_rx_class netdev_rx_dummy_class;
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_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);
+ struct netdev **);
+static void netdev_dummy_poll_notify(struct netdev_dummy *);
+static void netdev_dummy_queue_packet(struct netdev_dummy *, struct ofpbuf *);
+
+static void dummy_stream_close(struct dummy_stream *);
static bool
is_dummy_class(const struct netdev_class *class)
return class->create == netdev_dummy_create;
}
-static struct netdev_dev_dummy *
-netdev_dev_dummy_cast(const struct netdev_dev *netdev_dev)
+static struct netdev_dummy *
+netdev_dummy_cast(const struct netdev *netdev)
{
- assert(is_dummy_class(netdev_dev_get_class(netdev_dev)));
- return CONTAINER_OF(netdev_dev, struct netdev_dev_dummy, netdev_dev);
+ ovs_assert(is_dummy_class(netdev_get_class(netdev)));
+ return CONTAINER_OF(netdev, struct netdev_dummy, up);
}
-static struct netdev_dummy *
-netdev_dummy_cast(const struct netdev *netdev)
+static struct netdev_rx_dummy *
+netdev_rx_dummy_cast(const struct netdev_rx *rx)
{
- struct netdev_dev *netdev_dev = netdev_get_dev(netdev);
- assert(is_dummy_class(netdev_dev_get_class(netdev_dev)));
- return CONTAINER_OF(netdev, struct netdev_dummy, netdev);
+ netdev_rx_assert_class(rx, &netdev_rx_dummy_class);
+ return CONTAINER_OF(rx, struct netdev_rx_dummy, up);
}
-static int
-netdev_dummy_create(const struct netdev_class *class, const char *name,
- struct netdev_dev **netdev_devp)
+static void
+netdev_dummy_run(void)
{
- static unsigned int n = 0xaa550000;
- struct netdev_dev_dummy *netdev_dev;
-
- netdev_dev = xzalloc(sizeof *netdev_dev);
- netdev_dev_init(&netdev_dev->netdev_dev, name, class);
- netdev_dev->hwaddr[0] = 0xaa;
- netdev_dev->hwaddr[1] = 0x55;
- netdev_dev->hwaddr[2] = n >> 24;
- netdev_dev->hwaddr[3] = n >> 16;
- netdev_dev->hwaddr[4] = n >> 8;
- netdev_dev->hwaddr[5] = n;
- netdev_dev->mtu = 1500;
- netdev_dev->flags = 0;
- netdev_dev->change_seq = 1;
- list_init(&netdev_dev->devs);
-
- shash_add(&dummy_netdev_devs, name, netdev_dev);
+ struct shash_node *node;
+
+ SHASH_FOR_EACH (node, &dummy_netdevs) {
+ struct netdev_dummy *dev = node->data;
+ size_t i;
+
+ if (dev->pstream) {
+ struct stream *new_stream;
+ int error;
+
+ error = pstream_accept(dev->pstream, &new_stream);
+ if (!error) {
+ struct dummy_stream *s;
+
+ dev->streams = xrealloc(dev->streams,
+ ((dev->n_streams + 1)
+ * sizeof *dev->streams));
+ s = &dev->streams[dev->n_streams++];
+ s->stream = new_stream;
+ ofpbuf_init(&s->rxbuf, 2048);
+ list_init(&s->txq);
+ } else if (error != EAGAIN) {
+ VLOG_WARN("%s: accept failed (%s)",
+ pstream_get_name(dev->pstream), strerror(error));
+ pstream_close(dev->pstream);
+ dev->pstream = NULL;
+ }
+ }
- n++;
+ for (i = 0; i < dev->n_streams; i++) {
+ struct dummy_stream *s = &dev->streams[i];
+ int error = 0;
+ size_t n;
+
+ stream_run(s->stream);
+
+ if (!list_is_empty(&s->txq)) {
+ struct ofpbuf *txbuf;
+ int retval;
+
+ txbuf = ofpbuf_from_list(list_front(&s->txq));
+ retval = stream_send(s->stream, txbuf->data, txbuf->size);
+ if (retval > 0) {
+ ofpbuf_pull(txbuf, retval);
+ if (!txbuf->size) {
+ list_remove(&txbuf->list_node);
+ ofpbuf_delete(txbuf);
+ }
+ } else if (retval != -EAGAIN) {
+ error = -retval;
+ }
+ }
- *netdev_devp = &netdev_dev->netdev_dev;
+ if (!error) {
+ if (s->rxbuf.size < 2) {
+ n = 2 - s->rxbuf.size;
+ } else {
+ uint16_t frame_len;
+
+ frame_len = ntohs(get_unaligned_be16(s->rxbuf.data));
+ if (frame_len < ETH_HEADER_LEN) {
+ error = EPROTO;
+ n = 0;
+ } else {
+ n = (2 + frame_len) - s->rxbuf.size;
+ }
+ }
+ }
+ if (!error) {
+ int retval;
+
+ ofpbuf_prealloc_tailroom(&s->rxbuf, n);
+ retval = stream_recv(s->stream, ofpbuf_tail(&s->rxbuf), n);
+ if (retval > 0) {
+ s->rxbuf.size += retval;
+ if (retval == n && s->rxbuf.size > 2) {
+ ofpbuf_pull(&s->rxbuf, 2);
+ netdev_dummy_queue_packet(dev,
+ ofpbuf_clone(&s->rxbuf));
+ ofpbuf_clear(&s->rxbuf);
+ }
+ } else if (retval != -EAGAIN) {
+ error = (retval < 0 ? -retval
+ : s->rxbuf.size ? EPROTO
+ : EOF);
+ }
+ }
- return 0;
+ if (error) {
+ VLOG_DBG("%s: closing connection (%s)",
+ stream_get_name(s->stream),
+ ovs_retval_to_string(error));
+ dummy_stream_close(&dev->streams[i]);
+ dev->streams[i] = dev->streams[--dev->n_streams];
+ }
+ }
+ }
}
static void
-netdev_dummy_destroy(struct netdev_dev *netdev_dev_)
+dummy_stream_close(struct dummy_stream *s)
{
- struct netdev_dev_dummy *netdev_dev = netdev_dev_dummy_cast(netdev_dev_);
+ stream_close(s->stream);
+ ofpbuf_uninit(&s->rxbuf);
+ ofpbuf_list_delete(&s->txq);
+}
+
+static void
+netdev_dummy_wait(void)
+{
+ struct shash_node *node;
+
+ SHASH_FOR_EACH (node, &dummy_netdevs) {
+ struct netdev_dummy *dev = node->data;
+ size_t i;
- shash_find_and_delete(&dummy_netdev_devs,
- netdev_dev_get_name(netdev_dev_));
- free(netdev_dev);
+ if (dev->pstream) {
+ pstream_wait(dev->pstream);
+ }
+ for (i = 0; i < dev->n_streams; i++) {
+ struct dummy_stream *s = &dev->streams[i];
+
+ stream_run_wait(s->stream);
+ if (!list_is_empty(&s->txq)) {
+ stream_send_wait(s->stream);
+ }
+ stream_recv_wait(s->stream);
+ }
+ }
}
static int
-netdev_dummy_open(struct netdev_dev *netdev_dev_, struct netdev **netdevp)
+netdev_dummy_create(const struct netdev_class *class, const char *name,
+ struct netdev **netdevp)
{
- struct netdev_dev_dummy *netdev_dev = netdev_dev_dummy_cast(netdev_dev_);
+ static unsigned int n = 0xaa550000;
struct netdev_dummy *netdev;
- netdev = xmalloc(sizeof *netdev);
- netdev_init(&netdev->netdev, netdev_dev_);
- list_init(&netdev->recv_queue);
- netdev->listening = false;
+ netdev = xzalloc(sizeof *netdev);
+ netdev_init(&netdev->up, name, class);
+ netdev->hwaddr[0] = 0xaa;
+ netdev->hwaddr[1] = 0x55;
+ netdev->hwaddr[2] = n >> 24;
+ netdev->hwaddr[3] = n >> 16;
+ netdev->hwaddr[4] = n >> 8;
+ netdev->hwaddr[5] = n;
+ netdev->mtu = 1500;
+ netdev->flags = 0;
+ netdev->change_seq = 1;
+ netdev->ifindex = -EOPNOTSUPP;
+
+ netdev->pstream = NULL;
+ netdev->streams = NULL;
+ netdev->n_streams = 0;
+
+ list_init(&netdev->rxes);
+
+ shash_add(&dummy_netdevs, name, netdev);
+
+ n++;
+
+ *netdevp = &netdev->up;
- *netdevp = &netdev->netdev;
- list_push_back(&netdev_dev->devs, &netdev->node);
return 0;
}
static void
-netdev_dummy_close(struct netdev *netdev_)
+netdev_dummy_destroy(struct netdev *netdev_)
{
struct netdev_dummy *netdev = netdev_dummy_cast(netdev_);
- list_remove(&netdev->node);
- ofpbuf_list_delete(&netdev->recv_queue);
+ size_t i;
+
+ shash_find_and_delete(&dummy_netdevs,
+ netdev_get_name(netdev_));
+ pstream_close(netdev->pstream);
+ for (i = 0; i < netdev->n_streams; i++) {
+ dummy_stream_close(&netdev->streams[i]);
+ }
+ free(netdev->streams);
free(netdev);
}
static int
-netdev_dummy_listen(struct netdev *netdev_)
+netdev_dummy_get_config(const struct netdev *netdev_, struct smap *args)
{
struct netdev_dummy *netdev = netdev_dummy_cast(netdev_);
- netdev->listening = true;
+
+ if (netdev->ifindex >= 0) {
+ smap_add_format(args, "ifindex", "%d", netdev->ifindex);
+ }
+ if (netdev->pstream) {
+ smap_add(args, "pstream", pstream_get_name(netdev->pstream));
+ }
+ return 0;
+}
+
+static int
+netdev_dummy_set_config(struct netdev *netdev_, const struct smap *args)
+{
+ struct netdev_dummy *netdev = netdev_dummy_cast(netdev_);
+ const char *pstream;
+
+ netdev->ifindex = smap_get_int(args, "ifindex", -EOPNOTSUPP);
+
+ pstream = smap_get(args, "pstream");
+ if (!pstream
+ || !netdev->pstream
+ || strcmp(pstream_get_name(netdev->pstream), pstream)) {
+ pstream_close(netdev->pstream);
+ netdev->pstream = NULL;
+
+ if (pstream) {
+ int error;
+
+ error = pstream_open(pstream, &netdev->pstream, DSCP_DEFAULT);
+ if (error) {
+ VLOG_WARN("%s: open failed (%s)", pstream, strerror(error));
+ }
+ }
+ }
return 0;
}
static int
-netdev_dummy_recv(struct netdev *netdev_, void *buffer, size_t size)
+netdev_dummy_rx_open(struct netdev *netdev_, struct netdev_rx **rxp)
{
struct netdev_dummy *netdev = netdev_dummy_cast(netdev_);
+ struct netdev_rx_dummy *rx;
+
+ rx = xmalloc(sizeof *rx);
+ netdev_rx_init(&rx->up, &netdev->up, &netdev_rx_dummy_class);
+ list_push_back(&netdev->rxes, &rx->node);
+ list_init(&rx->recv_queue);
+ rx->recv_queue_len = 0;
+
+ *rxp = &rx->up;
+ return 0;
+}
+
+static int
+netdev_rx_dummy_recv(struct netdev_rx *rx_, void *buffer, size_t size)
+{
+ struct netdev_rx_dummy *rx = netdev_rx_dummy_cast(rx_);
struct ofpbuf *packet;
size_t packet_size;
- if (list_is_empty(&netdev->recv_queue)) {
+ if (list_is_empty(&rx->recv_queue)) {
return -EAGAIN;
}
- packet = ofpbuf_from_list(list_pop_front(&netdev->recv_queue));
+ packet = ofpbuf_from_list(list_pop_front(&rx->recv_queue));
+ rx->recv_queue_len--;
if (packet->size > size) {
return -EMSGSIZE;
}
}
static void
-netdev_dummy_recv_wait(struct netdev *netdev_)
+netdev_rx_dummy_destroy(struct netdev_rx *rx_)
{
- struct netdev_dummy *netdev = netdev_dummy_cast(netdev_);
- if (!list_is_empty(&netdev->recv_queue)) {
+ struct netdev_rx_dummy *rx = netdev_rx_dummy_cast(rx_);
+ list_remove(&rx->node);
+ ofpbuf_list_delete(&rx->recv_queue);
+ free(rx);
+}
+
+static void
+netdev_rx_dummy_wait(struct netdev_rx *rx_)
+{
+ struct netdev_rx_dummy *rx = netdev_rx_dummy_cast(rx_);
+ if (!list_is_empty(&rx->recv_queue)) {
poll_immediate_wake();
}
}
static int
-netdev_dummy_drain(struct netdev *netdev_)
+netdev_rx_dummy_drain(struct netdev_rx *rx_)
{
- struct netdev_dummy *netdev = netdev_dummy_cast(netdev_);
- ofpbuf_list_delete(&netdev->recv_queue);
+ struct netdev_rx_dummy *rx = netdev_rx_dummy_cast(rx_);
+ ofpbuf_list_delete(&rx->recv_queue);
+ rx->recv_queue_len = 0;
+ return 0;
+}
+
+static int
+netdev_dummy_send(struct netdev *netdev, const void *buffer, size_t size)
+{
+ struct netdev_dummy *dev = netdev_dummy_cast(netdev);
+ size_t i;
+
+ if (size < ETH_HEADER_LEN) {
+ return EMSGSIZE;
+ } else {
+ const struct eth_header *eth = buffer;
+ int max_size;
+
+ max_size = dev->mtu + ETH_HEADER_LEN;
+ if (eth->eth_type == htons(ETH_TYPE_VLAN)) {
+ max_size += VLAN_HEADER_LEN;
+ }
+ if (size > max_size) {
+ return EMSGSIZE;
+ }
+ }
+
+ dev->stats.tx_packets++;
+ dev->stats.tx_bytes += size;
+
+ for (i = 0; i < dev->n_streams; i++) {
+ struct dummy_stream *s = &dev->streams[i];
+
+ if (list_size(&s->txq) < NETDEV_DUMMY_MAX_QUEUE) {
+ struct ofpbuf *b;
+
+ b = ofpbuf_clone_data_with_headroom(buffer, size, 2);
+ put_unaligned_be16(ofpbuf_push_uninit(b, 2), htons(size));
+ list_push_back(&s->txq, &b->list_node);
+ }
+ }
+
return 0;
}
netdev_dummy_set_etheraddr(struct netdev *netdev,
const uint8_t mac[ETH_ADDR_LEN])
{
- struct netdev_dev_dummy *dev =
- netdev_dev_dummy_cast(netdev_get_dev(netdev));
+ struct netdev_dummy *dev = netdev_dummy_cast(netdev);
if (!eth_addr_equals(dev->hwaddr, mac)) {
memcpy(dev->hwaddr, mac, ETH_ADDR_LEN);
- netdev_dev_dummy_poll_notify(dev);
+ netdev_dummy_poll_notify(dev);
}
return 0;
netdev_dummy_get_etheraddr(const struct netdev *netdev,
uint8_t mac[ETH_ADDR_LEN])
{
- const struct netdev_dev_dummy *dev =
- netdev_dev_dummy_cast(netdev_get_dev(netdev));
+ const struct netdev_dummy *dev = netdev_dummy_cast(netdev);
memcpy(mac, dev->hwaddr, ETH_ADDR_LEN);
return 0;
static int
netdev_dummy_get_mtu(const struct netdev *netdev, int *mtup)
{
- const struct netdev_dev_dummy *dev =
- netdev_dev_dummy_cast(netdev_get_dev(netdev));
+ const struct netdev_dummy *dev = netdev_dummy_cast(netdev);
*mtup = dev->mtu;
return 0;
static int
netdev_dummy_set_mtu(const struct netdev *netdev, int mtu)
{
- struct netdev_dev_dummy *dev =
- netdev_dev_dummy_cast(netdev_get_dev(netdev));
+ struct netdev_dummy *dev = netdev_dummy_cast(netdev);
dev->mtu = mtu;
return 0;
static int
netdev_dummy_get_stats(const struct netdev *netdev, struct netdev_stats *stats)
{
- const struct netdev_dev_dummy *dev =
- netdev_dev_dummy_cast(netdev_get_dev(netdev));
+ const struct netdev_dummy *dev = netdev_dummy_cast(netdev);
*stats = dev->stats;
return 0;
static int
netdev_dummy_set_stats(struct netdev *netdev, const struct netdev_stats *stats)
{
- struct netdev_dev_dummy *dev =
- netdev_dev_dummy_cast(netdev_get_dev(netdev));
+ struct netdev_dummy *dev = netdev_dummy_cast(netdev);
dev->stats = *stats;
return 0;
}
static int
-netdev_dummy_update_flags(struct netdev *netdev,
- enum netdev_flags off, enum netdev_flags on,
- enum netdev_flags *old_flagsp)
+netdev_dummy_get_ifindex(const struct netdev *netdev)
{
- struct netdev_dev_dummy *dev =
- netdev_dev_dummy_cast(netdev_get_dev(netdev));
+ struct netdev_dummy *dev = netdev_dummy_cast(netdev);
- return netdev_dev_dummy_update_flags(dev, off, on, old_flagsp);
+ return dev->ifindex;
}
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)
+netdev_dummy_update_flags(struct netdev *netdev_,
+ enum netdev_flags off, enum netdev_flags on,
+ enum netdev_flags *old_flagsp)
{
+ struct netdev_dummy *netdev = netdev_dummy_cast(netdev_);
+
if ((off | on) & ~(NETDEV_UP | NETDEV_PROMISC)) {
return EINVAL;
}
- *old_flagsp = dev->flags;
- dev->flags |= on;
- dev->flags &= ~off;
- if (*old_flagsp != dev->flags) {
- netdev_dev_dummy_poll_notify(dev);
+ *old_flagsp = netdev->flags;
+ netdev->flags |= on;
+ netdev->flags &= ~off;
+ if (*old_flagsp != netdev->flags) {
+ netdev_dummy_poll_notify(netdev);
}
return 0;
}
static unsigned int
netdev_dummy_change_seq(const struct netdev *netdev)
{
- return netdev_dev_dummy_cast(netdev_get_dev(netdev))->change_seq;
+ return netdev_dummy_cast(netdev)->change_seq;
}
\f
/* Helper functions. */
static void
-netdev_dev_dummy_poll_notify(struct netdev_dev_dummy *dev)
+netdev_dummy_poll_notify(struct netdev_dummy *dev)
{
dev->change_seq++;
if (!dev->change_seq) {
static const struct netdev_class dummy_class = {
"dummy",
NULL, /* init */
- NULL, /* run */
- NULL, /* wait */
+ netdev_dummy_run,
+ netdev_dummy_wait,
netdev_dummy_create,
netdev_dummy_destroy,
- NULL, /* get_config */
- NULL, /* set_config */
+ netdev_dummy_get_config,
+ netdev_dummy_set_config,
+ NULL, /* get_tunnel_config */
- netdev_dummy_open,
- netdev_dummy_close,
+ netdev_dummy_rx_open,
- netdev_dummy_listen,
- netdev_dummy_recv,
- netdev_dummy_recv_wait,
- netdev_dummy_drain,
-
- NULL, /* send */
+ netdev_dummy_send, /* send */
NULL, /* send_wait */
netdev_dummy_set_etheraddr,
netdev_dummy_get_etheraddr,
netdev_dummy_get_mtu,
netdev_dummy_set_mtu,
- NULL, /* get_ifindex */
+ netdev_dummy_get_ifindex,
NULL, /* get_carrier */
NULL, /* get_carrier_resets */
NULL, /* get_miimon */
NULL, /* get_in6 */
NULL, /* add_router */
NULL, /* get_next_hop */
- NULL, /* get_drv_info */
+ NULL, /* get_status */
NULL, /* arp_lookup */
netdev_dummy_update_flags,
netdev_dummy_change_seq
};
+static const struct netdev_rx_class netdev_rx_dummy_class = {
+ netdev_rx_dummy_destroy,
+ netdev_rx_dummy_recv,
+ netdev_rx_dummy_wait,
+ netdev_rx_dummy_drain,
+};
+
static struct ofpbuf *
eth_from_packet_or_flow(const char *s)
{
* settle for parsing a datapath key for now.
*/
ofpbuf_init(&odp_key, 0);
- error = odp_flow_key_from_string(s, NULL, &odp_key);
+ error = odp_flow_from_string(s, NULL, &odp_key, NULL);
if (error) {
ofpbuf_uninit(&odp_key);
return NULL;
return packet;
}
+static void
+netdev_dummy_queue_packet__(struct netdev_rx_dummy *rx, struct ofpbuf *packet)
+{
+ list_push_back(&rx->recv_queue, &packet->list_node);
+ rx->recv_queue_len++;
+}
+
+static void
+netdev_dummy_queue_packet(struct netdev_dummy *dummy, struct ofpbuf *packet)
+{
+ struct netdev_rx_dummy *rx, *prev;
+
+ prev = NULL;
+ LIST_FOR_EACH (rx, node, &dummy->rxes) {
+ if (rx->recv_queue_len < NETDEV_DUMMY_MAX_QUEUE) {
+ if (prev) {
+ netdev_dummy_queue_packet__(prev, ofpbuf_clone(packet));
+ }
+ prev = rx;
+ }
+ }
+ if (prev) {
+ netdev_dummy_queue_packet__(prev, packet);
+ } else {
+ ofpbuf_delete(packet);
+ }
+}
+
static void
netdev_dummy_receive(struct unixctl_conn *conn,
int argc, const char *argv[], void *aux OVS_UNUSED)
{
- struct netdev_dev_dummy *dummy_dev;
- int n_listeners;
+ struct netdev_dummy *dummy_dev;
int i;
- dummy_dev = shash_find_data(&dummy_netdev_devs, argv[1]);
+ dummy_dev = shash_find_data(&dummy_netdevs, argv[1]);
if (!dummy_dev) {
unixctl_command_reply_error(conn, "no such dummy netdev");
return;
}
- n_listeners = 0;
for (i = 2; i < argc; i++) {
- struct netdev_dummy *dev;
struct ofpbuf *packet;
packet = eth_from_packet_or_flow(argv[i]);
return;
}
- n_listeners = 0;
- LIST_FOR_EACH (dev, node, &dummy_dev->devs) {
- if (dev->listening) {
- struct ofpbuf *copy = ofpbuf_clone(packet);
- list_push_back(&dev->recv_queue, ©->list_node);
- n_listeners++;
- }
- }
- ofpbuf_delete(packet);
- }
+ dummy_dev->stats.rx_packets++;
+ dummy_dev->stats.rx_bytes += packet->size;
- if (!n_listeners) {
- unixctl_command_reply(conn, "packets queued but nobody listened");
- } else {
- unixctl_command_reply(conn, "success");
+ netdev_dummy_queue_packet(dummy_dev, packet);
}
+
+ unixctl_command_reply(conn, NULL);
}
static void
-netdev_dev_dummy_set_admin_state(struct netdev_dev_dummy *dev,
- bool admin_state)
+netdev_dummy_set_admin_state__(struct netdev_dummy *dev, bool admin_state)
{
enum netdev_flags old_flags;
if (admin_state) {
- netdev_dev_dummy_update_flags(dev, 0, NETDEV_UP, &old_flags);
+ netdev_dummy_update_flags(&dev->up, 0, NETDEV_UP, &old_flags);
} else {
- netdev_dev_dummy_update_flags(dev, NETDEV_UP, 0, &old_flags);
+ netdev_dummy_update_flags(&dev->up, NETDEV_UP, 0, &old_flags);
}
}
}
if (argc > 2) {
- struct netdev_dev_dummy *dummy_dev;
+ struct netdev_dummy *dummy_dev;
- dummy_dev = shash_find_data(&dummy_netdev_devs, argv[1]);
+ dummy_dev = shash_find_data(&dummy_netdevs, argv[1]);
if (dummy_dev) {
- netdev_dev_dummy_set_admin_state(dummy_dev, up);
+ netdev_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);
+ SHASH_FOR_EACH (node, &dummy_netdevs) {
+ netdev_dummy_set_admin_state__(node->data, up);
}
}
unixctl_command_reply(conn, "OK");
sset_destroy(&types);
}
netdev_register_provider(&dummy_class);
+
+ netdev_vport_tunnel_register();
}
git://git.onelab.eu / sliver-openvswitch.git / blobdiff