update rx/tx stats

[sliver-openvswitch.git] / lib / netdev-tunnel.c

diff --git a/lib/netdev-tunnel.c b/lib/netdev-tunnel.c
index 6bbf2cb..f94474c 100644 (file)
--- a/lib/netdev-tunnel.c
+++ b/lib/netdev-tunnel.c
@@ -41,7 +41,6 @@ VLOG_DEFINE_THIS_MODULE(netdev_tunnel);
 struct netdev_dev_tunnel {
     struct netdev_dev netdev_dev;
     uint8_t hwaddr[ETH_ADDR_LEN];
-    int mtu;
     struct netdev_stats stats;
     enum netdev_flags flags;
     int sockfd;
@@ -55,13 +54,15 @@ struct netdev_dev_tunnel {
 
 struct netdev_tunnel {
     struct netdev netdev;
-};
+} ;
+
+static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(5, 20);
 
 static struct shash tunnel_netdev_devs = SHASH_INITIALIZER(&tunnel_netdev_devs);
 
 static int netdev_tunnel_create(const struct netdev_class *, const char *,
                                struct netdev_dev **);
-static void netdev_tunnel_poll_notify(const struct netdev *);
+static void netdev_tunnel_update_seq(struct netdev_dev_tunnel *);
 
 static bool
 is_tunnel_class(const struct netdev_class *class)
@@ -100,7 +101,6 @@ netdev_tunnel_create(const struct netdev_class *class, const char *name,
     netdev_dev->hwaddr[3] = n >> 16;
     netdev_dev->hwaddr[4] = n >> 8;
     netdev_dev->hwaddr[5] = n;
-    netdev_dev->mtu = 1500;
     netdev_dev->flags = 0;
     netdev_dev->change_seq = 1;
     memset(&netdev_dev->remote_addr, 0, sizeof(netdev_dev->remote_addr));
@@ -190,6 +190,7 @@ netdev_tunnel_connect(struct netdev_dev_tunnel *dev)
         return errno;
     }
     dev->connected = true;
+    netdev_tunnel_update_seq(dev);
     VLOG_DBG("%s: connected to (%s, %d)", netdev_dev_get_name(&dev->netdev_dev),
         inet_ntoa(dev->remote_addr.sin_addr), ntohs(dev->remote_addr.sin_port));
     return 0;
@@ -242,11 +243,20 @@ netdev_tunnel_recv(struct netdev *netdev_, void *buffer, size_t size)
        VLOG_DBG("%s: recv(%x, %d, MSG_TRUNC) = %d",
                        netdev_get_name(netdev_), buffer, size, retval);
         if (retval >= 0) {
-            return retval <= size ? retval : -EMSGSIZE;
+           dev->stats.rx_packets++;
+           dev->stats.rx_bytes += retval;
+            if (retval <= size) {
+               return retval;
+           } else {
+               dev->stats.rx_errors++;
+               dev->stats.rx_length_errors++;
+               return -EMSGSIZE;
+           }
         } else if (errno != EINTR) {
             if (errno != EAGAIN) {
-                VLOG_WARN("error receiveing Ethernet packet on %s: %s",
-                    strerror(errno), netdev_get_name(netdev_));
+                VLOG_WARN_RL(&rl, "error receiveing Ethernet packet on %s: %s",
+                    netdev_get_name(netdev_), strerror(errno));
+               dev->stats.rx_errors++;
             }
             return -errno;
         }
@@ -269,19 +279,27 @@ netdev_tunnel_send(struct netdev *netdev_, const void *buffer, size_t size)
     struct netdev_dev_tunnel *dev = 
        netdev_dev_tunnel_cast(netdev_get_dev(netdev_));
     if (!dev->connected)
-        return -EAGAIN;
+        return EAGAIN;
     for (;;) {
         ssize_t retval;
         retval = send(dev->sockfd, buffer, size, 0);
        VLOG_DBG("%s: send(%x, %d) = %d", netdev_get_name(netdev_), buffer, size, retval);
         if (retval >= 0) {
-            return retval;
+           dev->stats.tx_packets++;
+           dev->stats.tx_bytes++;
+           if (retval != size) {
+               VLOG_WARN_RL(&rl, "sent partial Ethernet packet (%zd bytes of "
+                            "%zu) on %s", retval, size, netdev_get_name(netdev_));
+               dev->stats.tx_errors++;
+           }
+            return 0;
         } else if (errno != EINTR) {
             if (errno != EAGAIN) {
-                VLOG_WARN("error sending Ethernet packet on %s: %s",
-                    strerror(errno), netdev_get_name(netdev_));
+                VLOG_WARN_RL(&rl, "error sending Ethernet packet on %s: %s",
+                    netdev_get_name(netdev_), strerror(errno));
+               dev->stats.tx_errors++;
             }
-            return -errno;
+            return errno;
         }
     }
 }
