[GNUnet-SVN] r11125 - gnunet/src/hostlist

[gnunet]

Author: wachs
Date: 2010-04-30 09:48:14 +0200 (Fri, 30 Apr 2010)
New Revision: 11125

Modified:
   gnunet/src/hostlist/hostlist-server.c
   gnunet/src/hostlist/test_gnunet_daemon_hostlist_learning.c
   gnunet/src/hostlist/test_learning_adv_peer.conf
Log:
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

Modified: gnunet/src/hostlist/hostlist-server.c
===================================================================
--- gnunet/src/hostlist/hostlist-server.c       2010-04-30 07:34:25 UTC (rev 
11124)
+++ gnunet/src/hostlist/hostlist-server.c       2010-04-30 07:48:14 UTC (rev 
11125)
@@ -602,10 +602,9 @@
                                                   &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 ();
 

Modified: gnunet/src/hostlist/test_gnunet_daemon_hostlist_learning.c
===================================================================
--- gnunet/src/hostlist/test_gnunet_daemon_hostlist_learning.c  2010-04-30 
07:34:25 UTC (rev 11124)
+++ gnunet/src/hostlist/test_gnunet_daemon_hostlist_learning.c  2010-04-30 
07:48:14 UTC (rev 11125)
@@ -293,7 +293,7 @@
 
   if ( GNUNET_SYSERR  == GNUNET_CONFIGURATION_get_value_string (adv_peer.cfg,
                                                    "HOSTLIST",
-                                                   "HOSTNAME",
+                                                   "EXTERNAL_DNS_NAME",
                                                    &hostname))
     hostname = GNUNET_RESOLVER_local_fqdn_get ();
 

Modified: gnunet/src/hostlist/test_learning_adv_peer.conf
===================================================================
--- gnunet/src/hostlist/test_learning_adv_peer.conf     2010-04-30 07:34:25 UTC 
(rev 11124)
+++ gnunet/src/hostlist/test_learning_adv_peer.conf     2010-04-30 07:48:14 UTC 
(rev 11125)
@@ -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 @@
 WEAKRANDOM = YES
 
 [hostlist]
-HOSTNAME = localhost
+EXTERNAL_DNS_NAME = localhost
 HTTPPORT = 12981
 SERVERS = http://localhost:12981/
 OPTIONS = -p -a