diff options
author | Christian Grothoff <christian@grothoff.org> | 2010-03-18 14:33:34 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2010-03-18 14:33:34 +0000 |
commit | 2fc9115f16dbc9aeebd54b55038d67209cd8d566 (patch) | |
tree | 5ebb26bdf39bdc9b5318b3fd5f7a8ddee1d9e551 /src/transport | |
parent | e96eebe6c1fc697b1913e8e36266849d64114786 (diff) | |
download | gnunet-2fc9115f16dbc9aeebd54b55038d67209cd8d566.tar.gz gnunet-2fc9115f16dbc9aeebd54b55038d67209cd8d566.zip |
fix
Diffstat (limited to 'src/transport')
-rw-r--r-- | src/transport/plugin_transport_udp.c | 13 | ||||
-rw-r--r-- | src/transport/test_transport_api_udp_peer1.conf | 2 | ||||
-rw-r--r-- | src/transport/test_transport_api_udp_peer2.conf | 2 |
3 files changed, 6 insertions, 11 deletions
diff --git a/src/transport/plugin_transport_udp.c b/src/transport/plugin_transport_udp.c index 3d57c09a8..739716b17 100644 --- a/src/transport/plugin_transport_udp.c +++ b/src/transport/plugin_transport_udp.c | |||
@@ -42,17 +42,12 @@ | |||
42 | 42 | ||
43 | #define DEBUG_UDP GNUNET_NO | 43 | #define DEBUG_UDP GNUNET_NO |
44 | 44 | ||
45 | /* | 45 | /** |
46 | * Transport cost to peer, always 1 for UDP (direct connection) | 46 | * Transport cost to peer, always 1 for UDP (direct connection) |
47 | */ | 47 | */ |
48 | #define UDP_DIRECT_DISTANCE 1 | 48 | #define UDP_DIRECT_DISTANCE 1 |
49 | 49 | ||
50 | /** | 50 | /** |
51 | * Handle for request of hostname resolution, non-NULL if pending. | ||
52 | */ | ||
53 | static struct GNUNET_RESOLVER_RequestHandle *hostname_dns; | ||
54 | |||
55 | /** | ||
56 | * How long until we give up on transmitting the welcome message? | 51 | * How long until we give up on transmitting the welcome message? |
57 | */ | 52 | */ |
58 | #define HOSTNAME_RESOLVE_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5) | 53 | #define HOSTNAME_RESOLVE_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5) |
@@ -760,10 +755,10 @@ libgnunet_plugin_transport_udp_done (void *cls) | |||
760 | struct Plugin *plugin = api->cls; | 755 | struct Plugin *plugin = api->cls; |
761 | 756 | ||
762 | udp_transport_server_stop (plugin); | 757 | udp_transport_server_stop (plugin); |
763 | if (NULL != hostname_dns) | 758 | if (NULL != plugin->hostname_dns) |
764 | { | 759 | { |
765 | GNUNET_RESOLVER_request_cancel (hostname_dns); | 760 | GNUNET_RESOLVER_request_cancel (plugin->hostname_dns); |
766 | hostname_dns = NULL; | 761 | plugin->hostname_dns = NULL; |
767 | } | 762 | } |
768 | GNUNET_SERVICE_stop (plugin->service); | 763 | GNUNET_SERVICE_stop (plugin->service); |
769 | 764 | ||
diff --git a/src/transport/test_transport_api_udp_peer1.conf b/src/transport/test_transport_api_udp_peer1.conf index a62f153d9..e33b5de9a 100644 --- a/src/transport/test_transport_api_udp_peer1.conf +++ b/src/transport/test_transport_api_udp_peer1.conf | |||
@@ -71,7 +71,7 @@ CONFIG = $DEFAULTCONFIG | |||
71 | HOME = $SERVICEHOME | 71 | HOME = $SERVICEHOME |
72 | HOSTNAME = localhost | 72 | HOSTNAME = localhost |
73 | PORT = 12365 | 73 | PORT = 12365 |
74 | PREFIX = valgrind --track-origins=yes --leak-check=full --log-file=valgrind_udp_peer1.log | 74 | #PREFIX = valgrind --track-origins=yes --leak-check=full --log-file=valgrind_udp_peer1.log |
75 | #PREFIX = xterm -e xterm -T transport -e gdb --args | 75 | #PREFIX = xterm -e xterm -T transport -e gdb --args |
76 | 76 | ||
77 | [peerinfo] | 77 | [peerinfo] |
diff --git a/src/transport/test_transport_api_udp_peer2.conf b/src/transport/test_transport_api_udp_peer2.conf index bf14f16a3..f10aedd1f 100644 --- a/src/transport/test_transport_api_udp_peer2.conf +++ b/src/transport/test_transport_api_udp_peer2.conf | |||
@@ -72,7 +72,7 @@ CONFIG = $DEFAULTCONFIG | |||
72 | HOME = $SERVICEHOME | 72 | HOME = $SERVICEHOME |
73 | HOSTNAME = localhost | 73 | HOSTNAME = localhost |
74 | PORT = 22365 | 74 | PORT = 22365 |
75 | PREFIX = valgrind --track-origins=yes --leak-check=full --log-file=valgrind_udp_peer2.log | 75 | #PREFIX = valgrind --track-origins=yes --leak-check=full --log-file=valgrind_udp_peer2.log |
76 | 76 | ||
77 | [peerinfo] | 77 | [peerinfo] |
78 | TRUST = $SERVICEHOME/data/credit/ | 78 | TRUST = $SERVICEHOME/data/credit/ |