aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSree Harsha Totakura <totakura@in.tum.de>2012-10-14 09:30:02 +0000
committerSree Harsha Totakura <totakura@in.tum.de>2012-10-14 09:30:02 +0000
commitcc0f8581409bde67d45fdf9803cb375cdf46b727 (patch)
tree3fd675a4f9b31cd6f3f94654cef31144e527c1c8
parent0925e5b887363074ee2f0009b62510cf32ce8c84 (diff)
fixes
-rw-r--r--src/testbed/gnunet-service-testbed.c2
-rw-r--r--src/testbed/gnunet-testbed-profiler.c3
2 files changed, 1 insertions, 4 deletions
diff --git a/src/testbed/gnunet-service-testbed.c b/src/testbed/gnunet-service-testbed.c
index ea28af8d9b..4ef61becf3 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 e1aa61a1be..64f4185698 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);