#include <errno.h>
+#include "connectivity.h"
#include "flow.h"
#include "list.h"
#include "netdev-provider.h"
#include "ofp-print.h"
#include "ofpbuf.h"
#include "packets.h"
+#include "pcap-file.h"
#include "poll-loop.h"
+#include "seq.h"
#include "shash.h"
#include "sset.h"
#include "stream.h"
#include "unaligned.h"
+#include "timeval.h"
#include "unixctl.h"
#include "vlog.h"
struct list txq;
};
+/* Protects 'dummy_list'. */
+static struct ovs_mutex dummy_list_mutex = OVS_MUTEX_INITIALIZER;
+
+/* Contains all 'struct dummy_dev's. */
+static struct list dummy_list OVS_GUARDED_BY(dummy_list_mutex)
+ = LIST_INITIALIZER(&dummy_list);
+
struct netdev_dummy {
struct netdev up;
+ /* In dummy_list. */
+ struct list list_node OVS_GUARDED_BY(dummy_list_mutex);
+
/* Protects all members below. */
- struct ovs_mutex mutex;
+ struct ovs_mutex mutex OVS_ACQ_AFTER(dummy_list_mutex);
- uint8_t hwaddr[ETH_ADDR_LEN];
- int mtu;
- struct netdev_stats stats;
- enum netdev_flags flags;
- unsigned int change_seq;
- int ifindex;
+ uint8_t hwaddr[ETH_ADDR_LEN] OVS_GUARDED;
+ int mtu OVS_GUARDED;
+ struct netdev_stats stats OVS_GUARDED;
+ enum netdev_flags flags OVS_GUARDED;
+ int ifindex OVS_GUARDED;
- struct pstream *pstream;
- struct dummy_stream *streams;
- size_t n_streams;
+ struct pstream *pstream OVS_GUARDED;
+ struct dummy_stream *streams OVS_GUARDED;
+ size_t n_streams OVS_GUARDED;
- struct list rxes; /* List of child "netdev_rx_dummy"s. */
-};
+ FILE *tx_pcap, *rx_pcap OVS_GUARDED;
-static const struct netdev_class dummy_class;
+ struct list rxes OVS_GUARDED; /* List of child "netdev_rx_dummy"s. */
+};
/* Max 'recv_queue_len' in struct netdev_dummy. */
#define NETDEV_DUMMY_MAX_QUEUE 100
static unixctl_cb_func netdev_dummy_set_admin_state;
static int netdev_dummy_construct(struct netdev *);
-static void netdev_dummy_poll_notify(struct netdev_dummy *netdev)
- OVS_REQUIRES(netdev->mutex);
static void netdev_dummy_queue_packet(struct netdev_dummy *, struct ofpbuf *);
static void dummy_stream_close(struct dummy_stream *);
static void
netdev_dummy_run(void)
{
- struct shash dummy_netdevs;
- struct shash_node *node;
+ struct netdev_dummy *dev;
- shash_init(&dummy_netdevs);
- netdev_get_devices(&dummy_class, &dummy_netdevs);
- SHASH_FOR_EACH (node, &dummy_netdevs) {
- struct netdev_dummy *dev = node->data;
+ ovs_mutex_lock(&dummy_list_mutex);
+ LIST_FOR_EACH (dev, list_node, &dummy_list) {
size_t i;
ovs_mutex_lock(&dev->mutex);
}
ovs_mutex_unlock(&dev->mutex);
- netdev_close(&dev->up);
}
- shash_destroy(&dummy_netdevs);
+ ovs_mutex_unlock(&dummy_list_mutex);
}
static void
static void
netdev_dummy_wait(void)
{
- struct shash dummy_netdevs;
- struct shash_node *node;
+ struct netdev_dummy *dev;
- shash_init(&dummy_netdevs);
- netdev_get_devices(&dummy_class, &dummy_netdevs);
- SHASH_FOR_EACH (node, &dummy_netdevs) {
- struct netdev_dummy *dev = node->data;
+ ovs_mutex_lock(&dummy_list_mutex);
+ LIST_FOR_EACH (dev, list_node, &dummy_list) {
size_t i;
ovs_mutex_lock(&dev->mutex);
stream_recv_wait(s->stream);
}
ovs_mutex_unlock(&dev->mutex);
- netdev_close(&dev->up);
}
- shash_destroy(&dummy_netdevs);
+ ovs_mutex_unlock(&dummy_list_mutex);
}
static struct netdev *
atomic_add(&next_n, 1, &n);
- ovs_mutex_init(&netdev->mutex, PTHREAD_MUTEX_NORMAL);
+ ovs_mutex_init(&netdev->mutex);
+ ovs_mutex_lock(&netdev->mutex);
netdev->hwaddr[0] = 0xaa;
netdev->hwaddr[1] = 0x55;
netdev->hwaddr[2] = n >> 24;
netdev->hwaddr[5] = n;
netdev->mtu = 1500;
netdev->flags = 0;
- netdev->change_seq = 1;
netdev->ifindex = -EOPNOTSUPP;
netdev->pstream = NULL;
netdev->n_streams = 0;
list_init(&netdev->rxes);
+ ovs_mutex_unlock(&netdev->mutex);
+
+ ovs_mutex_lock(&dummy_list_mutex);
+ list_push_back(&dummy_list, &netdev->list_node);
+ ovs_mutex_unlock(&dummy_list_mutex);
return 0;
}
struct netdev_dummy *netdev = netdev_dummy_cast(netdev_);
size_t i;
+ ovs_mutex_lock(&dummy_list_mutex);
+ list_remove(&netdev->list_node);
+ ovs_mutex_unlock(&dummy_list_mutex);
+
+ ovs_mutex_lock(&netdev->mutex);
pstream_close(netdev->pstream);
for (i = 0; i < netdev->n_streams; i++) {
dummy_stream_close(&netdev->streams[i]);
}
free(netdev->streams);
+ ovs_mutex_unlock(&netdev->mutex);
ovs_mutex_destroy(&netdev->mutex);
}
{
struct netdev_dummy *netdev = netdev_dummy_cast(netdev_);
+ ovs_mutex_lock(&netdev->mutex);
+
if (netdev->ifindex >= 0) {
smap_add_format(args, "ifindex", "%d", netdev->ifindex);
}
+
if (netdev->pstream) {
smap_add(args, "pstream", pstream_get_name(netdev->pstream));
}
+
+ ovs_mutex_unlock(&netdev->mutex);
return 0;
}
{
struct netdev_dummy *netdev = netdev_dummy_cast(netdev_);
const char *pstream;
+ const char *pcap;
ovs_mutex_lock(&netdev->mutex);
netdev->ifindex = smap_get_int(args, "ifindex", -EOPNOTSUPP);
}
}
}
+
+ if (netdev->rx_pcap) {
+ fclose(netdev->rx_pcap);
+ }
+ if (netdev->tx_pcap && netdev->tx_pcap != netdev->rx_pcap) {
+ fclose(netdev->tx_pcap);
+ }
+ netdev->rx_pcap = netdev->tx_pcap = NULL;
+ pcap = smap_get(args, "pcap");
+ if (pcap) {
+ netdev->rx_pcap = netdev->tx_pcap = pcap_open(pcap, "ab");
+ } else {
+ const char *rx_pcap = smap_get(args, "rx_pcap");
+ const char *tx_pcap = smap_get(args, "tx_pcap");
+
+ if (rx_pcap) {
+ netdev->rx_pcap = pcap_open(rx_pcap, "ab");
+ }
+ if (tx_pcap) {
+ netdev->tx_pcap = pcap_open(tx_pcap, "ab");
+ }
+ }
+
ovs_mutex_unlock(&netdev->mutex);
return 0;
if (packet->size <= size) {
memcpy(buffer, packet->data, packet->size);
retval = packet->size;
+
+ ovs_mutex_lock(&netdev->mutex);
+ netdev->stats.rx_packets++;
+ netdev->stats.rx_bytes += packet->size;
+ ovs_mutex_unlock(&netdev->mutex);
} else {
retval = -EMSGSIZE;
}
const struct eth_header *eth = buffer;
int max_size;
+ ovs_mutex_lock(&dev->mutex);
max_size = dev->mtu + ETH_HEADER_LEN;
+ ovs_mutex_unlock(&dev->mutex);
+
if (eth->eth_type == htons(ETH_TYPE_VLAN)) {
max_size += VLAN_HEADER_LEN;
}
dev->stats.tx_packets++;
dev->stats.tx_bytes += size;
+ if (dev->tx_pcap) {
+ struct ofpbuf packet;
+
+ ofpbuf_use_const(&packet, buffer, size);
+ pcap_write(dev->tx_pcap, &packet);
+ fflush(dev->tx_pcap);
+ }
+
for (i = 0; i < dev->n_streams; i++) {
struct dummy_stream *s = &dev->streams[i];
ovs_mutex_lock(&dev->mutex);
if (!eth_addr_equals(dev->hwaddr, mac)) {
memcpy(dev->hwaddr, mac, ETH_ADDR_LEN);
- netdev_dummy_poll_notify(dev);
+ seq_change(connectivity_seq_get());
}
ovs_mutex_unlock(&dev->mutex);
netdev->flags |= on;
netdev->flags &= ~off;
if (*old_flagsp != netdev->flags) {
- netdev_dummy_poll_notify(netdev);
+ seq_change(connectivity_seq_get());
}
return 0;
return error;
}
-
-static unsigned int
-netdev_dummy_change_seq(const struct netdev *netdev_)
-{
- struct netdev_dummy *netdev = netdev_dummy_cast(netdev_);
- unsigned int change_seq;
-
- ovs_mutex_lock(&netdev->mutex);
- change_seq = netdev->change_seq;
- ovs_mutex_unlock(&netdev->mutex);
-
- return change_seq;
-}
\f
/* Helper functions. */
-static void
-netdev_dummy_poll_notify(struct netdev_dummy *dev)
-{
- dev->change_seq++;
- if (!dev->change_seq) {
- dev->change_seq++;
- }
-}
-
static const struct netdev_class dummy_class = {
"dummy",
NULL, /* init */
NULL, /* set_queue */
NULL, /* delete_queue */
NULL, /* get_queue_stats */
- NULL, /* dump_queues */
+ NULL, /* queue_dump_start */
+ NULL, /* queue_dump_next */
+ NULL, /* queue_dump_done */
NULL, /* dump_queue_stats */
NULL, /* get_in4 */
netdev_dummy_update_flags,
- netdev_dummy_change_seq,
-
netdev_dummy_rx_alloc,
netdev_dummy_rx_construct,
netdev_dummy_rx_destruct,
static void
netdev_dummy_queue_packet(struct netdev_dummy *dummy, struct ofpbuf *packet)
+ OVS_REQUIRES(dummy->mutex)
{
struct netdev_rx_dummy *rx, *prev;
+ if (dummy->rx_pcap) {
+ pcap_write(dummy->rx_pcap, packet);
+ fflush(dummy->rx_pcap);
+ }
prev = NULL;
LIST_FOR_EACH (rx, node, &dummy->rxes) {
if (rx->recv_queue_len < NETDEV_DUMMY_MAX_QUEUE) {
}
ovs_mutex_lock(&dummy_dev->mutex);
- dummy_dev->stats.rx_packets++;
- dummy_dev->stats.rx_bytes += packet->size;
netdev_dummy_queue_packet(dummy_dev, packet);
ovs_mutex_unlock(&dummy_dev->mutex);
}
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) {
- struct netdev *netdev_ = node->data;
- struct netdev_dummy *netdev = netdev_dummy_cast(netdev_);
+ struct netdev_dummy *netdev;
+ ovs_mutex_lock(&dummy_list_mutex);
+ LIST_FOR_EACH (netdev, list_node, &dummy_list) {
ovs_mutex_lock(&netdev->mutex);
netdev_dummy_set_admin_state__(netdev, up);
ovs_mutex_unlock(&netdev->mutex);
-
- netdev_close(netdev_);
}
- shash_destroy(&dummy_netdevs);
+ ovs_mutex_unlock(&dummy_list_mutex);
}
unixctl_command_reply(conn, "OK");
}
sset_init(&types);
netdev_enumerate_types(&types);
SSET_FOR_EACH (type, &types) {
+ if (!strcmp(type, "patch")) {
+ continue;
+ }
if (!netdev_unregister_provider(type)) {
struct netdev_class *class;
int error;
projects / cascardo / ovs.git / blobdiff