diff options
Diffstat (limited to 'src/reducer')
-rw-r--r-- | src/reducer/anastasis_api_recovery_redux.c | 16 | ||||
-rw-r--r-- | src/reducer/anastasis_api_redux.c | 25 |
2 files changed, 21 insertions, 20 deletions
diff --git a/src/reducer/anastasis_api_recovery_redux.c b/src/reducer/anastasis_api_recovery_redux.c index 21b1f51..d0c3f2d 100644 --- a/src/reducer/anastasis_api_recovery_redux.c +++ b/src/reducer/anastasis_api_recovery_redux.c @@ -2216,7 +2216,7 @@ sync_providers (json_t *state, &provider_url), GNUNET_JSON_spec_end () }; - struct ANASTASIS_CRYPTO_ProviderSaltP salt; + struct ANASTASIS_CRYPTO_ProviderSaltP provider_salt; struct SyncEntry *se; if (GNUNET_OK != @@ -2235,7 +2235,7 @@ sync_providers (json_t *state, if (GNUNET_OK == ANASTASIS_reducer_lookup_salt (state, provider_url, - &salt)) + &provider_salt)) continue; /* provider already ready */ se = GNUNET_new (struct SyncEntry); se->ms = ms; @@ -2302,13 +2302,13 @@ poll_providers (json_t *state, ms->cb_cls = cb_cls; json_object_foreach (ap, url, obj) { - struct ANASTASIS_CRYPTO_ProviderSaltP salt; + struct ANASTASIS_CRYPTO_ProviderSaltP provider_salt; struct SyncEntry *se; if (GNUNET_OK == ANASTASIS_reducer_lookup_salt (state, url, - &salt)) + &provider_salt)) continue; se = GNUNET_new (struct SyncEntry); se->ms = ms; @@ -2640,10 +2640,10 @@ done_secret_selecting (json_t *state, &pa), GNUNET_JSON_spec_end () }; - struct ANASTASIS_CRYPTO_ProviderSaltP salt; + struct ANASTASIS_CRYPTO_ProviderSaltP provider_salt; struct GNUNET_JSON_Specification pspec[] = { - GNUNET_JSON_spec_fixed_auto ("salt", - &salt), + GNUNET_JSON_spec_fixed_auto ("provider_salt", + &provider_salt), GNUNET_JSON_spec_end () }; json_t *p_cfg; @@ -2751,7 +2751,7 @@ done_secret_selecting (json_t *state, id_data, version, pd->backend_url, - &salt, + &provider_salt, &policy_lookup_cb, pd, &core_early_secret_cb, diff --git a/src/reducer/anastasis_api_redux.c b/src/reducer/anastasis_api_redux.c index 58ca0fb..1dba576 100644 --- a/src/reducer/anastasis_api_redux.c +++ b/src/reducer/anastasis_api_redux.c @@ -188,9 +188,9 @@ struct ConfigRequest struct TALER_Amount liability_limit; /** - * Server salt. + * Provider salt. */ - struct ANASTASIS_CRYPTO_ProviderSaltP salt; + struct ANASTASIS_CRYPTO_ProviderSaltP provider_salt; /** * Task to timeout /config requests. @@ -539,8 +539,8 @@ notify_waiting (struct ConfigRequest *cr) cr->business_name), GNUNET_JSON_pack_uint64 ("storage_limit_in_megabytes", cr->storage_limit_in_megabytes), - GNUNET_JSON_pack_data_auto ("salt", - &cr->salt), + GNUNET_JSON_pack_data_auto ("provider_salt", + &cr->provider_salt), GNUNET_JSON_pack_uint64 ("http_status", cr->http_status)); } @@ -617,7 +617,7 @@ config_cb (void *cls, cr->annual_fee = acfg->annual_fee; cr->truth_upload_fee = acfg->truth_upload_fee; cr->liability_limit = acfg->liability_limit; - cr->salt = acfg->salt; + cr->provider_salt = acfg->provider_salt; } } notify_waiting (cr); @@ -2013,17 +2013,18 @@ ANASTASIS_REDUX_load_continents_ () /** - * Lookup @a salt of @a provider_url in @a state. + * Lookup @a provider_salt of @a provider_url in @a state. * * @param state the state to inspect * @param provider_url provider to look into - * @param[out] salt value to extract + * @param[out] provider_salt value to extract * @return #GNUNET_OK on success */ enum GNUNET_GenericReturnValue -ANASTASIS_reducer_lookup_salt (const json_t *state, - const char *provider_url, - struct ANASTASIS_CRYPTO_ProviderSaltP *salt) +ANASTASIS_reducer_lookup_salt ( + const json_t *state, + const char *provider_url, + struct ANASTASIS_CRYPTO_ProviderSaltP *provider_salt) { const json_t *aps; const json_t *cfg; @@ -2040,8 +2041,8 @@ ANASTASIS_reducer_lookup_salt (const json_t *state, &http_status), NULL), GNUNET_JSON_spec_mark_optional ( - GNUNET_JSON_spec_fixed_auto ("salt", - salt), + GNUNET_JSON_spec_fixed_auto ("provider_salt", + provider_salt), &no_salt), GNUNET_JSON_spec_end () }; |