Apply find_* function refactorings

src/attr.c

@@ -149,7 +149,7 @@ static int read_server_reply(
 	return rv;
 }
 
-int do_attr_command(cmd_request_t cmd)
+int do_attr_command(struct booth_config *conf, cmd_request_t cmd)
 {
 	struct booth_site *site = NULL;
 	struct boothc_header *header;
@@ -160,7 +160,7 @@ int do_attr_command(cmd_request_t cmd)
 	if (!*cl.site)
 		site = local;
 	else {
-		if (!find_site_by_name(cl.site, &site, 1)) {
+		if (!find_site_by_name(conf, cl.site, &site, 1)) {
 			log_error("Site \"%s\" not configured.", cl.site);
 			goto out_close;
 		}

src/attr.h

@@ -31,7 +31,18 @@
 
 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);
+
+/**
+ * @internal
+ * Carry out a geo-atribute related command
+ *
+ * @param[in,out] conf  config object to refer to
+ * @param[in]     cmd   what to perform
+ *
+ * @return 0 or negative value (-1 or -errno) on error
+ */
+int do_attr_command(struct booth_config *conf, cmd_request_t cmd);
+
 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);

src/booth.h

@@ -77,6 +77,10 @@
 /* Says that another one should recover. */
 #define TICKET_LOST CHAR2CONST('L', 'O', 'S', 'T')
 
+struct booth_config;
+
+typedef void (*workfn_t)(struct booth_config *conf, int ci);
+
 
 typedef char boothc_site[BOOTH_NAME_LEN];
 typedef char boothc_ticket[BOOTH_NAME_LEN];
@@ -338,7 +342,7 @@ struct client {
 	const struct booth_transport *transport;
 	struct boothc_ticket_msg *msg;
 	int offset; /* bytes read so far into msg */
-	void (*workfn)(int);
+	workfn_t workfn;
 	void (*deadfn)(int);
 };
 
@@ -347,7 +351,7 @@ extern struct pollfd *pollfds;
 
 
 int client_add(int fd, const struct booth_transport *tpt,
-		void (*workfn)(int ci), void (*deadfn)(int ci));
+		workfn_t workfn, void (*deadfn)(int ci));
 int find_client_by_fd(int fd);
 void safe_copy(char *dest, char *value, size_t buflen, const char *description);
 int update_authkey(void);

src/config.c

@@ -991,16 +991,18 @@ int check_config(struct booth_config *conf, int type)
 }
 
 
