[GNUnet-SVN] r30947 - in gnunet/src: testbed testing

[gnunet]

Author: harsha
Date: 2013-11-28 17:24:43 +0100 (Thu, 28 Nov 2013)
New Revision: 30947

Modified:
   gnunet/src/testbed/gnunet-service-testbed_peers.c
   gnunet/src/testing/testing.c
Log:
- write PEERID to PATHS so that it can be used for dollar expansion


Modified: gnunet/src/testbed/gnunet-service-testbed_peers.c
===================================================================
--- gnunet/src/testbed/gnunet-service-testbed_peers.c   2013-11-28 16:19:59 UTC 
(rev 30946)
+++ gnunet/src/testbed/gnunet-service-testbed_peers.c   2013-11-28 16:24:43 UTC 
(rev 30947)
@@ -361,6 +361,9 @@
     }
     GNUNET_CONFIGURATION_set_value_number (cfg, "TESTBED", "PEERID",
                                            (unsigned long long) peer_id);
+    
+    GNUNET_CONFIGURATION_set_value_number (cfg, "PATHS", "PEERID",
+                                           (unsigned long long) peer_id);
     peer = GNUNET_malloc (sizeof (struct Peer));
     peer->is_remote = GNUNET_NO;
     peer->details.local.cfg = cfg;

Modified: gnunet/src/testing/testing.c
===================================================================
--- gnunet/src/testing/testing.c        2013-11-28 16:19:59 UTC (rev 30946)
+++ gnunet/src/testing/testing.c        2013-11-28 16:24:43 UTC (rev 30947)
@@ -1253,7 +1253,10 @@
     peer->args = strdup ("");
   }
   else
+  {
+    peer->main_binary = GNUNET_CONFIGURATION_expand_dollar (peer->main_binary);
     peer->args = strdup (libexec_binary);
+  }
   peer->system = system;
   peer->key_number = key_number;
   GNUNET_free (libexec_binary);