From 948a5551d0923d6f74cd927c2ae9390d5ac3b953 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Pokorn=C3=BD?= Date: Tue, 13 Sep 2016 20:10:13 +0200 Subject: [PATCH] Refactor: call find_site_by_name just once, up the stream Respective logic was duplicated for all "booth list/peers/grant/revoke" and "geostore list/get/set/del" separately, so utilize a natural control flow to carry this once-resolved target site from here, sharing it with the special case of "daemon" role invoked with "-s site" (debug mode). Side effect: simpler, terser code. --- src/attr.c | 13 +---------- src/attr.h | 2 +- src/main.c | 64 ++++++++++++++++++++++-------------------------------- 3 files changed, 28 insertions(+), 51 deletions(-) diff --git a/src/attr.c b/src/attr.c index 0e407b69..805ccb35 100644 --- a/src/attr.c +++ b/src/attr.c @@ -150,24 +150,13 @@ static int read_server_reply( return rv; } -int do_attr_command(cmd_request_t cmd) +int do_attr_command(cmd_request_t cmd, struct booth_site *site) { - struct booth_site *site = NULL; struct boothc_header *header; struct booth_transport const *tpt; int len, rv = -1; char *msg = NULL; - if (!*cl.site) - site = local; - else { - if (!find_site_by_name(cl.site, &site, 1)) { - log_error("Site \"%s\" not configured.", cl.site); - rv = -ENOENT; - goto out_close; - } - } - if (site->type == ARBITRATOR) { if (site == local) { log_error("We're just an arbitrator, no attributes here."); diff --git a/src/attr.h b/src/attr.h index 1c680bdf..a94ac16b 100644 --- a/src/attr.h +++ b/src/attr.h @@ -31,7 +31,7 @@ void print_geostore_usage(void); int test_attr_reply(cmd_result_t reply_code, cmd_request_t cmd); -int do_attr_command(cmd_request_t cmd); +int do_attr_command(cmd_request_t cmd, struct booth_site *site); int process_attr_request(struct client *req_client, void *buf); int attr_recv(void *buf, struct booth_site *source); int store_geo_attr(struct ticket_config *tk, const char *name, const char *val, int notime); diff --git a/src/main.c b/src/main.c index 76e62c7c..245b05c0 100644 --- a/src/main.c +++ b/src/main.c @@ -346,7 +346,7 @@ int update_authkey() return 0; } -static int setup_config(int type) +static int setup_config(int type, struct booth_site **site) { int rv; @@ -370,14 +370,21 @@ static int setup_config(int type) } /* Set "local" pointer, ignoring errors. */ - if (cl.type == DAEMON && cl.site[0]) { - if (!find_site_by_name(cl.site, &local, 1)) { - log_error("Cannot find \"%s\" (myself) in the configuration.", - cl.site); + if ((cl.type == DAEMON || site) && cl.site[0]) { + if (!find_site_by_name(cl.site, + cl.type == DAEMON ? &local : site, 1)) { + log_error("Cannot find \"%s\"%s in the configuration.", + cl.site, cl.type == DAEMON ? " (myself)" : ""); return -EINVAL; } - local->local = 1; - } else if (!find_myself(NULL, type == CLIENT || type == GEOSTORE)) { + if (cl.type == DAEMON) { + local->local = 1; + if (site) + *site = local; + } + } + if (!(cl.type == DAEMON && cl.site[0]) + && !find_myself(site, type == CLIENT || type == GEOSTORE)) { log_error("Cannot find myself in the configuration."); return -EINVAL; } @@ -635,9 +642,8 @@ static int test_reply(cmd_result_t reply_code, cmd_request_t cmd) return rv; } -static int query_get_string_answer(cmd_request_t cmd) +static int query_get_string_answer(cmd_request_t cmd, struct booth_site *site) { - struct booth_site *site; struct boothc_hdr_msg reply; struct boothc_header *header; char *data; @@ -662,14 +668,6 @@ static int query_get_string_answer(cmd_request_t cmd) init_header(header, cmd, 0, cl.options, 0, 0, msg_size); - if (!*cl.site) - site = local; - else if (!find_site_by_name(cl.site, &site, 1)) { - log_error("cannot find site \"%s\"", cl.site); - rv = -ENOENT; - goto out; - } - tpt = booth_transport + TCP; rv = tpt->open(site); if (rv < 0) @@ -709,16 +707,14 @@ static int query_get_string_answer(cmd_request_t cmd) rv = test_reply_f(ntohl(reply.header.result), cmd); out_close: tpt->close(site); -out: if (data) free(data); return rv; } -static int do_command(cmd_request_t cmd) +static int do_command(cmd_request_t cmd, struct booth_site *site) { - struct booth_site *site; struct boothc_ticket_msg reply; struct booth_transport const *tpt; uint32_t leader_id; @@ -737,16 +733,6 @@ static int do_command(cmd_request_t cmd) /* Always use TCP for client - at least for now. */ tpt = booth_transport + TCP; - if (!*cl.site) - site = local; - else { - if (!find_site_by_name(cl.site, &site, 1)) { - log_error("Site \"%s\" not configured.", cl.site); - rv = -ENOENT; - goto out_close; - } - } - if (site->type == ARBITRATOR) { if (site == local) { log_error("We're just an arbitrator, cannot grant/revoke tickets here."); @@ -1296,7 +1282,7 @@ static int do_status(int type) ret = PCMK_OCF_NOT_RUNNING; - rv = setup_config(type); + rv = setup_config(type, NULL); if (rv) { reason = "Error reading configuration."; ret = PCMK_OCF_UNKNOWN_ERROR; @@ -1412,7 +1398,7 @@ static int do_server(int type) int rv = -1; static char log_ent[128] = DAEMON_NAME "-"; - rv = setup_config(type); + rv = setup_config(type, NULL); if (rv < 0) return rv; @@ -1478,8 +1464,9 @@ static int do_server(int type) static int do_client(void) { int rv; + struct booth_site *site; - rv = setup_config(CLIENT); + rv = setup_config(CLIENT, &site); if (rv < 0) { log_error("cannot read config"); goto out; @@ -1488,12 +1475,12 @@ static int do_client(void) switch (cl.op) { case CMD_LIST: case CMD_PEERS: - rv = query_get_string_answer(cl.op); + rv = query_get_string_answer(cl.op, site); break; case CMD_GRANT: case CMD_REVOKE: - rv = do_command(cl.op); + rv = do_command(cl.op, site); break; } @@ -1504,8 +1491,9 @@ static int do_client(void) static int do_attr(void) { int rv = -1; + struct booth_site *site; - rv = setup_config(GEOSTORE); + rv = setup_config(GEOSTORE, &site); if (rv < 0) { log_error("cannot read config"); goto out; @@ -1529,12 +1517,12 @@ static int do_attr(void) switch (cl.op) { case ATTR_LIST: case ATTR_GET: - rv = query_get_string_answer(cl.op); + rv = query_get_string_answer(cl.op, site); break; case ATTR_SET: case ATTR_DEL: - rv = do_attr_command(cl.op); + rv = do_attr_command(cl.op, site); break; }