-static int get_other_site(struct booth_site **node)
+static int get_other_site(struct booth_config *conf,
+			  struct booth_site **node)
 {
 	struct booth_site *n;
 	int i;
 
 	*node = NULL;
-	if (!booth_conf)
+	if (conf == NULL) {
 		return 0;
+	}
 
-	FOREACH_NODE(i, n) {
+	FOREACH_NODE(conf, i, n) {
 		if (n != local && n->type == SITE) {
 			if (!*node) {
 				*node = n;
@@ -1014,18 +1016,21 @@ static int get_other_site(struct booth_site **node)
 }
 
 
-int find_site_by_name(char *site, struct booth_site **node, int any_type)
+int find_site_by_name(struct booth_config *conf, const char *site,
+		      struct booth_site **node, int any_type)
 {
 	struct booth_site *n;
 	int i;
 
-	if (!booth_conf)
+	if (conf == NULL) {
 		return 0;
+	}
 
-	if (!strcmp(site, OTHER_SITE))
-		return get_other_site(node);
+	if (!strcmp(site, OTHER_SITE)) {
+		return get_other_site(conf, node);
+	}
 
-	FOREACH_NODE(i, n) {
+	FOREACH_NODE(conf, i, n) {
 		if ((n->type == SITE || any_type) &&
 		    strncmp(n->addr_string, site, sizeof(n->addr_string)) == 0) {
 			*node = n;
@@ -1036,7 +1041,8 @@ int find_site_by_name(char *site, struct booth_site **node, int any_type)
 	return 0;
 }
 
-int find_site_by_id(uint32_t site_id, struct booth_site **node)
+int find_site_by_id(struct booth_config *conf,
+		    uint32_t site_id, struct booth_site **node)
 {
 	struct booth_site *n;
 	int i;
@@ -1046,10 +1052,11 @@ int find_site_by_id(uint32_t site_id, struct booth_site **node)
 		return 1;
 	}
 
-	if (!booth_conf)
+	if (conf == NULL) {
 		return 0;
+	}
 
-	FOREACH_NODE(i, n) {
+	FOREACH_NODE(conf, i, n) {
 		if (n->site_id == site_id) {
 			*node = n;
 			return 1;
@@ -1059,7 +1066,6 @@ int find_site_by_id(uint32_t site_id, struct booth_site **node)
 	return 0;
 }
 
-
 const char *type_to_string(int type)
 {
 	switch (type)

src/config.h

@@ -25,6 +25,17 @@
 #include "booth.h"
 #include "timer.h"
 #include "raft.h"
+
+/* Forward declaration of the booth config structure that will be defined later.
+ * This is necessary here because transport.h references booth_config, but this
+ * file also references transport_layer_t.  We need some way to break the
+ * circular dependency.
+ *
+ * This also means that config.h must always be included before transport.h in
+ * any source files.
+ */
+struct booth_config;
+
 #include "transport.h"
 
 
@@ -355,8 +366,33 @@ int read_config(struct booth_config **conf, const char *path, int type);
  */
 int check_config(struct booth_config *conf, int type);
 
-int find_site_by_name(char *site, struct booth_site **node, int any_type);
-int find_site_by_id(uint32_t site_id, struct booth_site **node);
+/**
+ * @internal
+ * Find site in booth configuration by resolved host name
+ *
+ * @param[in,out] conf config object to refer to
+ * @param[in] site name to match against previously resolved host names
+ * @param[out] node relevant tracked data when found
+ * @param[in] any_type whether or not to consider also non-site members
+ *
+ * @return 0 if nothing found, or 1 when found (node assigned accordingly)
+ */
+int find_site_by_name(struct booth_config *conf, const char *site,
+		      struct booth_site **node, int any_type);
+
+
+/**
+ * @internal
+ * Find site in booth configuration by a hash (id)
+ *
+ * @param[in,out] conf config object to refer to
+ * @param[in] site_id hash (id) to match against previously resolved ones
+ * @param[out] node relevant tracked data when found
+ *
+ * @return 0 if nothing found, or 1 when found (node assigned accordingly)
+ */
+int find_site_by_id(struct booth_config *conf, uint32_t site_id,
+		    struct booth_site **node);
 
 const char *type_to_string(int type);
 

src/handler.c

@@ -133,7 +133,7 @@ void wait_child(int sig)
 	/* use waitpid(2) and not wait(2) in order not to interfere
 	 * with popen(2)/pclose(2) and system(2) used in pacemaker.c
 	 */
-	FOREACH_TICKET(i, tk) {
+	_FOREACH_TICKET(i, tk) {
 		if (tk_test.path && tk_test.pid > 0 &&
 				(tk_test.progstate == EXTPROG_RUNNING ||
 				tk_test.progstate == EXTPROG_IGNORE) &&

src/main.c

@@ -165,8 +165,7 @@ static void client_dead(int ci)
 }
 
 int client_add(int fd, const struct booth_transport *tpt,
-		void (*workfn)(int ci),
-		void (*deadfn)(int ci))
+		workfn_t workfn, void (*deadfn)(int ci))
 {
 	int i;
 	struct client *c;
@@ -233,7 +232,7 @@ static int format_peers(char **pdata, unsigned int *len)
 		return -ENOMEM;
 
 	cp = data;
-	FOREACH_NODE(i, s) {
+	_FOREACH_NODE(i, s) {
 		if (s == local)
 			continue;
 		strftime(time_str, sizeof(time_str), "%F %T",
@@ -394,15 +393,15 @@ static int setup_config(struct booth_config **conf, int type)
 
 	/* Set "local" pointer, ignoring errors. */
 	if (cl.type == DAEMON && cl.site[0]) {
-		if (!find_site_by_name(cl.site, &local, 1)) {
+		if (!find_site_by_name(booth_conf, cl.site, &local, 1)) {
 			log_error("Cannot find \"%s\" in the configuration.",
 					cl.site);
 			return -EINVAL;
 		}
 		local->local = 1;
-	} else
-		find_myself(NULL, type == CLIENT || type == GEOSTORE);
-
+	} else {
+		find_myself(booth_conf, NULL, type == CLIENT || type == GEOSTORE);
+	}
 
 	rv = check_config(booth_conf, type);
 	if (rv < 0)
@@ -521,17 +520,18 @@ static int process_signals(void)
 
 static int loop(int fd)
 {
-	void (*workfn) (int ci);
+	workfn_t workfn;
 	void (*deadfn) (int ci);
 	int rv, i;
 
 	rv = setup_transport();
 	if (rv < 0)
 		goto fail;
 
-	rv = setup_ticket();
-	if (rv < 0)
+	rv = setup_ticket(booth_conf);
+	if (rv < 0) {
 		goto fail;
+	}
 
 	rv = write_daemon_state(fd, BOOTHD_STARTED);
 	if (rv != 0) {
@@ -559,8 +559,9 @@ static int loop(int fd)
 
 			if (pollfds[i].revents & POLLIN) {
 				workfn = clients[i].workfn;
-				if (workfn)
-					workfn(i);
+				if (workfn) {
+					workfn(booth_conf, i);
+				}
 			}
 			if (pollfds[i].revents &
 					(POLLERR | POLLHUP | POLLNVAL)) {
@@ -708,7 +709,7 @@ static int query_get_string_answer(cmd_request_t cmd)
 
 	if (!*cl.site)
 		site = local;
-	else if (!find_site_by_name(cl.site, &site, 1)) {
+	else if (!find_site_by_name(booth_conf, cl.site, &site, 1)) {
 		log_error("cannot find site \"%s\"", cl.site);
 		rv = ENOENT;
 		goto out;
@@ -782,7 +783,7 @@ static int do_command(cmd_request_t cmd)
 	if (!*cl.site)
 		site = local;
 	else {
-		if (!find_site_by_name(cl.site, &site, 1)) {
+		if (!find_site_by_name(booth_conf, cl.site, &site, 1)) {
 			log_error("Site \"%s\" not configured.", cl.site);
 			goto out_close;
 		}
@@ -837,7 +838,7 @@ static int do_command(cmd_request_t cmd)
 	if (rv == 1) {
 		tpt->close(site);
 		leader_id = ntohl(reply.ticket.leader);
-		if (!find_site_by_id(leader_id, &site)) {
+		if (!find_site_by_id(booth_conf, leader_id, &site)) {
 			log_error("Message with unknown redirect site %x received", leader_id);
 			rv = -1;
 			goto out_close;
@@ -1617,7 +1618,7 @@ static int do_attr(struct booth_config **conf)
 
 	case ATTR_SET:
 	case ATTR_DEL:
-		rv = do_attr_command(cl.op);
+		rv = do_attr_command(booth_conf, cl.op);
 		break;
 	}
 

src/manual.c

@@ -18,9 +18,9 @@
 
 #include "manual.h"
 
+#include "config.h"
 #include "transport.h"
 #include "ticket.h"
-#include "config.h"
 #include "log.h"
 #include "request.h"