diff options
author | Christian Grothoff <christian@grothoff.org> | 2010-11-24 12:01:52 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2010-11-24 12:01:52 +0000 |
commit | 1ad2882cb8779c07dc4930dca417c84f6ffeba38 (patch) | |
tree | c98f11954bccd42a6b6a8d4f33ceb9b742cc342f | |
parent | 364b7d59c77677d3b18478118f3636515ad4d0ed (diff) | |
download | gnunet-1ad2882cb8779c07dc4930dca417c84f6ffeba38.tar.gz gnunet-1ad2882cb8779c07dc4930dca417c84f6ffeba38.zip |
style
-rw-r--r-- | src/transport/plugin_transport_tcp.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/src/transport/plugin_transport_tcp.c b/src/transport/plugin_transport_tcp.c index 94f1eb329..015de3d8a 100644 --- a/src/transport/plugin_transport_tcp.c +++ b/src/transport/plugin_transport_tcp.c | |||
@@ -1960,8 +1960,12 @@ process_interfaces (void *cls, | |||
1960 | { | 1960 | { |
1961 | case AF_INET: | 1961 | case AF_INET: |
1962 | t4.ipv4_addr = ((struct sockaddr_in *) addr)->sin_addr.s_addr; | 1962 | t4.ipv4_addr = ((struct sockaddr_in *) addr)->sin_addr.s_addr; |
1963 | GNUNET_assert(NULL != inet_ntop(AF_INET, &t4.ipv4_addr, &buf[0], INET_ADDRSTRLEN)); | 1963 | GNUNET_assert (NULL != inet_ntop(AF_INET, |
1964 | if ((plugin->bind_address != NULL) && (0 != strcmp(buf, plugin->bind_address))) | 1964 | &t4.ipv4_addr, |
1965 | &buf[0], | ||
1966 | INET_ADDRSTRLEN)); | ||
1967 | if ( (plugin->bind_address != NULL) && | ||
1968 | (0 != strcmp(buf, plugin->bind_address)) ) | ||
1965 | { | 1969 | { |
1966 | GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, | 1970 | GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, |
1967 | "tcp", | 1971 | "tcp", |
@@ -1985,7 +1989,9 @@ process_interfaces (void *cls, | |||
1985 | break; | 1989 | break; |
1986 | case AF_INET6: | 1990 | case AF_INET6: |
1987 | if ( (IN6_IS_ADDR_LINKLOCAL (&((struct sockaddr_in6 *) addr)->sin6_addr)) || | 1991 | if ( (IN6_IS_ADDR_LINKLOCAL (&((struct sockaddr_in6 *) addr)->sin6_addr)) || |
1988 | (GNUNET_YES == GNUNET_CONFIGURATION_get_value_yesno(plugin->env->cfg, "transport-tcp", "DISABLEV6")) ) | 1992 | (GNUNET_YES == GNUNET_CONFIGURATION_get_value_yesno(plugin->env->cfg, |
1993 | "transport-tcp", | ||
1994 | "DISABLEV6")) ) | ||
1989 | { | 1995 | { |
1990 | /* skip link local addresses */ | 1996 | /* skip link local addresses */ |
1991 | return GNUNET_OK; | 1997 | return GNUNET_OK; |
@@ -1994,7 +2000,8 @@ process_interfaces (void *cls, | |||
1994 | &((struct sockaddr_in6 *) addr)->sin6_addr, | 2000 | &((struct sockaddr_in6 *) addr)->sin6_addr, |
1995 | sizeof (struct in6_addr)); | 2001 | sizeof (struct in6_addr)); |
1996 | add_to_address_list (plugin, &t6.ipv6_addr, sizeof (struct in6_addr)); | 2002 | add_to_address_list (plugin, &t6.ipv6_addr, sizeof (struct in6_addr)); |
1997 | if ((plugin->behind_nat == GNUNET_YES) && (plugin->only_nat_addresses == GNUNET_YES)) | 2003 | if ( (plugin->behind_nat == GNUNET_YES) && |
2004 | (plugin->only_nat_addresses == GNUNET_YES) ) | ||
1998 | t6.t6_port = htons(0); | 2005 | t6.t6_port = htons(0); |
1999 | else if (plugin->behind_nat == GNUNET_YES) /* We are behind NAT, but will advertise NAT and normal addresses */ | 2006 | else if (plugin->behind_nat == GNUNET_YES) /* We are behind NAT, but will advertise NAT and normal addresses */ |
2000 | { | 2007 | { |