diff options
Diffstat (limited to 'src/include/gnunet_core_service.h')
-rw-r--r-- | src/include/gnunet_core_service.h | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/src/include/gnunet_core_service.h b/src/include/gnunet_core_service.h index caa02c6b2..7fe871741 100644 --- a/src/include/gnunet_core_service.h +++ b/src/include/gnunet_core_service.h | |||
@@ -178,7 +178,6 @@ typedef void | |||
178 | * Certain events (such as connect/disconnect notifications) are not | 178 | * Certain events (such as connect/disconnect notifications) are not |
179 | * subject to queue size limitations. | 179 | * subject to queue size limitations. |
180 | * | 180 | * |
181 | * @param sched scheduler to use | ||
182 | * @param cfg configuration to use | 181 | * @param cfg configuration to use |
183 | * @param timeout after how long should we give up trying to connect to the core service? | 182 | * @param timeout after how long should we give up trying to connect to the core service? |
184 | * @param cls closure for the various callbacks that follow (including handlers in the handlers array) | 183 | * @param cls closure for the various callbacks that follow (including handlers in the handlers array) |
@@ -215,8 +214,7 @@ typedef void | |||
215 | * NULL on error (in this case, init is never called) | 214 | * NULL on error (in this case, init is never called) |
216 | */ | 215 | */ |
217 | struct GNUNET_CORE_Handle * | 216 | struct GNUNET_CORE_Handle * |
218 | GNUNET_CORE_connect (struct GNUNET_SCHEDULER_Handle *sched, | 217 | GNUNET_CORE_connect (const struct GNUNET_CONFIGURATION_Handle *cfg, |
219 | const struct GNUNET_CONFIGURATION_Handle *cfg, | ||
220 | struct GNUNET_TIME_Relative timeout, | 218 | struct GNUNET_TIME_Relative timeout, |
221 | void *cls, | 219 | void *cls, |
222 | GNUNET_CORE_StartupCallback init, | 220 | GNUNET_CORE_StartupCallback init, |
@@ -257,7 +255,6 @@ struct GNUNET_CORE_PeerRequestHandle; | |||
257 | * to our connection attempt within the given time frame, 'cont' will | 255 | * to our connection attempt within the given time frame, 'cont' will |
258 | * be called with the TIMEOUT reason code. | 256 | * be called with the TIMEOUT reason code. |
259 | * | 257 | * |
260 | * @param sched scheduler to use | ||
261 | * @param cfg configuration to use | 258 | * @param cfg configuration to use |
262 | * @param timeout how long to try to talk to core | 259 | * @param timeout how long to try to talk to core |
263 | * @param peer who should we connect to | 260 | * @param peer who should we connect to |
@@ -266,8 +263,7 @@ struct GNUNET_CORE_PeerRequestHandle; | |||
266 | * @return NULL on error (cont will not be called), otherwise handle for cancellation | 263 | * @return NULL on error (cont will not be called), otherwise handle for cancellation |
267 | */ | 264 | */ |
268 | struct GNUNET_CORE_PeerRequestHandle * | 265 | struct GNUNET_CORE_PeerRequestHandle * |
269 | GNUNET_CORE_peer_request_connect (struct GNUNET_SCHEDULER_Handle *sched, | 266 | GNUNET_CORE_peer_request_connect (const struct GNUNET_CONFIGURATION_Handle *cfg, |
270 | const struct GNUNET_CONFIGURATION_Handle *cfg, | ||
271 | struct GNUNET_TIME_Relative timeout, | 267 | struct GNUNET_TIME_Relative timeout, |
272 | const struct GNUNET_PeerIdentity * peer, | 268 | const struct GNUNET_PeerIdentity * peer, |
273 | GNUNET_SCHEDULER_Task cont, | 269 | GNUNET_SCHEDULER_Task cont, |
@@ -317,7 +313,6 @@ struct GNUNET_CORE_InformationRequestContext; | |||
317 | /** | 313 | /** |
318 | * Obtain statistics and/or change preferences for the given peer. | 314 | * Obtain statistics and/or change preferences for the given peer. |
319 | * | 315 | * |
320 | * @param sched scheduler to use | ||
321 | * @param cfg configuration to use | 316 | * @param cfg configuration to use |
322 | * @param peer identifies the peer | 317 | * @param peer identifies the peer |
323 | * @param timeout after how long should we give up (and call "info" with NULL | 318 | * @param timeout after how long should we give up (and call "info" with NULL |
@@ -340,8 +335,7 @@ struct GNUNET_CORE_InformationRequestContext; | |||
340 | * @return NULL on error | 335 | * @return NULL on error |
341 | */ | 336 | */ |
342 | struct GNUNET_CORE_InformationRequestContext * | 337 | struct GNUNET_CORE_InformationRequestContext * |
343 | GNUNET_CORE_peer_change_preference (struct GNUNET_SCHEDULER_Handle *sched, | 338 | GNUNET_CORE_peer_change_preference (const struct GNUNET_CONFIGURATION_Handle *cfg, |
344 | const struct GNUNET_CONFIGURATION_Handle *cfg, | ||
345 | const struct GNUNET_PeerIdentity *peer, | 339 | const struct GNUNET_PeerIdentity *peer, |
346 | struct GNUNET_TIME_Relative timeout, | 340 | struct GNUNET_TIME_Relative timeout, |
347 | struct GNUNET_BANDWIDTH_Value32NBO bw_out, | 341 | struct GNUNET_BANDWIDTH_Value32NBO bw_out, |
@@ -362,15 +356,13 @@ GNUNET_CORE_peer_change_preference_cancel (struct GNUNET_CORE_InformationRequest | |||
362 | /** | 356 | /** |
363 | * Obtain statistics and/or change preferences for the given peer. | 357 | * Obtain statistics and/or change preferences for the given peer. |
364 | * | 358 | * |
365 | * @param sched scheduler to use | ||
366 | * @param cfg configuration to use | 359 | * @param cfg configuration to use |
367 | * @param peer_cb function to call with the peer information | 360 | * @param peer_cb function to call with the peer information |
368 | * @param cb_cls closure for peer_cb | 361 | * @param cb_cls closure for peer_cb |
369 | * @return GNUNET_OK if iterating, GNUNET_SYSERR on error | 362 | * @return GNUNET_OK if iterating, GNUNET_SYSERR on error |
370 | */ | 363 | */ |
371 | int | 364 | int |
372 | GNUNET_CORE_iterate_peers (struct GNUNET_SCHEDULER_Handle *sched, | 365 | GNUNET_CORE_iterate_peers (const struct GNUNET_CONFIGURATION_Handle *cfg, |
373 | const struct GNUNET_CONFIGURATION_Handle *cfg, | ||
374 | GNUNET_CORE_ConnectEventHandler peer_cb, | 366 | GNUNET_CORE_ConnectEventHandler peer_cb, |
375 | void *cb_cls); | 367 | void *cb_cls); |
376 | 368 | ||