more FBSD fixes

1 files changed, 18 insertions, 8 deletions

diff --git a/src/transport/plugin_transport_udp.c b/src/transport/plugin_transport_udp.c
index 322bdd1d0..4de3f2c44 100644
--- a/src/transport/plugin_transport_udp.c
+++ b/src/transport/plugin_transport_udp.c
@@ -295,9 +295,9 @@ udp_plugin_send (void *cls,
 #endif
       a6.sin6_family = AF_INET6;
       a6.sin6_port = t6->u6_port;
-      memcpy (a6.sin6_addr.s6_addr,
+      memcpy (&a6.sin6_addr,
               &t6->ipv6_addr,
-              16);      
+              sizeof (struct in6_addr));      
       sb = &a6;
       sbs = sizeof (a6);
     }
@@ -380,9 +380,14 @@ process_interfaces (void *cls,
     }
   else if (af == AF_INET6)
     {
+      if (IN6_IS_ADDR_LINKLOCAL (&((struct sockaddr_in6 *) addr)->sin6_addr))
+        {
+          /* skip link local addresses */
+          return GNUNET_OK;
+        }
       memcpy (&t6.ipv6_addr,
-              ((struct sockaddr_in6 *) addr)->sin6_addr.s6_addr,
-              16);
+              &((struct sockaddr_in6 *) addr)->sin6_addr,
+              sizeof (struct in6_addr));
       t6.u6_port = htons (plugin->adv_port);
       arg = &t6;
       args = sizeof (t6);
@@ -541,8 +546,8 @@ 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,
-                s6->sin6_addr.s6_addr,
-                16);
+                &s6->sin6_addr,
+                sizeof (struct in6_addr));
         ca = &t6;
         calen = sizeof (struct IPv6UdpAddress);
       }
@@ -714,6 +719,11 @@ udp_check_address (void *cls, void *addr, size_t addrlen)
   else
     {
       v6 = (struct IPv6UdpAddress *) addr;
+      if (IN6_IS_ADDR_LINKLOCAL (&v6->ipv6_addr))
+        {
+          GNUNET_break_op (0);
+          return GNUNET_SYSERR;
+        }
       v6->u6_port = htons (check_port (plugin, ntohs (v6->u6_port)));
     }
   return GNUNET_OK;
@@ -782,9 +792,9 @@ udp_plugin_address_pretty_printer (void *cls,
       a6.sin6_family = AF_INET6;
       a6.sin6_port = t6->u6_port;
       port = ntohs (t6->u6_port);
-      memcpy (a6.sin6_addr.s6_addr,
+      memcpy (&a6.sin6_addr,
               &t6->ipv6_addr,
-              16);      
+              sizeof (struct in6_addr));      
       sb = &a6;
       sbs = sizeof (a6);
     }