X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fnetdev-tunnel.c;h=dcc5e2ca92d07121e3d642115db226e17f8659b4;hb=79f108b14e7944ddc4669e9c03fc34b40a3a2288;hp=fdc1d976a4fc493bd673dafcdc6c6bade0bc8751;hpb=dca9309ae888995f13be5e1bfa607214ca531613;p=sliver-openvswitch.git

diff --git a/lib/netdev-tunnel.c b/lib/netdev-tunnel.c
index fdc1d976a..dcc5e2ca9 100644
--- a/lib/netdev-tunnel.c
+++ b/lib/netdev-tunnel.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010 Nicira Networks.
+ * Copyright (c) 2010, 2011, 2012 Nicira Networks.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,319 +15,618 @@
  */
 
 #include <config.h>
+
+#include <unistd.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
 #include <errno.h>
-#include <fcntl.h>
-#include <net/if.h>
-#include <sys/ioctl.h>
 
+#include "flow.h"
+#include "list.h"
+#include "dpif-netdev.h"
 #include "netdev-provider.h"
-#include "netdev-vport.h"
-#include "openflow/openflow.h"
-#include "openvswitch/datapath-protocol.h"
-#include "openvswitch/tunnel.h"
+#include "odp-util.h"
+#include "ofp-print.h"
+#include "ofpbuf.h"
 #include "packets.h"
+#include "poll-loop.h"
+#include "shash.h"
+#include "sset.h"
+#include "unixctl.h"
 #include "socket-util.h"
 #include "vlog.h"
 
-VLOG_DEFINE_THIS_MODULE(netdev_tunnel)
+VLOG_DEFINE_THIS_MODULE(netdev_tunnel);
 
