Refactor: get rid of any use of booth_conf global var except for main.c

And except for said single use intermingled with another global
mentioned in the previous commit: transport() of inline-fn.h.

Signed-off-by: Jan Pokorný <[email protected]>

Author: jnpkrn

src/handler.c

@@ -35,15 +35,18 @@
 #include "booth.h"
 #include "handler.h"
 
-static int set_booth_env(struct ticket_config *tk)
+static int set_booth_env(struct booth_config *conf_ptr,
+                         struct ticket_config *tk)
 {
 	int rv;
 	char expires[16];
 
+	assert(conf_ptr != NULL);
+
 	sprintf(expires, "%" PRId64, (int64_t)wall_ts(&tk->term_expires));
 	rv = setenv("BOOTH_TICKET", tk->name, 1) ||
 		setenv("BOOTH_LOCAL", local->addr_string, 1) ||
-		setenv("BOOTH_CONF_NAME", booth_conf->name, 1) ||
+		setenv("BOOTH_CONF_NAME", conf_ptr->name, 1) ||
 		setenv("BOOTH_CONF_PATH", cl.configfile, 1) ||
 		setenv("BOOTH_TICKET_EXPIRES", expires, 1);
 
@@ -65,9 +68,10 @@ closefiles(void)
 }
 
 static void
-run_ext_prog(struct ticket_config *tk, char *prog)
+run_ext_prog(struct booth_config *conf_ptr, struct ticket_config *tk,
+             char *prog)
 {
-	if (set_booth_env(tk)) {
+	if (set_booth_env(conf_ptr, tk)) {
 		_exit(1);
 	}
 	closefiles(); /* don't leak open files */
@@ -125,15 +129,15 @@ int tk_test_exit_status(struct ticket_config *tk)
 	return rv;
 }
 
-void wait_child(int sig)
+void wait_child(struct booth_config *conf_ptr)
 {
 	int i, status;
 	struct ticket_config *tk;
 
 	/* 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(booth_conf, i, tk) {
+	FOREACH_TICKET(conf_ptr, i, tk) {
 		if (tk_test.path && tk_test.pid > 0 &&
 				(tk_test.progstate == EXTPROG_RUNNING ||
 				tk_test.progstate == EXTPROG_IGNORE) &&
@@ -187,7 +191,7 @@ void ignore_ext_test(struct ticket_config *tk)
 }
 
 static void
-process_ext_dir(struct ticket_config *tk)
+process_ext_dir(struct booth_config *conf_ptr, struct ticket_config *tk)
 {
 	char prog[FILENAME_MAX+1];
 	int rv, n_progs, i, status;
@@ -220,7 +224,7 @@ process_ext_dir(struct ticket_config *tk)
 			log_error("fork: %s", strerror(errno));
 			_exit(1);
 		case 0: /* child */
-			run_ext_prog(tk, prog);
+			run_ext_prog(conf_ptr, tk, prog);
 			break;  /* run_ext_prog effectively noreturn */
 		default: /* parent */
 			while (waitpid(curr_pid, &status, 0) != curr_pid)
@@ -241,7 +245,7 @@ process_ext_dir(struct ticket_config *tk)
  * RUNCMD_ERR: executing program failed (or some other failure)
  * RUNCMD_MORE: program forked, results later
  */
-int run_handler(struct ticket_config *tk)
+int run_handler(struct booth_config *conf_ptr, struct ticket_config *tk)
 {
 	int rv = 0;
 	pid_t pid;
@@ -262,9 +266,9 @@ int run_handler(struct ticket_config *tk)
 		return RUNCMD_ERR;
 	case 0: /* child */
 		if (tk_test.is_dir) {
-			process_ext_dir(tk);
+			process_ext_dir(conf_ptr, tk);
 		} else {
-			run_ext_prog(tk, tk_test.path);
+			run_ext_prog(conf_ptr, tk, tk_test.path);
 		}
 	default: /* parent */
 		tk_test.pid = pid;

src/handler.h

@@ -24,12 +24,30 @@ enum {
 	RUNCMD_MORE = -2,
 };
 
-int run_handler(struct ticket_config *tk);
+/**
+ * @internal
+ * First stage of incoming datagram handling (authentication)
+ *
+ * @param[inout] conf_ptr config object to refer to
+ * @param[in] tk ticket at hand
+ *
+ * @return 0, #RUNCMD_ERR, #RUNCMD_MORE
+ */
+int run_handler(struct booth_config *conf_ptr, struct ticket_config *tk);
+
 int tk_test_exit_status(struct ticket_config *tk);
 void ignore_ext_test(struct ticket_config *tk);
 int is_ext_prog_running(struct ticket_config *tk);
 void ext_prog_timeout(struct ticket_config *tk);
-void wait_child(int sig);
+
+/**
+ * @internal
+ * SIGCHLD handling so as to mark the handler-at-a-ticket finalization
+ *
+ * @param[inout] conf_ptr config object to refer to
+ * @param[in] tk ticket at hand
+ */
+void wait_child(struct booth_config *conf_ptr);
 
 #define set_progstate(tk, newst) do { \
 	if (!(newst)) tk_log_debug("progstate reset"); \

src/main.c

@@ -1420,6 +1420,11 @@ static void sig_exit_handler(int sig)
 	exit(0);
 }
 
+static void wait_child_adaptor(int sig)
+{
+	wait_child(booth_conf);
+}
+
 static int do_server(struct booth_config **conf_pptr, int type)
 {
 	int rv = -1;
@@ -1490,7 +1495,7 @@ static int do_server(struct booth_config **conf_pptr, int type)
 	}
 #endif
 
-	signal(SIGCHLD, (__sighandler_t)wait_child);
+	signal(SIGCHLD, (__sighandler_t) wait_child_adaptor);
 	rv = loop(lock_fd);
 
 	return rv;

src/ticket.c

@@ -274,7 +274,7 @@ static int do_ext_prog(struct booth_config *conf_ptr,
 
 	switch(tk_test.progstate) {
 	case EXTPROG_IDLE:
-		rv = run_handler(tk);
+		rv = run_handler(conf_ptr, tk);
 		if (rv == RUNCMD_ERR) {
 			tk_log_warn("couldn't run external test, not allowed to acquire ticket");
 			ext_prog_failed(conf_ptr, tk, start_election);