diff options
author | Christian Grothoff <christian@grothoff.org> | 2012-06-02 07:14:17 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2012-06-02 07:14:17 +0000 |
commit | ce3b8ae67aea16ab220d51669d5dbf25b8597f60 (patch) | |
tree | 6cf1b2f2588a63ee074b0e061d9fdf97a303613b /src/transport/plugin_transport_tcp.c | |
parent | e3e29a9dce520c5ebc372d890f8f59c19d83e65d (diff) | |
download | gnunet-ce3b8ae67aea16ab220d51669d5dbf25b8597f60.tar.gz gnunet-ce3b8ae67aea16ab220d51669d5dbf25b8597f60.zip |
-fix
Diffstat (limited to 'src/transport/plugin_transport_tcp.c')
-rw-r--r-- | src/transport/plugin_transport_tcp.c | 38 |
1 files changed, 21 insertions, 17 deletions
diff --git a/src/transport/plugin_transport_tcp.c b/src/transport/plugin_transport_tcp.c index 4d742eced..af5c71540 100644 --- a/src/transport/plugin_transport_tcp.c +++ b/src/transport/plugin_transport_tcp.c | |||
@@ -647,24 +647,28 @@ tcp_string_to_address (void *cls, const char *addr, uint16_t addrlen, | |||
647 | switch (socket_address.ss_family) | 647 | switch (socket_address.ss_family) |
648 | { | 648 | { |
649 | case AF_INET: | 649 | case AF_INET: |
650 | struct IPv4TcpAddress *t4; | 650 | { |
651 | struct sockaddr_in *in4 = (struct sockaddr_in *) &socket_address; | 651 | struct IPv4TcpAddress *t4; |
652 | 652 | struct sockaddr_in *in4 = (struct sockaddr_in *) &socket_address; | |
653 | t4 = GNUNET_malloc (sizeof (struct IPv4TcpAddress)); | 653 | |
654 | t4->ipv4_addr = in4->sin_addr.s_addr; | 654 | t4 = GNUNET_malloc (sizeof (struct IPv4TcpAddress)); |
655 | t4->t4_port = in4->sin_port; | 655 | t4->ipv4_addr = in4->sin_addr.s_addr; |
656 | *buf = t4; | 656 | t4->t4_port = in4->sin_port; |
657 | *added = sizeof (struct IPv4TcpAddress); | 657 | *buf = t4; |
658 | return GNUNET_OK; | 658 | *added = sizeof (struct IPv4TcpAddress); |
659 | return GNUNET_OK; | ||
660 | } | ||
659 | case AF_INET6: | 661 | case AF_INET6: |
660 | struct IPv6TcpAddress *t6; | 662 | { |
661 | struct sockaddr_in6 *in6 = (struct sockaddr_in6 *) &socket_address; | 663 | struct IPv6TcpAddress *t6; |
662 | t6 = GNUNET_malloc (sizeof (struct IPv6TcpAddress)); | 664 | struct sockaddr_in6 *in6 = (struct sockaddr_in6 *) &socket_address; |
663 | t6->ipv6_addr = in6->sin6_addr; | 665 | t6 = GNUNET_malloc (sizeof (struct IPv6TcpAddress)); |
664 | t6->t6_port = in6->sin6_port; | 666 | t6->ipv6_addr = in6->sin6_addr; |
665 | *buf = t6; | 667 | t6->t6_port = in6->sin6_port; |
666 | *added = sizeof (struct IPv6TcpAddress); | 668 | *buf = t6; |
667 | return GNUNET_OK; | 669 | *added = sizeof (struct IPv6TcpAddress); |
670 | return GNUNET_OK; | ||
671 | } | ||
668 | default: | 672 | default: |
669 | return GNUNET_SYSERR; | 673 | return GNUNET_SYSERR; |
670 | } | 674 | } |