X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fnetdev-pltap.c;h=cfa3dbb8171382c5d94631cc2eb28451a55ca5d9;hb=a6e73618f53138eb6f55e2c66ff8c649794fd8dd;hp=b2cc3ecbabc49885285bbc5cf93e15a921fd5cee;hpb=7186aaa9dc9562a1090356ca428a58624f432748;p=sliver-openvswitch.git

diff --git a/lib/netdev-pltap.c b/lib/netdev-pltap.c
index b2cc3ecba..cfa3dbb81 100644
--- a/lib/netdev-pltap.c
+++ b/lib/netdev-pltap.c
@@ -45,65 +45,70 @@
 
 VLOG_DEFINE_THIS_MODULE(netdev_pltap);
 
-struct netdev_dev_pltap {
-    struct netdev_dev netdev_dev;
+struct netdev_pltap {
+    struct netdev up;
     char *real_name;
-    char *error;
     struct netdev_stats stats;
+    enum netdev_flags new_flags;
     enum netdev_flags flags;
     int fd;
     struct sockaddr_in local_addr;
     int local_netmask;
     bool valid_local_ip;
     bool valid_local_netmask;
-    bool finalized;
     bool sync_flags_needed;
     struct list sync_list;
     unsigned int change_seq;
 };
 
+static const struct netdev_rx_class netdev_rx_pltap_class;
+
 static struct list sync_list;
 
-struct netdev_pltap {
-    struct netdev netdev;
+struct netdev_rx_pltap {
+    struct netdev_rx up;    
+    int fd;
 };
 
 static int af_inet_sock = -1;
 
 static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(5, 20);
 
-static struct shash pltap_netdev_devs = SHASH_INITIALIZER(&pltap_netdev_devs);
+static struct shash pltap_netdevs = SHASH_INITIALIZER(&pltap_netdevs);
 
 static int netdev_pltap_create(const struct netdev_class *, const char *,
-                               struct netdev_dev **);
+                               struct netdev **);
 
-static struct shash pltap_creating = SHASH_INITIALIZER(&pltap_creating);
-
-static void netdev_pltap_update_seq(struct netdev_dev_pltap *);
-static int get_flags(struct netdev_dev_pltap *dev, enum netdev_flags *flags);
+static void netdev_pltap_update_seq(struct netdev_pltap *);
+static int get_flags(struct netdev_pltap *dev, enum netdev_flags *flags);
 
 static bool
-is_pltap_class(const struct netdev_class *class)
+netdev_pltap_finalized(struct netdev_pltap *dev)
 {
-    return class->create == netdev_pltap_create;
+    return dev->valid_local_ip && dev->valid_local_netmask;
 }
 
-static struct netdev_dev_pltap *
-netdev_dev_pltap_cast(const struct netdev_dev *netdev_dev)
+static bool
+is_netdev_pltap_class(const struct netdev_class *class)
 {
-    assert(is_pltap_class(netdev_dev_get_class(netdev_dev)));
-    return CONTAINER_OF(netdev_dev, struct netdev_dev_pltap, netdev_dev);
+    return class->create == netdev_pltap_create;
 }
 
 static struct netdev_pltap *
 netdev_pltap_cast(const struct netdev *netdev)
 {
-    struct netdev_dev *netdev_dev = netdev_get_dev(netdev);
-    assert(is_pltap_class(netdev_dev_get_class(netdev_dev)));
-    return CONTAINER_OF(netdev, struct netdev_pltap, netdev);
+    ovs_assert(is_netdev_pltap_class(netdev_get_class(netdev)));
+    return CONTAINER_OF(netdev, struct netdev_pltap, up);
+}
+
+static struct netdev_rx_pltap*
+netdev_rx_pltap_cast(const struct netdev_rx *rx)
+{
+    netdev_rx_assert_class(rx, &netdev_rx_pltap_class);
+    return CONTAINER_OF(rx, struct netdev_rx_pltap, up);
 }
 
-static void sync_needed(struct netdev_dev_pltap *dev)
+static void sync_needed(struct netdev_pltap *dev)
 {
     if (dev->sync_flags_needed)
         return;
@@ -113,7 +118,7 @@ static void sync_needed(struct netdev_dev_pltap *dev)
 	
 }
 
-static void sync_done(struct netdev_dev_pltap *dev)
+static void sync_done(struct netdev_pltap *dev)
 {
     if (!dev->sync_flags_needed)
         return;
@@ -124,89 +129,115 @@ static void sync_done(struct netdev_dev_pltap *dev)
 
 static int
 netdev_pltap_create(const struct netdev_class *class OVS_UNUSED, const char *name,
-                    struct netdev_dev **netdev_devp)
+                    struct netdev **netdevp)
 {
-    struct netdev_dev_pltap *netdev_dev;
+    struct netdev_pltap *netdev;
     int error;
 
-    netdev_dev = xzalloc(sizeof *netdev_dev);
+    netdev = xzalloc(sizeof *netdev);
 
-    netdev_dev->real_name = xzalloc(IFNAMSIZ + 1);
-    netdev_dev->error = NULL;
-    memset(&netdev_dev->local_addr, 0, sizeof(netdev_dev->local_addr));
-    netdev_dev->valid_local_ip = false;
-    netdev_dev->valid_local_netmask = false;
-    netdev_dev->finalized = false;
-    netdev_dev->flags = 0;
-    netdev_dev->sync_flags_needed = false;
-    list_init(&netdev_dev->sync_list);
+    netdev->real_name = xzalloc(IFNAMSIZ + 1);
+    memset(&netdev->local_addr, 0, sizeof(netdev->local_addr));
+    netdev->valid_local_ip = false;
+    netdev->valid_local_netmask = false;
+    netdev->flags = 0;
+    netdev->sync_flags_needed = false;
+    list_init(&netdev->sync_list);
 
 
     /* Open tap device. */
-    netdev_dev->fd = tun_alloc(IFF_TAP, netdev_dev->real_name);
-    if (netdev_dev->fd < 0) {
+    netdev->fd = tun_alloc(IFF_TAP, netdev->real_name);
+    if (netdev->fd < 0) {
         error = errno;
         VLOG_WARN("tun_alloc(IFF_TAP, %s) failed: %s", name, strerror(error));
         goto cleanup;
     }
-    VLOG_DBG("real_name = %s", netdev_dev->real_name);
+    VLOG_DBG("real_name = %s", netdev->real_name);
 
     /* Make non-blocking. */
-    error = set_nonblocking(netdev_dev->fd);
+    error = set_nonblocking(netdev->fd);
     if (error) {
         goto cleanup;
     }
 
-    netdev_dev_init(&netdev_dev->netdev_dev, name, &netdev_pltap_class);
-    shash_add(&pltap_netdev_devs, name, netdev_dev);
-    *netdev_devp = &netdev_dev->netdev_dev;
+    netdev_init(&netdev->up, name, &netdev_pltap_class);
+    shash_add(&pltap_netdevs, name, netdev);
+    *netdevp = &netdev->up;
     return 0;
 
 cleanup:
-    free(netdev_dev);
+    free(netdev);
     return error;
 }
 
 static void
-netdev_pltap_destroy(struct netdev_dev *netdev_dev_)
+netdev_pltap_destroy(struct netdev *netdev_)
 {
-    struct netdev_dev_pltap *netdev_dev = netdev_dev_pltap_cast(netdev_dev_);
+    struct netdev_pltap *netdev = netdev_pltap_cast(netdev_);
 
-    if (netdev_dev->fd != -1)
-    	close(netdev_dev->fd);
+    if (netdev->fd != -1)
+    	close(netdev->fd);
 
-    shash_find_and_delete(&pltap_netdev_devs,
-                          netdev_dev_get_name(netdev_dev_));
-    free(netdev_dev);
-}
+    sync_done(netdev);
 
-static int
-netdev_pltap_open(struct netdev_dev *netdev_dev_, struct netdev **netdevp)
-{
-    struct netdev_pltap *netdev;
+    shash_find_and_delete(&pltap_netdevs,
+                          netdev_get_name(netdev_));
+    free(netdev);
+}
 
-    netdev = xmalloc(sizeof *netdev);
-    netdev_init(&netdev->netdev, netdev_dev_);
+static int netdev_pltap_up(struct netdev_pltap *dev);
 
-    *netdevp = &netdev->netdev;
+static int
+netdev_pltap_rx_open(struct netdev *netdev_, struct netdev_rx **rxp)
+{
+    struct netdev_pltap *netdev =
+        netdev_pltap_cast(netdev_);
+    struct netdev_rx_pltap *rx;
+    int err;
+
+    rx = xmalloc(sizeof *rx);
+    netdev_rx_init(&rx->up, netdev_, &netdev_rx_pltap_class);
+    rx->fd = netdev->fd;
+    *rxp = &rx->up;
+    if (!netdev_pltap_finalized(netdev))
+        return 0;
+    err = netdev_pltap_up(netdev);
+    if (err) {
+        free(rx);
+        *rxp = NULL;
+        return err;
+    }
     return 0;
 }
 
 static void
-netdev_pltap_close(struct netdev *netdev_)
+netdev_rx_pltap_destroy(struct netdev_rx *rx_)
 {
-    struct netdev_pltap *netdev = netdev_pltap_cast(netdev_);
-    free(netdev);
+    struct netdev_rx_pltap *rx = netdev_rx_pltap_cast(rx_);
+    free(rx);
 }
 
 static int vsys_transaction(const char *script,
-	const char *msg, char *reply, size_t reply_size)
+	const char **preply, char *format, ...)
 {
+    char *msg = NULL, *reply = NULL;
+    const size_t reply_size = 1024;
     int ifd = -1, ofd = -1, maxfd;
     size_t bytes_to_write, bytes_to_read,
            bytes_written = 0, bytes_read = 0;
     int error = 0;
     char *ofname = NULL, *ifname = NULL;
+    va_list args;
+
+    va_start(args, format);
+    msg = xvasprintf(format, args);
+    va_end(args);
+    reply = (char*)xmalloc(reply_size);
+    if (!msg || !reply) {
+    	VLOG_ERR("Out of memory");
+	error = ENOMEM;
+	goto cleanup;
+    }
 
     ofname = xasprintf("/vsys/%s.out", script);
     ifname = xasprintf("/vsys/%s.in", script);
@@ -288,12 +319,19 @@ static int vsys_transaction(const char *script,
     }
     if (bytes_read) {
     	reply[bytes_read] = '\0';
-        VLOG_ERR("%s returned: %s", script, reply);
+	if (preply) {
+		*preply = reply;
+		reply = NULL; /* prevent freeing the reply msg */
+	} else {
+		VLOG_ERR("%s returned: %s", script, reply);
+	}
 	error = EAGAIN;
 	goto cleanup;
     }
 
 cleanup:
+    free(msg);
+    free(reply);
     free(ofname);
     free(ifname);
     close(ifd);
@@ -302,122 +340,92 @@ cleanup:
 }
 
 static int
-netdev_pltap_sync_flags(struct netdev_dev_pltap *dev)
+netdev_pltap_up(struct netdev_pltap *dev)
 {
-    int error = 0;
-    char *msg = NULL, *reply = NULL;
-    const size_t reply_size = 1024;
-    enum netdev_flags flags = 0;
-
-
-    if (dev->fd < 0 || !dev->finalized) {
-    	/* pretend we have synchronized, we will do it later */
-	sync_needed(dev);
+    if (!netdev_pltap_finalized(dev)) {
         return 0;
     }
+    
+    return vsys_transaction("vif_up", NULL, "%s\n"IP_FMT"\n%d\n",
+	       dev->real_name,
+	       IP_ARGS(dev->local_addr.sin_addr.s_addr),
+	       dev->local_netmask);
+}
 
-    error = get_flags(dev, &flags);
-    if (error) {
-    	VLOG_ERR("get_flags(%s): %s", dev->real_name, strerror(error));
-	goto cleanup;
+static int
+netdev_pltap_down(struct netdev_pltap *dev)
+{
+    if (!netdev_pltap_finalized(dev)) {
+        return 0;
     }
-    VLOG_DBG("sync_flags(%s): current: %s %s",
-        dev->real_name,
-    	(flags & NETDEV_UP ? "UP" : "-"),
-    	(flags & NETDEV_PROMISC ? "PROMISC" : "-"));
+    
+    return vsys_transaction("vif_down", NULL, "%s\n", dev->real_name);
+}
 
-    if ((dev->flags & NETDEV_PROMISC) ^ (flags & NETDEV_PROMISC)) {
-	    msg = xasprintf("%s\n%s",
-	       dev->real_name,
-	       (dev->flags & NETDEV_PROMISC ? "" : "-\n"));
-	    reply = (char*)xmalloc(reply_size);
-	    if (!msg || !reply) {
-		VLOG_ERR("Out of memory\n");
-		error = ENOMEM;
-		goto cleanup;
-	    }
-	    error = vsys_transaction("promisc", msg, reply, reply_size);
-	    if (error) {
-		dev->error = reply;
-		reply = NULL; /* prevent free of reply msg */
-		goto cleanup;
-	    }
-	    netdev_pltap_update_seq(dev);
+static int
+netdev_pltap_promisc(struct netdev_pltap *dev, bool promisc)
+{
+    if (!netdev_pltap_finalized(dev)) {
+        return 0;
     }
 
-cleanup:
-
-    sync_done(dev);
-    free(msg);
-    free(reply);
-
-    return error;
+    return vsys_transaction("promisc", NULL, "%s\n%s",
+	       dev->real_name,
+	       (promisc ? "" : "-\n"));
 }
 
-static int
-netdev_pltap_create_finalize(struct netdev_dev_pltap *dev)
+static void
+netdev_pltap_sync_flags(struct netdev_pltap *dev)
 {
-    int error = 0;
-    char *msg = NULL, *reply = NULL;
-    const size_t reply_size = 1024;
 
-    if (dev->finalized)
-        return 0;
-    if (!dev->valid_local_ip || !dev->valid_local_netmask)
-        return 0;
-    
-    msg = xasprintf("%s\n"IP_FMT"\n%d\n",
-       dev->real_name,
-       IP_ARGS(&dev->local_addr.sin_addr),
-       dev->local_netmask);
-    reply = (char*)xmalloc(reply_size);
-    if (!msg || !reply) {
-        VLOG_ERR("Out of memory");
-	error = ENOMEM;
-	goto cleanup;
+    if (dev->fd < 0 || !netdev_pltap_finalized(dev)) {
+    	sync_done(dev);
+    	return;
     }
-    error = vsys_transaction("vif_up", msg, reply, reply_size);
-    if (error) {
-	dev->error = reply;
-	reply = NULL; /* prevent free of reply msg */
-	goto cleanup;
+    
+    VLOG_DBG("sync_flags(%s): current: %s %s  target: %s %s",
+        dev->real_name,
+    	(dev->flags & NETDEV_UP ? "UP" : "-"),
+    	(dev->flags & NETDEV_PROMISC ? "PROMISC" : "-"),
+    	(dev->new_flags & NETDEV_UP ? "UP" : "-"),
+    	(dev->new_flags & NETDEV_PROMISC ? "PROMISC" : "-"));
+
+    if ((dev->new_flags & NETDEV_UP) && !(dev->flags & NETDEV_UP)) {
+        (void) netdev_pltap_up(dev);
+    } else if (!(dev->new_flags & NETDEV_UP) && (dev->flags & NETDEV_UP)) {
+        (void) netdev_pltap_down(dev);
     }
-    dev->finalized = true;
-    error = netdev_pltap_sync_flags(dev);
-    if (error) {
-    	goto cleanup;
+
+    if ((dev->new_flags & NETDEV_PROMISC) ^ (dev->flags & NETDEV_PROMISC)) {
+        (void) netdev_pltap_promisc(dev, dev->new_flags & NETDEV_PROMISC);
     }
-    free(dev->error);
-    dev->error = NULL;
-    netdev_pltap_update_seq(dev);
 
-cleanup:
-    free(msg);
-    free(reply);
-    return error;
+    netdev_pltap_update_seq(dev);
+    sync_done(dev);
 }
 
+
 static int
-netdev_pltap_get_config(struct netdev_dev *dev_, struct smap *args)
+netdev_pltap_get_config(const struct netdev *dev_, struct smap *args)
 {
-    struct netdev_dev_pltap *netdev_dev = netdev_dev_pltap_cast(dev_);
+    struct netdev_pltap *netdev = netdev_pltap_cast(dev_);
 
-    if (netdev_dev->valid_local_ip)
+    if (netdev->valid_local_ip)
     	smap_add_format(args, "local_ip", IP_FMT,
-            IP_ARGS(&netdev_dev->local_addr.sin_addr));
-    if (netdev_dev->valid_local_netmask)
+            IP_ARGS(netdev->local_addr.sin_addr.s_addr));
+    if (netdev->valid_local_netmask)
         smap_add_format(args, "local_netmask", "%"PRIu32,
-            ntohs(netdev_dev->local_netmask));
-    return netdev_pltap_create_finalize(netdev_dev);
+            ntohs(netdev->local_netmask));
+    return 0;
 }
 
 static int
-netdev_pltap_set_config(struct netdev_dev *dev_, const struct smap *args)
+netdev_pltap_set_config(struct netdev *dev_, const struct smap *args)
 {
-    struct netdev_dev_pltap *netdev_dev = netdev_dev_pltap_cast(dev_);
+    struct netdev_pltap *netdev = netdev_pltap_cast(dev_);
     struct shash_node *node;
 
-    VLOG_DBG("pltap_set_config(%s)", netdev_dev_get_name(dev_));
+    VLOG_DBG("pltap_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, "local_ip")) {
@@ -425,42 +433,37 @@ netdev_pltap_set_config(struct netdev_dev *dev_, const struct smap *args)
 	    if (lookup_ip(node->data, &addr)) {
 		VLOG_WARN("%s: bad 'local_ip'", node->name);
 	    } else {
-		netdev_dev->local_addr.sin_addr = addr;
-		netdev_dev->valid_local_ip = true;
+		netdev->local_addr.sin_addr = addr;
+		netdev->valid_local_ip = true;
 	    }
 	} else if (!strcmp(node->name, "local_netmask")) {
-	    netdev_dev->local_netmask = atoi(node->data);
+	    netdev->local_netmask = atoi(node->data);
 	    // XXX check valididy
-	    netdev_dev->valid_local_netmask = true;
+	    netdev->valid_local_netmask = true;
 	} else {
 	    VLOG_WARN("%s: unknown argument '%s'", 
-	    	netdev_dev_get_name(dev_), node->name);
+	    	netdev_get_name(dev_), node->name);
 	}
     }
-    return netdev_pltap_create_finalize(netdev_dev);        
-}
-
-static int
-netdev_pltap_listen(struct netdev *netdev_ OVS_UNUSED)
-{
+    if (netdev_pltap_finalized(netdev)) {
+        netdev->new_flags |= NETDEV_UP;
+        sync_needed(netdev);
+    }
     return 0;
 }
 
 static int
-netdev_pltap_recv(struct netdev *netdev_, void *buffer, size_t size)
+netdev_rx_pltap_recv(struct netdev_rx *rx_, void *buffer, size_t size)
 {
-    struct netdev_dev_pltap *dev = 
-    	netdev_dev_pltap_cast(netdev_get_dev(netdev_));
+    struct netdev_rx_pltap *rx = netdev_rx_pltap_cast(rx_);
     char prefix[4];
     struct iovec iov[2] = {
         { .iov_base = prefix, .iov_len = 4 },
 	{ .iov_base = buffer, .iov_len = size }
     };
-    if (!dev->finalized)
-        return -EAGAIN;
     for (;;) {
         ssize_t retval;
-        retval = readv(dev->fd, iov, 2);
+        retval = readv(rx->fd, iov, 2);
         if (retval >= 0) {
             if (retval <= size) {
 	    	return retval;
@@ -470,7 +473,7 @@ netdev_pltap_recv(struct netdev *netdev_, void *buffer, size_t size)
         } else if (errno != EINTR) {
             if (errno != EAGAIN) {
                 VLOG_WARN_RL(&rl, "error receiveing Ethernet packet on %s: %s",
-                    netdev_get_name(netdev_), strerror(errno));
+                    netdev_rx_get_name(rx_), strerror(errno));
             }
             return -errno;
         }
@@ -478,26 +481,27 @@ netdev_pltap_recv(struct netdev *netdev_, void *buffer, size_t size)
 }
 
 static void
-netdev_pltap_recv_wait(struct netdev *netdev_)
+netdev_rx_pltap_wait(struct netdev_rx *rx_)
 {
-    struct netdev_dev_pltap *dev = 
-    	netdev_dev_pltap_cast(netdev_get_dev(netdev_));
-    if (dev->finalized && dev->fd >= 0) {
-        poll_fd_wait(dev->fd, POLLIN);
+    struct netdev_rx_pltap *rx = netdev_rx_pltap_cast(rx_);
+    struct netdev_pltap *netdev =
+        netdev_pltap_cast(rx->up.netdev);
+    if (rx->fd >= 0 && netdev_pltap_finalized(netdev)) {
+        poll_fd_wait(rx->fd, POLLIN);
     }
 }
 
 static int
 netdev_pltap_send(struct netdev *netdev_, const void *buffer, size_t size)
 {
-    struct netdev_dev_pltap *dev = 
-    	netdev_dev_pltap_cast(netdev_get_dev(netdev_));
+    struct netdev_pltap *dev = 
+    	netdev_pltap_cast(netdev_);
     char prefix[4] = { 0, 0, 8, 6 };
     struct iovec iov[2] = {
         { .iov_base = prefix, .iov_len = 4 },
 	{ .iov_base = (char*) buffer, .iov_len = size }
     };
-    if (dev->fd < 0 || !dev->finalized)
+    if (dev->fd < 0)
         return EAGAIN;
     for (;;) {
         ssize_t retval;
@@ -521,25 +525,24 @@ netdev_pltap_send(struct netdev *netdev_, const void *buffer, size_t size)
 static void
 netdev_pltap_send_wait(struct netdev *netdev_)
 {
-    struct netdev_dev_pltap *dev = 
-    	netdev_dev_pltap_cast(netdev_get_dev(netdev_));
-    if (dev->finalized && dev->fd >= 0) {
+    struct netdev_pltap *dev = 
+    	netdev_pltap_cast(netdev_);
+    if (dev->fd >= 0 && netdev_pltap_finalized(dev)) {
         poll_fd_wait(dev->fd, POLLOUT);
     }
 }
 
 static int
-netdev_pltap_drain(struct netdev *netdev_)
+netdev_rx_pltap_drain(struct netdev_rx *rx_)
 {
-    struct netdev_dev_pltap *dev = 
-    	netdev_dev_pltap_cast(netdev_get_dev(netdev_));
+    struct netdev_rx_pltap *rx = netdev_rx_pltap_cast(rx_);
     char buffer[128];
     int error;
 
-    if (dev->fd < 0 || !dev->finalized)
-    	return 0;
+    if (rx->fd < 0)
+    	return EAGAIN;
     for (;;) {
-    	error = recv(dev->fd, buffer, 128, MSG_TRUNC);
+    	error = recv(rx->fd, buffer, 128, MSG_TRUNC);
 	if (error) {
             if (error == -EAGAIN)
 	        break;
@@ -560,7 +563,7 @@ netdev_pltap_set_etheraddr(struct netdev *netdevi OVS_UNUSED,
 
 // XXX from netdev-linux.c
 static int
-get_etheraddr(struct netdev_dev_pltap *dev, uint8_t ea[ETH_ADDR_LEN])
+get_etheraddr(struct netdev_pltap *dev, uint8_t ea[ETH_ADDR_LEN])
 {
     struct ifreq ifr;
     int hwaddr_family;
@@ -586,7 +589,7 @@ get_etheraddr(struct netdev_dev_pltap *dev, uint8_t ea[ETH_ADDR_LEN])
 }
 
 static int
-get_flags(struct netdev_dev_pltap *dev, enum netdev_flags *flags)
+get_flags(struct netdev_pltap *dev, enum netdev_flags *flags)
 {
     struct ifreq ifr;
 
@@ -606,9 +609,9 @@ static int
 netdev_pltap_get_etheraddr(const struct netdev *netdev,
                            uint8_t mac[ETH_ADDR_LEN])
 {
-    struct netdev_dev_pltap *dev = 
-    	netdev_dev_pltap_cast(netdev_get_dev(netdev));
-    if (dev->fd < 0 || !dev->finalized)
+    struct netdev_pltap *dev = 
+    	netdev_pltap_cast(netdev);
+    if (dev->fd < 0)
         return EAGAIN;
     return get_etheraddr(dev, mac);
 }
@@ -629,38 +632,42 @@ netdev_pltap_set_stats(struct netdev *netdev OVS_UNUSED, const struct netdev_sta
 
 
 static int
-netdev_pltap_update_flags(struct netdev *netdev,
+netdev_pltap_update_flags(struct netdev *dev_,
                           enum netdev_flags off, enum netdev_flags on,
                           enum netdev_flags *old_flagsp)
 {
-    struct netdev_dev_pltap *dev =
-        netdev_dev_pltap_cast(netdev_get_dev(netdev));
+    struct netdev_pltap *netdev =
+        netdev_pltap_cast(dev_);
+    int error = 0;
 
     if ((off | on) & ~(NETDEV_UP | NETDEV_PROMISC)) {
         return EINVAL;
     }
 
-    *old_flagsp = dev->flags;
-    dev->flags |= on;
-    dev->flags &= ~off;
-    if (*old_flagsp != dev->flags) {
+    if (netdev_pltap_finalized(netdev)) {
+        error = get_flags(netdev, &netdev->flags);
+    }
+    *old_flagsp = netdev->flags;
+    netdev->new_flags |= on;
+    netdev->new_flags &= ~off;
+    if (netdev->flags != netdev->new_flags) {
 	/* we cannot sync here, since we may be in a signal handler */
-        sync_needed(dev);
+        sync_needed(netdev);
     }
 
-    return 0;
+    return error;
 }
 
 static unsigned int
 netdev_pltap_change_seq(const struct netdev *netdev)
 {
-    return netdev_dev_pltap_cast(netdev_get_dev(netdev))->change_seq;
+    return netdev_pltap_cast(netdev)->change_seq;
 }
 
 /* Helper functions. */
 
 static void
-netdev_pltap_update_seq(struct netdev_dev_pltap *dev)
+netdev_pltap_update_seq(struct netdev_pltap *dev)
 {
     dev->change_seq++;
     if (!dev->change_seq) {
@@ -672,15 +679,15 @@ static void
 netdev_pltap_get_real_name(struct unixctl_conn *conn,
                      int argc OVS_UNUSED, const char *argv[], void *aux OVS_UNUSED)
 {
-    struct netdev_dev_pltap *pltap_dev;
+    struct netdev_pltap *pltap_dev;
 
-    pltap_dev = shash_find_data(&pltap_netdev_devs, argv[1]);
+    pltap_dev = shash_find_data(&pltap_netdevs, argv[1]);
     if (!pltap_dev) {
         unixctl_command_reply_error(conn, "no such pltap netdev");
         return;
     }
-    if (pltap_dev->error) {
-    	unixctl_command_reply_error(conn, pltap_dev->error);
+    if (pltap_dev->fd < 0) {
+    	unixctl_command_reply_error(conn, "no real device attached");
 	return;
     }
 
@@ -703,7 +710,7 @@ netdev_pltap_init(void)
 static void
 netdev_pltap_run(void)
 {
-    struct netdev_dev_pltap *iter, *next;
+    struct netdev_pltap *iter, *next;
     LIST_FOR_EACH_SAFE(iter, next, sync_list, &sync_list) {
         netdev_pltap_sync_flags(iter);
     }
@@ -712,8 +719,10 @@ netdev_pltap_run(void)
 static void
 netdev_pltap_wait(void)
 {
-    if (!list_is_empty(&sync_list))
+    if (!list_is_empty(&sync_list)) {
+        VLOG_DBG("netdev_pltap: scheduling sync");
         poll_immediate_wake();
+    }
 }
 
 const struct netdev_class netdev_pltap_class = {
@@ -726,14 +735,9 @@ const struct netdev_class netdev_pltap_class = {
     netdev_pltap_destroy,
     netdev_pltap_get_config,
     netdev_pltap_set_config, 
+    NULL,			/* get_tunnel_config */
 
-    netdev_pltap_open,
-    netdev_pltap_close,
-
-    netdev_pltap_listen,
-    netdev_pltap_recv,
-    netdev_pltap_recv_wait,
-    netdev_pltap_drain,
+    netdev_pltap_rx_open,
 
     netdev_pltap_send, 
     netdev_pltap_send_wait,  
@@ -776,3 +780,11 @@ const struct netdev_class netdev_pltap_class = {
 
     netdev_pltap_change_seq
 };
+
+static const struct netdev_rx_class netdev_rx_pltap_class = {
+    netdev_rx_pltap_destroy,
+    netdev_rx_pltap_recv,
+    netdev_rx_pltap_wait,
+    netdev_rx_pltap_drain,
+
+};