From 0601dd2e424534b6c4cacf8c6844f354919cc0ca Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Fri, 15 Apr 2022 12:26:12 +0200
Subject: -fix synchronous provider discovery logic

---
 src/reducer/anastasis_api_recovery_redux.c | 12 ++++++++----
 src/reducer/anastasis_api_redux.c          | 11 +++++------
 2 files changed, 13 insertions(+), 10 deletions(-)

(limited to 'src/reducer')

diff --git a/src/reducer/anastasis_api_recovery_redux.c b/src/reducer/anastasis_api_recovery_redux.c
index d831adc..22be38d 100644
--- a/src/reducer/anastasis_api_recovery_redux.c
+++ b/src/reducer/anastasis_api_recovery_redux.c
@@ -2271,6 +2271,7 @@ poll_providers (json_t *state,
   {
     struct ANASTASIS_CRYPTO_ProviderSaltP provider_salt;
     struct SyncEntry *se;
+    struct ANASTASIS_ReduxAction *ra;
 
     if (GNUNET_OK ==
         ANASTASIS_reducer_lookup_salt (state,
@@ -2282,10 +2283,13 @@ poll_providers (json_t *state,
     GNUNET_CONTAINER_DLL_insert (ms->se_head,
                                  ms->se_tail,
                                  se);
-    se->ra = ANASTASIS_REDUX_add_provider_to_state_ (url,
-                                                     state,
-                                                     &sync_progress,
-                                                     se);
+    ra = ANASTASIS_REDUX_add_provider_to_state_ (url,
+                                                 state,
+                                                 &sync_progress,
+                                                 se);
+    if (NULL == ra)
+      return NULL; /* sync_progress already called! */
+    se->ra = ra;
   }
   if (NULL == ms->se_head)
   {
diff --git a/src/reducer/anastasis_api_redux.c b/src/reducer/anastasis_api_redux.c
index 5dde4c6..2271942 100644
--- a/src/reducer/anastasis_api_redux.c
+++ b/src/reducer/anastasis_api_redux.c
@@ -661,6 +661,8 @@ check_config (const char *url)
                                  cr_tail,
                                  cr);
   }
+  if (MHD_HTTP_OK == cr->http_status)
+    return cr;
   cr->co = ANASTASIS_get_config (ANASTASIS_REDUX_ctx_,
                                  cr->url,
                                  &config_cb,
@@ -670,12 +672,9 @@ check_config (const char *url)
     GNUNET_break (0);
     return NULL;
   }
-  else
-  {
-    cr->tt = GNUNET_SCHEDULER_add_delayed (CONFIG_GENERIC_TIMEOUT,
-                                           &config_request_timeout,
-                                           cr);
-  }
+  cr->tt = GNUNET_SCHEDULER_add_delayed (CONFIG_GENERIC_TIMEOUT,
+                                         &config_request_timeout,
+                                         cr);
   return cr;
 }
 
-- 
cgit v1.2.3