From 4061c53cc2527d3a8a7dc2b1b55b48ffd8fe2482 Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Fri, 22 May 2015 09:42:02 +0000
Subject: -fix bad leftover peerid to string conversion

---
 src/pt/test_gns_vpn.c       | 16 +++++++++-------
 src/pt/test_gnunet_vpn.c    |  6 ++++--
 src/pt/test_gnunet_vpn.conf |  5 ++---
 3 files changed, 15 insertions(+), 12 deletions(-)

(limited to 'src')

diff --git a/src/pt/test_gns_vpn.c b/src/pt/test_gns_vpn.c
index efc2867aa..96a5dd723 100644
--- a/src/pt/test_gns_vpn.c
+++ b/src/pt/test_gns_vpn.c
@@ -363,14 +363,14 @@ run (void *cls,
 {
   enum MHD_FLAG flags;
   struct GNUNET_PeerIdentity id;
-  struct GNUNET_CRYPTO_HashAsciiEncoded peername;
+  char *peername;
   struct GNUNET_CRYPTO_EcdsaPrivateKey *zone_key;
   struct GNUNET_GNSRECORD_Data rd;
   char *rd_string;
   char *zone_keyfile;
 
   GNUNET_TESTING_peer_get_identity (peer, &id);
-  GNUNET_CRYPTO_hash_to_enc ((struct GNUNET_HashCode*)&id, &peername);
+  peername = GNUNET_strdup (GNUNET_i2s_full (&id));
 
   namestore = GNUNET_NAMESTORE_connect (cfg);
   GNUNET_assert (NULL != namestore);
@@ -391,6 +391,7 @@ run (void *cls,
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "Failed to get key from cfg\n");
+    GNUNET_free (peername);
     return;
   }
 
@@ -400,10 +401,12 @@ run (void *cls,
                    "6 %s %s",
                    (char*) &peername,
                    "www.gnu.");
-  GNUNET_assert (GNUNET_OK == GNUNET_GNSRECORD_string_to_value (GNUNET_GNSRECORD_TYPE_VPN,
-                                                               rd_string,
-                                                               (void**)&rd.data,
-                                                               &rd.data_size));
+  GNUNET_free (peername);
+  GNUNET_assert (GNUNET_OK ==
+                 GNUNET_GNSRECORD_string_to_value (GNUNET_GNSRECORD_TYPE_VPN,
+                                                   rd_string,
+                                                   (void**) &rd.data,
+                                                   &rd.data_size));
   rd.record_type = GNUNET_GNSRECORD_TYPE_VPN;
 
   GNUNET_NAMESTORE_records_store (namestore,
@@ -597,4 +600,3 @@ main (int argc, char *const *argv)
 }
 
 /* end of test_gns_vpn.c */
-
diff --git a/src/pt/test_gnunet_vpn.c b/src/pt/test_gnunet_vpn.c
index d2d166625..ef22fa404 100644
--- a/src/pt/test_gnunet_vpn.c
+++ b/src/pt/test_gnunet_vpn.c
@@ -406,7 +406,8 @@ main (int argc, char *const *argv)
   {
     GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR, "access",
                               "/dev/net/tun");
-    fprintf (stderr, "WARNING: System unable to run test, skipping.\n");
+    fprintf (stderr,
+             "WARNING: System unable to run test, skipping.\n");
     return 0;
   }
 #endif
@@ -430,7 +431,8 @@ main (int argc, char *const *argv)
   type = strstr (bin, "-");
   if (NULL == type)
   {
-    fprintf (stderr, "invalid binary name\n");
+    fprintf (stderr,
+             "invalid binary name\n");
     return 1;
   }
   type++;
diff --git a/src/pt/test_gnunet_vpn.conf b/src/pt/test_gnunet_vpn.conf
index 5540c0fe4..929215cc5 100644
--- a/src/pt/test_gnunet_vpn.conf
+++ b/src/pt/test_gnunet_vpn.conf
@@ -15,9 +15,8 @@ EXIT_IPV6 = YES
 # FIXME: can we use 'lo'?
 EXIT_IFNAME = eth1
 
-[testing]
-WEAKRANDOM = YES
-HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
+[hostlist]
+AUTOSTART = NO
 
 [nse]
 WORKBITS = 1
-- 
cgit v1.2.3