struct list rxes; /* List of child "netdev_rx_dummy"s. */
};
+static const struct netdev_class dummy_class;
+
/* Max 'recv_queue_len' in struct netdev_dummy. */
#define NETDEV_DUMMY_MAX_QUEUE 100
bool listening;
};
-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 **);
+static int netdev_dummy_construct(struct netdev *);
static void netdev_dummy_poll_notify(struct netdev_dummy *);
static void netdev_dummy_queue_packet(struct netdev_dummy *, struct ofpbuf *);
static bool
is_dummy_class(const struct netdev_class *class)
{
- return class->create == netdev_dummy_create;
+ return class->construct == netdev_dummy_construct;
}
static struct netdev_dummy *
static struct netdev_rx_dummy *
netdev_rx_dummy_cast(const struct netdev_rx *rx)
{
- netdev_rx_assert_class(rx, &netdev_rx_dummy_class);
+ ovs_assert(is_dummy_class(netdev_get_class(rx->netdev)));
return CONTAINER_OF(rx, struct netdev_rx_dummy, up);
}
static void
netdev_dummy_run(void)
{
+ struct shash dummy_netdevs;
struct shash_node *node;
+ shash_init(&dummy_netdevs);
+ netdev_get_devices(&dummy_class, &dummy_netdevs);
SHASH_FOR_EACH (node, &dummy_netdevs) {
struct netdev_dummy *dev = node->data;
size_t i;
dev->streams[i] = dev->streams[--dev->n_streams];
}
}
+
+ netdev_close(&dev->up);
}
+ shash_destroy(&dummy_netdevs);
}
static void
static void
netdev_dummy_wait(void)
{
+ struct shash dummy_netdevs;
struct shash_node *node;
+ shash_init(&dummy_netdevs);
+ netdev_get_devices(&dummy_class, &dummy_netdevs);
SHASH_FOR_EACH (node, &dummy_netdevs) {
struct netdev_dummy *dev = node->data;
size_t i;
}
stream_recv_wait(s->stream);
}
+ netdev_close(&dev->up);
}
+ shash_destroy(&dummy_netdevs);
+}
+
+static struct netdev *
+netdev_dummy_alloc(void)
+{
+ struct netdev_dummy *netdev = xzalloc(sizeof *netdev);
+ return &netdev->up;
}
static int
-netdev_dummy_create(const struct netdev_class *class, const char *name,
- struct netdev **netdevp)
+netdev_dummy_construct(struct netdev *netdev_)
{
static atomic_uint next_n = ATOMIC_VAR_INIT(0xaa550000);
- struct netdev_dummy *netdev;
+ struct netdev_dummy *netdev = netdev_dummy_cast(netdev_);
unsigned int n;
atomic_add(&next_n, 1, &n);
- netdev = xzalloc(sizeof *netdev);
- netdev_init(&netdev->up, name, class);
netdev->hwaddr[0] = 0xaa;
netdev->hwaddr[1] = 0x55;
netdev->hwaddr[2] = n >> 24;
list_init(&netdev->rxes);
- shash_add(&dummy_netdevs, name, netdev);
-
- *netdevp = &netdev->up;
-
return 0;
}
static void
-netdev_dummy_destroy(struct netdev *netdev_)
+netdev_dummy_destruct(struct netdev *netdev_)
{
struct netdev_dummy *netdev = netdev_dummy_cast(netdev_);
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);
+}
+
+static void
+netdev_dummy_dealloc(struct netdev *netdev_)
+{
+ struct netdev_dummy *netdev = netdev_dummy_cast(netdev_);
+
free(netdev);
}
return 0;
}
+static struct netdev_rx *
+netdev_dummy_rx_alloc(void)
+{
+ struct netdev_rx_dummy *rx = xzalloc(sizeof *rx);
+ return &rx->up;
+}
+
static int
-netdev_dummy_rx_open(struct netdev *netdev_, struct netdev_rx **rxp)
+netdev_dummy_rx_construct(struct netdev_rx *rx_)
{
- struct netdev_dummy *netdev = netdev_dummy_cast(netdev_);
- struct netdev_rx_dummy *rx;
+ struct netdev_rx_dummy *rx = netdev_rx_dummy_cast(rx_);
+ struct netdev_dummy *netdev = netdev_dummy_cast(rx->up.netdev);
- 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 void
+netdev_dummy_rx_destruct(struct netdev_rx *rx_)
+{
+ struct netdev_rx_dummy *rx = netdev_rx_dummy_cast(rx_);
+
+ list_remove(&rx->node);
+ ofpbuf_list_delete(&rx->recv_queue);
+}
+
+static void
+netdev_dummy_rx_dealloc(struct netdev_rx *rx_)
+{
+ struct netdev_rx_dummy *rx = netdev_rx_dummy_cast(rx_);
+
+ free(rx);
+}
+
static int
-netdev_rx_dummy_recv(struct netdev_rx *rx_, void *buffer, size_t size)
+netdev_dummy_rx_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;
+ int retval;
if (list_is_empty(&rx->recv_queue)) {
return -EAGAIN;
packet = ofpbuf_from_list(list_pop_front(&rx->recv_queue));
rx->recv_queue_len--;
- if (packet->size > size) {
- return -EMSGSIZE;
+ if (packet->size <= size) {
+ memcpy(buffer, packet->data, packet->size);
+ retval = packet->size;
+ } else {
+ retval = -EMSGSIZE;
}
- packet_size = packet->size;
-
- memcpy(buffer, packet->data, packet->size);
ofpbuf_delete(packet);
- return packet_size;
+ return retval;
}
static void
-netdev_rx_dummy_destroy(struct netdev_rx *rx_)
-{
- 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_)
+netdev_dummy_rx_wait(struct netdev_rx *rx_)
{
struct netdev_rx_dummy *rx = netdev_rx_dummy_cast(rx_);
if (!list_is_empty(&rx->recv_queue)) {
}
static int
-netdev_rx_dummy_drain(struct netdev_rx *rx_)
+netdev_dummy_rx_drain(struct netdev_rx *rx_)
{
struct netdev_rx_dummy *rx = netdev_rx_dummy_cast(rx_);
ofpbuf_list_delete(&rx->recv_queue);
netdev_dummy_run,
netdev_dummy_wait,
- netdev_dummy_create,
- netdev_dummy_destroy,
+ netdev_dummy_alloc,
+ netdev_dummy_construct,
+ netdev_dummy_destruct,
+ netdev_dummy_dealloc,
netdev_dummy_get_config,
netdev_dummy_set_config,
NULL, /* get_tunnel_config */
- netdev_dummy_rx_open,
-
netdev_dummy_send, /* send */
NULL, /* send_wait */
netdev_dummy_update_flags,
- netdev_dummy_change_seq
-};
+ 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,
+ netdev_dummy_rx_alloc,
+ netdev_dummy_rx_construct,
+ netdev_dummy_rx_destruct,
+ netdev_dummy_rx_dealloc,
+ netdev_dummy_rx_recv,
+ netdev_dummy_rx_wait,
+ netdev_dummy_rx_drain,
};
static struct ofpbuf *
int argc, const char *argv[], void *aux OVS_UNUSED)
{
struct netdev_dummy *dummy_dev;
+ struct netdev *netdev;
int i;
- dummy_dev = shash_find_data(&dummy_netdevs, argv[1]);
- if (!dummy_dev) {
+ netdev = netdev_from_name(argv[1]);
+ if (!netdev || !is_dummy_class(netdev->netdev_class)) {
unixctl_command_reply_error(conn, "no such dummy netdev");
- return;
+ goto exit;
}
+ dummy_dev = netdev_dummy_cast(netdev);
for (i = 2; i < argc; i++) {
struct ofpbuf *packet;
packet = eth_from_packet_or_flow(argv[i]);
if (!packet) {
unixctl_command_reply_error(conn, "bad packet syntax");
- return;
+ goto exit;
}
dummy_dev->stats.rx_packets++;
}
unixctl_command_reply(conn, NULL);
+
+exit:
+ netdev_close(netdev);
}
static void
}
if (argc > 2) {
- struct netdev_dummy *dummy_dev;
+ struct netdev *netdev = netdev_from_name(argv[1]);
+ if (netdev && is_dummy_class(netdev->netdev_class)) {
+ struct netdev_dummy *dummy_dev = netdev_dummy_cast(netdev);
- dummy_dev = shash_find_data(&dummy_netdevs, argv[1]);
- if (dummy_dev) {
netdev_dummy_set_admin_state__(dummy_dev, up);
+ netdev_close(netdev);
} else {
unixctl_command_reply_error(conn, "Unknown Dummy Interface");
+ netdev_close(netdev);
return;
}
} else {
+ struct shash dummy_netdevs;
struct shash_node *node;
+ shash_init(&dummy_netdevs);
+ netdev_get_devices(&dummy_class, &dummy_netdevs);
SHASH_FOR_EACH (node, &dummy_netdevs) {
- netdev_dummy_set_admin_state__(node->data, up);
+ struct netdev *netdev = node->data;
+ netdev_dummy_set_admin_state__(netdev_dummy_cast(netdev), up);
+ netdev_close(netdev);
}
+ shash_destroy(&dummy_netdevs);
}
unixctl_command_reply(conn, "OK");
}
git://git.onelab.eu / sliver-openvswitch.git / blobdiff