diff options
author | Christian Grothoff <christian@grothoff.org> | 2015-10-07 10:11:29 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2015-10-07 10:11:29 +0000 |
commit | 6c83690184e6f258e61d8187ad5999f4f87f2e49 (patch) | |
tree | e64f62d92cd88b0fe5e663b1671934bd8f45f778 /src/util/connection.c | |
parent | c787d89df7c64eceb6145b0a8847736641ea73ca (diff) | |
download | gnunet-6c83690184e6f258e61d8187ad5999f4f87f2e49.tar.gz gnunet-6c83690184e6f258e61d8187ad5999f4f87f2e49.zip |
enable clean up of NAT STUN state, prevents test_plugin_udp from segfaulting
Diffstat (limited to 'src/util/connection.c')
-rw-r--r-- | src/util/connection.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/util/connection.c b/src/util/connection.c index 5f40dc894..5362a5685 100644 --- a/src/util/connection.c +++ b/src/util/connection.c | |||
@@ -738,9 +738,9 @@ try_connect_using_address (void *cls, | |||
738 | if (NULL == addr) | 738 | if (NULL == addr) |
739 | { | 739 | { |
740 | connection->dns_active = NULL; | 740 | connection->dns_active = NULL; |
741 | if ((NULL == connection->ap_head) && | 741 | if ((NULL == connection->ap_head) && |
742 | (NULL == connection->sock) && | 742 | (NULL == connection->sock) && |
743 | (NULL == connection->proxy_handshake)) | 743 | (NULL == connection->proxy_handshake)) |
744 | connect_fail_continuation (connection); | 744 | connect_fail_continuation (connection); |
745 | return; | 745 | return; |
746 | } | 746 | } |
@@ -991,8 +991,8 @@ GNUNET_CONNECTION_create_from_sockaddr (int af_family, | |||
991 | int | 991 | int |
992 | GNUNET_CONNECTION_check (struct GNUNET_CONNECTION_Handle *connection) | 992 | GNUNET_CONNECTION_check (struct GNUNET_CONNECTION_Handle *connection) |
993 | { | 993 | { |
994 | if ((NULL != connection->ap_head) || | 994 | if ((NULL != connection->ap_head) || |
995 | (NULL != connection->dns_active) || | 995 | (NULL != connection->dns_active) || |
996 | (NULL != connection->proxy_handshake)) | 996 | (NULL != connection->proxy_handshake)) |
997 | return GNUNET_YES; /* still trying to connect */ | 997 | return GNUNET_YES; /* still trying to connect */ |
998 | if ( (0 != connection->destroy_later) || | 998 | if ( (0 != connection->destroy_later) || |
@@ -1588,7 +1588,7 @@ GNUNET_CONNECTION_create_proxied_from_handshake (struct GNUNET_CONNECTION_Handle | |||
1588 | 1588 | ||
1589 | 1589 | ||
1590 | /** | 1590 | /** |
1591 | * Activate proxied connection and destroy initial proxy handshake connection. | 1591 | * Activate proxied connection and destroy initial proxy handshake connection. |
1592 | * There must not be any pending requests for reading or writing to the | 1592 | * There must not be any pending requests for reading or writing to the |
1593 | * proxy hadshake connection at this time. | 1593 | * proxy hadshake connection at this time. |
1594 | * | 1594 | * |