@@ -327,7 +345,7 @@ netdev_tunnel_set_etheraddr(struct netdev *netdev,
 
     if (!eth_addr_equals(dev->hwaddr, mac)) {
         memcpy(dev->hwaddr, mac, ETH_ADDR_LEN);
-        netdev_tunnel_poll_notify(netdev);
+        netdev_tunnel_update_seq(dev);
     }
 
     return 0;
@@ -344,35 +362,6 @@ netdev_tunnel_get_etheraddr(const struct netdev *netdev,
     return 0;
 }
 
-static int
-netdev_tunnel_get_mtu(const struct netdev *netdev, int *mtup)
-{
-    const struct netdev_dev_tunnel *dev =
-        netdev_dev_tunnel_cast(netdev_get_dev(netdev));
-
-    *mtup = dev->mtu;
-    return 0;
-}
-
-static int
-netdev_tunnel_set_mtu(const struct netdev *netdev, int mtu)
-{
-    struct netdev_dev_tunnel *dev =
-        netdev_dev_tunnel_cast(netdev_get_dev(netdev));
-
-    dev->mtu = mtu;
-    return 0;
-}
-
-static int
-netdev_tunnel_get_carrier(const struct netdev *netdev, bool *carrier)
-{
-    struct netdev_dev_tunnel *dev =
-        netdev_dev_tunnel_cast(netdev_get_dev(netdev));
-    VLOG_DBG("tunnel_get_carrier(%s)", netdev_get_name(netdev));
-    *carrier = dev->connected;
-    return 0;
-}
 
 static int
 netdev_tunnel_get_stats(const struct netdev *netdev, struct netdev_stats *stats)
@@ -406,11 +395,12 @@ netdev_tunnel_update_flags(struct netdev *netdev,
         return EINVAL;
     }
 
+    // XXX should we actually do something with this flags?
     *old_flagsp = dev->flags;
     dev->flags |= on;
     dev->flags &= ~off;
     if (*old_flagsp != dev->flags) {
-        netdev_tunnel_poll_notify(netdev);
+        netdev_tunnel_update_seq(dev);
     }
     return 0;
 }
@@ -424,11 +414,8 @@ netdev_tunnel_change_seq(const struct netdev *netdev)
 /* Helper functions. */
 
 static void
-netdev_tunnel_poll_notify(const struct netdev *netdev)
+netdev_tunnel_update_seq(struct netdev_dev_tunnel *dev)
 {
-    struct netdev_dev_tunnel *dev =
-        netdev_dev_tunnel_cast(netdev_get_dev(netdev));
-
     dev->change_seq++;
     if (!dev->change_seq) {
         dev->change_seq++;
@@ -486,10 +473,10 @@ const struct netdev_class netdev_tunnel_class = {
 
     netdev_tunnel_set_etheraddr,
     netdev_tunnel_get_etheraddr,
-    netdev_tunnel_get_mtu,
-    netdev_tunnel_set_mtu,
+    NULL,                      /* get_mtu */
+    NULL,                      /* set_mtu */
     NULL,                       /* get_ifindex */
-    netdev_tunnel_get_carrier,  /* get_carrier */
+    NULL,                      /* get_carrier */
     NULL,                       /* get_carrier_resets */
     NULL,                       /* get_miimon */
     netdev_tunnel_get_stats,