diff options
author | LRN <lrn1986@gmail.com> | 2013-03-20 18:50:18 +0000 |
---|---|---|
committer | LRN <lrn1986@gmail.com> | 2013-03-20 18:50:18 +0000 |
commit | 346748a3a55e197fe206e87b0520cef85ab9fda3 (patch) | |
tree | 37bc351cba1af84ee12e8d5dcd6d596f0456da3f /src/arm/test_exponential_backoff.c | |
parent | 41646c7ce6e3d1711beb4b95da08afbd5b79d097 (diff) | |
download | gnunet-346748a3a55e197fe206e87b0520cef85ab9fda3.tar.gz gnunet-346748a3a55e197fe206e87b0520cef85ab9fda3.zip |
Simplify ARM alloc/connect
Diffstat (limited to 'src/arm/test_exponential_backoff.c')
-rw-r--r-- | src/arm/test_exponential_backoff.c | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/src/arm/test_exponential_backoff.c b/src/arm/test_exponential_backoff.c index 5613794c3..30d614c2f 100644 --- a/src/arm/test_exponential_backoff.c +++ b/src/arm/test_exponential_backoff.c | |||
@@ -280,7 +280,7 @@ static void | |||
280 | trigger_disconnect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 280 | trigger_disconnect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) |
281 | { | 281 | { |
282 | GNUNET_ARM_disconnect_and_free (arm); | 282 | GNUNET_ARM_disconnect_and_free (arm); |
283 | GNUNET_ARM_monitor_disconnect (mon); | 283 | GNUNET_ARM_monitor_disconnect_and_free (mon); |
284 | } | 284 | } |
285 | 285 | ||
286 | 286 | ||
@@ -360,16 +360,25 @@ task (void *cls, char *const *args, const char *cfgfile, | |||
360 | GNUNET_free (armconfig); | 360 | GNUNET_free (armconfig); |
361 | } | 361 | } |
362 | 362 | ||
363 | arm = GNUNET_ARM_alloc (cfg); | 363 | arm = GNUNET_ARM_connect (cfg, NULL, NULL); |
364 | GNUNET_ARM_connect (arm, NULL, NULL); | 364 | if (NULL != arm) |
365 | mon = GNUNET_ARM_monitor_alloc (cfg); | 365 | { |
366 | GNUNET_ARM_monitor (mon, srv_status, NULL); | 366 | mon = GNUNET_ARM_monitor (cfg, srv_status, NULL); |
367 | if (NULL != mon) | ||
368 | { | ||
367 | #if START_ARM | 369 | #if START_ARM |
368 | GNUNET_ARM_request_service_start (arm, "arm", | 370 | GNUNET_ARM_request_service_start (arm, "arm", |
369 | GNUNET_OS_INHERIT_STD_OUT_AND_ERR, GNUNET_TIME_UNIT_ZERO, arm_start_cb, NULL); | 371 | GNUNET_OS_INHERIT_STD_OUT_AND_ERR, GNUNET_TIME_UNIT_ZERO, arm_start_cb, NULL); |
370 | #else | 372 | #else |
371 | arm_start_cb (NULL, arm, GNUNET_ARM_REQUEST_SENT_OK, "arm", GNUNET_ARM_SERVICE_STARTING); | 373 | arm_start_cb (NULL, arm, GNUNET_ARM_REQUEST_SENT_OK, "arm", GNUNET_ARM_SERVICE_STARTING); |
372 | #endif | 374 | #endif |
375 | } | ||
376 | else | ||
377 | { | ||
378 | GNUNET_ARM_disconnect_and_free (arm); | ||
379 | arm = NULL; | ||
380 | } | ||
381 | } | ||
373 | } | 382 | } |
374 | 383 | ||
375 | static int | 384 | static int |