From: Sree Harsha Totakura <totakura@in.tum.de>
Date: Sun, 14 Oct 2012 09:30:02 +0000 (+0000)
Subject: fixes
X-Git-Tag: initial-import-from-subversion-38251~11414
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=cc0f8581409bde67d45fdf9803cb375cdf46b727;p=oweals%2Fgnunet.git

fixes
---

diff --git a/src/testbed/gnunet-service-testbed.c b/src/testbed/gnunet-service-testbed.c
index ea28af8d9..4ef61becf 100644
--- a/src/testbed/gnunet-service-testbed.c
+++ b/src/testbed/gnunet-service-testbed.c
@@ -1867,8 +1867,6 @@ peer_create_success_cb (void *cls, const struct GNUNET_MessageHeader *msg)
         (const struct GNUNET_TESTBED_PeerCreateSuccessEventMessage *) msg;
     GNUNET_assert (NULL != fo_ctxt->cls);
     remote_peer = fo_ctxt->cls;
-    GNUNET_assert (remote_peer->details.remote.remote_host_id
-                   == ntohl (success_msg->peer_id));
     peer_list_add (remote_peer);
   }
   msize = ntohs (msg->size);
diff --git a/src/testbed/gnunet-testbed-profiler.c b/src/testbed/gnunet-testbed-profiler.c
index e1aa61a1b..64f418569 100644
--- a/src/testbed/gnunet-testbed-profiler.c
+++ b/src/testbed/gnunet-testbed-profiler.c
@@ -205,7 +205,6 @@ do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   while (NULL != (dll_op = dll_op_head))
   {
     GNUNET_TESTBED_operation_cancel (dll_op->op);
-    GNUNET_free_non_null (dll_op->cls);
     GNUNET_CONTAINER_DLL_remove (dll_op_head, dll_op_tail, dll_op);
     GNUNET_free (dll_op);
   }
@@ -329,7 +328,7 @@ controller_event_cb (void *cls,
             dll_op->cls = &peers[peer_cnt];
             dll_op->op = GNUNET_TESTBED_peer_create (mc,
                                                      hosts
-                                                     [peer_cnt % num_peers],
+                                                     [peer_cnt % num_hosts],
                                                      cfg,
                                                      &peer_create_cb,
                                                      dll_op);