diff options
author | Philipp Tölke <toelke@in.tum.de> | 2011-08-02 07:34:38 +0000 |
---|---|---|
committer | Philipp Tölke <toelke@in.tum.de> | 2011-08-02 07:34:38 +0000 |
commit | 55770b3e05a212890f46250f2babdbac502da774 (patch) | |
tree | 387e66b41d4c10a5f441ef9c2e8d9cef0c051591 /src/vpn/gnunet-service-dns.c | |
parent | 8d05776bcb9f306821a4e1ae64550cf9e180591e (diff) | |
download | gnunet-55770b3e05a212890f46250f2babdbac502da774.tar.gz gnunet-55770b3e05a212890f46250f2babdbac502da774.zip |
Revert "save the dns-tunnel"
This reverts commit 239ce5412a61e92edcd372c1a751c54763f5f80f.
Diffstat (limited to 'src/vpn/gnunet-service-dns.c')
-rw-r--r-- | src/vpn/gnunet-service-dns.c | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/src/vpn/gnunet-service-dns.c b/src/vpn/gnunet-service-dns.c index ce27fe6a0..e71acbe50 100644 --- a/src/vpn/gnunet-service-dns.c +++ b/src/vpn/gnunet-service-dns.c | |||
@@ -44,11 +44,6 @@ | |||
44 | struct GNUNET_MESH_Handle *mesh_handle; | 44 | struct GNUNET_MESH_Handle *mesh_handle; |
45 | 45 | ||
46 | /** | 46 | /** |
47 | * The tunnel to send queries | ||
48 | */ | ||
49 | static struct GNUNET_MESH_Tunnel* dns_tunnel; | ||
50 | |||
51 | /** | ||
52 | * The UDP-Socket through which DNS-Resolves will be sent if they are not to be | 47 | * The UDP-Socket through which DNS-Resolves will be sent if they are not to be |
53 | * sent through gnunet. The port of this socket will not be hijacked. | 48 | * sent through gnunet. The port of this socket will not be hijacked. |
54 | */ | 49 | */ |
@@ -360,14 +355,13 @@ send_mesh_query (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
360 | 355 | ||
361 | struct tunnel_cls *cls_ = (struct tunnel_cls*)cls; | 356 | struct tunnel_cls *cls_ = (struct tunnel_cls*)cls; |
362 | 357 | ||
363 | if (NULL == dns_tunnel) | 358 | cls_->tunnel = GNUNET_MESH_peer_request_connect_by_type(mesh_handle, |
364 | dns_tunnel = GNUNET_MESH_peer_request_connect_by_type(mesh_handle, | 359 | GNUNET_TIME_UNIT_HOURS, |
365 | GNUNET_TIME_UNIT_HOURS, | 360 | GNUNET_APPLICATION_TYPE_INTERNET_RESOLVER, |
366 | GNUNET_APPLICATION_TYPE_INTERNET_RESOLVER, | 361 | mesh_connect, |
367 | mesh_connect, | 362 | NULL, |
368 | NULL, | 363 | cls_); |
369 | cls_); | 364 | |
370 | cls_->tunnel = dns_tunnel; | ||
371 | remote_pending[cls_->dns.s.id] = cls_; | 365 | remote_pending[cls_->dns.s.id] = cls_; |
372 | } | 366 | } |
373 | 367 | ||