netdev-tunnel: use sockaddr_storage

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

diff --git a/lib/netdev-tunnel.c b/lib/netdev-tunnel.c
index b197e53..13cca1f 100644 (file)
--- a/lib/netdev-tunnel.c
+++ b/lib/netdev-tunnel.c
@@ -48,8 +48,8 @@ struct netdev_tunnel {
     struct netdev_stats stats;
     enum netdev_flags flags;
     int sockfd;
-    struct sockaddr_in local_addr;
-    struct sockaddr_in remote_addr;
+    struct sockaddr_storage local_addr;
+    struct sockaddr_storage remote_addr;
     bool valid_remote_ip;
     bool valid_remote_port;
     bool connected;
@@ -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,
+        &netdev->local_addr, 0);
     if (netdev->sockfd < 0) {
        return netdev->sockfd;
     }
@@ -132,7 +133,7 @@ netdev_tunnel_construct(struct netdev *netdev_)
     n++;
 
     VLOG_DBG("tunnel_create: name=%s, fd=%d, port=%d",
-        netdev_get_name(netdev_), netdev->sockfd, netdev->local_addr.sin_port);
+        netdev_get_name(netdev_), netdev->sockfd, ss_get_port(&netdev->local_addr));
 
     return 0;
 
@@ -168,12 +169,15 @@ netdev_tunnel_get_config(const struct netdev *dev_, struct smap *args)
     struct netdev_tunnel *netdev = netdev_tunnel_cast(dev_);
 
     ovs_mutex_lock(&netdev->mutex);
-    if (netdev->valid_remote_ip)
+    if (netdev->valid_remote_ip) {
+        const struct sockaddr_in *sin =
+            ALIGNED_CAST(const struct sockaddr_in *, &netdev->remote_addr);
        smap_add_format(args, "remote_ip", IP_FMT,
-               IP_ARGS(netdev->remote_addr.sin_addr.s_addr));
+               IP_ARGS(sin->sin_addr.s_addr));
+    }
     if (netdev->valid_remote_port)
         smap_add_format(args, "remote_port", "%"PRIu16,
-               ntohs(netdev->remote_addr.sin_port));
+               ss_get_port(&netdev->remote_addr));
     ovs_mutex_unlock(&netdev->mutex);
     return 0;
 }
@@ -183,18 +187,22 @@ netdev_tunnel_connect(struct netdev_tunnel *dev)
     OVS_REQUIRES(dev->mutex)
 {
     char buf[1024];
+    struct sockaddr_in *sin =
+        ALIGNED_CAST(struct sockaddr_in *, &dev->remote_addr);
     if (dev->sockfd < 0)
         return EBADF;
     if (!dev->valid_remote_ip || !dev->valid_remote_port)
         return 0;
-    dev->remote_addr.sin_family = AF_INET;
-    if (connect(dev->sockfd, (struct sockaddr*) &dev->remote_addr, sizeof(dev->remote_addr)) < 0) {
+    if (connect(dev->sockfd, (struct sockaddr*) sin, sizeof(*sin)) < 0) {
+        VLOG_DBG("%s: connect returned %s", netdev_get_name(&dev->up),
+            ovs_strerror(errno));
         return errno;
     }
     dev->connected = true;
     netdev_tunnel_update_seq(dev);
     VLOG_DBG("%s: connected to (%s, %d)", netdev_get_name(&dev->up),
-        inet_ntop(AF_INET, &dev->remote_addr.sin_addr, buf, 1024), ntohs(dev->remote_addr.sin_port));
+        inet_ntop(AF_INET, &sin->sin_addr.s_addr, buf, 1024),
+        ss_get_port(&dev->remote_addr));
     return 0;
 }
 
@@ -204,6 +212,8 @@ netdev_tunnel_set_config(struct netdev *dev_, const struct smap *args)
     struct netdev_tunnel *netdev = netdev_tunnel_cast(dev_);
     struct shash_node *node;
     int error;
+    struct sockaddr_in *sin =
+        ALIGNED_CAST(struct sockaddr_in *, &netdev->remote_addr);
 
     ovs_mutex_lock(&netdev->mutex);
     VLOG_DBG("tunnel_set_config(%s)", netdev_get_name(dev_));
@@ -214,11 +224,12 @@ netdev_tunnel_set_config(struct netdev *dev_, const struct smap *args)
            if (lookup_ip(node->data, &addr)) {
                VLOG_WARN("%s: bad 'remote_ip'", node->name);
            } else {
-               netdev->remote_addr.sin_addr = addr;
+        sin->sin_family = AF_INET;
+               sin->sin_addr = addr;
                netdev->valid_remote_ip = true;
            }
        } else if (!strcmp(node->name, "remote_port")) {
-           netdev->remote_addr.sin_port = htons(atoi(node->data));
+           sin->sin_port = htons(atoi(node->data));
            netdev->valid_remote_port = true;
        } else {
            VLOG_WARN("%s: unknown argument '%s'", 
@@ -271,7 +282,7 @@ netdev_tunnel_rx_recv(struct netdev_rx *rx_, struct ofpbuf *buffer)
     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->data, size, MSG_TRUNC);
@@ -281,11 +292,12 @@ netdev_tunnel_rx_recv(struct netdev_rx *rx_, struct ofpbuf *buffer)
                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) {
@@ -293,7 +305,7 @@ netdev_tunnel_rx_recv(struct netdev_rx *rx_, struct ofpbuf *buffer)
                     netdev_rx_get_name(rx_), ovs_strerror(errno));
                    netdev->stats.rx_errors++;
             }
-            return -errno;
+            return errno;
         }
     }
 }
@@ -452,18 +464,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;
-}
 \f
 /* Helper functions. */
 
@@ -492,7 +492,7 @@ netdev_tunnel_get_port(struct unixctl_conn *conn,
     }
 
     ovs_mutex_lock(&tunnel_dev->mutex);
-    sprintf(buf, "%d", ntohs(tunnel_dev->local_addr.sin_port));
+    sprintf(buf, "%d", ss_get_port(&tunnel_dev->local_addr));
     ovs_mutex_unlock(&tunnel_dev->mutex);
 
     unixctl_command_reply(conn, buf);