#include "ofp-print.h"
#include "ofpbuf.h"
#include "packets.h"
+#include "pcap-file.h"
#include "poll-loop.h"
#include "shash.h"
#include "sset.h"
#include "stream.h"
#include "unaligned.h"
+#include "timeval.h"
#include "unixctl.h"
#include "vlog.h"
/* Protects all members below. */
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;
+ unsigned int change_seq 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;
+
+ struct list rxes OVS_GUARDED; /* List of child "netdev_rx_dummy"s. */
};
/* Max 'recv_queue_len' in struct netdev_dummy. */
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->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);
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);
+ 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;
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];
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 */
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) {
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;