diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/ats/gnunet-service-ats_addresses.c | 6 | ||||
-rw-r--r-- | src/ats/gnunet-service-ats_addresses_mlp.c | 19 | ||||
-rw-r--r-- | src/ats/gnunet-service-ats_addresses_mlp.h | 18 | ||||
-rw-r--r-- | src/ats/gnunet-service-ats_addresses_simplistic.c | 12 | ||||
-rw-r--r-- | src/ats/gnunet-service-ats_addresses_simplistic.h | 10 | ||||
-rw-r--r-- | src/ats/gnunet-service-ats_performance.c | 4 | ||||
-rw-r--r-- | src/ats/gnunet-service-ats_performance.h | 10 | ||||
-rw-r--r-- | src/ats/gnunet-service-ats_scheduling.c | 1 | ||||
-rw-r--r-- | src/ats/gnunet-service-ats_scheduling.h | 6 |
9 files changed, 66 insertions, 20 deletions
diff --git a/src/ats/gnunet-service-ats_addresses.c b/src/ats/gnunet-service-ats_addresses.c index 65f9ce89a..36070f999 100644 --- a/src/ats/gnunet-service-ats_addresses.c +++ b/src/ats/gnunet-service-ats_addresses.c | |||
@@ -321,6 +321,7 @@ create_address (const struct GNUNET_PeerIdentity *peer, | |||
321 | /** | 321 | /** |
322 | * Destroy the given address. | 322 | * Destroy the given address. |
323 | * | 323 | * |
324 | * @param handle the address handle | ||
324 | * @param addr address to destroy | 325 | * @param addr address to destroy |
325 | * @return GNUNET_YES if bandwidth allocations should be recalcualted | 326 | * @return GNUNET_YES if bandwidth allocations should be recalcualted |
326 | */ | 327 | */ |
@@ -421,6 +422,7 @@ compare_address_it (void *cls, const struct GNUNET_HashCode * key, void *value) | |||
421 | * Compares by peer identity and network address OR by session ID | 422 | * Compares by peer identity and network address OR by session ID |
422 | * (one of the two must match). | 423 | * (one of the two must match). |
423 | * | 424 | * |
425 | * @param handle the address handle | ||
424 | * @param peer peer to lookup addresses for | 426 | * @param peer peer to lookup addresses for |
425 | * @param addr existing address record | 427 | * @param addr existing address record |
426 | * @return existing address record, NULL for none | 428 | * @return existing address record, NULL for none |
@@ -794,6 +796,7 @@ GAS_addresses_in_use (struct GAS_Addresses_Handle *handle, | |||
794 | /** | 796 | /** |
795 | * Cancel address suggestions for a peer | 797 | * Cancel address suggestions for a peer |
796 | * | 798 | * |
799 | * @param handle the address handle | ||
797 | * @param peer the respective peer | 800 | * @param peer the respective peer |
798 | */ | 801 | */ |
799 | void | 802 | void |
@@ -829,6 +832,7 @@ GAS_addresses_request_address_cancel (struct GAS_Addresses_Handle *handle, | |||
829 | /** | 832 | /** |
830 | * Add an address suggestions for a peer | 833 | * Add an address suggestions for a peer |
831 | * | 834 | * |
835 | * @param handle the address handle | ||
832 | * @param peer the respective peer | 836 | * @param peer the respective peer |
833 | */ | 837 | */ |
834 | void | 838 | void |
@@ -1268,6 +1272,7 @@ peer_it (void *cls, | |||
1268 | /** | 1272 | /** |
1269 | * Return all peers currently known to ATS | 1273 | * Return all peers currently known to ATS |
1270 | * | 1274 | * |
1275 | * @param handle the address handle | ||
1271 | * @param p_it the iterator to call for every peer, callbach with id == NULL | 1276 | * @param p_it the iterator to call for every peer, callbach with id == NULL |
1272 | * when done | 1277 | * when done |
1273 | * @param p_it_cls the closure for the iterator | 1278 | * @param p_it_cls the closure for the iterator |
@@ -1332,6 +1337,7 @@ peerinfo_it (void *cls, | |||
1332 | /** | 1337 | /** |
1333 | * Return all peers currently known to ATS | 1338 | * Return all peers currently known to ATS |
1334 | * | 1339 | * |
1340 | * @param handle the address handle | ||
1335 | * @param peer the respective peer | 1341 | * @param peer the respective peer |
1336 | * @param pi_it the iterator to call for every peer | 1342 | * @param pi_it the iterator to call for every peer |
1337 | * @param pi_it_cls the closure for the iterator | 1343 | * @param pi_it_cls the closure for the iterator |
diff --git a/src/ats/gnunet-service-ats_addresses_mlp.c b/src/ats/gnunet-service-ats_addresses_mlp.c index 2ba939982..8e852ad75 100644 --- a/src/ats/gnunet-service-ats_addresses_mlp.c +++ b/src/ats/gnunet-service-ats_addresses_mlp.c | |||
@@ -339,6 +339,7 @@ create_constraint_it (void *cls, const struct GNUNET_HashCode * key, void *value | |||
339 | return GNUNET_OK; | 339 | return GNUNET_OK; |
340 | } | 340 | } |
341 | 341 | ||
342 | #if 0 | ||
342 | /** | 343 | /** |
343 | * Find the required ATS information for an address | 344 | * Find the required ATS information for an address |
344 | * | 345 | * |
@@ -347,7 +348,6 @@ create_constraint_it (void *cls, const struct GNUNET_HashCode * key, void *value | |||
347 | * | 348 | * |
348 | * @return the index on success, otherwise GNUNET_SYSERR | 349 | * @return the index on success, otherwise GNUNET_SYSERR |
349 | */ | 350 | */ |
350 | #if 0 | ||
351 | static int | 351 | static int |
352 | mlp_lookup_ats (struct ATS_Address *addr, int ats_index) | 352 | mlp_lookup_ats (struct ATS_Address *addr, int ats_index) |
353 | { | 353 | { |
@@ -1073,6 +1073,12 @@ GAS_mlp_solve_problem (void *solver, struct GAS_MLP_SolutionContext *ctx) | |||
1073 | * | 1073 | * |
1074 | * @param cfg the GNUNET_CONFIGURATION_Handle handle | 1074 | * @param cfg the GNUNET_CONFIGURATION_Handle handle |
1075 | * @param stats the GNUNET_STATISTICS handle | 1075 | * @param stats the GNUNET_STATISTICS handle |
1076 | * @param network array of GNUNET_ATS_NetworkType with length dest_length | ||
1077 | * @param out_dest array of outbound quotas | ||
1078 | * @param in_dest array of outbound quota | ||
1079 | * @param dest_length array length for quota arrays | ||
1080 | * @param bw_changed_cb callback for changed bandwidth amounts | ||
1081 | * @param bw_changed_cb_cls cls for callback | ||
1076 | * @return struct GAS_MLP_Handle on success, NULL on fail | 1082 | * @return struct GAS_MLP_Handle on success, NULL on fail |
1077 | */ | 1083 | */ |
1078 | void * | 1084 | void * |
@@ -1544,10 +1550,13 @@ GAS_mlp_address_add (void *solver, struct GNUNET_CONTAINER_MultiHashMap * addres | |||
1544 | * Otherwise the addresses' values can be updated and the existing base can | 1550 | * Otherwise the addresses' values can be updated and the existing base can |
1545 | * be reused | 1551 | * be reused |
1546 | * | 1552 | * |
1547 | * @param solver the MLP Handle | 1553 | * @param solver the solver Handle |
1548 | * @param addresses the address hashmap | 1554 | * @param addresses the address hashmap containing all addresses |
1549 | * the address has to be already removed from the hashmap | 1555 | * @param address the update address |
1550 | * @param address the address to update | 1556 | * @param session the new session (if changed otherwise current) |
1557 | * @param in_use the new address in use state (if changed otherwise current) | ||
1558 | * @param atsi the latest ATS information | ||
1559 | * @param atsi_count the atsi count | ||
1551 | */ | 1560 | */ |
1552 | void | 1561 | void |
1553 | GAS_mlp_address_update (void *solver, | 1562 | GAS_mlp_address_update (void *solver, |
diff --git a/src/ats/gnunet-service-ats_addresses_mlp.h b/src/ats/gnunet-service-ats_addresses_mlp.h index ce0a348a3..2f09bd269 100644 --- a/src/ats/gnunet-service-ats_addresses_mlp.h +++ b/src/ats/gnunet-service-ats_addresses_mlp.h | |||
@@ -316,7 +316,12 @@ struct MLP_information | |||
316 | * | 316 | * |
317 | * @param cfg configuration handle | 317 | * @param cfg configuration handle |
318 | * @param stats the GNUNET_STATISTICS handle | 318 | * @param stats the GNUNET_STATISTICS handle |
319 | * @param bw_changed_cb callback to call when assigned changes | 319 | * @param network array of GNUNET_ATS_NetworkType with length dest_length |
320 | * @param out_dest array of outbound quotas | ||
321 | * @param in_dest array of outbound quota | ||
322 | * @param dest_length array length for quota arrays | ||
323 | * @param bw_changed_cb callback for changed bandwidth amounts | ||
324 | * @param bw_changed_cb_cls cls for callback | ||
320 | * @return struct GAS_MLP_Handle on success, NULL on fail | 325 | * @return struct GAS_MLP_Handle on success, NULL on fail |
321 | */ | 326 | */ |
322 | void * | 327 | void * |
@@ -349,10 +354,13 @@ GAS_mlp_address_add (void *solver, struct GNUNET_CONTAINER_MultiHashMap * addres | |||
349 | * Otherwise the addresses' values can be updated and the existing base can | 354 | * Otherwise the addresses' values can be updated and the existing base can |
350 | * be reused | 355 | * be reused |
351 | * | 356 | * |
352 | * @param solver the MLP Handle | 357 | * @param solver the solver Handle |
353 | * @param addresses the address hashmap | 358 | * @param addresses the address hashmap containing all addresses |
354 | * the address has to be already added from the hashmap | 359 | * @param address the update address |
355 | * @param address the address to update | 360 | * @param session the new session (if changed otherwise current) |
361 | * @param in_use the new address in use state (if changed otherwise current) | ||
362 | * @param atsi the latest ATS information | ||
363 | * @param atsi_count the atsi count | ||
356 | */ | 364 | */ |
357 | void | 365 | void |
358 | GAS_mlp_address_update (void *solver, | 366 | GAS_mlp_address_update (void *solver, |
diff --git a/src/ats/gnunet-service-ats_addresses_simplistic.c b/src/ats/gnunet-service-ats_addresses_simplistic.c index c0b708b87..2c31359f5 100644 --- a/src/ats/gnunet-service-ats_addresses_simplistic.c +++ b/src/ats/gnunet-service-ats_addresses_simplistic.c | |||
@@ -135,7 +135,10 @@ struct AddressWrapper | |||
135 | * @param stats the GNUNET_STATISTICS handle | 135 | * @param stats the GNUNET_STATISTICS handle |
136 | * @param network array of GNUNET_ATS_NetworkType with length dest_length | 136 | * @param network array of GNUNET_ATS_NetworkType with length dest_length |
137 | * @param out_quota array of outbound quotas | 137 | * @param out_quota array of outbound quotas |
138 | * param in_quota array of outbound quota | 138 | * @param in_quota array of outbound quota |
139 | * @param dest_length array length for quota arrays | ||
140 | * @param bw_changed_cb callback for changed bandwidth amounts | ||
141 | * @param bw_changed_cb_cls cls for callback | ||
139 | * @return handle for the solver on success, NULL on fail | 142 | * @return handle for the solver on success, NULL on fail |
140 | */ | 143 | */ |
141 | void * | 144 | void * |
@@ -241,7 +244,8 @@ GAS_simplistic_done (void *solver) | |||
241 | /** | 244 | /** |
242 | * Update the quotas for a network type | 245 | * Update the quotas for a network type |
243 | * | 246 | * |
244 | * @param network the network type to update | 247 | * @param s the solver handle |
248 | * @param net the network type to update | ||
245 | * @param address_except address excluded from notifcation, since we suggest | 249 | * @param address_except address excluded from notifcation, since we suggest |
246 | * this address | 250 | * this address |
247 | */ | 251 | */ |
@@ -415,6 +419,10 @@ GAS_simplistic_address_delete (void *solver, | |||
415 | * @param solver the solver Handle | 419 | * @param solver the solver Handle |
416 | * @param addresses the address hashmap containing all addresses | 420 | * @param addresses the address hashmap containing all addresses |
417 | * @param address the update address | 421 | * @param address the update address |
422 | * @param session the new session (if changed otherwise current) | ||
423 | * @param in_use the new address in use state (if changed otherwise current) | ||
424 | * @param atsi the latest ATS information | ||
425 | * @param atsi_count the atsi count | ||
418 | */ | 426 | */ |
419 | void | 427 | void |
420 | GAS_simplistic_address_update (void *solver, | 428 | GAS_simplistic_address_update (void *solver, |
diff --git a/src/ats/gnunet-service-ats_addresses_simplistic.h b/src/ats/gnunet-service-ats_addresses_simplistic.h index 029a74037..0a3eee4bd 100644 --- a/src/ats/gnunet-service-ats_addresses_simplistic.h +++ b/src/ats/gnunet-service-ats_addresses_simplistic.h | |||
@@ -48,8 +48,10 @@ | |||
48 | * @param stats the GNUNET_STATISTICS handle | 48 | * @param stats the GNUNET_STATISTICS handle |
49 | * @param network array of GNUNET_ATS_NetworkType with length dest_length | 49 | * @param network array of GNUNET_ATS_NetworkType with length dest_length |
50 | * @param out_quota array of outbound quotas | 50 | * @param out_quota array of outbound quotas |
51 | * param in_quota array of outbound quota | 51 | * @param in_quota array of outbound quota |
52 | * @param bw_changed_cb callback to call when assigned changes | 52 | * @param dest_length array length for quota arrays |
53 | * @param bw_changed_cb callback for changed bandwidth amounts | ||
54 | * @param bw_changed_cb_cls cls for callback | ||
53 | * @return handle for the solver on success, NULL on fail | 55 | * @return handle for the solver on success, NULL on fail |
54 | */ | 56 | */ |
55 | void * | 57 | void * |
@@ -87,6 +89,10 @@ GAS_simplistic_address_add (void *solver, struct GNUNET_CONTAINER_MultiHashMap * | |||
87 | * @param solver the solver Handle | 89 | * @param solver the solver Handle |
88 | * @param addresses the address hashmap containing all addresses | 90 | * @param addresses the address hashmap containing all addresses |
89 | * @param address the update address | 91 | * @param address the update address |
92 | * @param session the new session (if changed otherwise current) | ||
93 | * @param in_use the new address in use state (if changed otherwise current) | ||
94 | * @param atsi the latest ATS information | ||
95 | * @param atsi_count the atsi count | ||
90 | */ | 96 | */ |
91 | void | 97 | void |
92 | GAS_simplistic_address_update (void *solver, | 98 | GAS_simplistic_address_update (void *solver, |
diff --git a/src/ats/gnunet-service-ats_performance.c b/src/ats/gnunet-service-ats_performance.c index ef6e5572a..6ebd021cf 100644 --- a/src/ats/gnunet-service-ats_performance.c +++ b/src/ats/gnunet-service-ats_performance.c | |||
@@ -554,7 +554,8 @@ GAS_handle_reservation_request (void *cls, struct GNUNET_SERVER_Client *client, | |||
554 | * @param message the request message | 554 | * @param message the request message |
555 | */ | 555 | */ |
556 | void | 556 | void |
557 | GAS_handle_preference_change (void *cls, struct GNUNET_SERVER_Client *client, | 557 | GAS_handle_preference_change (void *cls, |
558 | struct GNUNET_SERVER_Client *client, | ||
558 | const struct GNUNET_MessageHeader *message) | 559 | const struct GNUNET_MessageHeader *message) |
559 | { | 560 | { |
560 | const struct ChangePreferenceMessage *msg; | 561 | const struct ChangePreferenceMessage *msg; |
@@ -598,6 +599,7 @@ GAS_handle_preference_change (void *cls, struct GNUNET_SERVER_Client *client, | |||
598 | * Initialize performance subsystem. | 599 | * Initialize performance subsystem. |
599 | * | 600 | * |
600 | * @param server handle to our server | 601 | * @param server handle to our server |
602 | * @param addresses the address handle to use | ||
601 | */ | 603 | */ |
602 | void | 604 | void |
603 | GAS_performance_init (struct GNUNET_SERVER_Handle *server, | 605 | GAS_performance_init (struct GNUNET_SERVER_Handle *server, |
diff --git a/src/ats/gnunet-service-ats_performance.h b/src/ats/gnunet-service-ats_performance.h index 0ef481d48..6d527ae19 100644 --- a/src/ats/gnunet-service-ats_performance.h +++ b/src/ats/gnunet-service-ats_performance.h | |||
@@ -87,7 +87,8 @@ GAS_performance_notify_all_clients (const struct GNUNET_PeerIdentity *peer, | |||
87 | * @param message the request message | 87 | * @param message the request message |
88 | */ | 88 | */ |
89 | void | 89 | void |
90 | GAS_handle_request_address_list (void *cls, struct GNUNET_SERVER_Client *client, | 90 | GAS_handle_request_address_list (void *cls, |
91 | struct GNUNET_SERVER_Client *client, | ||
91 | const struct GNUNET_MessageHeader *message); | 92 | const struct GNUNET_MessageHeader *message); |
92 | 93 | ||
93 | /** | 94 | /** |
@@ -98,7 +99,8 @@ GAS_handle_request_address_list (void *cls, struct GNUNET_SERVER_Client *client, | |||
98 | * @param message the request message | 99 | * @param message the request message |
99 | */ | 100 | */ |
100 | void | 101 | void |
101 | GAS_handle_reservation_request (void *cls, struct GNUNET_SERVER_Client *client, | 102 | GAS_handle_reservation_request (void *cls, |
103 | struct GNUNET_SERVER_Client *client, | ||
102 | const struct GNUNET_MessageHeader *message); | 104 | const struct GNUNET_MessageHeader *message); |
103 | 105 | ||
104 | 106 | ||
@@ -110,7 +112,8 @@ GAS_handle_reservation_request (void *cls, struct GNUNET_SERVER_Client *client, | |||
110 | * @param message the request message | 112 | * @param message the request message |
111 | */ | 113 | */ |
112 | void | 114 | void |
113 | GAS_handle_preference_change (void *cls, struct GNUNET_SERVER_Client *client, | 115 | GAS_handle_preference_change (void *cls, |
116 | struct GNUNET_SERVER_Client *client, | ||
114 | const struct GNUNET_MessageHeader *message); | 117 | const struct GNUNET_MessageHeader *message); |
115 | 118 | ||
116 | 119 | ||
@@ -118,6 +121,7 @@ GAS_handle_preference_change (void *cls, struct GNUNET_SERVER_Client *client, | |||
118 | * Initialize performance subsystem. | 121 | * Initialize performance subsystem. |
119 | * | 122 | * |
120 | * @param server handle to our server | 123 | * @param server handle to our server |
124 | * @param addresses the address handle to use | ||
121 | */ | 125 | */ |
122 | void | 126 | void |
123 | GAS_performance_init (struct GNUNET_SERVER_Handle *server, | 127 | GAS_performance_init (struct GNUNET_SERVER_Handle *server, |
diff --git a/src/ats/gnunet-service-ats_scheduling.c b/src/ats/gnunet-service-ats_scheduling.c index 70009b310..4a20f909d 100644 --- a/src/ats/gnunet-service-ats_scheduling.c +++ b/src/ats/gnunet-service-ats_scheduling.c | |||
@@ -482,6 +482,7 @@ GAS_handle_address_destroyed (void *cls, struct GNUNET_SERVER_Client *client, | |||
482 | * Initialize scheduling subsystem. | 482 | * Initialize scheduling subsystem. |
483 | * | 483 | * |
484 | * @param server handle to our server | 484 | * @param server handle to our server |
485 | * @param ah the address handle to use | ||
485 | */ | 486 | */ |
486 | void | 487 | void |
487 | GAS_scheduling_init (struct GNUNET_SERVER_Handle *server, struct GAS_Addresses_Handle *ah) | 488 | GAS_scheduling_init (struct GNUNET_SERVER_Handle *server, struct GAS_Addresses_Handle *ah) |
diff --git a/src/ats/gnunet-service-ats_scheduling.h b/src/ats/gnunet-service-ats_scheduling.h index e1ac166c5..d7b5e9cde 100644 --- a/src/ats/gnunet-service-ats_scheduling.h +++ b/src/ats/gnunet-service-ats_scheduling.h | |||
@@ -159,7 +159,8 @@ GAS_handle_address_in_use (void *cls, struct GNUNET_SERVER_Client *client, | |||
159 | * @param message the request message | 159 | * @param message the request message |
160 | */ | 160 | */ |
161 | void | 161 | void |
162 | GAS_handle_address_destroyed (void *cls, struct GNUNET_SERVER_Client *client, | 162 | GAS_handle_address_destroyed (void *cls, |
163 | struct GNUNET_SERVER_Client *client, | ||
163 | const struct GNUNET_MessageHeader *message); | 164 | const struct GNUNET_MessageHeader *message); |
164 | 165 | ||
165 | 166 | ||
@@ -167,9 +168,10 @@ GAS_handle_address_destroyed (void *cls, struct GNUNET_SERVER_Client *client, | |||
167 | * Initialize scheduling subsystem. | 168 | * Initialize scheduling subsystem. |
168 | * | 169 | * |
169 | * @param server handle to our server | 170 | * @param server handle to our server |
171 | * @param ah the address handle to use | ||
170 | */ | 172 | */ |
171 | void | 173 | void |
172 | GAS_scheduling_init (struct GNUNET_SERVER_Handle *server, struct GAS_Addresses_Handle *addresses); | 174 | GAS_scheduling_init (struct GNUNET_SERVER_Handle *server, struct GAS_Addresses_Handle *ah); |
173 | 175 | ||
174 | 176 | ||
175 | /** | 177 | /** |