X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fnetdev-dummy.c;h=fd30454d67b96863e767939890a2894785ecdaba;hb=afc9f54778901086a9565c14e1ce16c3c7aca514;hp=5c312109ba289b3405f45b6e53c24a033e681ecd;hpb=5e1de67fa16019acac301dd410ead42833dc3256;p=sliver-openvswitch.git diff --git a/lib/netdev-dummy.c b/lib/netdev-dummy.c index 5c312109b..fd30454d6 100644 --- a/lib/netdev-dummy.c +++ b/lib/netdev-dummy.c @@ -28,11 +28,13 @@ #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" @@ -60,18 +62,20 @@ struct netdev_dummy { /* 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. */ @@ -87,7 +91,7 @@ struct netdev_rx_dummy { 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) +static void netdev_dummy_changed(struct netdev_dummy *netdev) OVS_REQUIRES(netdev->mutex); static void netdev_dummy_queue_packet(struct netdev_dummy *, struct ofpbuf *); @@ -271,7 +275,8 @@ netdev_dummy_construct(struct netdev *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; @@ -288,6 +293,7 @@ netdev_dummy_construct(struct netdev *netdev_) 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); @@ -306,11 +312,13 @@ netdev_dummy_destruct(struct netdev *netdev_) 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); } @@ -327,12 +335,17 @@ netdev_dummy_get_config(const struct netdev *netdev_, struct smap *args) { 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; } @@ -341,6 +354,7 @@ netdev_dummy_set_config(struct netdev *netdev_, const struct smap *args) { 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); @@ -362,6 +376,29 @@ netdev_dummy_set_config(struct netdev *netdev_, const struct smap *args) } } } + + 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; @@ -433,6 +470,11 @@ netdev_dummy_rx_recv(struct netdev_rx *rx_, void *buffer, size_t size) 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; } @@ -480,7 +522,10 @@ netdev_dummy_send(struct netdev *netdev, const void *buffer, size_t size) 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; } @@ -493,6 +538,14 @@ netdev_dummy_send(struct netdev *netdev, const void *buffer, size_t size) 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]; @@ -518,7 +571,7 @@ netdev_dummy_set_etheraddr(struct netdev *netdev, ovs_mutex_lock(&dev->mutex); if (!eth_addr_equals(dev->hwaddr, mac)) { memcpy(dev->hwaddr, mac, ETH_ADDR_LEN); - netdev_dummy_poll_notify(dev); + netdev_dummy_changed(dev); } ovs_mutex_unlock(&dev->mutex); @@ -613,7 +666,7 @@ netdev_dummy_update_flags__(struct netdev_dummy *netdev, netdev->flags |= on; netdev->flags &= ~off; if (*old_flagsp != netdev->flags) { - netdev_dummy_poll_notify(netdev); + netdev_dummy_changed(netdev); } return 0; @@ -650,7 +703,7 @@ netdev_dummy_change_seq(const struct netdev *netdev_) /* Helper functions. */ static void -netdev_dummy_poll_notify(struct netdev_dummy *dev) +netdev_dummy_changed(struct netdev_dummy *dev) { dev->change_seq++; if (!dev->change_seq) { @@ -698,7 +751,9 @@ static const struct netdev_class dummy_class = { 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 */ @@ -771,9 +826,14 @@ netdev_dummy_queue_packet__(struct netdev_rx_dummy *rx, struct ofpbuf *packet) 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) { @@ -815,8 +875,6 @@ netdev_dummy_receive(struct unixctl_conn *conn, } 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); } @@ -900,6 +958,9 @@ netdev_dummy_register(bool override) 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;