diff options
Diffstat (limited to 'src/testbed')
-rw-r--r-- | src/testbed/gnunet-service-testbed_cpustatus.c | 2 | ||||
-rw-r--r-- | src/testbed/test_testbed_api_template.conf | 2 | ||||
-rw-r--r-- | src/testbed/testbed_api.c | 2 | ||||
-rw-r--r-- | src/testbed/testbed_api_topology.c | 6 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/testbed/gnunet-service-testbed_cpustatus.c b/src/testbed/gnunet-service-testbed_cpustatus.c index 70b865c73..440f2c24f 100644 --- a/src/testbed/gnunet-service-testbed_cpustatus.c +++ b/src/testbed/gnunet-service-testbed_cpustatus.c | |||
@@ -608,7 +608,7 @@ GST_stats_init (const struct GNUNET_CONFIGURATION_Handle *cfg) | |||
608 | return; | 608 | return; |
609 | } | 609 | } |
610 | fn = NULL; | 610 | fn = NULL; |
611 | (void) GNUNET_asprintf (&fn, "%s/%.*s-%jd.dat", stats_dir, len, | 611 | (void) GNUNET_asprintf (&fn, "%s/%.*s-%jd.dat", stats_dir, (int)len, |
612 | hostname, (intmax_t) getpid ()); | 612 | hostname, (intmax_t) getpid ()); |
613 | GNUNET_free (stats_dir); | 613 | GNUNET_free (stats_dir); |
614 | GNUNET_free (hostname); | 614 | GNUNET_free (hostname); |
diff --git a/src/testbed/test_testbed_api_template.conf b/src/testbed/test_testbed_api_template.conf index 255c1b766..ae0368a8b 100644 --- a/src/testbed/test_testbed_api_template.conf +++ b/src/testbed/test_testbed_api_template.conf | |||
@@ -32,7 +32,7 @@ WAN_QUOTA_IN = 3932160 | |||
32 | USE_EPHEMERAL_KEYS = NO | 32 | USE_EPHEMERAL_KEYS = NO |
33 | IMMEDIATE_START = YES | 33 | IMMEDIATE_START = YES |
34 | 34 | ||
35 | [transport-udp] | 35 | [transport-tcp] |
36 | TIMEOUT = 300 s | 36 | TIMEOUT = 300 s |
37 | 37 | ||
38 | [PATHS] | 38 | [PATHS] |
diff --git a/src/testbed/testbed_api.c b/src/testbed/testbed_api.c index 697783d96..09752ba28 100644 --- a/src/testbed/testbed_api.c +++ b/src/testbed/testbed_api.c | |||
@@ -448,7 +448,7 @@ handle_opsuccess ( | |||
448 | uint64_t op_id; | 448 | uint64_t op_id; |
449 | 449 | ||
450 | op_id = GNUNET_ntohll (msg->operation_id); | 450 | op_id = GNUNET_ntohll (msg->operation_id); |
451 | LOG_DEBUG ("Operation %lu successful\n", op_id); | 451 | LOG_DEBUG ("Operation %llu successful\n", op_id); |
452 | if (NULL == (opc = find_opc (c, op_id))) | 452 | if (NULL == (opc = find_opc (c, op_id))) |
453 | { | 453 | { |
454 | LOG_DEBUG ("Operation not found\n"); | 454 | LOG_DEBUG ("Operation not found\n"); |
diff --git a/src/testbed/testbed_api_topology.c b/src/testbed/testbed_api_topology.c index 1d765af92..a9a340e99 100644 --- a/src/testbed/testbed_api_topology.c +++ b/src/testbed/testbed_api_topology.c | |||
@@ -1089,7 +1089,7 @@ gen_topo_from_file (struct TopologyContext *tc, | |||
1089 | if (tc->num_peers <= peer_id) | 1089 | if (tc->num_peers <= peer_id) |
1090 | { | 1090 | { |
1091 | LOG (GNUNET_ERROR_TYPE_ERROR, | 1091 | LOG (GNUNET_ERROR_TYPE_ERROR, |
1092 | _ ("Topology file needs more peers than given ones\n"), filename); | 1092 | _ ("Topology file needs more peers than given ones\n")); |
1093 | goto _exit; | 1093 | goto _exit; |
1094 | } | 1094 | } |
1095 | state = OTHER_PEER_INDEX; | 1095 | state = OTHER_PEER_INDEX; |
@@ -1114,7 +1114,7 @@ gen_topo_from_file (struct TopologyContext *tc, | |||
1114 | if (tc->num_peers <= other_peer_id) | 1114 | if (tc->num_peers <= other_peer_id) |
1115 | { | 1115 | { |
1116 | LOG (GNUNET_ERROR_TYPE_ERROR, | 1116 | LOG (GNUNET_ERROR_TYPE_ERROR, |
1117 | _ ("Topology file needs more peers than given ones\n"), filename); | 1117 | _ ("Topology file needs more peers than given ones\n")); |
1118 | goto _exit; | 1118 | goto _exit; |
1119 | } | 1119 | } |
1120 | if (peer_id != other_peer_id) | 1120 | if (peer_id != other_peer_id) |
@@ -1150,7 +1150,7 @@ gen_topo_from_file (struct TopologyContext *tc, | |||
1150 | } | 1150 | } |
1151 | else | 1151 | else |
1152 | LOG (GNUNET_ERROR_TYPE_WARNING, | 1152 | LOG (GNUNET_ERROR_TYPE_WARNING, |
1153 | _ ("Ignoring to connect peer %u to peer %u\n"), | 1153 | _ ("Ignoring to connect peer %lu to peer %lu\n"), |
1154 | peer_id, | 1154 | peer_id, |
1155 | other_peer_id); | 1155 | other_peer_id); |
1156 | while (('\n' != data[offset]) && ('|' != data[offset]) && (offset < fs)) | 1156 | while (('\n' != data[offset]) && ('|' != data[offset]) && (offset < fs)) |