aboutsummaryrefslogtreecommitdiff
path: root/src/gns
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2015-05-25 20:59:29 +0000
committerChristian Grothoff <christian@grothoff.org>2015-05-25 20:59:29 +0000
commita1aee7611781a9991c31dbaa36d38c95ad5d5300 (patch)
tree76fa1711815f47f559fbdf02fffb9c5792837d26 /src/gns
parent33a7282c26b14f838ad6f1016b90b710cec5f93f (diff)
downloadgnunet-a1aee7611781a9991c31dbaa36d38c95ad5d5300.tar.gz
gnunet-a1aee7611781a9991c31dbaa36d38c95ad5d5300.zip
-comments, doxygen, indentation, style fixes, working on test_gns_vpn
Diffstat (limited to 'src/gns')
-rw-r--r--src/gns/gns.conf.in3
-rw-r--r--src/gns/gnunet-service-gns.c3
-rw-r--r--src/gns/test_gns_proxy.conf2
3 files changed, 6 insertions, 2 deletions
diff --git a/src/gns/gns.conf.in b/src/gns/gns.conf.in
index 34eda3ac5..7fbd572ab 100644
--- a/src/gns/gns.conf.in
+++ b/src/gns/gns.conf.in
@@ -25,6 +25,9 @@ ZONE_PUBLISH_TIME_WINDOW = 4 h
25 25
26# PREFIX = valgrind --leak-check=full --track-origins=yes 26# PREFIX = valgrind --leak-check=full --track-origins=yes
27 27
28# Setting this option enables hijacking DNS queries using iptables.
29# DNS_ROOT = KEY
30
28[gns-proxy] 31[gns-proxy]
29BINARY = gnunet-gns-proxy 32BINARY = gnunet-gns-proxy
30AUTOSTART = NO 33AUTOSTART = NO
diff --git a/src/gns/gnunet-service-gns.c b/src/gns/gnunet-service-gns.c
index 092da3577..60c277561 100644
--- a/src/gns/gnunet-service-gns.c
+++ b/src/gns/gnunet-service-gns.c
@@ -917,7 +917,8 @@ run (void *cls, struct GNUNET_SERVER_Handle *server,
917 &dns_root)) 917 &dns_root))
918 { 918 {
919 GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR, 919 GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR,
920 "gns", "DNS_ROOT", 920 "gns",
921 "DNS_ROOT",
921 _("valid public key required")); 922 _("valid public key required"));
922 GNUNET_SCHEDULER_add_now (&shutdown_task, NULL); 923 GNUNET_SCHEDULER_add_now (&shutdown_task, NULL);
923 GNUNET_free (dns_root_name); 924 GNUNET_free (dns_root_name);
diff --git a/src/gns/test_gns_proxy.conf b/src/gns/test_gns_proxy.conf
index 973c0257e..fb1b0c7c8 100644
--- a/src/gns/test_gns_proxy.conf
+++ b/src/gns/test_gns_proxy.conf
@@ -14,7 +14,7 @@ HOSTKEYSFILE = ${DATADIR}/testing_hostkeys.dat
14 14
15[gns] 15[gns]
16AUTOSTART = YES 16AUTOSTART = YES
17ZONEKEY = $GNUNET_TEST_HOME/.hostkey 17ZONEKEY = $GNUNET_TEST_HOME/.zonekey
18HIJACK_DNS = YES 18HIJACK_DNS = YES
19 19
20[gns-proxy] 20[gns-proxy]