X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fnetdev-tunnel.c;h=5443a2db8c57a3c94bb31fb6515724bb058e2fd6;hb=2f94e4095bb177d0ef849f8c0975219d3d7c0798;hp=3127e51bee7864fdb2df5c21fc1cd72b4a4e2461;hpb=5ea1eab089607de8f87189fe4463364e26576070;p=sliver-openvswitch.git

diff --git a/lib/netdev-tunnel.c b/lib/netdev-tunnel.c
index 3127e51be..5443a2db8 100644
--- a/lib/netdev-tunnel.c
+++ b/lib/netdev-tunnel.c
@@ -121,7 +121,8 @@ netdev_tunnel_construct(struct netdev *netdev_)
     netdev->connected = false;
 
 
-    netdev->sockfd = inet_open_passive(SOCK_DGRAM, "", 0, &netdev->local_addr, 0);
+    netdev->sockfd = inet_open_passive(SOCK_DGRAM, "", 0,
+        (struct sockaddr_storage *)&netdev->local_addr, 0);
     if (netdev->sockfd < 0) {
     	return netdev->sockfd;
     }
@@ -264,27 +265,29 @@ netdev_tunnel_rx_dealloc(struct netdev_rx *rx_)
 }
 
 static int
-netdev_tunnel_rx_recv(struct netdev_rx *rx_, void *buffer, size_t size)
+netdev_tunnel_rx_recv(struct netdev_rx *rx_, struct ofpbuf *buffer)
 {
+    size_t size = ofpbuf_tailroom(buffer);
     struct netdev_rx_tunnel *rx = netdev_rx_tunnel_cast(rx_);
     struct netdev_tunnel *netdev =
         netdev_tunnel_cast(rx_->netdev);
     if (!netdev->connected)
-        return -EAGAIN;
+        return EAGAIN;
     for (;;) {
         ssize_t retval;
-        retval = recv(rx->fd, buffer, size, MSG_TRUNC);
-	    VLOG_DBG("%s: recv(%"PRIxPTR", %zu, MSG_TRUNC) = %zd",
-		    netdev_rx_get_name(rx_), (uintptr_t)buffer, size, retval);
+        retval = recv(rx->fd, buffer->data, size, MSG_TRUNC);
+	    VLOG_DBG("%s: recv(%"PRIxPTR", %"PRIuSIZE", MSG_TRUNC) = %"PRIdSIZE,
+		    netdev_rx_get_name(rx_), (uintptr_t)buffer->data, size, retval);
         if (retval >= 0) {
-	    netdev->stats.rx_packets++;
-	    netdev->stats.rx_bytes += retval;
+	        netdev->stats.rx_packets++;
+	        netdev->stats.rx_bytes += retval;
             if (retval <= size) {
-	    	    return retval;
+                buffer->size += retval;
+	    	    return 0;
             } else {
                 netdev->stats.rx_errors++;
                 netdev->stats.rx_length_errors++;
-                return -EMSGSIZE;
+                return EMSGSIZE;
             }
         } else if (errno != EINTR) {
             if (errno != EAGAIN) {
@@ -292,7 +295,7 @@ netdev_tunnel_rx_recv(struct netdev_rx *rx_, void *buffer, size_t size)
                     netdev_rx_get_name(rx_), ovs_strerror(errno));
 	            netdev->stats.rx_errors++;
             }
-            return -errno;
+            return errno;
         }
     }
 }
@@ -317,14 +320,14 @@ netdev_tunnel_send(struct netdev *netdev_, const void *buffer, size_t size)
     for (;;) {
         ssize_t retval;
         retval = send(dev->sockfd, buffer, size, 0);
-    	VLOG_DBG("%s: send(%"PRIxPTR", %zu) = %zd",
+    	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 (%zd bytes of "
-		             "%zu) on %s", retval, size, netdev_get_name(netdev_));
+	        VLOG_WARN_RL(&rl, "sent partial Ethernet packet (%"PRIdSIZE" bytes of "
+		             "%"PRIuSIZE") on %s", retval, size, netdev_get_name(netdev_));
 		dev->stats.tx_errors++;
 	    }
             return 0;
@@ -451,18 +454,6 @@ out:
     return error;
 }
 
-static unsigned int
-netdev_tunnel_change_seq(const struct netdev *netdev_)
-{
-    struct netdev_tunnel *netdev = netdev_tunnel_cast(netdev_);
-    unsigned int change_seq;
-
-
-    ovs_mutex_lock(&netdev->mutex);
-    change_seq = netdev->change_seq;
-    ovs_mutex_unlock(&netdev->mutex);
-    return change_seq;
-}
 
 /* Helper functions. */
 
@@ -614,13 +605,11 @@ const struct netdev_class netdev_tunnel_class = {
     NULL,                       /* get_in6 */
     NULL,                       /* add_router */
     NULL,                       /* get_next_hop */
-    NULL,                       /* get_drv_info */
+    NULL,                       /* get_status */
     NULL,                       /* arp_lookup */
 
     netdev_tunnel_update_flags,
 
-    netdev_tunnel_change_seq,
-
     netdev_tunnel_rx_alloc,
     netdev_tunnel_rx_construct,
     netdev_tunnel_rx_destruct,