The external dns name used can now be set in the config file

By default EXTERNAL_DNS_NAME it is set to localhost to prevent the testcase from failing on systems with incorrect name resolution

diff --git a/src/hostlist/hostlist-server.c b/src/hostlist/hostlist-server.c
index 7ea495064e95af3f49abefbfbb4a4eddb29c5b48..b2e939ce05569087ef087297bfe3ec51dd00994d 100644 (file)
--- a/src/hostlist/hostlist-server.c
+++ b/src/hostlist/hostlist-server.c
@@ -602,10 +602,9 @@ GNUNET_HOSTLIST_server_start (const struct GNUNET_CONFIGURATION_Handle *c,
                                                   &port))
     return GNUNET_SYSERR;
 
-
   if ( GNUNET_SYSERR  == GNUNET_CONFIGURATION_get_value_string (cfg,
                                                    "HOSTLIST",
-                                                   "HOSTNAME",
+                                                   "EXTERNAL_DNS_NAME",
                                                    &hostname))
     hostname = GNUNET_RESOLVER_local_fqdn_get ();
 

diff --git a/src/hostlist/test_gnunet_daemon_hostlist_learning.c b/src/hostlist/test_gnunet_daemon_hostlist_learning.c
index 6510bca338bf504225e47637405c0d1a5809cf37..25456908aebc4716afaf52ca61fcfa68c6200d28 100644 (file)
--- a/src/hostlist/test_gnunet_daemon_hostlist_learning.c
+++ b/src/hostlist/test_gnunet_daemon_hostlist_learning.c
@@ -293,7 +293,7 @@ static int ad_arrive_handler (void *cls,
 
   if ( GNUNET_SYSERR  == GNUNET_CONFIGURATION_get_value_string (adv_peer.cfg,
                                                    "HOSTLIST",
-                                                   "HOSTNAME",
+                                                   "EXTERNAL_DNS_NAME",
                                                    &hostname))
     hostname = GNUNET_RESOLVER_local_fqdn_get ();
 

diff --git a/src/hostlist/test_learning_adv_peer.conf b/src/hostlist/test_learning_adv_peer.conf
index 3888b9f47f89efd5fde761de4a060fa5cc0a77e5..fdf3095d506c075ebc38a20fe72ab94bd6d4d612 100644 (file)
--- a/src/hostlist/test_learning_adv_peer.conf
+++ b/src/hostlist/test_learning_adv_peer.conf
@@ -1,6 +1,5 @@
 [PATHS]
 SERVICEHOME = /tmp/test-gnunetd-hostlist-peer-2/
-DEFAULTCONFIG = test_learning_adv_peer.conf
 
 [resolver]
 PORT = 22964
@@ -34,7 +33,7 @@ PORT = 22970
 WEAKRANDOM = YES
 
 [hostlist]
-HOSTNAME = localhost
+EXTERNAL_DNS_NAME = localhost
 HTTPPORT = 12981
 SERVERS = http://localhost:12981/
 OPTIONS = -p -a