-struct netdev_dev_tunnel {
-    struct netdev_dev netdev_dev;
+struct netdev_tunnel {
+    struct netdev up;
+
+    /* Protects all members below. */
+    struct ovs_mutex mutex;
+
+    uint8_t hwaddr[ETH_ADDR_LEN];
+    struct netdev_stats stats;
+    enum netdev_flags flags;
+    int sockfd;
+    struct sockaddr_storage local_addr;
+    struct sockaddr_storage remote_addr;
+    bool valid_remote_ip;
+    bool valid_remote_port;
+    bool connected;
+    unsigned int change_seq;
 };
 
-struct netdev_tunnel {
-    struct netdev netdev;
+struct netdev_rxq_tunnel {
+    struct netdev_rxq up;
+    int fd;
 };
 
-static int netdev_tunnel_create(const char *name, const char *type,
-                                const struct shash *args, struct netdev_dev **);
+static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(5, 20);
 
-static struct netdev_dev_tunnel *
-netdev_dev_tunnel_cast(const struct netdev_dev *netdev_dev)
+static struct ovs_mutex tunnel_netdevs_mutex = OVS_MUTEX_INITIALIZER;
+static struct shash tunnel_netdevs OVS_GUARDED_BY(tunnel_netdevs_mutex)
+    = SHASH_INITIALIZER(&tunnel_netdevs);
+
+static int netdev_tunnel_construct(struct netdev *netdevp_);
+static void netdev_tunnel_update_seq(struct netdev_tunnel *);
+
+static bool
+is_netdev_tunnel_class(const struct netdev_class *class)
 {
-    assert(netdev_dev_get_class(netdev_dev)->create == netdev_tunnel_create);
-    return CONTAINER_OF(netdev_dev, struct netdev_dev_tunnel, netdev_dev);
+    return class->construct == netdev_tunnel_construct;
 }
 
 static struct netdev_tunnel *
 netdev_tunnel_cast(const struct netdev *netdev)
 {
-    struct netdev_dev *netdev_dev = netdev_get_dev(netdev);
-    assert(netdev_dev_get_class(netdev_dev)->create == netdev_tunnel_create);
-    return CONTAINER_OF(netdev, struct netdev_tunnel, netdev);
+    ovs_assert(is_netdev_tunnel_class(netdev_get_class(netdev)));
+    return CONTAINER_OF(netdev, struct netdev_tunnel, up);
+}
+
+static struct netdev_rxq_tunnel *
+netdev_rxq_tunnel_cast(const struct netdev_rxq *rx)
+{
+    ovs_assert(is_netdev_tunnel_class(netdev_get_class(rx->netdev)));
+    return CONTAINER_OF(rx, struct netdev_rxq_tunnel, up);
+}
+
+static struct netdev *
+netdev_tunnel_alloc(void)
+{
+    struct netdev_tunnel *netdev = xzalloc(sizeof *netdev);
+    return &netdev->up;
 }
 
 static int
-parse_config(const char *name, const char *type, const struct shash *args,
-             struct tnl_port_config *config)
+netdev_tunnel_construct(struct netdev *netdev_)
 {
-    struct shash_node *node;
+    static atomic_uint next_n = ATOMIC_VAR_INIT(0);
+    struct netdev_tunnel *netdev = netdev_tunnel_cast(netdev_);
+    unsigned int n;
+
+    atomic_add(&next_n, 1, &n);
+
+    ovs_mutex_init(&netdev->mutex);
+    netdev->hwaddr[0] = 0xfe;
+    netdev->hwaddr[1] = 0xff;
+    netdev->hwaddr[2] = 0xff;
+    netdev->hwaddr[3] = n >> 16;
+    netdev->hwaddr[4] = n >> 8;
+    netdev->hwaddr[5] = n;
+    netdev->flags = 0;
+    netdev->change_seq = 1;
+    memset(&netdev->remote_addr, 0, sizeof(netdev->remote_addr));
+    netdev->valid_remote_ip = false;
+    netdev->valid_remote_port = false;
+    netdev->connected = false;
+
+
+    netdev->sockfd = inet_open_passive(SOCK_DGRAM, "", 0,
+        &netdev->local_addr, 0);
+    if (netdev->sockfd < 0) {
+    	return netdev->sockfd;
+    }
+
+
+    shash_add(&tunnel_netdevs, netdev_get_name(netdev_), netdev);
+
+    n++;
+
+    VLOG_DBG("tunnel_create: name=%s, fd=%d, port=%d",
+        netdev_get_name(netdev_), netdev->sockfd, ss_get_port(&netdev->local_addr));
+
+    return 0;
+
+}
 
-    memset(config, 0, sizeof *config);
+static void
+netdev_tunnel_destruct(struct netdev *netdev_)
+{
+    struct netdev_tunnel *netdev = netdev_tunnel_cast(netdev_);
+
+    ovs_mutex_lock(&tunnel_netdevs_mutex);
+
+    if (netdev->sockfd != -1)
+    	close(netdev->sockfd);
+
+    shash_find_and_delete(&tunnel_netdevs,
+                          netdev_get_name(netdev_));
+
+    ovs_mutex_destroy(&netdev->mutex);
+    ovs_mutex_unlock(&tunnel_netdevs_mutex);
+}
+
+static void
+netdev_tunnel_dealloc(struct netdev *netdev_)
+{
+    struct netdev_tunnel *netdev = netdev_tunnel_cast(netdev_);
+    free(netdev);
+}
 
-    config->flags |= TNL_F_PMTUD;
-    config->flags |= TNL_F_HDR_CACHE;
+static int
+netdev_tunnel_get_config(const struct netdev *dev_, struct smap *args)
+{
+    struct netdev_tunnel *netdev = netdev_tunnel_cast(dev_);
+
+    ovs_mutex_lock(&netdev->mutex);
+    if (netdev->valid_remote_ip) {
+        const struct sockaddr_in *sin =
+            ALIGNED_CAST(const struct sockaddr_in *, &netdev->remote_addr);
+        smap_add_format(args, "remote_ip", IP_FMT,
+                IP_ARGS(sin->sin_addr.s_addr));
+    }
+    if (netdev->valid_remote_port)
+        smap_add_format(args, "remote_port", "%"PRIu16,
+                ss_get_port(&netdev->remote_addr));
+    ovs_mutex_unlock(&netdev->mutex);
+    return 0;
+}
 
-    SHASH_FOR_EACH (node, args) {
+static int
+netdev_tunnel_connect(struct netdev_tunnel *dev)
+    OVS_REQUIRES(dev->mutex)
+{
+    char buf[1024];
+    struct sockaddr_in *sin =
+        ALIGNED_CAST(struct sockaddr_in *, &dev->remote_addr);
+    if (dev->sockfd < 0)
+        return EBADF;
+    if (!dev->valid_remote_ip || !dev->valid_remote_port)
+        return 0;
+    if (connect(dev->sockfd, (struct sockaddr*) sin, sizeof(*sin)) < 0) {
+        VLOG_DBG("%s: connect returned %s", netdev_get_name(&dev->up),
+                ovs_strerror(errno));
+        return errno;
+    }
+    dev->connected = true;
+    netdev_tunnel_update_seq(dev);
+    VLOG_DBG("%s: connected to (%s, %d)", netdev_get_name(&dev->up),
+            inet_ntop(AF_INET, &sin->sin_addr.s_addr, buf, 1024),
+            ss_get_port(&dev->remote_addr));
+    return 0;
+}
+
+static int
+netdev_tunnel_set_config(struct netdev *dev_, const struct smap *args)
+{
+    struct netdev_tunnel *netdev = netdev_tunnel_cast(dev_);
+    struct shash_node *node;
+    int error;
+    struct sockaddr_in *sin =
+        ALIGNED_CAST(struct sockaddr_in *, &netdev->remote_addr);
+
+    ovs_mutex_lock(&netdev->mutex);
+    VLOG_DBG("tunnel_set_config(%s)", netdev_get_name(dev_));
+    SMAP_FOR_EACH(node, args) {
+        VLOG_DBG("arg: %s->%s", node->name, (char*)node->data);
         if (!strcmp(node->name, "remote_ip")) {
-            struct in_addr in_addr;
-            if (lookup_ip(node->data, &in_addr)) {
-                VLOG_WARN("%s: bad %s 'remote_ip'", name, type);
-            } else {
-                config->daddr = in_addr.s_addr;
-            }
-        } else if (!strcmp(node->name, "local_ip")) {
-            struct in_addr in_addr;
-            if (lookup_ip(node->data, &in_addr)) {
-                VLOG_WARN("%s: bad %s 'local_ip'", name, type);
-            } else {
-                config->saddr = in_addr.s_addr;
-            }
-        } else if (!strcmp(node->name, "key") && !strcmp(type, "gre")) {
-            if (!strcmp(node->data, "flow")) {
-                config->flags |= TNL_F_IN_KEY_MATCH;
-                config->flags |= TNL_F_OUT_KEY_ACTION;
-            } else {
-                config->out_key = config->in_key = htonl(atoi(node->data));
-            }
-        } else if (!strcmp(node->name, "in_key") && !strcmp(type, "gre")) {
-            if (!strcmp(node->data, "flow")) {
-                config->flags |= TNL_F_IN_KEY_MATCH;
-            } else {
-                config->in_key = htonl(atoi(node->data));
-            }
-        } else if (!strcmp(node->name, "out_key") && !strcmp(type, "gre")) {
-            if (!strcmp(node->data, "flow")) {
-                config->flags |= TNL_F_OUT_KEY_ACTION;
+            struct in_addr addr;
+            if (lookup_ip(node->data, &addr)) {
+                VLOG_WARN("%s: bad 'remote_ip'", node->name);
             } else {
-                config->out_key = htonl(atoi(node->data));
-            }
-        } else if (!strcmp(node->name, "tos")) {
-            if (!strcmp(node->data, "inherit")) {
-                config->flags |= TNL_F_TOS_INHERIT;
-            } else {
-                config->tos = atoi(node->data);
-            }
-        } else if (!strcmp(node->name, "ttl")) {
-            if (!strcmp(node->data, "inherit")) {
-                config->flags |= TNL_F_TTL_INHERIT;
-            } else {
-                config->ttl = atoi(node->data);
-            }
-        } else if (!strcmp(node->name, "csum") && !strcmp(type, "gre")) {
-            if (!strcmp(node->data, "true")) {
-                config->flags |= TNL_F_CSUM;
-            }
-        } else if (!strcmp(node->name, "pmtud")) {
-            if (!strcmp(node->data, "false")) {
-                config->flags &= ~TNL_F_PMTUD;
-            }
-        } else if (!strcmp(node->name, "header_cache")) {
-            if (!strcmp(node->data, "false")) {
-                config->flags &= ~TNL_F_HDR_CACHE;
+                sin->sin_family = AF_INET;
+                sin->sin_addr = addr;
+                netdev->valid_remote_ip = true;
             }
+        } else if (!strcmp(node->name, "remote_port")) {
+            sin->sin_port = htons(atoi(node->data));
+            netdev->valid_remote_port = true;
         } else {
-            VLOG_WARN("%s: unknown %s argument '%s'", name, type, node->name);
+            VLOG_WARN("%s: unknown argument '%s'", 
+                    netdev_get_name(dev_), node->name);
         }
     }
+    error = netdev_tunnel_connect(netdev);        
+    ovs_mutex_unlock(&netdev->mutex);
+    return error;
+}
 
-    if (!config->daddr) {
-        VLOG_WARN("%s: %s type requires valid 'remote_ip' argument", name, type);
-        return EINVAL;
-    }
+static struct netdev_rxq *
+netdev_tunnel_rxq_alloc(void)
+{
+    struct netdev_rxq_tunnel *rx = xzalloc(sizeof *rx);
+    return &rx->up;
+}
+
+static int
+netdev_tunnel_rxq_construct(struct netdev_rxq *rx_)
+{   
+    struct netdev_rxq_tunnel *rx = netdev_rxq_tunnel_cast(rx_);
+    struct netdev *netdev_ = rx->up.netdev;
+    struct netdev_tunnel *netdev = netdev_tunnel_cast(netdev_);
 
+    ovs_mutex_lock(&netdev->mutex);
+    rx->fd = netdev->sockfd;
+    ovs_mutex_unlock(&netdev->mutex);
     return 0;
 }
 
-static int
-netdev_tunnel_create(const char *name, const char *type,
-                     const struct shash *args, struct netdev_dev **netdev_devp)
+static void
+netdev_tunnel_rxq_destruct(struct netdev_rxq *rx_ OVS_UNUSED)
 {
-    int err;
-    struct odp_vport_add ova;
-    struct tnl_port_config port_config;
-    struct netdev_dev_tunnel *netdev_dev;
-
-    ovs_strlcpy(ova.port_type, type, sizeof ova.port_type);
-    ovs_strlcpy(ova.devname, name, sizeof ova.devname);
-    ova.config = &port_config;
-
-    err = parse_config(name, type, args, &port_config);
-    if (err) {
-        return err;
-    }
+}
 
-    err = netdev_vport_do_ioctl(ODP_VPORT_ADD, &ova);
-    if (err == EBUSY) {
-        VLOG_WARN("%s: destroying existing device", name);
+static void
+netdev_tunnel_rxq_dealloc(struct netdev_rxq *rx_)
+{
+    struct netdev_rxq_tunnel *rx = netdev_rxq_tunnel_cast(rx_);
 
-        err = netdev_vport_do_ioctl(ODP_VPORT_DEL, ova.devname);
-        if (err) {
-            return err;
-        }
+    free(rx);
+}
 
-        err = netdev_vport_do_ioctl(ODP_VPORT_ADD, &ova);
+static int
+netdev_tunnel_rxq_recv(struct netdev_rxq *rx_, struct ofpbuf **packet, int *c)
+{
+    struct netdev_rxq_tunnel *rx = netdev_rxq_tunnel_cast(rx_);
+    struct netdev_tunnel *netdev =
+        netdev_tunnel_cast(rx_->netdev);
+    struct ofpbuf *buffer = NULL;
+    size_t size;
+    int error = 0;
+
+    if (!netdev->connected)
+        return EAGAIN;
+    buffer = ofpbuf_new_with_headroom(VLAN_ETH_HEADER_LEN + ETH_PAYLOAD_MAX,
+        DP_NETDEV_HEADROOM);
+    size = ofpbuf_tailroom(buffer);
+
+    for (;;) {
+        ssize_t retval;
+        retval = recv(rx->fd, buffer->data, size, MSG_TRUNC);
+        VLOG_DBG("%s: recv(%"PRIxPTR", %"PRIuSIZE", MSG_TRUNC) = %"PRIdSIZE,
+                netdev_rxq_get_name(rx_), (uintptr_t)buffer->data, size, retval);
+        if (retval >= 0) {
+            netdev->stats.rx_packets++;
+            netdev->stats.rx_bytes += retval;
+            if (retval <= size) {
+                buffer->size += retval;
+                goto out;
+            } else {
+                netdev->stats.rx_errors++;
+                netdev->stats.rx_length_errors++;
+                error = EMSGSIZE;
+                goto out;
+            }
+        } else if (errno != EINTR) {
+            if (errno != EAGAIN) {
+                VLOG_WARN_RL(&rl, "error receiveing Ethernet packet on %s: %s",
+                        netdev_rxq_get_name(rx_), ovs_strerror(errno));
+                netdev->stats.rx_errors++;
+            }
+            error = errno;
+            goto out;
+        }
     }
-
-    if (err) {
-        return err;
+out:
+    if (error) {
+        ofpbuf_delete(buffer);
+    } else {
+        dp_packet_pad(buffer);
+        packet[0] = buffer;
+        *c = 1;
     }
 
-    netdev_dev = xmalloc(sizeof *netdev_dev);
+    return error;
+}
 
-    if (!strcmp(type, "gre")) {
-        netdev_dev_init(&netdev_dev->netdev_dev, name, &netdev_gre_class);
-    } else {
-        netdev_dev_init(&netdev_dev->netdev_dev, name, &netdev_capwap_class);
+static void
+netdev_tunnel_rxq_wait(struct netdev_rxq *rx_)
+{
+    struct netdev_rxq_tunnel *rx = 
+        netdev_rxq_tunnel_cast(rx_);
+    if (rx->fd >= 0) {
+        poll_fd_wait(rx->fd, POLLIN);
     }
-
-    *netdev_devp = &netdev_dev->netdev_dev;
-    return 0;
 }
 
 static int
-netdev_tunnel_reconfigure(struct netdev_dev *netdev_dev_, const struct shash *args)
+netdev_tunnel_send(struct netdev *netdev_, struct ofpbuf *pkt, bool may_steal)
 {
-    const char *name = netdev_dev_get_name(netdev_dev_);
-    struct odp_vport_mod ovm;
-    struct tnl_port_config port_config;
-    int err;
-
-    ovs_strlcpy(ovm.devname, name, sizeof ovm.devname);
-    ovm.config = &port_config;
-
-    err = parse_config(name, netdev_dev_get_class(netdev_dev_)->type, args,
-                       &port_config);
-    if (err) {
-        return err;
+    const void *buffer = pkt->data;
+    size_t size = pkt->size;
+    struct netdev_tunnel *dev = 
+        netdev_tunnel_cast(netdev_);
+    int error = 0;
+    if (!dev->connected) {
+        error = EAGAIN;
+        goto out;
+    }
+    for (;;) {
+        ssize_t retval;
+        retval = send(dev->sockfd, buffer, size, 0);
+        VLOG_DBG("%s: send(%"PRIxPTR", %"PRIuSIZE") = %"PRIdSIZE,
+                netdev_get_name(netdev_), (uintptr_t)buffer, size, retval);
+        if (retval >= 0) {
+            dev->stats.tx_packets++;
+            dev->stats.tx_bytes += retval;
+            if (retval != size) {
+                VLOG_WARN_RL(&rl, "sent partial Ethernet packet (%"PRIdSIZE" bytes of "
+                        "%"PRIuSIZE") on %s", retval, size, netdev_get_name(netdev_));
+                dev->stats.tx_errors++;
+            }
+            goto out;
+        } else if (errno != EINTR) {
+            if (errno != EAGAIN) {
+                VLOG_WARN_RL(&rl, "error sending Ethernet packet on %s: %s",
+                        netdev_get_name(netdev_), ovs_strerror(errno));
+                dev->stats.tx_errors++;
+            }
+            error = errno;
+            goto out;
+        }
+    }
+out:
+    if (may_steal) {
+        ofpbuf_delete(pkt);
     }
 
-    return netdev_vport_do_ioctl(ODP_VPORT_MOD, &ovm);
+    return error;
 }
 
 static void
-netdev_tunnel_destroy(struct netdev_dev *netdev_dev_)
+netdev_tunnel_send_wait(struct netdev *netdev_)
 {
-    struct netdev_dev_tunnel *netdev_dev = netdev_dev_tunnel_cast(netdev_dev_);
+    struct netdev_tunnel *dev = netdev_tunnel_cast(netdev_);
+    if (dev->sockfd >= 0) {
+        poll_fd_wait(dev->sockfd, POLLOUT);
+    }
+}
 
-    netdev_vport_do_ioctl(ODP_VPORT_DEL, (char *)netdev_dev_get_name(netdev_dev_));
-    free(netdev_dev);
+static int
+netdev_tunnel_rxq_drain(struct netdev_rxq *rx_)
+{
+    struct netdev_tunnel *netdev =
+        netdev_tunnel_cast(rx_->netdev);
+    struct netdev_rxq_tunnel *rx = 
+        netdev_rxq_tunnel_cast(rx_);
+    char buffer[128];
+    int error;
+
+    if (!netdev->connected)
+        return 0;
+    for (;;) {
+        error = recv(rx->fd, buffer, 128, MSG_TRUNC);
+        if (error) {
+            if (error == -EAGAIN)
+                break;
+            else if (error != -EMSGSIZE)
+                return error;
+        }
+    }
+    return 0;
 }
 
 static int
-netdev_tunnel_open(struct netdev_dev *netdev_dev_, int ethertype OVS_UNUSED,
-                struct netdev **netdevp)
+netdev_tunnel_set_etheraddr(struct netdev *netdev,
+                           const uint8_t mac[ETH_ADDR_LEN])
 {
-    struct netdev_tunnel *netdev;
+    struct netdev_tunnel *dev = netdev_tunnel_cast(netdev);
 
-    netdev = xmalloc(sizeof *netdev);
-    netdev_init(&netdev->netdev, netdev_dev_);
+    ovs_mutex_lock(&dev->mutex);
+    if (!eth_addr_equals(dev->hwaddr, mac)) {
+        memcpy(dev->hwaddr, mac, ETH_ADDR_LEN);
+        netdev_tunnel_update_seq(dev);
+    }
+    ovs_mutex_unlock(&dev->mutex);
 
-    *netdevp = &netdev->netdev;
     return 0;
 }
 
-static void
-netdev_tunnel_close(struct netdev *netdev_)
+static int
+netdev_tunnel_get_etheraddr(const struct netdev *netdev,
+                           uint8_t mac[ETH_ADDR_LEN])
 {
-    struct netdev_tunnel *netdev = netdev_tunnel_cast(netdev_);
-    free(netdev);
+    const struct netdev_tunnel *dev = netdev_tunnel_cast(netdev);
+
+    ovs_mutex_lock(&dev->mutex);
+    memcpy(mac, dev->hwaddr, ETH_ADDR_LEN);
+    ovs_mutex_unlock(&dev->mutex);
+    return 0;
 }
 
-const struct netdev_class netdev_gre_class = {
-    "gre",
 
-    NULL,                       /* init */
-    NULL,                       /* run */
-    NULL,                       /* wait */
+static int
+netdev_tunnel_get_stats(const struct netdev *netdev, struct netdev_stats *stats)
+{
+    const struct netdev_tunnel *dev = netdev_tunnel_cast(netdev);
 
-    netdev_tunnel_create,
-    netdev_tunnel_destroy,
-    netdev_tunnel_reconfigure,
+    ovs_mutex_lock(&dev->mutex);
+    *stats = dev->stats;
+    ovs_mutex_unlock(&dev->mutex);
+    return 0;
+}
 
-    netdev_tunnel_open,
-    netdev_tunnel_close,
+static int
+netdev_tunnel_set_stats(struct netdev *netdev, const struct netdev_stats *stats)
+{
+    struct netdev_tunnel *dev = netdev_tunnel_cast(netdev);
 
-    NULL,                       /* enumerate */
+    ovs_mutex_lock(&dev->mutex);
+    dev->stats = *stats;
+    ovs_mutex_unlock(&dev->mutex);
+    return 0;
+}
 
-    NULL,                       /* recv */
-    NULL,                       /* recv_wait */
-    NULL,                       /* drain */
+static int
+netdev_tunnel_update_flags(struct netdev *dev_,
+                          enum netdev_flags off, enum netdev_flags on,
+                          enum netdev_flags *old_flagsp)
+{
+    struct netdev_tunnel *netdev =
+        netdev_tunnel_cast(dev_);
+    int error = 0;
+
+    ovs_mutex_lock(&netdev->mutex);
+    if ((off | on) & ~(NETDEV_UP | NETDEV_PROMISC)) {
+        error = EINVAL;
+        goto out;
+    }
 
-    NULL,                       /* send */
-    NULL,                       /* send_wait */
+    // XXX should we actually do something with these flags?
+    *old_flagsp = netdev->flags;
+    netdev->flags |= on;
+    netdev->flags &= ~off;
+    if (*old_flagsp != netdev->flags) {
+        netdev_tunnel_update_seq(netdev);
+    }
 
-    netdev_vport_set_etheraddr,
-    netdev_vport_get_etheraddr,
-    netdev_vport_get_mtu,
-    NULL,                       /* get_ifindex */
-    netdev_vport_get_carrier,
-    netdev_vport_get_stats,
-    netdev_vport_set_stats,
+out:
+    ovs_mutex_unlock(&netdev->mutex);
+    return error;
+}
 
-    NULL,                       /* get_features */
-    NULL,                       /* set_advertisements */
-    NULL,                       /* get_vlan_vid */
+
+/* Helper functions. */
 
-    NULL,                       /* set_policing */
-    NULL,                       /* get_qos_types */
-    NULL,                       /* get_qos_capabilities */
-    NULL,                       /* get_qos */
-    NULL,                       /* set_qos */
-    NULL,                       /* get_queue */
-    NULL,                       /* set_queue */
-    NULL,                       /* delete_queue */
-    NULL,                       /* get_queue_stats */
-    NULL,                       /* dump_queues */
-    NULL,                       /* dump_queue_stats */
+static void
+netdev_tunnel_update_seq(struct netdev_tunnel *dev)
+    OVS_REQUIRES(dev->mutex)
+{
+    dev->change_seq++;
+    if (!dev->change_seq) {
+        dev->change_seq++;
+    }
+}
 
-    NULL,                       /* get_in4 */
-    NULL,                       /* set_in4 */
-    NULL,                       /* get_in6 */
-    NULL,                       /* add_router */
-    NULL,                       /* get_next_hop */
-    NULL,                       /* arp_lookup */
+static void
+netdev_tunnel_get_port(struct unixctl_conn *conn,
+                     int argc OVS_UNUSED, const char *argv[], void *aux OVS_UNUSED)
+{
+    struct netdev_tunnel *tunnel_dev;
+    char buf[6];
+
+    ovs_mutex_lock(&tunnel_netdevs_mutex);
+    tunnel_dev = shash_find_data(&tunnel_netdevs, argv[1]);
+    if (!tunnel_dev) {
+        unixctl_command_reply_error(conn, "no such tunnel netdev");
+        goto out;
+    }
 
-    netdev_vport_update_flags,
+    ovs_mutex_lock(&tunnel_dev->mutex);
+    sprintf(buf, "%d", ss_get_port(&tunnel_dev->local_addr));
+    ovs_mutex_unlock(&tunnel_dev->mutex);
 
-    netdev_vport_poll_add,
-    netdev_vport_poll_remove,
-};
+    unixctl_command_reply(conn, buf);
+out:
+    ovs_mutex_unlock(&tunnel_netdevs_mutex);
+}
 
-const struct netdev_class netdev_capwap_class = {
-    "capwap",
+static void
+netdev_tunnel_get_tx_bytes(struct unixctl_conn *conn,
+                     int argc OVS_UNUSED, const char *argv[], void *aux OVS_UNUSED)
+{
+    struct netdev_tunnel *tunnel_dev;
+    char buf[128];
+
+    ovs_mutex_lock(&tunnel_netdevs_mutex);
+    tunnel_dev = shash_find_data(&tunnel_netdevs, argv[1]);
+    if (!tunnel_dev) {
+        unixctl_command_reply_error(conn, "no such tunnel netdev");
+        goto out;
+    }
 
-    NULL,                       /* init */
-    NULL,                       /* run */
-    NULL,                       /* wait */
+    ovs_mutex_lock(&tunnel_dev->mutex);
+    sprintf(buf, "%"PRIu64, tunnel_dev->stats.tx_bytes);
+    ovs_mutex_unlock(&tunnel_dev->mutex);
+    unixctl_command_reply(conn, buf);
+out:
+    ovs_mutex_unlock(&tunnel_netdevs_mutex);
+}
 
-    netdev_tunnel_create,
-    netdev_tunnel_destroy,
-    netdev_tunnel_reconfigure,
+static void
+netdev_tunnel_get_rx_bytes(struct unixctl_conn *conn,
+                     int argc OVS_UNUSED, const char *argv[], void *aux OVS_UNUSED)
+{
+    struct netdev_tunnel *tunnel_dev;
+    char buf[128];
+
+    ovs_mutex_lock(&tunnel_netdevs_mutex);
+    tunnel_dev = shash_find_data(&tunnel_netdevs, argv[1]);
+    if (!tunnel_dev) {
+        unixctl_command_reply_error(conn, "no such tunnel netdev");
+        goto out;
+    }
 
-    netdev_tunnel_open,
-    netdev_tunnel_close,
+    sprintf(buf, "%"PRIu64, tunnel_dev->stats.rx_bytes);
+    unixctl_command_reply(conn, buf);
+out:
+    ovs_mutex_unlock(&tunnel_netdevs_mutex);
+}
 
-    NULL,                       /* enumerate */
 
-    NULL,                       /* recv */
-    NULL,                       /* recv_wait */
-    NULL,                       /* drain */
+static int
+netdev_tunnel_init(void)
+{
+    unixctl_command_register("netdev-tunnel/get-port", "NAME",
+                             1, 1, netdev_tunnel_get_port, NULL);
+    unixctl_command_register("netdev-tunnel/get-tx-bytes", "NAME",
+                             1, 1, netdev_tunnel_get_tx_bytes, NULL);
+    unixctl_command_register("netdev-tunnel/get-rx-bytes", "NAME",
+                             1, 1, netdev_tunnel_get_rx_bytes, NULL);
+    return 0;
+}
+
+static void
+netdev_tunnel_run(void)
+{
+}
 
-    NULL,                       /* send */
-    NULL,                       /* send_wait */
+static void
+netdev_tunnel_wait(void)
+{
+}
 
-    netdev_vport_set_etheraddr,
-    netdev_vport_get_etheraddr,
-    netdev_vport_get_mtu,
+const struct netdev_class netdev_tunnel_class = {
+    "tunnel",
+    netdev_tunnel_init,    
+    netdev_tunnel_run,      
+    netdev_tunnel_wait,   
+
+    netdev_tunnel_alloc,
+    netdev_tunnel_construct,
+    netdev_tunnel_destruct,
+    netdev_tunnel_dealloc,
+    netdev_tunnel_get_config,
+    netdev_tunnel_set_config, 
+    NULL,			            /* get_tunnel_config */
+
+    netdev_tunnel_send, 
+    netdev_tunnel_send_wait,  
+
+    netdev_tunnel_set_etheraddr,
+    netdev_tunnel_get_etheraddr,
+    NULL,			            /* get_mtu */
+    NULL,			            /* set_mtu */
     NULL,                       /* get_ifindex */
-    netdev_vport_get_carrier,
-    netdev_vport_get_stats,
-    netdev_vport_set_stats,
+    NULL,			            /* get_carrier */
+    NULL,                       /* get_carrier_resets */
+    NULL,                       /* get_miimon */
+    netdev_tunnel_get_stats,
+    netdev_tunnel_set_stats,
 
     NULL,                       /* get_features */
     NULL,                       /* set_advertisements */
-    NULL,                       /* get_vlan_vid */
 
     NULL,                       /* set_policing */
     NULL,                       /* get_qos_types */
@@ -338,7 +637,9 @@ const struct netdev_class netdev_capwap_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 */
@@ -346,10 +647,16 @@ const struct netdev_class netdev_capwap_class = {
     NULL,                       /* get_in6 */
     NULL,                       /* add_router */
     NULL,                       /* get_next_hop */
+    NULL,                       /* get_status */
     NULL,                       /* arp_lookup */
 
-    netdev_vport_update_flags,
+    netdev_tunnel_update_flags,
 
-    netdev_vport_poll_add,
-    netdev_vport_poll_remove,
+    netdev_tunnel_rxq_alloc,
+    netdev_tunnel_rxq_construct,
+    netdev_tunnel_rxq_destruct,
+    netdev_tunnel_rxq_dealloc,
+    netdev_tunnel_rxq_recv,
+    netdev_tunnel_rxq_wait,
+    netdev_tunnel_rxq_drain,
 };