>From c85ccaaee886963962b6961fbeb5c9df319baa3b Mon Sep 17 00:00:00 2001 From: Jakub Hrozek Date: Mon, 25 May 2015 15:26:41 +0200 Subject: [PATCH 06/29] IPA: Add ipa_subdomains_handler_get_{start,cont} wrappers Previously it was error-prone to move code around, because the functions that started next subdomain request were scattered together with moving to next base or assigning next base. This patch creates a wrappers for better readability. --- src/providers/ipa/ipa_subdomains.c | 47 +++++++++++++++++++++++++++----------- 1 file changed, 34 insertions(+), 13 deletions(-) diff --git a/src/providers/ipa/ipa_subdomains.c b/src/providers/ipa/ipa_subdomains.c index 7587aabe5a768e1817e5857f7e27fbfe1a8b455b..0b1b194886fcd58afe986dedb9213ca81e597dce 100644 --- a/src/providers/ipa/ipa_subdomains.c +++ b/src/providers/ipa/ipa_subdomains.c @@ -827,8 +827,12 @@ struct ipa_subdomains_req_ctx { static void ipa_subdomains_get_conn_done(struct tevent_req *req); static errno_t -ipa_subdomains_handler_get(struct ipa_subdomains_req_ctx *ctx, - enum ipa_subdomains_req_type type); +ipa_subdomains_handler_get_start(struct ipa_subdomains_req_ctx *ctx, + struct sdap_search_base **search_bases, + enum ipa_subdomains_req_type type); +static errno_t +ipa_subdomains_handler_get_cont(struct ipa_subdomains_req_ctx *ctx, + enum ipa_subdomains_req_type type); static void ipa_subdomains_handler_done(struct tevent_req *req); static void ipa_subdomains_handler_master_done(struct tevent_req *req); static void ipa_subdomains_handler_ranges_done(struct tevent_req *req); @@ -923,7 +927,9 @@ static void ipa_subdomains_get_conn_done(struct tevent_req *req) goto fail; } - ret = ipa_subdomains_handler_get(ctx, IPA_SUBDOMAINS_RANGES); + ret = ipa_subdomains_handler_get_start(ctx, + ctx->sd_ctx->ranges_search_bases, + IPA_SUBDOMAINS_RANGES); if (ret != EOK && ret != EAGAIN) { goto fail; } @@ -978,6 +984,24 @@ ipa_subdomains_handler_get(struct ipa_subdomains_req_ctx *ctx, return EAGAIN; } +static errno_t +ipa_subdomains_handler_get_start(struct ipa_subdomains_req_ctx *ctx, + struct sdap_search_base **search_bases, + enum ipa_subdomains_req_type type) +{ + ctx->search_base_iter = 0; + ctx->search_bases = search_bases; + return ipa_subdomains_handler_get(ctx, type); +} + +static errno_t +ipa_subdomains_handler_get_cont(struct ipa_subdomains_req_ctx *ctx, + enum ipa_subdomains_req_type type) +{ + ctx->search_base_iter++; + return ipa_subdomains_handler_get(ctx, type); +} + static void ipa_get_view_name_done(struct tevent_req *req); static errno_t ipa_check_master(struct ipa_subdomains_req_ctx *ctx); @@ -1242,8 +1266,7 @@ static void ipa_subdomains_handler_done(struct tevent_req *req) ctx->reply_count += reply_count; } - ctx->search_base_iter++; - ret = ipa_subdomains_handler_get(ctx, IPA_SUBDOMAINS_SLAVE); + ret = ipa_subdomains_handler_get_cont(ctx, IPA_SUBDOMAINS_SLAVE); if (ret == EAGAIN) { return; } else if (ret != EOK) { @@ -1326,9 +1349,9 @@ static errno_t ipa_check_master(struct ipa_subdomains_req_ctx *ctx) domain->domain_id == NULL || domain->realm == NULL) { - ctx->search_base_iter = 0; - ctx->search_bases = ctx->sd_ctx->master_search_bases; - ret = ipa_subdomains_handler_get(ctx, IPA_SUBDOMAINS_MASTER); + ret = ipa_subdomains_handler_get_start(ctx, + ctx->sd_ctx->master_search_bases, + IPA_SUBDOMAINS_MASTER); if (ret == EAGAIN) { return EAGAIN; } else if (ret != EOK) { @@ -1377,9 +1400,8 @@ static void ipa_subdomains_handler_ranges_done(struct tevent_req *req) goto done; } - ctx->search_base_iter = 0; - ctx->search_bases = ctx->sd_ctx->search_bases; - ret = ipa_subdomains_handler_get(ctx, IPA_SUBDOMAINS_SLAVE); + ret = ipa_subdomains_handler_get_start(ctx, ctx->sd_ctx->search_bases, + IPA_SUBDOMAINS_SLAVE); if (ret == EAGAIN) { return; } else if (ret != EOK) { @@ -1438,8 +1460,7 @@ static void ipa_subdomains_handler_master_done(struct tevent_req *req) ret = sysdb_master_domain_add_info(ctx->sd_ctx->be_ctx->domain, realm, flat, id, NULL); } else { - ctx->search_base_iter++; - ret = ipa_subdomains_handler_get(ctx, IPA_SUBDOMAINS_MASTER); + ret = ipa_subdomains_handler_get_cont(ctx, IPA_SUBDOMAINS_MASTER); if (ret == EAGAIN) { return; } else if (ret != EOK) { -- 2.1.0