aboutsummaryrefslogtreecommitdiff
path: root/src/ats
diff options
context:
space:
mode:
Diffstat (limited to 'src/ats')
-rw-r--r--src/ats/gnunet-service-ats-solver_mlp.c50
-rw-r--r--src/ats/gnunet-service-ats-solver_proportional.c4
-rwxr-xr-xsrc/ats/gnunet-service-ats-solver_ril.c2
-rw-r--r--src/ats/gnunet-service-ats_addresses.c26
-rw-r--r--src/ats/gnunet-service-ats_normalization.c8
-rw-r--r--src/ats/gnunet-service-ats_reservations.c2
-rw-r--r--src/ats/perf_ats_mlp.c18
-rw-r--r--src/ats/test_ats_api_bandwidth_consumption.c2
-rw-r--r--src/ats/test_ats_api_performance_address_info.c2
-rw-r--r--src/ats/test_ats_api_performance_feedback.c2
-rw-r--r--src/ats/test_ats_api_scheduling_add_address.c2
-rw-r--r--src/ats/test_ats_api_scheduling_add_address_duplicate.c2
-rw-r--r--src/ats/test_ats_api_scheduling_add_address_inbound.c2
-rw-r--r--src/ats/test_ats_api_scheduling_add_session.c2
-rw-r--r--src/ats/test_ats_api_scheduling_block_and_reset.c36
-rw-r--r--src/ats/test_ats_api_scheduling_destroy_address.c2
-rw-r--r--src/ats/test_ats_api_scheduling_destroy_address_twice.c2
-rw-r--r--src/ats/test_ats_api_scheduling_destroy_inbound_connection.c2
-rw-r--r--src/ats/test_ats_api_scheduling_destroy_session.c2
-rw-r--r--src/ats/test_ats_api_scheduling_init.c2
-rw-r--r--src/ats/test_ats_api_scheduling_min_bw.c2
21 files changed, 86 insertions, 86 deletions
diff --git a/src/ats/gnunet-service-ats-solver_mlp.c b/src/ats/gnunet-service-ats-solver_mlp.c
index f36a3808e..f32ad101a 100644
--- a/src/ats/gnunet-service-ats-solver_mlp.c
+++ b/src/ats/gnunet-service-ats-solver_mlp.c
@@ -177,8 +177,8 @@ mlp_term_hook (void *info, const char *s)
177 * @return GNUNET_OK 177 * @return GNUNET_OK
178 */ 178 */
179static int 179static int
180reset_peers (void *cls, 180reset_peers (void *cls,
181 const struct GNUNET_PeerIdentity *key, 181 const struct GNUNET_PeerIdentity *key,
182 void *value) 182 void *value)
183 { 183 {
184 struct ATS_Peer *peer = value; 184 struct ATS_Peer *peer = value;
@@ -239,7 +239,7 @@ mlp_delete_problem (struct GAS_MLP_Handle *mlp)
239 mlp->p.ci = MLP_UNDEFINED; 239 mlp->p.ci = MLP_UNDEFINED;
240 240
241 241
242 GNUNET_CONTAINER_multipeermap_iterate (mlp->requested_peers, 242 GNUNET_CONTAINER_multipeermap_iterate (mlp->requested_peers,
243 &reset_peers, NULL); 243 &reset_peers, NULL);
244} 244}
245 245
@@ -393,7 +393,7 @@ struct CountContext
393}; 393};
394 394
395static int 395static int
396mlp_create_problem_count_addresses_it (void *cls, 396mlp_create_problem_count_addresses_it (void *cls,
397 const struct GNUNET_PeerIdentity *key, 397 const struct GNUNET_PeerIdentity *key,
398 void *value) 398 void *value)
399{ 399{
@@ -406,7 +406,7 @@ mlp_create_problem_count_addresses_it (void *cls,
406} 406}
407 407
408 408
409static int 409static int
410mlp_create_problem_count_addresses (const struct GNUNET_CONTAINER_MultiPeerMap *peers, 410mlp_create_problem_count_addresses (const struct GNUNET_CONTAINER_MultiPeerMap *peers,
411 const struct GNUNET_CONTAINER_MultiPeerMap *addresses) 411 const struct GNUNET_CONTAINER_MultiPeerMap *addresses)
412{ 412{
@@ -414,7 +414,7 @@ mlp_create_problem_count_addresses (const struct GNUNET_CONTAINER_MultiPeerMap *
414 414
415 cctx.peers = peers; 415 cctx.peers = peers;
416 cctx.result = 0; 416 cctx.result = 0;
417 GNUNET_CONTAINER_multipeermap_iterate (addresses, 417 GNUNET_CONTAINER_multipeermap_iterate (addresses,
418 &mlp_create_problem_count_addresses_it, &cctx); 418 &mlp_create_problem_count_addresses_it, &cctx);
419 return cctx.result; 419 return cctx.result;
420} 420}
@@ -600,8 +600,8 @@ mlp_create_problem_create_constraint (struct MLP_Problem *p, char *name,
600 * - Set address dependent entries in problem matrix as well 600 * - Set address dependent entries in problem matrix as well
601 */ 601 */
602static int 602static int
603mlp_create_problem_add_address_information (void *cls, 603mlp_create_problem_add_address_information (void *cls,
604 const struct GNUNET_PeerIdentity *key, 604 const struct GNUNET_PeerIdentity *key,
605 void *value) 605 void *value)
606{ 606{
607 struct GAS_MLP_Handle *mlp = cls; 607 struct GAS_MLP_Handle *mlp = cls;
@@ -842,7 +842,7 @@ mlp_create_problem (struct GAS_MLP_Handle *mlp)
842 LOG (GNUNET_ERROR_TYPE_DEBUG, 842 LOG (GNUNET_ERROR_TYPE_DEBUG,
843 "Rebuilding problem for %u peer(s) and %u addresse(s) and %u quality metrics == %u elements\n", 843 "Rebuilding problem for %u peer(s) and %u addresse(s) and %u quality metrics == %u elements\n",
844 p->num_peers, 844 p->num_peers,
845 p->num_addresses, 845 p->num_addresses,
846 mlp->pv.m_q, 846 mlp->pv.m_q,
847 p->num_elements); 847 p->num_elements);
848 848
@@ -874,8 +874,8 @@ mlp_create_problem (struct GAS_MLP_Handle *mlp)
874 mlp_create_problem_add_invariant_rows (mlp, p); 874 mlp_create_problem_add_invariant_rows (mlp, p);
875 875
876 /* Adding address dependent columns constraint rows */ 876 /* Adding address dependent columns constraint rows */
877 GNUNET_CONTAINER_multipeermap_iterate (mlp->addresses, 877 GNUNET_CONTAINER_multipeermap_iterate (mlp->addresses,
878 &mlp_create_problem_add_address_information, 878 &mlp_create_problem_add_address_information,
879 mlp); 879 mlp);
880 880
881 /* Load the matrix */ 881 /* Load the matrix */
@@ -961,8 +961,8 @@ mlp_solve_mlp_problem (struct GAS_MLP_Handle *mlp)
961 * @return #GNUNET_OK to continue 961 * @return #GNUNET_OK to continue
962 */ 962 */
963int 963int
964mlp_propagate_results (void *cls, 964mlp_propagate_results (void *cls,
965 const struct GNUNET_PeerIdentity *key, 965 const struct GNUNET_PeerIdentity *key,
966 void *value) 966 void *value)
967{ 967{
968 struct GAS_MLP_Handle *mlp = cls; 968 struct GAS_MLP_Handle *mlp = cls;
@@ -973,7 +973,7 @@ mlp_propagate_results (void *cls,
973 double mlp_use = MLP_NaN; 973 double mlp_use = MLP_NaN;
974 974
975 /* Check if we have to add this peer due to a pending request */ 975 /* Check if we have to add this peer due to a pending request */
976 if (GNUNET_NO == GNUNET_CONTAINER_multipeermap_contains (mlp->requested_peers, 976 if (GNUNET_NO == GNUNET_CONTAINER_multipeermap_contains (mlp->requested_peers,
977 key)) 977 key))
978 { 978 {
979 return GNUNET_OK; 979 return GNUNET_OK;
@@ -1224,12 +1224,12 @@ GAS_mlp_address_add (void *solver,
1224 address->solver_information = GNUNET_new (struct MLP_information); 1224 address->solver_information = GNUNET_new (struct MLP_information);
1225 } 1225 }
1226 else 1226 else
1227 LOG (GNUNET_ERROR_TYPE_ERROR, 1227 LOG (GNUNET_ERROR_TYPE_ERROR,
1228 _("Adding address for peer `%s' multiple times\n"), 1228 _("Adding address for peer `%s' multiple times\n"),
1229 GNUNET_i2s(&address->peer)); 1229 GNUNET_i2s(&address->peer));
1230 1230
1231 /* Is this peer included in the problem? */ 1231 /* Is this peer included in the problem? */
1232 if (NULL == (p = GNUNET_CONTAINER_multipeermap_get (mlp->requested_peers, 1232 if (NULL == (p = GNUNET_CONTAINER_multipeermap_get (mlp->requested_peers,
1233 &address->peer))) 1233 &address->peer)))
1234 { 1234 {
1235 LOG (GNUNET_ERROR_TYPE_DEBUG, "Adding address for peer `%s' without address request \n", GNUNET_i2s(&address->peer)); 1235 LOG (GNUNET_ERROR_TYPE_DEBUG, "Adding address for peer `%s' without address request \n", GNUNET_i2s(&address->peer));
@@ -1529,8 +1529,8 @@ GAS_mlp_address_delete (void *solver,
1529 * @return GNUNET_OK 1529 * @return GNUNET_OK
1530 */ 1530 */
1531static int 1531static int
1532mlp_get_preferred_address_it (void *cls, 1532mlp_get_preferred_address_it (void *cls,
1533 const struct GNUNET_PeerIdentity *key, 1533 const struct GNUNET_PeerIdentity *key,
1534 void *value) 1534 void *value)
1535{ 1535{
1536 static int counter = 0; 1536 static int counter = 0;
@@ -1563,7 +1563,7 @@ mlp_get_preferred_address_it (void *cls,
1563} 1563}
1564 1564
1565 1565
1566static double 1566static double
1567get_peer_pref_value (struct GAS_MLP_Handle *mlp, const struct GNUNET_PeerIdentity *peer) 1567get_peer_pref_value (struct GAS_MLP_Handle *mlp, const struct GNUNET_PeerIdentity *peer)
1568{ 1568{
1569 double res; 1569 double res;
@@ -1616,8 +1616,8 @@ GAS_mlp_get_preferred_address (void *solver,
1616 p = GNUNET_malloc (sizeof (struct ATS_Peer)); 1616 p = GNUNET_malloc (sizeof (struct ATS_Peer));
1617 p->id = (*peer); 1617 p->id = (*peer);
1618 p->f = get_peer_pref_value (mlp, peer); 1618 p->f = get_peer_pref_value (mlp, peer);
1619 GNUNET_CONTAINER_multipeermap_put (mlp->requested_peers, 1619 GNUNET_CONTAINER_multipeermap_put (mlp->requested_peers,
1620 peer, p, 1620 peer, p,
1621 GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST); 1621 GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST);
1622 1622
1623 /* Added new peer, we have to rebuild problem before solving */ 1623 /* Added new peer, we have to rebuild problem before solving */
@@ -1780,7 +1780,7 @@ GAS_mlp_address_preference_feedback (void *solver,
1780 1780
1781 1781
1782static int 1782static int
1783mlp_free_peers (void *cls, 1783mlp_free_peers (void *cls,
1784 const struct GNUNET_PeerIdentity *key, void *value) 1784 const struct GNUNET_PeerIdentity *key, void *value)
1785{ 1785{
1786 struct GNUNET_CONTAINER_MultiPeerMap *map = cls; 1786 struct GNUNET_CONTAINER_MultiPeerMap *map = cls;
@@ -1807,8 +1807,8 @@ GAS_mlp_done (void *solver)
1807 LOG (GNUNET_ERROR_TYPE_DEBUG, "Shutting down mlp solver\n"); 1807 LOG (GNUNET_ERROR_TYPE_DEBUG, "Shutting down mlp solver\n");
1808 mlp_delete_problem (mlp); 1808 mlp_delete_problem (mlp);
1809 1809
1810 GNUNET_CONTAINER_multipeermap_iterate (mlp->requested_peers, 1810 GNUNET_CONTAINER_multipeermap_iterate (mlp->requested_peers,
1811 &mlp_free_peers, 1811 &mlp_free_peers,
1812 mlp->requested_peers); 1812 mlp->requested_peers);
1813 GNUNET_CONTAINER_multipeermap_destroy (mlp->requested_peers); 1813 GNUNET_CONTAINER_multipeermap_destroy (mlp->requested_peers);
1814 mlp->requested_peers = NULL; 1814 mlp->requested_peers = NULL;
diff --git a/src/ats/gnunet-service-ats-solver_proportional.c b/src/ats/gnunet-service-ats-solver_proportional.c
index e9a553ad6..db9fcff85 100644
--- a/src/ats/gnunet-service-ats-solver_proportional.c
+++ b/src/ats/gnunet-service-ats-solver_proportional.c
@@ -576,7 +576,7 @@ find_property_index (uint32_t type)
576 * @return GNUNET_OK (continue to iterate) 576 * @return GNUNET_OK (continue to iterate)
577 */ 577 */
578static int 578static int
579find_best_address_it (void *cls, 579find_best_address_it (void *cls,
580 const struct GNUNET_PeerIdentity *key, 580 const struct GNUNET_PeerIdentity *key,
581 void *value) 581 void *value)
582{ 582{
@@ -721,7 +721,7 @@ get_network (struct GAS_PROPORTIONAL_Handle *s, uint32_t type)
721 * @return #GNUNET_NO on double active address else #GNUNET_YES; 721 * @return #GNUNET_NO on double active address else #GNUNET_YES;
722 */ 722 */
723static int 723static int
724get_active_address_it (void *cls, 724get_active_address_it (void *cls,
725 const struct GNUNET_PeerIdentity *key, 725 const struct GNUNET_PeerIdentity *key,
726 void *value) 726 void *value)
727{ 727{
diff --git a/src/ats/gnunet-service-ats-solver_ril.c b/src/ats/gnunet-service-ats-solver_ril.c
index 4cc19092d..1a9614fd3 100755
--- a/src/ats/gnunet-service-ats-solver_ril.c
+++ b/src/ats/gnunet-service-ats-solver_ril.c
@@ -1033,7 +1033,7 @@ ril_get_agent (struct GAS_RIL_Handle *solver, const struct GNUNET_PeerIdentity *
1033 1033
1034 for (cur = solver->agents_head; NULL != cur; cur = cur->next) 1034 for (cur = solver->agents_head; NULL != cur; cur = cur->next)
1035 { 1035 {
1036 if (0 == memcmp (peer, 1036 if (0 == memcmp (peer,
1037 &cur->peer, 1037 &cur->peer,
1038 sizeof (struct GNUNET_PeerIdentity))) 1038 sizeof (struct GNUNET_PeerIdentity)))
1039 { 1039 {
diff --git a/src/ats/gnunet-service-ats_addresses.c b/src/ats/gnunet-service-ats_addresses.c
index 8e3692b8e..f55bb4611 100644
--- a/src/ats/gnunet-service-ats_addresses.c
+++ b/src/ats/gnunet-service-ats_addresses.c
@@ -584,8 +584,8 @@ struct CompareAddressContext
584 * @return #GNUNET_YES to continue, #GNUNET_NO if address is founce 584 * @return #GNUNET_YES to continue, #GNUNET_NO if address is founce
585 */ 585 */
586static int 586static int
587compare_address_it (void *cls, 587compare_address_it (void *cls,
588 const struct GNUNET_PeerIdentity *key, 588 const struct GNUNET_PeerIdentity *key,
589 void *value) 589 void *value)
590{ 590{
591 struct CompareAddressContext *cac = cls; 591 struct CompareAddressContext *cac = cls;
@@ -675,7 +675,7 @@ find_equivalent_address (struct GAS_Addresses_Handle *handle,
675 cac.base_address = NULL; 675 cac.base_address = NULL;
676 cac.search = addr; 676 cac.search = addr;
677 GNUNET_CONTAINER_multipeermap_get_multiple (handle->addresses, 677 GNUNET_CONTAINER_multipeermap_get_multiple (handle->addresses,
678 peer, 678 peer,
679 &compare_address_it, &cac); 679 &compare_address_it, &cac);
680 680
681 if (cac.exact_address == NULL) 681 if (cac.exact_address == NULL)
@@ -1076,7 +1076,7 @@ destroy_by_session_id (void *cls,
1076 1076
1077 /* Notify solver about deletion */ 1077 /* Notify solver about deletion */
1078 GNUNET_assert( 1078 GNUNET_assert(
1079 GNUNET_YES == GNUNET_CONTAINER_multipeermap_remove (handle->addresses, 1079 GNUNET_YES == GNUNET_CONTAINER_multipeermap_remove (handle->addresses,
1080 &aa->peer, aa)); 1080 &aa->peer, aa));
1081 handle->s_del (handle->solver, aa, GNUNET_NO); 1081 handle->s_del (handle->solver, aa, GNUNET_NO);
1082 free_address (aa); 1082 free_address (aa);
@@ -1321,16 +1321,16 @@ GAS_addresses_request_address (struct GAS_Addresses_Handle *handle,
1321 * @return #GNUNET_OK to continue 1321 * @return #GNUNET_OK to continue
1322 */ 1322 */
1323static int 1323static int
1324reset_address_it (void *cls, 1324reset_address_it (void *cls,
1325 const struct GNUNET_PeerIdentity *key, 1325 const struct GNUNET_PeerIdentity *key,
1326 void *value) 1326 void *value)
1327{ 1327{
1328 struct ATS_Address *aa = value; 1328 struct ATS_Address *aa = value;
1329 1329
1330 GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, 1330 GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
1331 "Resetting interval for peer `%s' address %p from %llu to 0\n", 1331 "Resetting interval for peer `%s' address %p from %llu to 0\n",
1332 GNUNET_i2s (&aa->peer), 1332 GNUNET_i2s (&aa->peer),
1333 aa, 1333 aa,
1334 aa->block_interval); 1334 aa->block_interval);
1335 aa->blocked_until = GNUNET_TIME_UNIT_ZERO_ABS; 1335 aa->blocked_until = GNUNET_TIME_UNIT_ZERO_ABS;
1336 aa->block_interval = GNUNET_TIME_UNIT_ZERO; 1336 aa->block_interval = GNUNET_TIME_UNIT_ZERO;
@@ -1846,7 +1846,7 @@ GAS_addresses_init (const struct GNUNET_CONFIGURATION_Handle *cfg,
1846 GNUNET_ATS_NetworkTypeCount); 1846 GNUNET_ATS_NetworkTypeCount);
1847 1847
1848 ah->solver = ah->s_init (cfg, stats, ah->addresses, quotas, quotas_in, 1848 ah->solver = ah->s_init (cfg, stats, ah->addresses, quotas, quotas_in,
1849 quotas_out, quota_count, 1849 quotas_out, quota_count,
1850 &bandwidth_changed_cb, ah, &get_preferences_cb, 1850 &bandwidth_changed_cb, ah, &get_preferences_cb,
1851 NULL, &get_property_cb, NULL ); 1851 NULL, &get_property_cb, NULL );
1852 if (NULL == ah->solver) 1852 if (NULL == ah->solver)
@@ -1873,7 +1873,7 @@ GAS_addresses_init (const struct GNUNET_CONFIGURATION_Handle *cfg,
1873 * @return #GNUNET_OK (continue to iterate) 1873 * @return #GNUNET_OK (continue to iterate)
1874 */ 1874 */
1875static int 1875static int
1876destroy_all_address_it (void *cls, 1876destroy_all_address_it (void *cls,
1877 const struct GNUNET_PeerIdentity *key, 1877 const struct GNUNET_PeerIdentity *key,
1878 void *value) 1878 void *value)
1879{ 1879{
@@ -1881,7 +1881,7 @@ destroy_all_address_it (void *cls,
1881 struct ATS_Address *aa = value; 1881 struct ATS_Address *aa = value;
1882 1882
1883 /* Remove */ 1883 /* Remove */
1884 GNUNET_assert(GNUNET_YES == 1884 GNUNET_assert(GNUNET_YES ==
1885 GNUNET_CONTAINER_multipeermap_remove (handle->addresses, key, value)); 1885 GNUNET_CONTAINER_multipeermap_remove (handle->addresses, key, value));
1886 /* Notify */ 1886 /* Notify */
1887 handle->s_del (handle->solver, aa, GNUNET_NO); 1887 handle->s_del (handle->solver, aa, GNUNET_NO);
@@ -1958,7 +1958,7 @@ struct PeerIteratorContext
1958 * @return #GNUNET_OK to continue 1958 * @return #GNUNET_OK to continue
1959 */ 1959 */
1960static int 1960static int
1961peer_it (void *cls, 1961peer_it (void *cls,
1962 const struct GNUNET_PeerIdentity *key, 1962 const struct GNUNET_PeerIdentity *key,
1963 void *value) 1963 void *value)
1964{ 1964{
@@ -2000,7 +2000,7 @@ GAS_addresses_iterate_peers (struct GAS_Addresses_Handle *handle,
2000 ip_ctx.it_cls = p_it_cls; 2000 ip_ctx.it_cls = p_it_cls;
2001 ip_ctx.peers_returned = GNUNET_CONTAINER_multipeermap_create (size, 2001 ip_ctx.peers_returned = GNUNET_CONTAINER_multipeermap_create (size,
2002 GNUNET_NO); 2002 GNUNET_NO);
2003 GNUNET_CONTAINER_multipeermap_iterate (handle->addresses, 2003 GNUNET_CONTAINER_multipeermap_iterate (handle->addresses,
2004 &peer_it, 2004 &peer_it,
2005 &ip_ctx); 2005 &ip_ctx);
2006 GNUNET_CONTAINER_multipeermap_destroy (ip_ctx.peers_returned); 2006 GNUNET_CONTAINER_multipeermap_destroy (ip_ctx.peers_returned);
diff --git a/src/ats/gnunet-service-ats_normalization.c b/src/ats/gnunet-service-ats_normalization.c
index bd9dcb706..954f2b5f5 100644
--- a/src/ats/gnunet-service-ats_normalization.c
+++ b/src/ats/gnunet-service-ats_normalization.c
@@ -654,7 +654,7 @@ find_min_max_it (void *cls,
654 654
655 655
656static int 656static int
657normalize_address (void *cls, 657normalize_address (void *cls,
658 const struct GNUNET_PeerIdentity *h, 658 const struct GNUNET_PeerIdentity *h,
659 void *k) 659 void *k)
660{ 660{
@@ -693,8 +693,8 @@ normalize_address (void *cls,
693 */ 693 */
694static void 694static void
695property_normalize (struct GNUNET_CONTAINER_MultiPeerMap *addresses, 695property_normalize (struct GNUNET_CONTAINER_MultiPeerMap *addresses,
696 struct Property *p, 696 struct Property *p,
697 struct ATS_Address *address, 697 struct ATS_Address *address,
698 uint32_t avg_value) 698 uint32_t avg_value)
699{ 699{
700 struct FindMinMaxCtx find_ctx; 700 struct FindMinMaxCtx find_ctx;
@@ -762,7 +762,7 @@ property_normalize (struct GNUNET_CONTAINER_MultiPeerMap *addresses,
762 */ 762 */
763void 763void
764GAS_normalization_normalize_property (struct GNUNET_CONTAINER_MultiPeerMap *addresses, 764GAS_normalization_normalize_property (struct GNUNET_CONTAINER_MultiPeerMap *addresses,
765 struct ATS_Address *address, 765 struct ATS_Address *address,
766 const struct GNUNET_ATS_Information *atsi, 766 const struct GNUNET_ATS_Information *atsi,
767 uint32_t atsi_count) 767 uint32_t atsi_count)
768{ 768{
diff --git a/src/ats/gnunet-service-ats_reservations.c b/src/ats/gnunet-service-ats_reservations.c
index c75577cf9..bf5e62cae 100644
--- a/src/ats/gnunet-service-ats_reservations.c
+++ b/src/ats/gnunet-service-ats_reservations.c
@@ -137,7 +137,7 @@ GAS_reservations_init ()
137 * @return GNUNET_OK (continue to iterate) 137 * @return GNUNET_OK (continue to iterate)
138 */ 138 */
139static int 139static int
140free_tracker (void *cls, 140free_tracker (void *cls,
141 const struct GNUNET_PeerIdentity *key, void *value) 141 const struct GNUNET_PeerIdentity *key, void *value)
142{ 142{
143 struct GNUNET_BANDWIDTH_Tracker *tracker = value; 143 struct GNUNET_BANDWIDTH_Tracker *tracker = value;
diff --git a/src/ats/perf_ats_mlp.c b/src/ats/perf_ats_mlp.c
index 5d370104b..190635c77 100644
--- a/src/ats/perf_ats_mlp.c
+++ b/src/ats/perf_ats_mlp.c
@@ -374,10 +374,10 @@ check (void *cls, char *const *args, const char *cfgfile,
374 (GLP_YES == full_lp_presolv) ? "YES" : "NO", 374 (GLP_YES == full_lp_presolv) ? "YES" : "NO",
375 (GNUNET_OK == full_mip_presolv) ? "YES" : "NO", 375 (GNUNET_OK == full_mip_presolv) ? "YES" : "NO",
376 (unsigned long long) full_build_dur.rel_value_us, 376 (unsigned long long) full_build_dur.rel_value_us,
377 (unsigned long long) full_lp_dur.rel_value_us, 377 (unsigned long long) full_lp_dur.rel_value_us,
378 (unsigned long long) full_mip_dur.rel_value_us); 378 (unsigned long long) full_mip_dur.rel_value_us);
379 if ((0 < opt_update_quantity) || (0 < opt_update_percent)) 379 if ((0 < opt_update_quantity) || (0 < opt_update_percent))
380 fprintf (stderr, 380 fprintf (stderr,
381 "Update: %03u peers each %02u addresses; rebuild: LP/MIP state [%3s/%3s] presolv [%3s/%3s], (build/LP/MIP in us) %04llu / %04llu / %04llu\n", 381 "Update: %03u peers each %02u addresses; rebuild: LP/MIP state [%3s/%3s] presolv [%3s/%3s], (build/LP/MIP in us) %04llu / %04llu / %04llu\n",
382 cp + 1, ca, 382 cp + 1, ca,
383 (GNUNET_OK == update_lp_res) ? "OK" : "FAIL", 383 (GNUNET_OK == update_lp_res) ? "OK" : "FAIL",
@@ -385,31 +385,31 @@ check (void *cls, char *const *args, const char *cfgfile,
385 (GLP_YES == update_lp_presolv) ? "YES" : "NO", 385 (GLP_YES == update_lp_presolv) ? "YES" : "NO",
386 (GNUNET_OK == update_mip_presolv) ? "YES" : "NO", 386 (GNUNET_OK == update_mip_presolv) ? "YES" : "NO",
387 (unsigned long long) update_build_dur.rel_value_us, 387 (unsigned long long) update_build_dur.rel_value_us,
388 (unsigned long long) update_lp_dur.rel_value_us, 388 (unsigned long long) update_lp_dur.rel_value_us,
389 (unsigned long long) update_mip_dur.rel_value_us); 389 (unsigned long long) update_mip_dur.rel_value_us);
390 } 390 }
391 else 391 else
392 { 392 {
393 fprintf (stderr, 393 fprintf (stderr,
394 "Rebuild;%u;%u;%s;%s;%s;%s;%04llu;%04llu;%04llu\n", 394 "Rebuild;%u;%u;%s;%s;%s;%s;%04llu;%04llu;%04llu\n",
395 cp + 1, ca, 395 cp + 1, ca,
396 (GNUNET_OK == full_lp_res) ? "OK" : "FAIL", 396 (GNUNET_OK == full_lp_res) ? "OK" : "FAIL",
397 (GNUNET_OK == full_mip_res) ? "OK" : "FAIL", 397 (GNUNET_OK == full_mip_res) ? "OK" : "FAIL",
398 (GLP_YES == full_lp_presolv) ? "YES" : "NO", 398 (GLP_YES == full_lp_presolv) ? "YES" : "NO",
399 (GNUNET_OK == full_mip_presolv) ? "YES" : "NO", 399 (GNUNET_OK == full_mip_presolv) ? "YES" : "NO",
400 (unsigned long long) full_build_dur.rel_value_us, 400 (unsigned long long) full_build_dur.rel_value_us,
401 (unsigned long long) full_lp_dur.rel_value_us, 401 (unsigned long long) full_lp_dur.rel_value_us,
402 (unsigned long long) full_mip_dur.rel_value_us); 402 (unsigned long long) full_mip_dur.rel_value_us);
403 if ((0 < opt_update_quantity) || (0 < opt_update_percent)) 403 if ((0 < opt_update_quantity) || (0 < opt_update_percent))
404 fprintf (stderr, 404 fprintf (stderr,
405 "Update;%u;%u;%s;%s;%s;%s;%04llu;%04llu;%04llu\n", 405 "Update;%u;%u;%s;%s;%s;%s;%04llu;%04llu;%04llu\n",
406 cp + 1, ca, 406 cp + 1, ca,
407 (GNUNET_OK == update_lp_res) ? "OK" : "FAIL", 407 (GNUNET_OK == update_lp_res) ? "OK" : "FAIL",
408 (GNUNET_OK == update_mip_res) ? "OK" : "FAIL", 408 (GNUNET_OK == update_mip_res) ? "OK" : "FAIL",
409 (GLP_YES == update_lp_presolv) ? "YES" : "NO", 409 (GLP_YES == update_lp_presolv) ? "YES" : "NO",
410 (GNUNET_OK == update_mip_presolv) ? "YES" : "NO", 410 (GNUNET_OK == update_mip_presolv) ? "YES" : "NO",
411 (unsigned long long) update_build_dur.rel_value_us, 411 (unsigned long long) update_build_dur.rel_value_us,
412 (unsigned long long) update_lp_dur.rel_value_us, 412 (unsigned long long) update_lp_dur.rel_value_us,
413 (unsigned long long) update_mip_dur.rel_value_us); 413 (unsigned long long) update_mip_dur.rel_value_us);
414 } 414 }
415 } 415 }
diff --git a/src/ats/test_ats_api_bandwidth_consumption.c b/src/ats/test_ats_api_bandwidth_consumption.c
index 772d044a5..74ee22cfb 100644
--- a/src/ats/test_ats_api_bandwidth_consumption.c
+++ b/src/ats/test_ats_api_bandwidth_consumption.c
@@ -174,7 +174,7 @@ address_suggest_cb (void *cls, const struct GNUNET_PeerIdentity *peer,
174 174
175 175
176static void 176static void
177run (void *cls, 177run (void *cls,
178 const struct GNUNET_CONFIGURATION_Handle *cfg, 178 const struct GNUNET_CONFIGURATION_Handle *cfg,
179 struct GNUNET_TESTING_Peer *peer) 179 struct GNUNET_TESTING_Peer *peer)
180{ 180{
diff --git a/src/ats/test_ats_api_performance_address_info.c b/src/ats/test_ats_api_performance_address_info.c
index 7cdbc4e37..294d09192 100644
--- a/src/ats/test_ats_api_performance_address_info.c
+++ b/src/ats/test_ats_api_performance_address_info.c
@@ -226,7 +226,7 @@ static void next (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
226} 226}
227 227
228static void 228static void
229run (void *cls, 229run (void *cls,
230 const struct GNUNET_CONFIGURATION_Handle *mycfg, 230 const struct GNUNET_CONFIGURATION_Handle *mycfg,
231 struct GNUNET_TESTING_Peer *peer) 231 struct GNUNET_TESTING_Peer *peer)
232{ 232{
diff --git a/src/ats/test_ats_api_performance_feedback.c b/src/ats/test_ats_api_performance_feedback.c
index 35d31c495..f946e674a 100644
--- a/src/ats/test_ats_api_performance_feedback.c
+++ b/src/ats/test_ats_api_performance_feedback.c
@@ -208,7 +208,7 @@ static void next (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
208} 208}
209 209
210static void 210static void
211run (void *cls, 211run (void *cls,
212 const struct GNUNET_CONFIGURATION_Handle *mycfg, 212 const struct GNUNET_CONFIGURATION_Handle *mycfg,
213 struct GNUNET_TESTING_Peer *peer) 213 struct GNUNET_TESTING_Peer *peer)
214{ 214{
diff --git a/src/ats/test_ats_api_scheduling_add_address.c b/src/ats/test_ats_api_scheduling_add_address.c
index d9bd0d6e1..ce9f9fcbd 100644
--- a/src/ats/test_ats_api_scheduling_add_address.c
+++ b/src/ats/test_ats_api_scheduling_add_address.c
@@ -150,7 +150,7 @@ address_suggest_cb (void *cls, const struct GNUNET_HELLO_Address *address,
150 150
151 151
152static void 152static void
153run (void *cls, 153run (void *cls,
154 const struct GNUNET_CONFIGURATION_Handle *cfg, 154 const struct GNUNET_CONFIGURATION_Handle *cfg,
155 struct GNUNET_TESTING_Peer *peer) 155 struct GNUNET_TESTING_Peer *peer)
156{ 156{
diff --git a/src/ats/test_ats_api_scheduling_add_address_duplicate.c b/src/ats/test_ats_api_scheduling_add_address_duplicate.c
index 9fd4d2096..e7b4fb6fe 100644
--- a/src/ats/test_ats_api_scheduling_add_address_duplicate.c
+++ b/src/ats/test_ats_api_scheduling_add_address_duplicate.c
@@ -161,7 +161,7 @@ address_suggest_cb (void *cls, const struct GNUNET_HELLO_Address *address,
161 161
162 162
163static void 163static void
164run (void *cls, 164run (void *cls,
165 const struct GNUNET_CONFIGURATION_Handle *cfg, 165 const struct GNUNET_CONFIGURATION_Handle *cfg,
166 struct GNUNET_TESTING_Peer *peer) 166 struct GNUNET_TESTING_Peer *peer)
167{ 167{
diff --git a/src/ats/test_ats_api_scheduling_add_address_inbound.c b/src/ats/test_ats_api_scheduling_add_address_inbound.c
index f0368c1ae..4cb560982 100644
--- a/src/ats/test_ats_api_scheduling_add_address_inbound.c
+++ b/src/ats/test_ats_api_scheduling_add_address_inbound.c
@@ -156,7 +156,7 @@ address_suggest_cb (void *cls, const struct GNUNET_HELLO_Address *address,
156 156
157 157
158static void 158static void
159run (void *cls, 159run (void *cls,
160 const struct GNUNET_CONFIGURATION_Handle *cfg, 160 const struct GNUNET_CONFIGURATION_Handle *cfg,
161 struct GNUNET_TESTING_Peer *peer) 161 struct GNUNET_TESTING_Peer *peer)
162{ 162{
diff --git a/src/ats/test_ats_api_scheduling_add_session.c b/src/ats/test_ats_api_scheduling_add_session.c
index eafb6fbe2..c415b57e2 100644
--- a/src/ats/test_ats_api_scheduling_add_session.c
+++ b/src/ats/test_ats_api_scheduling_add_session.c
@@ -163,7 +163,7 @@ address_suggest_cb (void *cls, const struct GNUNET_HELLO_Address *address,
163 163
164 164
165static void 165static void
166run (void *cls, 166run (void *cls,
167 const struct GNUNET_CONFIGURATION_Handle *cfg, 167 const struct GNUNET_CONFIGURATION_Handle *cfg,
168 struct GNUNET_TESTING_Peer *peer) 168 struct GNUNET_TESTING_Peer *peer)
169{ 169{
diff --git a/src/ats/test_ats_api_scheduling_block_and_reset.c b/src/ats/test_ats_api_scheduling_block_and_reset.c
index d5bd58031..c4dd8b4bb 100644
--- a/src/ats/test_ats_api_scheduling_block_and_reset.c
+++ b/src/ats/test_ats_api_scheduling_block_and_reset.c
@@ -150,7 +150,7 @@ address_suggest_cb (void *cls, const struct GNUNET_HELLO_Address *address,
150 if (3 == stage) 150 if (3 == stage)
151 { 151 {
152 /* Suggestion after resetting block interval */ 152 /* Suggestion after resetting block interval */
153 reset_block_duration = GNUNET_TIME_absolute_get_difference (reset_block_start, 153 reset_block_duration = GNUNET_TIME_absolute_get_difference (reset_block_start,
154 GNUNET_TIME_absolute_get()); 154 GNUNET_TIME_absolute_get());
155 GNUNET_log (GNUNET_ERROR_TYPE_INFO, 155 GNUNET_log (GNUNET_ERROR_TYPE_INFO,
156 "Address suggestion after resetting blocking took about %s!\n", 156 "Address suggestion after resetting blocking took about %s!\n",
@@ -180,7 +180,7 @@ address_suggest_cb (void *cls, const struct GNUNET_HELLO_Address *address,
180 if (((initial_duration.rel_value_us * 3) <= block_duration.rel_value_us) && 180 if (((initial_duration.rel_value_us * 3) <= block_duration.rel_value_us) &&
181 ((reset_block_duration.rel_value_us * 3) <= block_duration.rel_value_us)) 181 ((reset_block_duration.rel_value_us * 3) <= block_duration.rel_value_us))
182 { 182 {
183 GNUNET_log (GNUNET_ERROR_TYPE_INFO, 183 GNUNET_log (GNUNET_ERROR_TYPE_INFO,
184 "Address suggestion after resetting blocking and initial suggestion (%llu us) much faster than with blocking (%llu us)\n", 184 "Address suggestion after resetting blocking and initial suggestion (%llu us) much faster than with blocking (%llu us)\n",
185 (unsigned long long) initial_duration.rel_value_us, 185 (unsigned long long) initial_duration.rel_value_us,
186 (unsigned long long) block_duration.rel_value_us); 186 (unsigned long long) block_duration.rel_value_us);
@@ -188,7 +188,7 @@ address_suggest_cb (void *cls, const struct GNUNET_HELLO_Address *address,
188 } 188 }
189 else 189 else
190 { 190 {
191 GNUNET_log (GNUNET_ERROR_TYPE_ERROR, 191 GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
192 "Address suggestion after resetting blocking and initial suggestion (%llu us) not faster than with blocking (%llu us)\n", 192 "Address suggestion after resetting blocking and initial suggestion (%llu us) not faster than with blocking (%llu us)\n",
193 (unsigned long long) initial_duration.rel_value_us, 193 (unsigned long long) initial_duration.rel_value_us,
194 (unsigned long long) block_duration.rel_value_us); 194 (unsigned long long) block_duration.rel_value_us);
@@ -211,7 +211,7 @@ address_suggest_cb (void *cls, const struct GNUNET_HELLO_Address *address,
211 211
212 if (GNUNET_OK == compare_addresses (address, session, &test_hello_address, test_session)) 212 if (GNUNET_OK == compare_addresses (address, session, &test_hello_address, test_session))
213 { 213 {
214 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 214 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
215 "Stage %u: Callback with correct address `%s'\n", stage, 215 "Stage %u: Callback with correct address `%s'\n", stage,
216 GNUNET_i2s (&address->peer)); 216 GNUNET_i2s (&address->peer));
217 ret = 0; 217 ret = 0;
@@ -228,7 +228,7 @@ address_suggest_cb (void *cls, const struct GNUNET_HELLO_Address *address,
228 228
229 if (GNUNET_OK != compare_ats(atsi, ats_count, test_ats_info, test_ats_count)) 229 if (GNUNET_OK != compare_ats(atsi, ats_count, test_ats_info, test_ats_count))
230 { 230 {
231 GNUNET_log (GNUNET_ERROR_TYPE_ERROR, 231 GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
232 "Stage %u: Callback with incorrect ats info \n"); 232 "Stage %u: Callback with incorrect ats info \n");
233 GNUNET_ATS_suggest_address_cancel (sched_ats, &p.id); 233 GNUNET_ATS_suggest_address_cancel (sched_ats, &p.id);
234 GNUNET_SCHEDULER_add_now (&end, NULL); 234 GNUNET_SCHEDULER_add_now (&end, NULL);
@@ -246,16 +246,16 @@ address_suggest_cb (void *cls, const struct GNUNET_HELLO_Address *address,
246 /* Initial suggestion */ 246 /* Initial suggestion */
247 if (GNUNET_OK == compare_addresses (address, session, &test_hello_address, test_session)) 247 if (GNUNET_OK == compare_addresses (address, session, &test_hello_address, test_session))
248 { 248 {
249 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 249 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
250 "Stage %u: Callback with correct address `%s'\n", 250 "Stage %u: Callback with correct address `%s'\n",
251 stage, 251 stage,
252 GNUNET_i2s (&address->peer)); 252 GNUNET_i2s (&address->peer));
253 ret = 0; 253 ret = 0;
254 } 254 }
255 else 255 else
256 { 256 {
257 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 257 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
258 "Stage %u: Callback with invalid address `%s'\n", 258 "Stage %u: Callback with invalid address `%s'\n",
259 stage, 259 stage,
260 GNUNET_i2s (&address->peer)); 260 GNUNET_i2s (&address->peer));
261 GNUNET_ATS_suggest_address_cancel (sched_ats, &p.id); 261 GNUNET_ATS_suggest_address_cancel (sched_ats, &p.id);
@@ -265,7 +265,7 @@ address_suggest_cb (void *cls, const struct GNUNET_HELLO_Address *address,
265 265
266 if (GNUNET_OK != compare_ats(atsi, ats_count, test_ats_info, test_ats_count)) 266 if (GNUNET_OK != compare_ats(atsi, ats_count, test_ats_info, test_ats_count))
267 { 267 {
268 GNUNET_log (GNUNET_ERROR_TYPE_ERROR, 268 GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
269 "Stage %u: Callback with incorrect ats info\n", 269 "Stage %u: Callback with incorrect ats info\n",
270 stage); 270 stage);
271 GNUNET_ATS_suggest_address_cancel (sched_ats, &p.id); 271 GNUNET_ATS_suggest_address_cancel (sched_ats, &p.id);
@@ -274,8 +274,8 @@ address_suggest_cb (void *cls, const struct GNUNET_HELLO_Address *address,
274 } 274 }
275 stage++; 275 stage++;
276 initial_duration = GNUNET_TIME_absolute_get_difference(initial_start, GNUNET_TIME_absolute_get()); 276 initial_duration = GNUNET_TIME_absolute_get_difference(initial_start, GNUNET_TIME_absolute_get());
277 GNUNET_log (GNUNET_ERROR_TYPE_INFO, 277 GNUNET_log (GNUNET_ERROR_TYPE_INFO,
278 "Stage %u: Initial suggestion took about %s\n", 278 "Stage %u: Initial suggestion took about %s\n",
279 stage, 279 stage,
280 GNUNET_STRINGS_relative_time_to_string (block_duration, 280 GNUNET_STRINGS_relative_time_to_string (block_duration,
281 GNUNET_YES)); 281 GNUNET_YES));
@@ -288,8 +288,8 @@ address_suggest_cb (void *cls, const struct GNUNET_HELLO_Address *address,
288 /* Startup suggestion */ 288 /* Startup suggestion */
289 if (GNUNET_OK == compare_addresses (address, session, &test_hello_address, test_session)) 289 if (GNUNET_OK == compare_addresses (address, session, &test_hello_address, test_session))
290 { 290 {
291 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 291 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
292 "Stage %u: Callback with correct address `%s'\n", 292 "Stage %u: Callback with correct address `%s'\n",
293 stage, 293 stage,
294 GNUNET_i2s (&address->peer)); 294 GNUNET_i2s (&address->peer));
295 ret = 0; 295 ret = 0;
@@ -297,7 +297,7 @@ address_suggest_cb (void *cls, const struct GNUNET_HELLO_Address *address,
297 else 297 else
298 { 298 {
299 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 299 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
300 "Stage %u: Callback with invalid address `%s'\n", 300 "Stage %u: Callback with invalid address `%s'\n",
301 stage, 301 stage,
302 GNUNET_i2s (&address->peer)); 302 GNUNET_i2s (&address->peer));
303 GNUNET_ATS_suggest_address_cancel (sched_ats, &p.id); 303 GNUNET_ATS_suggest_address_cancel (sched_ats, &p.id);
@@ -307,7 +307,7 @@ address_suggest_cb (void *cls, const struct GNUNET_HELLO_Address *address,
307 307
308 if (GNUNET_OK != compare_ats (atsi, ats_count, test_ats_info, test_ats_count)) 308 if (GNUNET_OK != compare_ats (atsi, ats_count, test_ats_info, test_ats_count))
309 { 309 {
310 GNUNET_log (GNUNET_ERROR_TYPE_ERROR, 310 GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
311 "Stage %u: Callback with incorrect ats info\n", 311 "Stage %u: Callback with incorrect ats info\n",
312 stage); 312 stage);
313 GNUNET_ATS_suggest_address_cancel (sched_ats, &p.id); 313 GNUNET_ATS_suggest_address_cancel (sched_ats, &p.id);
@@ -325,7 +325,7 @@ address_suggest_cb (void *cls, const struct GNUNET_HELLO_Address *address,
325 325
326 326
327static void 327static void
328run (void *cls, 328run (void *cls,
329 const struct GNUNET_CONFIGURATION_Handle *cfg, 329 const struct GNUNET_CONFIGURATION_Handle *cfg,
330 struct GNUNET_TESTING_Peer *peer) 330 struct GNUNET_TESTING_Peer *peer)
331{ 331{
@@ -336,7 +336,7 @@ run (void *cls,
336 sched_ats = GNUNET_ATS_scheduling_init (cfg, &address_suggest_cb, NULL); 336 sched_ats = GNUNET_ATS_scheduling_init (cfg, &address_suggest_cb, NULL);
337 if (sched_ats == NULL) 337 if (sched_ats == NULL)
338 { 338 {
339 GNUNET_log (GNUNET_ERROR_TYPE_ERROR, 339 GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
340 "Could not connect to ATS scheduling!\n"); 340 "Could not connect to ATS scheduling!\n");
341 ret = 1; 341 ret = 1;
342 end (); 342 end ();
diff --git a/src/ats/test_ats_api_scheduling_destroy_address.c b/src/ats/test_ats_api_scheduling_destroy_address.c
index 78005fe84..aa70f6b5a 100644
--- a/src/ats/test_ats_api_scheduling_destroy_address.c
+++ b/src/ats/test_ats_api_scheduling_destroy_address.c
@@ -161,7 +161,7 @@ address_suggest_cb (void *cls, const struct GNUNET_HELLO_Address *address,
161 161
162 162
163static void 163static void
164run (void *cls, 164run (void *cls,
165 const struct GNUNET_CONFIGURATION_Handle *cfg, 165 const struct GNUNET_CONFIGURATION_Handle *cfg,
166 struct GNUNET_TESTING_Peer *peer) 166 struct GNUNET_TESTING_Peer *peer)
167{ 167{
diff --git a/src/ats/test_ats_api_scheduling_destroy_address_twice.c b/src/ats/test_ats_api_scheduling_destroy_address_twice.c
index e3cd2cd2c..ef03674df 100644
--- a/src/ats/test_ats_api_scheduling_destroy_address_twice.c
+++ b/src/ats/test_ats_api_scheduling_destroy_address_twice.c
@@ -163,7 +163,7 @@ address_suggest_cb (void *cls, const struct GNUNET_HELLO_Address *address,
163 163
164 164
165static void 165static void
166run (void *cls, 166run (void *cls,
167 const struct GNUNET_CONFIGURATION_Handle *cfg, 167 const struct GNUNET_CONFIGURATION_Handle *cfg,
168 struct GNUNET_TESTING_Peer *peer) 168 struct GNUNET_TESTING_Peer *peer)
169{ 169{
diff --git a/src/ats/test_ats_api_scheduling_destroy_inbound_connection.c b/src/ats/test_ats_api_scheduling_destroy_inbound_connection.c
index 100bfd249..90a8d070f 100644
--- a/src/ats/test_ats_api_scheduling_destroy_inbound_connection.c
+++ b/src/ats/test_ats_api_scheduling_destroy_inbound_connection.c
@@ -162,7 +162,7 @@ address_suggest_cb (void *cls, const struct GNUNET_HELLO_Address *address,
162 162
163 163
164static void 164static void
165run (void *cls, 165run (void *cls,
166 const struct GNUNET_CONFIGURATION_Handle *cfg, 166 const struct GNUNET_CONFIGURATION_Handle *cfg,
167 struct GNUNET_TESTING_Peer *peer) 167 struct GNUNET_TESTING_Peer *peer)
168{ 168{
diff --git a/src/ats/test_ats_api_scheduling_destroy_session.c b/src/ats/test_ats_api_scheduling_destroy_session.c
index 523822667..dc53a894d 100644
--- a/src/ats/test_ats_api_scheduling_destroy_session.c
+++ b/src/ats/test_ats_api_scheduling_destroy_session.c
@@ -167,7 +167,7 @@ address_suggest_cb (void *cls, const struct GNUNET_HELLO_Address *address,
167 167
168 168
169static void 169static void
170run (void *cls, 170run (void *cls,
171 const struct GNUNET_CONFIGURATION_Handle *cfg, 171 const struct GNUNET_CONFIGURATION_Handle *cfg,
172 struct GNUNET_TESTING_Peer *peer) 172 struct GNUNET_TESTING_Peer *peer)
173{ 173{
diff --git a/src/ats/test_ats_api_scheduling_init.c b/src/ats/test_ats_api_scheduling_init.c
index 7fd954eb5..aab5f2373 100644
--- a/src/ats/test_ats_api_scheduling_init.c
+++ b/src/ats/test_ats_api_scheduling_init.c
@@ -117,7 +117,7 @@ address_suggest_cb (void *cls, const struct GNUNET_HELLO_Address *address,
117 117
118 118
119static void 119static void
120run (void *cls, 120run (void *cls,
121 const struct GNUNET_CONFIGURATION_Handle *cfg, 121 const struct GNUNET_CONFIGURATION_Handle *cfg,
122 struct GNUNET_TESTING_Peer *peer) 122 struct GNUNET_TESTING_Peer *peer)
123{ 123{
diff --git a/src/ats/test_ats_api_scheduling_min_bw.c b/src/ats/test_ats_api_scheduling_min_bw.c
index 5a59c23bb..4da07628c 100644
--- a/src/ats/test_ats_api_scheduling_min_bw.c
+++ b/src/ats/test_ats_api_scheduling_min_bw.c
@@ -117,7 +117,7 @@ address_suggest_cb (void *cls, const struct GNUNET_HELLO_Address *address,
117} 117}
118 118
119static void 119static void
120run (void *cls, 120run (void *cls,
121 const struct GNUNET_CONFIGURATION_Handle *cfg, 121 const struct GNUNET_CONFIGURATION_Handle *cfg,
122 struct GNUNET_TESTING_Peer *peer) 122 struct GNUNET_TESTING_Peer *peer)
123{ 123{