[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r24293 - gnunet/src/testbed
From: |
gnunet |
Subject: |
[GNUnet-SVN] r24293 - gnunet/src/testbed |
Date: |
Fri, 12 Oct 2012 16:58:31 +0200 |
Author: harsha
Date: 2012-10-12 16:58:31 +0200 (Fri, 12 Oct 2012)
New Revision: 24293
Modified:
gnunet/src/testbed/gnunet-service-testbed.c
gnunet/src/testbed/gnunet-testbed-profiler.c
gnunet/src/testbed/testbed_api.c
Log:
fixes
Modified: gnunet/src/testbed/gnunet-service-testbed.c
===================================================================
--- gnunet/src/testbed/gnunet-service-testbed.c 2012-10-12 14:01:50 UTC (rev
24292)
+++ gnunet/src/testbed/gnunet-service-testbed.c 2012-10-12 14:58:31 UTC (rev
24293)
@@ -1479,12 +1479,15 @@
msg = (const struct GNUNET_TESTBED_AddHostMessage *) message;
msize = ntohs (msg->header.size);
- username = (char *) &(msg[1]);
+ username = (char *) &msg[1];
username_length = ntohs (msg->user_name_length);
- GNUNET_assert (msize > (sizeof (struct GNUNET_TESTBED_AddHostMessage) +
username_length + 1)); /* msg must contain hostname */
if (0 != username_length)
- GNUNET_assert ('\0' == username[username_length]);
- username_length = (0 == username_length) ? 0 : username_length + 1;
+ username_length++;
+ /* msg must contain hostname */
+ GNUNET_assert (msize > (sizeof (struct GNUNET_TESTBED_AddHostMessage) +
+ username_length + 1));
+ if (0 != username_length)
+ GNUNET_assert ('\0' == username[username_length - 1]);
hostname = username + username_length;
hostname_length =
msize - (sizeof (struct GNUNET_TESTBED_AddHostMessage) +
username_length);
Modified: gnunet/src/testbed/gnunet-testbed-profiler.c
===================================================================
--- gnunet/src/testbed/gnunet-testbed-profiler.c 2012-10-12 14:01:50 UTC
(rev 24292)
+++ gnunet/src/testbed/gnunet-testbed-profiler.c 2012-10-12 14:58:31 UTC
(rev 24293)
@@ -252,14 +252,15 @@
{
static unsigned int reg_host;
- register_hosts_task = GNUNET_SCHEDULER_NO_TASK;
- if (reg_host == num_hosts)
+ register_hosts_task = GNUNET_SCHEDULER_NO_TASK;
+ if (reg_host == num_hosts - 1)
{
LOG (GNUNET_ERROR_TYPE_DEBUG,
"All hosts successfully registered\n");
/* Start peer create task */
+ return;
}
- reg_handle = GNUNET_TESTBED_register_host (mc, hosts[reg_host++],
+ reg_handle = GNUNET_TESTBED_register_host (mc, hosts[++reg_host],
host_registration_completion,
NULL);
}
Modified: gnunet/src/testbed/testbed_api.c
===================================================================
--- gnunet/src/testbed/testbed_api.c 2012-10-12 14:01:50 UTC (rev 24292)
+++ gnunet/src/testbed/testbed_api.c 2012-10-12 14:58:31 UTC (rev 24293)
@@ -1780,9 +1780,13 @@
msg->header.type = htons (GNUNET_MESSAGE_TYPE_TESTBED_ADDHOST);
msg->host_id = htonl (GNUNET_TESTBED_host_get_id_ (host));
msg->ssh_port = htons (GNUNET_TESTBED_host_get_ssh_port_ (host));
- msg->user_name_length = htons (user_name_length);
if (NULL != username)
+ {
+ msg->user_name_length = htons (user_name_length - 1);
memcpy (&msg[1], username, user_name_length);
+ }
+ else
+ msg->user_name_length = htons (user_name_length);
strcpy (((void *) &msg[1]) + user_name_length, hostname);
GNUNET_TESTBED_queue_message_ (controller,
(struct GNUNET_MessageHeader *) msg);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r24293 - gnunet/src/testbed,
gnunet <=