aboutsummaryrefslogtreecommitdiff
path: root/src/testbed/testbed_api_hosts.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/testbed/testbed_api_hosts.c')
-rw-r--r--src/testbed/testbed_api_hosts.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/testbed/testbed_api_hosts.c b/src/testbed/testbed_api_hosts.c
index 4e14a4d4d..731944bc4 100644
--- a/src/testbed/testbed_api_hosts.c
+++ b/src/testbed/testbed_api_hosts.c
@@ -498,8 +498,9 @@ GNUNET_TESTBED_hosts_load_from_file (const char *filename,
498 if (NULL == starting_host) 498 if (NULL == starting_host)
499 return 0; 499 return 0;
500 *hosts = GNUNET_malloc (sizeof (struct GNUNET_TESTBED_Host *) * count); 500 *hosts = GNUNET_malloc (sizeof (struct GNUNET_TESTBED_Host *) * count);
501 memcpy (*hosts, &host_list[GNUNET_TESTBED_host_get_id_ (starting_host)], 501 GNUNET_memcpy (*hosts,
502 sizeof (struct GNUNET_TESTBED_Host *) * count); 502 &host_list[GNUNET_TESTBED_host_get_id_ (starting_host)],
503 sizeof (struct GNUNET_TESTBED_Host *) * count);
503 return count; 504 return count;
504} 505}
505 506
@@ -1454,14 +1455,14 @@ GNUNET_TESTBED_register_host (struct GNUNET_TESTBED_Controller *controller,
1454 if (NULL != username) 1455 if (NULL != username)
1455 { 1456 {
1456 msg->username_length = htons (username_length); 1457 msg->username_length = htons (username_length);
1457 ptr = memcpy (ptr, username, username_length); 1458 GNUNET_memcpy (ptr, username, username_length);
1458 ptr += username_length; 1459 ptr += username_length;
1459 } 1460 }
1460 msg->hostname_length = htons (hostname_length); 1461 msg->hostname_length = htons (hostname_length);
1461 ptr = memcpy (ptr, hostname, hostname_length); 1462 GNUNET_memcpy (ptr, hostname, hostname_length);
1462 ptr += hostname_length; 1463 ptr += hostname_length;
1463 msg->config_size = htons (config_size); 1464 msg->config_size = htons (config_size);
1464 ptr = memcpy (ptr, cconfig, cc_size); 1465 GNUNET_memcpy (ptr, cconfig, cc_size);
1465 ptr += cc_size; 1466 ptr += cc_size;
1466 GNUNET_assert ((ptr - (void *) msg) == msg_size); 1467 GNUNET_assert ((ptr - (void *) msg) == msg_size);
1467 GNUNET_free (cconfig); 1468 GNUNET_free (cconfig);