aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorxrs <xrs@mail36.net>2017-02-09 22:28:29 +0100
committerxrs <xrs@mail36.net>2017-02-09 22:28:29 +0100
commitf1a91551990bc81e4179d48256bf14252bad7d0d (patch)
tree55268d45795f299116b0492e93421eb6e816df56 /src
parenta03d291e3253572b19712918759011198118b3b2 (diff)
downloadgnunet-f1a91551990bc81e4179d48256bf14252bad7d0d.tar.gz
gnunet-f1a91551990bc81e4179d48256bf14252bad7d0d.zip
fixed crash on test_multicast_multipeer
Diffstat (limited to 'src')
-rw-r--r--src/multicast/test_multicast_multipeer.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/src/multicast/test_multicast_multipeer.c b/src/multicast/test_multicast_multipeer.c
index 7b7b1407f..591aa56f8 100644
--- a/src/multicast/test_multicast_multipeer.c
+++ b/src/multicast/test_multicast_multipeer.c
@@ -258,19 +258,17 @@ peer_information_cb (void *cls,
258 const struct GNUNET_TESTBED_PeerInformation *pinfo, 258 const struct GNUNET_TESTBED_PeerInformation *pinfo,
259 const char *emsg) 259 const char *emsg)
260{ 260{
261 struct GNUNET_HashCode pub_hash;
262
263 if (NULL == pinfo) { 261 if (NULL == pinfo) {
264 result = GNUNET_SYSERR; 262 result = GNUNET_SYSERR;
265 GNUNET_SCHEDULER_shutdown (); 263 GNUNET_SCHEDULER_shutdown ();
266 } 264 }
267 265
268 GNUNET_CRYPTO_hash (&peer_id_origin, sizeof (peer_id_origin), &pub_hash);
269 GNUNET_log (GNUNET_ERROR_TYPE_INFO,
270 "Got peer information of origin (%s)\n", GNUNET_h2s (&pub_hash));
271 peer_id_origin = pinfo->result.id; 266 peer_id_origin = pinfo->result.id;
272 267
273 GNUNET_log (GNUNET_ERROR_TYPE_INFO, 268 GNUNET_log (GNUNET_ERROR_TYPE_INFO,
269 "Got peer information of origin (%s)\n", GNUNET_i2s(pinfo->result.id));
270
271 GNUNET_log (GNUNET_ERROR_TYPE_INFO,
274 "Create member peer\n"); 272 "Create member peer\n");
275 /* connect to multicast service of member */ 273 /* connect to multicast service of member */
276 op1 = GNUNET_TESTBED_service_connect (NULL, /* Closure for operation */ 274 op1 = GNUNET_TESTBED_service_connect (NULL, /* Closure for operation */
@@ -400,8 +398,8 @@ testbed_master (void *cls,
400 398
401 GNUNET_SCHEDULER_add_shutdown (&shutdown_task, NULL); /* Schedule a new task on shutdown */ 399 GNUNET_SCHEDULER_add_shutdown (&shutdown_task, NULL); /* Schedule a new task on shutdown */
402 400
403 /* Schedule the shutdown task with a delay of a few 1econds */ 401 /* Schedule the shutdown task with a delay of a few Seconds */
404 timeout_tid = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 3), 402 timeout_tid = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 10),
405 &timeout_task, NULL); 403 &timeout_task, NULL);
406} 404}
407 405