diff options
author | Christian Grothoff <christian@grothoff.org> | 2017-02-22 21:42:42 +0100 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2017-02-22 21:42:42 +0100 |
commit | 945443b67fe95893ceb711e1bcd7049477f3cba7 (patch) | |
tree | f9f0c9fd3f1483facaa4e50dbbccd68520137f91 /src/gns/gnunet-service-gns.c | |
parent | cd9531932c72478a3f7c17eb78238daa2302b2ef (diff) | |
download | gnunet-945443b67fe95893ceb711e1bcd7049477f3cba7.tar.gz gnunet-945443b67fe95893ceb711e1bcd7049477f3cba7.zip |
remove dead code and dead linker dependencies
Diffstat (limited to 'src/gns/gnunet-service-gns.c')
-rw-r--r-- | src/gns/gnunet-service-gns.c | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/src/gns/gnunet-service-gns.c b/src/gns/gnunet-service-gns.c index 1e8d07bc5..570c07fdf 100644 --- a/src/gns/gnunet-service-gns.c +++ b/src/gns/gnunet-service-gns.c | |||
@@ -29,14 +29,11 @@ | |||
29 | #include "gnunet_dnsparser_lib.h" | 29 | #include "gnunet_dnsparser_lib.h" |
30 | #include "gnunet_dht_service.h" | 30 | #include "gnunet_dht_service.h" |
31 | #include "gnunet_namecache_service.h" | 31 | #include "gnunet_namecache_service.h" |
32 | #include "gnunet_namestore_service.h" | ||
33 | #include "gnunet_identity_service.h" | 32 | #include "gnunet_identity_service.h" |
34 | #include "gnunet_gns_service.h" | 33 | #include "gnunet_gns_service.h" |
35 | #include "gnunet_statistics_service.h" | 34 | #include "gnunet_statistics_service.h" |
36 | #include "gns.h" | 35 | #include "gns.h" |
37 | #include "gnunet-service-gns_resolver.h" | 36 | #include "gnunet-service-gns_resolver.h" |
38 | #include "gnunet-service-gns_reverser.h" | ||
39 | #include "gnunet-service-gns_shorten.h" | ||
40 | #include "gnunet-service-gns_interceptor.h" | 37 | #include "gnunet-service-gns_interceptor.h" |
41 | #include "gnunet_protocols.h" | 38 | #include "gnunet_protocols.h" |
42 | 39 | ||
@@ -114,11 +111,6 @@ static struct GNUNET_DHT_Handle *dht_handle; | |||
114 | static struct GNUNET_NAMECACHE_Handle *namecache_handle; | 111 | static struct GNUNET_NAMECACHE_Handle *namecache_handle; |
115 | 112 | ||
116 | /** | 113 | /** |
117 | * Our handle to the namestore service | ||
118 | */ | ||
119 | static struct GNUNET_NAMESTORE_Handle *namestore_handle; | ||
120 | |||
121 | /** | ||
122 | * Our handle to the identity service | 114 | * Our handle to the identity service |
123 | */ | 115 | */ |
124 | static struct GNUNET_IDENTITY_Handle *identity_handle; | 116 | static struct GNUNET_IDENTITY_Handle *identity_handle; |
@@ -174,11 +166,6 @@ shutdown_task (void *cls) | |||
174 | GNUNET_NO); | 166 | GNUNET_NO); |
175 | statistics = NULL; | 167 | statistics = NULL; |
176 | } | 168 | } |
177 | if (NULL != namestore_handle) | ||
178 | { | ||
179 | GNUNET_NAMESTORE_disconnect (namestore_handle); | ||
180 | namestore_handle = NULL; | ||
181 | } | ||
182 | if (NULL != namecache_handle) | 169 | if (NULL != namecache_handle) |
183 | { | 170 | { |
184 | GNUNET_NAMECACHE_disconnect (namecache_handle); | 171 | GNUNET_NAMECACHE_disconnect (namecache_handle); |
@@ -447,15 +434,7 @@ run (void *cls, | |||
447 | 434 | ||
448 | v6_enabled = GNUNET_NETWORK_test_pf (PF_INET6); | 435 | v6_enabled = GNUNET_NETWORK_test_pf (PF_INET6); |
449 | v4_enabled = GNUNET_NETWORK_test_pf (PF_INET); | 436 | v4_enabled = GNUNET_NETWORK_test_pf (PF_INET); |
450 | namestore_handle = GNUNET_NAMESTORE_connect (c); | 437 | namecache_handle = GNUNET_NAMECACHE_connect (c); |
451 | if (NULL == namestore_handle) | ||
452 | { | ||
453 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | ||
454 | _("Failed to connect to the namestore!\n")); | ||
455 | GNUNET_SCHEDULER_shutdown (); | ||
456 | return; | ||
457 | } | ||
458 | namecache_handle = GNUNET_NAMECACHE_connect (c); | ||
459 | if (NULL == namecache_handle) | 438 | if (NULL == namecache_handle) |
460 | { | 439 | { |
461 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 440 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |