From 16d34819087d7fa77bcb6f4b5e9e73d7e3220c4d Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Fri, 21 May 2010 10:07:56 +0000
Subject: [PATCH] fix compile error on FBSD

---
 src/transport/plugin_transport_tcp.c | 14 +++++++-------
 src/transport/plugin_transport_udp.c | 12 ++++++------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/transport/plugin_transport_tcp.c b/src/transport/plugin_transport_tcp.c
index c10419744..546bc2066 100644
--- a/src/transport/plugin_transport_tcp.c
+++ b/src/transport/plugin_transport_tcp.c
@@ -89,7 +89,7 @@ struct IPv6TcpAddress
   /**
    * IPv6 address.
    */
-  unsigned char ipv6_addr[16];
+  struct in6_addr ipv6_addr;
 
   /**
    * Port number, in network byte order.
@@ -326,7 +326,7 @@ tcp_address_to_string (void *cls,
       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 @@ tcp_plugin_send (void *cls,
 	  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 @@ tcp_plugin_address_pretty_printer (void *cls,
       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 @@ tcp_plugin_check_address (void *cls, void *addr, size_t addrlen)
   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 @@ handle_tcp_welcome (void *cls,
 	      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 @@ process_interfaces (void *cls,
 	  /* 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);
diff --git a/src/transport/plugin_transport_udp.c b/src/transport/plugin_transport_udp.c
index e86431ca2..322bdd1d0 100644
--- a/src/transport/plugin_transport_udp.c
+++ b/src/transport/plugin_transport_udp.c
@@ -97,7 +97,7 @@ struct IPv6UdpAddress
   /**
    * IPv6 address.
    */
-  unsigned char ipv6_addr[16];
+  struct in6_addr ipv6_addr;
 
   /**
    * Port number, in network byte order.
@@ -296,7 +296,7 @@ udp_plugin_send (void *cls,
       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 @@ process_interfaces (void *cls,
     }
   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 @@ udp_plugin_select (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
       {
 	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 @@ udp_plugin_address_pretty_printer (void *cls,
       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 @@ udp_address_to_string (void *cls,
       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))
-- 
2.25.1