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_tcp.c | |
parent | 1d338b90e93c843c8a89290230ef0fe115021499 (diff) | |
download | gnunet-16d34819087d7fa77bcb6f4b5e9e73d7e3220c4d.tar.gz gnunet-16d34819087d7fa77bcb6f4b5e9e73d7e3220c4d.zip |
fix compile error on FBSD
Diffstat (limited to 'src/transport/plugin_transport_tcp.c')
-rw-r--r-- | src/transport/plugin_transport_tcp.c | 14 |
1 files changed, 7 insertions, 7 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 | |||
89 | /** | 89 | /** |
90 | * IPv6 address. | 90 | * IPv6 address. |
91 | */ | 91 | */ |
92 | unsigned char ipv6_addr[16]; | 92 | struct in6_addr ipv6_addr; |
93 | 93 | ||
94 | /** | 94 | /** |
95 | * Port number, in network byte order. | 95 | * Port number, in network byte order. |
@@ -326,7 +326,7 @@ tcp_address_to_string (void *cls, | |||
326 | t6 = addr; | 326 | t6 = addr; |
327 | af = AF_INET6; | 327 | af = AF_INET6; |
328 | port = ntohs (t6->t6_port); | 328 | port = ntohs (t6->t6_port); |
329 | memcpy (&a6, t6->ipv6_addr, sizeof (a6)); | 329 | memcpy (&a6, &t6->ipv6_addr, sizeof (a6)); |
330 | sb = &a6; | 330 | sb = &a6; |
331 | } | 331 | } |
332 | else if (addrlen == sizeof (struct IPv4TcpAddress)) | 332 | else if (addrlen == sizeof (struct IPv4TcpAddress)) |
@@ -857,7 +857,7 @@ tcp_plugin_send (void *cls, | |||
857 | a6.sin6_family = AF_INET6; | 857 | a6.sin6_family = AF_INET6; |
858 | a6.sin6_port = t6->t6_port; | 858 | a6.sin6_port = t6->t6_port; |
859 | memcpy (a6.sin6_addr.s6_addr, | 859 | memcpy (a6.sin6_addr.s6_addr, |
860 | t6->ipv6_addr, | 860 | &t6->ipv6_addr, |
861 | 16); | 861 | 16); |
862 | sb = &a6; | 862 | sb = &a6; |
863 | sbs = sizeof (a6); | 863 | sbs = sizeof (a6); |
@@ -1086,7 +1086,7 @@ tcp_plugin_address_pretty_printer (void *cls, | |||
1086 | a6.sin6_family = AF_INET6; | 1086 | a6.sin6_family = AF_INET6; |
1087 | a6.sin6_port = t6->t6_port; | 1087 | a6.sin6_port = t6->t6_port; |
1088 | memcpy (a6.sin6_addr.s6_addr, | 1088 | memcpy (a6.sin6_addr.s6_addr, |
1089 | t6->ipv6_addr, | 1089 | &t6->ipv6_addr, |
1090 | 16); | 1090 | 16); |
1091 | port = ntohs (t6->t6_port); | 1091 | port = ntohs (t6->t6_port); |
1092 | sb = &a6; | 1092 | sb = &a6; |
@@ -1176,7 +1176,7 @@ tcp_plugin_check_address (void *cls, void *addr, size_t addrlen) | |||
1176 | else | 1176 | else |
1177 | { | 1177 | { |
1178 | v6 = (struct IPv6TcpAddress *) addr; | 1178 | v6 = (struct IPv6TcpAddress *) addr; |
1179 | if (IN6_IS_ADDR_LINKLOCAL (v6->ipv6_addr)) | 1179 | if (IN6_IS_ADDR_LINKLOCAL (&v6->ipv6_addr)) |
1180 | { | 1180 | { |
1181 | GNUNET_break_op (0); | 1181 | GNUNET_break_op (0); |
1182 | return GNUNET_SYSERR; | 1182 | return GNUNET_SYSERR; |
@@ -1253,7 +1253,7 @@ handle_tcp_welcome (void *cls, | |||
1253 | s6 = vaddr; | 1253 | s6 = vaddr; |
1254 | t6 = GNUNET_malloc (sizeof (struct IPv6TcpAddress)); | 1254 | t6 = GNUNET_malloc (sizeof (struct IPv6TcpAddress)); |
1255 | t6->t6_port = s6->sin6_port; | 1255 | t6->t6_port = s6->sin6_port; |
1256 | memcpy (t6->ipv6_addr, | 1256 | memcpy (&t6->ipv6_addr, |
1257 | s6->sin6_addr.s6_addr, | 1257 | s6->sin6_addr.s6_addr, |
1258 | 16); | 1258 | 16); |
1259 | session->connect_addr = t6; | 1259 | session->connect_addr = t6; |
@@ -1456,7 +1456,7 @@ process_interfaces (void *cls, | |||
1456 | /* skip link local addresses */ | 1456 | /* skip link local addresses */ |
1457 | return GNUNET_OK; | 1457 | return GNUNET_OK; |
1458 | } | 1458 | } |
1459 | memcpy (t6.ipv6_addr, | 1459 | memcpy (&t6.ipv6_addr, |
1460 | ((struct sockaddr_in6 *) addr)->sin6_addr.s6_addr, | 1460 | ((struct sockaddr_in6 *) addr)->sin6_addr.s6_addr, |
1461 | 16); | 1461 | 16); |
1462 | t6.t6_port = htons (plugin->adv_port); | 1462 | t6.t6_port = htons (plugin->adv_port); |