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 @@
 
 #define DEBUG_UDP GNUNET_NO
 
-/*
+/**
  * Transport cost to peer, always 1 for UDP (direct connection)
  */
 #define UDP_DIRECT_DISTANCE 1
 
 /**
- * Handle for request of hostname resolution, non-NULL if pending.
- */
-static struct GNUNET_RESOLVER_RequestHandle *hostname_dns;
-
-/**
  * How long until we give up on transmitting the welcome message?
  */
 #define HOSTNAME_RESOLVE_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5)
@@ -760,10 +755,10 @@ libgnunet_plugin_transport_udp_done (void *cls)
   struct Plugin *plugin = api->cls;
 
   udp_transport_server_stop (plugin);
-  if (NULL != hostname_dns)
+  if (NULL != plugin->hostname_dns)
     {
-      GNUNET_RESOLVER_request_cancel (hostname_dns);
-      hostname_dns = NULL;
+      GNUNET_RESOLVER_request_cancel (plugin->hostname_dns);
+      plugin->hostname_dns = NULL;
     }
   GNUNET_SERVICE_stop (plugin->service);
 
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
 HOME = $SERVICEHOME
 HOSTNAME = localhost
 PORT = 12365
-PREFIX = valgrind --track-origins=yes --leak-check=full --log-file=valgrind_udp_peer1.log
+#PREFIX = valgrind --track-origins=yes --leak-check=full --log-file=valgrind_udp_peer1.log
 #PREFIX = xterm -e xterm -T transport -e gdb --args 
 
 [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
 HOME = $SERVICEHOME
 HOSTNAME = localhost
 PORT = 22365
-PREFIX = valgrind --track-origins=yes --leak-check=full --log-file=valgrind_udp_peer2.log
+#PREFIX = valgrind --track-origins=yes --leak-check=full --log-file=valgrind_udp_peer2.log
 
 [peerinfo]
 TRUST = $SERVICEHOME/data/credit/