diff options
Diffstat (limited to 'src/gns')
-rw-r--r-- | src/gns/gnunet-dns2gns.c | 21 | ||||
-rw-r--r-- | src/gns/test_gns_lookup.conf | 3 | ||||
-rw-r--r-- | src/gns/test_gns_nick_shorten.conf | 3 | ||||
-rw-r--r-- | src/gns/test_gns_proxy.conf | 1 | ||||
-rw-r--r-- | src/gns/test_gns_simple_lookup.conf | 3 |
5 files changed, 15 insertions, 16 deletions
diff --git a/src/gns/gnunet-dns2gns.c b/src/gns/gnunet-dns2gns.c index a19a97cf3..bd909f938 100644 --- a/src/gns/gnunet-dns2gns.c +++ b/src/gns/gnunet-dns2gns.c | |||
@@ -200,10 +200,16 @@ do_shutdown (void *cls, | |||
200 | GNUNET_IDENTITY_disconnect (identity); | 200 | GNUNET_IDENTITY_disconnect (identity); |
201 | identity = NULL; | 201 | identity = NULL; |
202 | } | 202 | } |
203 | GNUNET_GNS_disconnect (gns); | 203 | if (NULL != gns) |
204 | gns = NULL; | 204 | { |
205 | GNUNET_DNSSTUB_stop (dns_stub); | 205 | GNUNET_GNS_disconnect (gns); |
206 | dns_stub = NULL; | 206 | gns = NULL; |
207 | } | ||
208 | if (NULL != dns_stub) | ||
209 | { | ||
210 | GNUNET_DNSSTUB_stop (dns_stub); | ||
211 | dns_stub = NULL; | ||
212 | } | ||
207 | } | 213 | } |
208 | 214 | ||
209 | 215 | ||
@@ -448,9 +454,10 @@ handle_request (struct GNUNET_NETWORK_Handle *lsock, | |||
448 | strcpy (&name[name_len - strlen (fcfs_suffix)], | 454 | strcpy (&name[name_len - strlen (fcfs_suffix)], |
449 | ".gnu"); | 455 | ".gnu"); |
450 | use_gns = GNUNET_YES; | 456 | use_gns = GNUNET_YES; |
451 | } else if ( (name_len > strlen (dns_suffix)) && | 457 | } |
452 | (0 == strcasecmp (dns_suffix, | 458 | else if ( (name_len > strlen (dns_suffix)) && |
453 | &name[name_len - strlen (dns_suffix)])) ) | 459 | (0 == strcasecmp (dns_suffix, |
460 | &name[name_len - strlen (dns_suffix)])) ) | ||
454 | { | 461 | { |
455 | /* replace ".zkey.eu" with ".zkey" */ | 462 | /* replace ".zkey.eu" with ".zkey" */ |
456 | strcpy (&name[name_len - strlen (dns_suffix)], | 463 | strcpy (&name[name_len - strlen (dns_suffix)], |
diff --git a/src/gns/test_gns_lookup.conf b/src/gns/test_gns_lookup.conf index 219d82f8a..ea8c7c3fc 100644 --- a/src/gns/test_gns_lookup.conf +++ b/src/gns/test_gns_lookup.conf | |||
@@ -9,9 +9,6 @@ AUTOSTART = YES | |||
9 | [transport] | 9 | [transport] |
10 | PLUGINS = | 10 | PLUGINS = |
11 | 11 | ||
12 | [arm] | ||
13 | DEFAULTSERVICES = | ||
14 | |||
15 | [gns] | 12 | [gns] |
16 | #PREFIX = valgrind --leak-check=full --track-origins=yes | 13 | #PREFIX = valgrind --leak-check=full --track-origins=yes |
17 | AUTOSTART = YES | 14 | AUTOSTART = YES |
diff --git a/src/gns/test_gns_nick_shorten.conf b/src/gns/test_gns_nick_shorten.conf index 73a713413..eac9fee43 100644 --- a/src/gns/test_gns_nick_shorten.conf +++ b/src/gns/test_gns_nick_shorten.conf | |||
@@ -9,9 +9,6 @@ AUTOSTART = YES | |||
9 | [transport] | 9 | [transport] |
10 | PLUGINS = | 10 | PLUGINS = |
11 | 11 | ||
12 | [arm] | ||
13 | DEFAULTSERVICES = | ||
14 | |||
15 | [gns] | 12 | [gns] |
16 | #PREFIX = valgrind --leak-check=full --track-origins=yes | 13 | #PREFIX = valgrind --leak-check=full --track-origins=yes |
17 | AUTOSTART = YES | 14 | AUTOSTART = YES |
diff --git a/src/gns/test_gns_proxy.conf b/src/gns/test_gns_proxy.conf index da6a1823a..973c0257e 100644 --- a/src/gns/test_gns_proxy.conf +++ b/src/gns/test_gns_proxy.conf | |||
@@ -5,7 +5,6 @@ GNUNET_TEST_HOME = /tmp/gnunet-test-gns-proxy/ | |||
5 | PLUGINS = tcp | 5 | PLUGINS = tcp |
6 | 6 | ||
7 | [arm] | 7 | [arm] |
8 | DEFAULTSERVICES = statistics dns namestore gns | ||
9 | PORT = 0 | 8 | PORT = 0 |
10 | ALLOW_SHUTDOWN = YES | 9 | ALLOW_SHUTDOWN = YES |
11 | 10 | ||
diff --git a/src/gns/test_gns_simple_lookup.conf b/src/gns/test_gns_simple_lookup.conf index d1aef4ca7..77ee8fc18 100644 --- a/src/gns/test_gns_simple_lookup.conf +++ b/src/gns/test_gns_simple_lookup.conf | |||
@@ -33,7 +33,6 @@ WAN_QUOTA_OUT = 1 GB | |||
33 | PORT = 12092 | 33 | PORT = 12092 |
34 | 34 | ||
35 | [arm] | 35 | [arm] |
36 | DEFAULTSERVICES = core dht namestore gns | ||
37 | PORT = 12366 | 36 | PORT = 12366 |
38 | 37 | ||
39 | [transport-tcp] | 38 | [transport-tcp] |
@@ -59,7 +58,7 @@ AUTOSTART = YES | |||
59 | DNS_EXIT = 8.8.8.8 | 58 | DNS_EXIT = 8.8.8.8 |
60 | 59 | ||
61 | [gns] | 60 | [gns] |
62 | #PREFIX = valgrind --leak-check=full --track-origins=yes | 61 | #PREFIX = valgrind --leak-check=full --track-origins=yes |
63 | AUTOSTART = YES | 62 | AUTOSTART = YES |
64 | BINARY = gnunet-service-gns | 63 | BINARY = gnunet-service-gns |
65 | ZONEKEY = zonefiles/test_zonekey | 64 | ZONEKEY = zonefiles/test_zonekey |