[GNUnet-SVN] r35779 - gnunet/src/pt

[gnunet]

Author: grothoff
Date: 2015-05-22 11:42:02 +0200 (Fri, 22 May 2015)
New Revision: 35779

Modified:
   gnunet/src/pt/test_gns_vpn.c
   gnunet/src/pt/test_gnunet_vpn.c
   gnunet/src/pt/test_gnunet_vpn.conf
Log:
-fix bad leftover peerid to string conversion

Modified: gnunet/src/pt/test_gns_vpn.c
===================================================================
--- gnunet/src/pt/test_gns_vpn.c        2015-05-22 09:38:34 UTC (rev 35778)
+++ gnunet/src/pt/test_gns_vpn.c        2015-05-22 09:42:02 UTC (rev 35779)
@@ -363,7 +363,7 @@
 {
   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;
@@ -370,7 +370,7 @@
   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 @@
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "Failed to get key from cfg\n");
+    GNUNET_free (peername);
     return;
   }
 
@@ -400,10 +401,12 @@
                    "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 @@
 }
 
 /* end of test_gns_vpn.c */
-

Modified: gnunet/src/pt/test_gnunet_vpn.c
===================================================================
--- gnunet/src/pt/test_gnunet_vpn.c     2015-05-22 09:38:34 UTC (rev 35778)
+++ gnunet/src/pt/test_gnunet_vpn.c     2015-05-22 09:42:02 UTC (rev 35779)
@@ -406,7 +406,8 @@
   {
     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 @@
   type = strstr (bin, "-");
   if (NULL == type)
   {
-    fprintf (stderr, "invalid binary name\n");
+    fprintf (stderr,
+             "invalid binary name\n");
     return 1;
   }
   type++;

Modified: gnunet/src/pt/test_gnunet_vpn.conf
===================================================================
--- gnunet/src/pt/test_gnunet_vpn.conf  2015-05-22 09:38:34 UTC (rev 35778)
+++ gnunet/src/pt/test_gnunet_vpn.conf  2015-05-22 09:42:02 UTC (rev 35779)
@@ -15,9 +15,8 @@
 # FIXME: can we use 'lo'?
 EXIT_IFNAME = eth1
 
-[testing]
-WEAKRANDOM = YES
-HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
+[hostlist]
+AUTOSTART = NO
 
 [nse]
 WORKBITS = 1