From b36cf857a67f73f308b7623e74eca7754e2a7acc Mon Sep 17 00:00:00 2001
From: "Nathan S. Evans" <evans@in.tum.de>
Date: Fri, 8 Oct 2010 11:40:55 +0000
Subject: [PATCH] toelke: don't bug dht

---
 src/vpn/gnunet-service-dns.c | 8 ++++----
 src/vpn/test-conf.conf       | 8 +++++++-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/vpn/gnunet-service-dns.c b/src/vpn/gnunet-service-dns.c
index eb7cfac01..b2e9a63f8 100644
--- a/src/vpn/gnunet-service-dns.c
+++ b/src/vpn/gnunet-service-dns.c
@@ -20,7 +20,7 @@
 
 /**
  * @file vpn/gnunet-service-dns.c
- * @author Philipp Tölke
+ * @author Philipp Toelke
  */
 #include "platform.h"
 #include "gnunet_getopt_lib.h"
@@ -214,11 +214,11 @@ publish_name (void *cls,
     return;
 
   char* name = "philipptoelke.gnunet.";
-  size_t size = sizeof(struct GNUNET_DNS_Record) + strlen(name) - 1;
+  size_t size = sizeof(struct GNUNET_DNS_Record) + strlen(name);
   struct GNUNET_DNS_Record *data = alloca(size);
   memset(data, 0, size);
-  memcpy(data->name, name, strlen(name));
-  data->namelen = strlen(name);
+  memcpy(data->name, name, strlen(name) + 1);
+  data->namelen = strlen(name) + 1;
   *((unsigned int*)&data->service_descriptor) = 0x11223344;
   *((unsigned int*)&data->peer) = 0x55667788;
 
diff --git a/src/vpn/test-conf.conf b/src/vpn/test-conf.conf
index b66ad21c7..bac52349c 100644
--- a/src/vpn/test-conf.conf
+++ b/src/vpn/test-conf.conf
@@ -28,6 +28,7 @@ TIMEOUT = 300000
 
 [dht]
 AUTOSTART = YES
+DEBUG = YES
 PORT = 2095
 HOSTNAME = localhost
 HOME = $SERVICEHOME
@@ -47,6 +48,10 @@ UNIXPATH = /tmp/gnunet-service-dht.sock
 # REJECT_FROM6 =
 # PREFIX =
 
+[dhtcache]
+QUOTA = 1000000
+DATABASE = sqlite
+
 [arm]
 PORT = 2087
 HOSTNAME = localhost
@@ -55,7 +60,7 @@ CONFIG = $DEFAULTCONFIG
 BINARY = gnunet-service-arm
 ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;
-DEFAULTSERVICES = vpn hostlist core transport dns dht
+DEFAULTSERVICES = core transport dht vpn dns
 UNIXPATH = /tmp/gnunet-service-arm.sock
 # GLOBAL_POSTFIX = -l $SERVICEHOME/{}-logs
 # GLOBAL_PREFIX =
@@ -184,6 +189,7 @@ BINARY = gnunet-daemon-topology
 
 [hostlist]
 # port for hostlist http server
+AUTOSTART = NO
 HTTPPORT = 8080
 DEBUG = YES
 HOME = $SERVICEHOME
-- 
2.25.1