use zu/zd in printf to avoid warnings on 32bit

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

diff --git a/lib/netdev-tunnel.c b/lib/netdev-tunnel.c
index 797813b..095306f 100644 (file)
--- a/lib/netdev-tunnel.c
+++ b/lib/netdev-tunnel.c
@@ -73,7 +73,7 @@ is_tunnel_class(const struct netdev_class *class)
 static struct netdev_dev_tunnel *
 netdev_dev_tunnel_cast(const struct netdev_dev *netdev_dev)
 {
-    assert(is_tunnel_class(netdev_dev_get_class(netdev_dev)));
+    ovs_assert(is_tunnel_class(netdev_dev_get_class(netdev_dev)));
     return CONTAINER_OF(netdev_dev, struct netdev_dev_tunnel, netdev_dev);
 }
 
@@ -81,7 +81,7 @@ static struct netdev_tunnel *
 netdev_tunnel_cast(const struct netdev *netdev)
 {
     struct netdev_dev *netdev_dev = netdev_get_dev(netdev);
-    assert(is_tunnel_class(netdev_dev_get_class(netdev_dev)));
+    ovs_assert(is_tunnel_class(netdev_dev_get_class(netdev_dev)));
     return CONTAINER_OF(netdev, struct netdev_tunnel, netdev);
 }
 
@@ -170,7 +170,7 @@ netdev_tunnel_get_config(struct netdev_dev *dev_, struct smap *args)
 
     if (netdev_dev->valid_remote_ip)
        smap_add_format(args, "remote_ip", IP_FMT,
-               IP_ARGS(&netdev_dev->remote_addr.sin_addr));
+               IP_ARGS(netdev_dev->remote_addr.sin_addr.s_addr));
     if (netdev_dev->valid_remote_port)
         smap_add_format(args, "remote_port", "%"PRIu16,
                ntohs(netdev_dev->remote_addr.sin_port));
@@ -239,7 +239,7 @@ netdev_tunnel_recv(struct netdev *netdev_, void *buffer, size_t size)
     for (;;) {
         ssize_t retval;
         retval = recv(dev->sockfd, buffer, size, MSG_TRUNC);
-       VLOG_DBG("%s: recv(%"PRIxPTR", %"PRIu64", MSG_TRUNC) = %"PRId64,
+       VLOG_DBG("%s: recv(%"PRIxPTR", %zu, MSG_TRUNC) = %zd",
                 netdev_get_name(netdev_), (uintptr_t)buffer, size, retval);
         if (retval >= 0) {
            dev->stats.rx_packets++;
@@ -282,14 +282,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", %"PRIu64") = %"PRId64,
+       VLOG_DBG("%s: send(%"PRIxPTR", %zu) = %zd",
                 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 (%"PRId64" bytes of "
-                            "%"PRIu64") on %s", retval, size, netdev_get_name(netdev_));
+               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;
@@ -496,6 +496,7 @@ const struct netdev_class netdev_tunnel_class = {
     netdev_tunnel_destroy,
     netdev_tunnel_get_config,
     netdev_tunnel_set_config, 
+    NULL,                      /* get_tunnel_config */
 
     netdev_tunnel_open,
     netdev_tunnel_close,