From: Giuseppe Lettieri <g.lettieri@iet.unipi.it>
Date: Fri, 11 Apr 2014 08:11:22 +0000 (+0200)
Subject: comply with new ofpbuf interface
X-Git-Tag: sliver-openvswitch-2.2.90-1~4
X-Git-Url: http://git.onelab.eu/?p=sliver-openvswitch.git;a=commitdiff_plain;h=8d25251929c8f325bed0fff24192d5a87034b32e

comply with new ofpbuf interface
---

diff --git a/lib/netdev-pltap.c b/lib/netdev-pltap.c
index cbb76eaf6..88c673a79 100644
--- a/lib/netdev-pltap.c
+++ b/lib/netdev-pltap.c
@@ -522,14 +522,14 @@ netdev_pltap_rxq_recv(struct netdev_rxq *rx_, struct ofpbuf **packet, int *c)
     buffer = ofpbuf_new_with_headroom(VLAN_ETH_HEADER_LEN + ETH_PAYLOAD_MAX,
         DP_NETDEV_HEADROOM);
     size = ofpbuf_tailroom(buffer);
-    iov[1].iov_base = buffer->data;
+    iov[1].iov_base = ofpbuf_data(buffer);
     iov[1].iov_len = size;
     for (;;) {
         ssize_t retval;
         retval = readv(rx->fd, iov, 2);
         if (retval >= 0) {
             if (retval <= size) {
-            buffer->size += retval;
+            ofpbuf_set_size(buffer, ofpbuf_size(buffer) + retval);
 	    	goto out;
 	    } else {
 	    	error = EMSGSIZE;
@@ -570,8 +570,8 @@ netdev_pltap_rxq_wait(struct netdev_rxq *rx_)
 static int
 netdev_pltap_send(struct netdev *netdev_, struct ofpbuf *pkt, bool may_steal)
 {
-    const void *buffer = pkt->data;
-    size_t size = pkt->size;
+    const void *buffer = ofpbuf_data(pkt);
+    size_t size = ofpbuf_size(pkt);
     struct netdev_pltap *dev = 
         netdev_pltap_cast(netdev_);
     int error = 0;
@@ -588,9 +588,9 @@ netdev_pltap_send(struct netdev *netdev_, struct ofpbuf *pkt, bool may_steal)
         ssize_t retval;
         retval = writev(dev->fd, iov, 2);
         if (retval >= 0) {
-            if (retval != size + 4) {
+            if (retval != size + sizeof(pi)) {
                 VLOG_WARN_RL(&rl, "sent partial Ethernet packet (%"PRIdSIZE" bytes of %"PRIuSIZE") on %s",
-                        retval, size + 4, netdev_get_name(netdev_));
+                        retval, size + sizeof(pi), netdev_get_name(netdev_));
             }
             goto out;
         } else if (errno != EINTR) {
diff --git a/lib/netdev-tunnel.c b/lib/netdev-tunnel.c
index dcc5e2ca9..574115e82 100644
--- a/lib/netdev-tunnel.c
+++ b/lib/netdev-tunnel.c
@@ -282,6 +282,7 @@ netdev_tunnel_rxq_recv(struct netdev_rxq *rx_, struct ofpbuf **packet, int *c)
     struct netdev_tunnel *netdev =
         netdev_tunnel_cast(rx_->netdev);
     struct ofpbuf *buffer = NULL;
+    void *data;
     size_t size;
     int error = 0;
 
@@ -289,18 +290,19 @@ netdev_tunnel_rxq_recv(struct netdev_rxq *rx_, struct ofpbuf **packet, int *c)
         return EAGAIN;
     buffer = ofpbuf_new_with_headroom(VLAN_ETH_HEADER_LEN + ETH_PAYLOAD_MAX,
         DP_NETDEV_HEADROOM);
+    data = ofpbuf_data(buffer);
     size = ofpbuf_tailroom(buffer);
 
     for (;;) {
         ssize_t retval;
-        retval = recv(rx->fd, buffer->data, size, MSG_TRUNC);
+        retval = recv(rx->fd, data, size, MSG_TRUNC);
         VLOG_DBG("%s: recv(%"PRIxPTR", %"PRIuSIZE", MSG_TRUNC) = %"PRIdSIZE,
-                netdev_rxq_get_name(rx_), (uintptr_t)buffer->data, size, retval);
+                netdev_rxq_get_name(rx_), (uintptr_t)data, size, retval);
         if (retval >= 0) {
             netdev->stats.rx_packets++;
             netdev->stats.rx_bytes += retval;
             if (retval <= size) {
-                buffer->size += retval;
+                ofpbuf_set_size(buffer, ofpbuf_size(buffer) + retval);
                 goto out;
             } else {
                 netdev->stats.rx_errors++;
@@ -343,8 +345,8 @@ netdev_tunnel_rxq_wait(struct netdev_rxq *rx_)
 static int
 netdev_tunnel_send(struct netdev *netdev_, struct ofpbuf *pkt, bool may_steal)
 {
-    const void *buffer = pkt->data;
-    size_t size = pkt->size;
+    const void *buffer = ofpbuf_data(pkt);
+    size_t size = ofpbuf_size(pkt);
     struct netdev_tunnel *dev = 
         netdev_tunnel_cast(netdev_);
     int error = 0;