diff options
author | Christian Grothoff <christian@grothoff.org> | 2013-03-23 23:29:49 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2013-03-23 23:29:49 +0000 |
commit | d2a6a96a87f2bfd2b80f4c56bd6e4e9002dde1fa (patch) | |
tree | 1b218f092297e1e45eaea36e63adefbb8e266eb8 /src/arm | |
parent | 74db1810919c40b1784fac5df99a63ac7eec659f (diff) | |
download | gnunet-d2a6a96a87f2bfd2b80f4c56bd6e4e9002dde1fa.tar.gz gnunet-d2a6a96a87f2bfd2b80f4c56bd6e4e9002dde1fa.zip |
-doxygen fixes
Diffstat (limited to 'src/arm')
-rw-r--r-- | src/arm/arm_api.c | 28 | ||||
-rw-r--r-- | src/arm/gnunet-arm.c | 11 |
2 files changed, 19 insertions, 20 deletions
diff --git a/src/arm/arm_api.c b/src/arm/arm_api.c index 49cc55315..9b235f023 100644 --- a/src/arm/arm_api.c +++ b/src/arm/arm_api.c | |||
@@ -444,29 +444,29 @@ GNUNET_ARM_connect (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
444 | * @param h the handle that was being used | 444 | * @param h the handle that was being used |
445 | */ | 445 | */ |
446 | void | 446 | void |
447 | GNUNET_ARM_disconnect_and_free (struct GNUNET_ARM_Handle *handle) | 447 | GNUNET_ARM_disconnect_and_free (struct GNUNET_ARM_Handle *h) |
448 | { | 448 | { |
449 | LOG (GNUNET_ERROR_TYPE_DEBUG, "Disconnecting from ARM service\n"); | 449 | LOG (GNUNET_ERROR_TYPE_DEBUG, "Disconnecting from ARM service\n"); |
450 | if (NULL != handle->cth) | 450 | if (NULL != h->cth) |
451 | { | 451 | { |
452 | GNUNET_CLIENT_notify_transmit_ready_cancel (handle->cth); | 452 | GNUNET_CLIENT_notify_transmit_ready_cancel (h->cth); |
453 | handle->cth = NULL; | 453 | h->cth = NULL; |
454 | } | 454 | } |
455 | clear_pending_messages (handle, GNUNET_ARM_REQUEST_DISCONNECTED); | 455 | clear_pending_messages (h, GNUNET_ARM_REQUEST_DISCONNECTED); |
456 | if (NULL != handle->client) | 456 | if (NULL != h->client) |
457 | { | 457 | { |
458 | GNUNET_CLIENT_disconnect (handle->client); | 458 | GNUNET_CLIENT_disconnect (h->client); |
459 | handle->client = NULL; | 459 | h->client = NULL; |
460 | } | 460 | } |
461 | if (GNUNET_SCHEDULER_NO_TASK != handle->reconnect_task) | 461 | if (GNUNET_SCHEDULER_NO_TASK != h->reconnect_task) |
462 | { | 462 | { |
463 | GNUNET_SCHEDULER_cancel (handle->reconnect_task); | 463 | GNUNET_SCHEDULER_cancel (h->reconnect_task); |
464 | handle->reconnect_task = GNUNET_SCHEDULER_NO_TASK; | 464 | h->reconnect_task = GNUNET_SCHEDULER_NO_TASK; |
465 | } | 465 | } |
466 | if (GNUNET_NO == handle->service_test_is_active) | 466 | if (GNUNET_NO == h->service_test_is_active) |
467 | { | 467 | { |
468 | GNUNET_CONFIGURATION_destroy (handle->cfg); | 468 | GNUNET_CONFIGURATION_destroy (h->cfg); |
469 | GNUNET_free (handle); | 469 | GNUNET_free (h); |
470 | } | 470 | } |
471 | } | 471 | } |
472 | 472 | ||
diff --git a/src/arm/gnunet-arm.c b/src/arm/gnunet-arm.c index 3d94fed80..aae8b9eda 100644 --- a/src/arm/gnunet-arm.c +++ b/src/arm/gnunet-arm.c | |||
@@ -248,11 +248,10 @@ static void action_loop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *t | |||
248 | * @param arm handle to the ARM connection | 248 | * @param arm handle to the ARM connection |
249 | * @param connected GNUNET_YES if connected, GNUNET_NO if disconnected, | 249 | * @param connected GNUNET_YES if connected, GNUNET_NO if disconnected, |
250 | * GNUNET_SYSERR on error. | 250 | * GNUNET_SYSERR on error. |
251 | * @param error GNUNET_YES if we encountered a permanent error, and there | ||
252 | * will be no re-connection. | ||
253 | */ | 251 | */ |
254 | static void | 252 | static void |
255 | conn_status (void *cls, struct GNUNET_ARM_Handle *arm, char connected) | 253 | conn_status (void *cls, struct GNUNET_ARM_Handle *arm, |
254 | int connected) | ||
256 | { | 255 | { |
257 | if (GNUNET_SYSERR == connected) | 256 | if (GNUNET_SYSERR == connected) |
258 | { | 257 | { |
@@ -576,13 +575,13 @@ run (void *cls, char *const *args, const char *cfgfile, | |||
576 | else | 575 | else |
577 | GNUNET_free (armconfig); | 576 | GNUNET_free (armconfig); |
578 | } | 577 | } |
579 | h = GNUNET_ARM_connect (cfg, conn_status, NULL); | 578 | h = GNUNET_ARM_connect (cfg, &conn_status, NULL); |
580 | if (NULL != h) | 579 | if (NULL != h) |
581 | { | 580 | { |
582 | m = GNUNET_ARM_monitor (cfg, srv_status, NULL); | 581 | m = GNUNET_ARM_monitor (cfg, &srv_status, NULL); |
583 | if (NULL != m) | 582 | if (NULL != m) |
584 | { | 583 | { |
585 | GNUNET_SCHEDULER_add_now (action_loop, NULL); | 584 | GNUNET_SCHEDULER_add_now (&action_loop, NULL); |
586 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, | 585 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, |
587 | shutdown_task, NULL); | 586 | shutdown_task, NULL); |
588 | } | 587 | } |