[GNUnet-SVN] r11475 - gnunet/src/transport

[gnunet]

Author: grothoff
Date: 2010-05-21 12:07:56 +0200 (Fri, 21 May 2010)
New Revision: 11475

Modified:
   gnunet/src/transport/plugin_transport_tcp.c
   gnunet/src/transport/plugin_transport_udp.c
Log:
fix compile error on FBSD

Modified: gnunet/src/transport/plugin_transport_tcp.c
===================================================================
--- gnunet/src/transport/plugin_transport_tcp.c 2010-05-21 09:19:00 UTC (rev 
11474)
+++ gnunet/src/transport/plugin_transport_tcp.c 2010-05-21 10:07:56 UTC (rev 
11475)
@@ -89,7 +89,7 @@
   /**
    * IPv6 address.
    */
-  unsigned char ipv6_addr[16];
+  struct in6_addr ipv6_addr;
 
   /**
    * Port number, in network byte order.
@@ -326,7 +326,7 @@
       t6 = addr;
       af = AF_INET6;
       port = ntohs (t6->t6_port);
-      memcpy (&a6, t6->ipv6_addr, sizeof (a6));
+      memcpy (&a6, &t6->ipv6_addr, sizeof (a6));
       sb = &a6;
     }
   else if (addrlen == sizeof (struct IPv4TcpAddress))
@@ -857,7 +857,7 @@
          a6.sin6_family = AF_INET6;
          a6.sin6_port = t6->t6_port;
          memcpy (a6.sin6_addr.s6_addr,
-                 t6->ipv6_addr,
+                 &t6->ipv6_addr,
                  16);      
          sb = &a6;
          sbs = sizeof (a6);
@@ -1086,7 +1086,7 @@
       a6.sin6_family = AF_INET6;
       a6.sin6_port = t6->t6_port;
       memcpy (a6.sin6_addr.s6_addr,
-             t6->ipv6_addr,
+             &t6->ipv6_addr,
              16);      
       port = ntohs (t6->t6_port);
       sb = &a6;
@@ -1176,7 +1176,7 @@
   else
     {
       v6 = (struct IPv6TcpAddress *) addr;
-      if (IN6_IS_ADDR_LINKLOCAL (v6->ipv6_addr))
+      if (IN6_IS_ADDR_LINKLOCAL (&v6->ipv6_addr))
        {
          GNUNET_break_op (0);
          return GNUNET_SYSERR;
@@ -1253,7 +1253,7 @@
              s6 = vaddr;
              t6 = GNUNET_malloc (sizeof (struct IPv6TcpAddress));
              t6->t6_port = s6->sin6_port;
-             memcpy (t6->ipv6_addr,
+             memcpy (&t6->ipv6_addr,
                      s6->sin6_addr.s6_addr,
                      16);
              session->connect_addr = t6;
@@ -1456,7 +1456,7 @@
          /* skip link local addresses */
          return GNUNET_OK;
        }
-      memcpy (t6.ipv6_addr,
+      memcpy (&t6.ipv6_addr,
              ((struct sockaddr_in6 *) addr)->sin6_addr.s6_addr,
              16);
       t6.t6_port = htons (plugin->adv_port);

Modified: gnunet/src/transport/plugin_transport_udp.c
===================================================================
--- gnunet/src/transport/plugin_transport_udp.c 2010-05-21 09:19:00 UTC (rev 
11474)
+++ gnunet/src/transport/plugin_transport_udp.c 2010-05-21 10:07:56 UTC (rev 
11475)
@@ -97,7 +97,7 @@
   /**
    * IPv6 address.
    */
-  unsigned char ipv6_addr[16];
+  struct in6_addr ipv6_addr;
 
   /**
    * Port number, in network byte order.
@@ -296,7 +296,7 @@
       a6.sin6_family = AF_INET6;
       a6.sin6_port = t6->u6_port;
       memcpy (a6.sin6_addr.s6_addr,
-             t6->ipv6_addr,
+             &t6->ipv6_addr,
              16);      
       sb = &a6;
       sbs = sizeof (a6);
@@ -380,7 +380,7 @@
     }
   else if (af == AF_INET6)
     {
-      memcpy (t6.ipv6_addr,
+      memcpy (&t6.ipv6_addr,
              ((struct sockaddr_in6 *) addr)->sin6_addr.s6_addr,
              16);
       t6.u6_port = htons (plugin->adv_port);
@@ -540,7 +540,7 @@
       {
        s6 = (const struct sockaddr_in6*) &addr;
        t6.u6_port = s6->sin6_port;
-       memcpy (t6.ipv6_addr,
+       memcpy (&t6.ipv6_addr,
                s6->sin6_addr.s6_addr,
                16);
        ca = &t6;
@@ -783,7 +783,7 @@
       a6.sin6_port = t6->u6_port;
       port = ntohs (t6->u6_port);
       memcpy (a6.sin6_addr.s6_addr,
-             t6->ipv6_addr,
+             &t6->ipv6_addr,
              16);      
       sb = &a6;
       sbs = sizeof (a6);
@@ -850,7 +850,7 @@
       t6 = addr;
       af = AF_INET6;
       port = ntohs (t6->u6_port);
-      memcpy (&a6, t6->ipv6_addr, sizeof (a6));
+      memcpy (&a6, &t6->ipv6_addr, sizeof (a6));
       sb = &a6;
     }
   else if (addrlen == sizeof (struct IPv4UdpAddress))