aboutsummaryrefslogtreecommitdiff
path: root/src/ats
diff options
context:
space:
mode:
authorMatthias Wachs <wachs@net.in.tum.de>2013-03-15 09:01:21 +0000
committerMatthias Wachs <wachs@net.in.tum.de>2013-03-15 09:01:21 +0000
commit2f1a326dfce5dbd5cbe6bb597feb5b8831855e15 (patch)
treece2bdd50f1f665395d8d5f24eef5643acb601744 /src/ats
parentd1c05be0514d7b0074a8df34b12a0acb6bae82d0 (diff)
downloadgnunet-2f1a326dfce5dbd5cbe6bb597feb5b8831855e15.tar.gz
gnunet-2f1a326dfce5dbd5cbe6bb597feb5b8831855e15.zip
doxygen
Diffstat (limited to 'src/ats')
-rw-r--r--src/ats/gnunet-service-ats_addresses.c4
-rw-r--r--src/ats/gnunet-service-ats_addresses_mlp.c8
-rw-r--r--src/ats/gnunet-service-ats_addresses_simplistic.c9
3 files changed, 11 insertions, 10 deletions
diff --git a/src/ats/gnunet-service-ats_addresses.c b/src/ats/gnunet-service-ats_addresses.c
index a88ff5681..05ff2bc9d 100644
--- a/src/ats/gnunet-service-ats_addresses.c
+++ b/src/ats/gnunet-service-ats_addresses.c
@@ -81,8 +81,8 @@
81 * is loaded from ats configuration during initialization. This quota defines 81 * is loaded from ats configuration during initialization. This quota defines
82 * to total amount of inbound and outbound traffic allowed for a specific 82 * to total amount of inbound and outbound traffic allowed for a specific
83 * network. The configuration values used are in section ats: 83 * network. The configuration values used are in section ats:
84 * * <NETWORK>_QUOTA_IN = <value> 84 * * "NETWORK"_QUOTA_IN = <value>
85 * * <NETWORK>_QUOTA_IN = <value> 85 * * "NETWORK"_QUOTA_IN = <value>
86 * 86 *
87 * You can specify quotas by setting the <value> to a: 87 * You can specify quotas by setting the <value> to a:
88 * * unrestricted: unlimited 88 * * unrestricted: unlimited
diff --git a/src/ats/gnunet-service-ats_addresses_mlp.c b/src/ats/gnunet-service-ats_addresses_mlp.c
index a70981594..3a4e14a32 100644
--- a/src/ats/gnunet-service-ats_addresses_mlp.c
+++ b/src/ats/gnunet-service-ats_addresses_mlp.c
@@ -816,10 +816,12 @@ mlp_solve_mlp_problem (struct GAS_MLP_Handle *mlp)
816 816
817 817
818/** 818/**
819 * Solves the MLP problem 819 * Propagates the results when MLP problem was solved
820 * 820 *
821 * @param mlp the MLP Handle 821 * @param cls the MLP handle
822 * @return GNUNET_OK if could be solved, GNUNET_SYSERR on failure 822 * @param key the peer identity
823 * @param value the address
824 * @return GNUNET_OK to continue
823 */ 825 */
824int 826int
825mlp_propagate_results (void *cls, const struct GNUNET_HashCode *key, void *value) 827mlp_propagate_results (void *cls, const struct GNUNET_HashCode *key, void *value)
diff --git a/src/ats/gnunet-service-ats_addresses_simplistic.c b/src/ats/gnunet-service-ats_addresses_simplistic.c
index d88aa4838..7450412c9 100644
--- a/src/ats/gnunet-service-ats_addresses_simplistic.c
+++ b/src/ats/gnunet-service-ats_addresses_simplistic.c
@@ -514,7 +514,6 @@ GAS_simplistic_done (void *solver)
514/** 514/**
515 * Test if bandwidth is available in this network 515 * Test if bandwidth is available in this network
516 * 516 *
517 * @param s the solver handle
518 * @param net the network type to update 517 * @param net the network type to update
519 * @return GNUNET_YES or GNUNET_NO 518 * @return GNUNET_YES or GNUNET_NO
520 */ 519 */
@@ -1278,7 +1277,7 @@ recalculate_preferences (struct PreferencePeer *p)
1278 * f_k_p_i_ * / f_t 1277 * f_k_p_i_ * / f_t
1279 * f_k_p_i_rel = [1..2], default 1.0 1278 * f_k_p_i_rel = [1..2], default 1.0
1280 * } 1279 * }
1281 * f_p_i_rel = sum (f_k_p_i_rel) / #k 1280 * f_p_i_rel = sum (f_k_p_i_rel) / count(k)
1282 * } 1281 * }
1283 * 1282 *
1284 **/ 1283 **/
@@ -1456,7 +1455,7 @@ GAS_simplistic_address_change_preference (void *solver,
1456 void *client, 1455 void *client,
1457 const struct GNUNET_PeerIdentity *peer, 1456 const struct GNUNET_PeerIdentity *peer,
1458 enum GNUNET_ATS_PreferenceKind kind, 1457 enum GNUNET_ATS_PreferenceKind kind,
1459 float score_f) 1458 float score)
1460{ 1459{
1461 static struct GNUNET_TIME_Absolute next_update; 1460 static struct GNUNET_TIME_Absolute next_update;
1462 struct GAS_SIMPLISTIC_Handle *s = solver; 1461 struct GAS_SIMPLISTIC_Handle *s = solver;
@@ -1472,7 +1471,7 @@ GAS_simplistic_address_change_preference (void *solver,
1472 client, 1471 client,
1473 GNUNET_i2s (peer), 1472 GNUNET_i2s (peer),
1474 GNUNET_ATS_print_preference_type (kind), 1473 GNUNET_ATS_print_preference_type (kind),
1475 score_f); 1474 score);
1476 1475
1477 if (kind >= GNUNET_ATS_PreferenceCount) 1476 if (kind >= GNUNET_ATS_PreferenceCount)
1478 { 1477 {
@@ -1518,7 +1517,7 @@ GAS_simplistic_address_change_preference (void *solver,
1518 GNUNET_CONTAINER_DLL_insert (c_cur->p_head, c_cur->p_tail, p_cur); 1517 GNUNET_CONTAINER_DLL_insert (c_cur->p_head, c_cur->p_tail, p_cur);
1519 } 1518 }
1520 1519
1521 update_preference (p_cur, kind, score_f); 1520 update_preference (p_cur, kind, score);
1522 1521
1523 /* FIXME: We should update quotas if UPDATE_INTERVAL is reached */ 1522 /* FIXME: We should update quotas if UPDATE_INTERVAL is reached */
1524 if (GNUNET_TIME_absolute_get().abs_value > next_update.abs_value) 1523 if (GNUNET_TIME_absolute_get().abs_value > next_update.abs_value)