diff options
author | Christian Grothoff <christian@grothoff.org> | 2010-05-21 10:07:56 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2010-05-21 10:07:56 +0000 |
commit | 16d34819087d7fa77bcb6f4b5e9e73d7e3220c4d (patch) | |
tree | 0d46cc0446c97a9735be1e360b4b1f9814fdae39 /src/transport/plugin_transport_udp.c | |
parent | 1d338b90e93c843c8a89290230ef0fe115021499 (diff) | |
download | gnunet-16d34819087d7fa77bcb6f4b5e9e73d7e3220c4d.tar.gz gnunet-16d34819087d7fa77bcb6f4b5e9e73d7e3220c4d.zip |
fix compile error on FBSD
Diffstat (limited to 'src/transport/plugin_transport_udp.c')
-rw-r--r-- | src/transport/plugin_transport_udp.c | 12 |
1 files changed, 6 insertions, 6 deletions
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 | |||
97 | /** | 97 | /** |
98 | * IPv6 address. | 98 | * IPv6 address. |
99 | */ | 99 | */ |
100 | unsigned char ipv6_addr[16]; | 100 | struct in6_addr ipv6_addr; |
101 | 101 | ||
102 | /** | 102 | /** |
103 | * Port number, in network byte order. | 103 | * Port number, in network byte order. |
@@ -296,7 +296,7 @@ udp_plugin_send (void *cls, | |||
296 | a6.sin6_family = AF_INET6; | 296 | a6.sin6_family = AF_INET6; |
297 | a6.sin6_port = t6->u6_port; | 297 | a6.sin6_port = t6->u6_port; |
298 | memcpy (a6.sin6_addr.s6_addr, | 298 | memcpy (a6.sin6_addr.s6_addr, |
299 | t6->ipv6_addr, | 299 | &t6->ipv6_addr, |
300 | 16); | 300 | 16); |
301 | sb = &a6; | 301 | sb = &a6; |
302 | sbs = sizeof (a6); | 302 | sbs = sizeof (a6); |
@@ -380,7 +380,7 @@ process_interfaces (void *cls, | |||
380 | } | 380 | } |
381 | else if (af == AF_INET6) | 381 | else if (af == AF_INET6) |
382 | { | 382 | { |
383 | memcpy (t6.ipv6_addr, | 383 | memcpy (&t6.ipv6_addr, |
384 | ((struct sockaddr_in6 *) addr)->sin6_addr.s6_addr, | 384 | ((struct sockaddr_in6 *) addr)->sin6_addr.s6_addr, |
385 | 16); | 385 | 16); |
386 | t6.u6_port = htons (plugin->adv_port); | 386 | t6.u6_port = htons (plugin->adv_port); |
@@ -540,7 +540,7 @@ udp_plugin_select (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
540 | { | 540 | { |
541 | s6 = (const struct sockaddr_in6*) &addr; | 541 | s6 = (const struct sockaddr_in6*) &addr; |
542 | t6.u6_port = s6->sin6_port; | 542 | t6.u6_port = s6->sin6_port; |
543 | memcpy (t6.ipv6_addr, | 543 | memcpy (&t6.ipv6_addr, |
544 | s6->sin6_addr.s6_addr, | 544 | s6->sin6_addr.s6_addr, |
545 | 16); | 545 | 16); |
546 | ca = &t6; | 546 | ca = &t6; |
@@ -783,7 +783,7 @@ udp_plugin_address_pretty_printer (void *cls, | |||
783 | a6.sin6_port = t6->u6_port; | 783 | a6.sin6_port = t6->u6_port; |
784 | port = ntohs (t6->u6_port); | 784 | port = ntohs (t6->u6_port); |
785 | memcpy (a6.sin6_addr.s6_addr, | 785 | memcpy (a6.sin6_addr.s6_addr, |
786 | t6->ipv6_addr, | 786 | &t6->ipv6_addr, |
787 | 16); | 787 | 16); |
788 | sb = &a6; | 788 | sb = &a6; |
789 | sbs = sizeof (a6); | 789 | sbs = sizeof (a6); |
@@ -850,7 +850,7 @@ udp_address_to_string (void *cls, | |||
850 | t6 = addr; | 850 | t6 = addr; |
851 | af = AF_INET6; | 851 | af = AF_INET6; |
852 | port = ntohs (t6->u6_port); | 852 | port = ntohs (t6->u6_port); |
853 | memcpy (&a6, t6->ipv6_addr, sizeof (a6)); | 853 | memcpy (&a6, &t6->ipv6_addr, sizeof (a6)); |
854 | sb = &a6; | 854 | sb = &a6; |
855 | } | 855 | } |
856 | else if (addrlen == sizeof (struct IPv4UdpAddress)) | 856 | else if (addrlen == sizeof (struct IPv4UdpAddress)) |