5 files changed, 315 insertions, 202 deletions

diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index d40a0937..3d5ad1a9 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -53,7 +53,9 @@ EXTRA_DIST = t \
                          check_game.d \
                          check_dbi.d \
                          check_ssh.d \
-                         check_dns.d
+                         check_dns.d \
+                         check_apt.d \
+                         check_by_ssh.d
 
 PLUGINHDRS = common.h
 
diff --git a/plugins/check_apt.c b/plugins/check_apt.c
index 1eda45dd..e840184b 100644
--- a/plugins/check_apt.c
+++ b/plugins/check_apt.c
@@ -29,6 +29,7 @@
  *
  *****************************************************************************/
 
+#include "states.h"
 const char *progname = "check_apt";
 const char *copyright = "2006-2024";
 const char *email = "devel@monitoring-plugins.org";
@@ -37,13 +38,7 @@ const char *email = "devel@monitoring-plugins.org";
 #include "runcmd.h"
 #include "utils.h"
 #include "regex.h"
-
-/* some constants */
-typedef enum {
-        UPGRADE,
-        DIST_UPGRADE,
-        NO_UPGRADE
-} upgrade_type;
+#include "check_apt.d/config.h"
 
 /* Character for hidden input file option (for testing). */
 #define INPUT_FILE_OPT CHAR_MAX + 1
@@ -61,14 +56,18 @@ typedef enum {
 #define SECURITY_RE "^[^\\(]*\\(.* (Debian-Security:|Ubuntu:[^/]*/[^-]*-security)"
 
 /* some standard functions */
-static int process_arguments(int /*argc*/, char ** /*argv*/);
+typedef struct {
+        int errorcode;
+        check_apt_config config;
+} check_apt_config_wrapper;
+static check_apt_config_wrapper process_arguments(int /*argc*/, char ** /*argv*/);
 static void print_help(void);
 void print_usage(void);
 
 /* construct the appropriate apt-get cmdline */
-static char *construct_cmdline(upgrade_type u, const char *opts);
+static char *construct_cmdline(upgrade_type /*u*/, const char * /*opts*/);
 /* run an apt-get update */
-static int run_update(void);
+static int run_update(char * /*update_opts*/);
 
 typedef struct {
         int errorcode;
@@ -79,42 +78,35 @@ typedef struct {
 } run_upgrade_result;
 
 /* run an apt-get upgrade */
-static run_upgrade_result run_upgrade(void);
+run_upgrade_result run_upgrade(upgrade_type upgrade, const char *do_include, const char *do_exclude, const char *do_critical,
+                                                           const char *upgrade_opts, const char *input_filename);
 
 /* add another clause to a regexp */
-static char *add_to_regexp(char *expr, const char *next);
+static char *add_to_regexp(char * /*expr*/, const char * /*next*/);
 /* extract package name from Inst line */
-static char *pkg_name(char *line);
+static char *pkg_name(char * /*line*/);
 /* string comparison function for qsort */
-static int cmpstringp(const void *p1, const void *p2);
+static int cmpstringp(const void * /*p1*/, const void * /*p2*/);
 
 /* configuration variables */
-static int verbose = 0;                /* -v */
-static bool list = false;              /* list packages available for upgrade */
-static bool do_update = false;         /* whether to call apt-get update */
-static bool only_critical = false;     /* whether to warn about non-critical updates */
-static upgrade_type upgrade = UPGRADE; /* which type of upgrade to do */
-static char *upgrade_opts = NULL;      /* options to override defaults for upgrade */
-static char *update_opts = NULL;       /* options to override defaults for update */
-static char *do_include = NULL;        /* regexp to only include certain packages */
-static char *do_exclude = NULL;        /* regexp to only exclude certain packages */
-static char *do_critical = NULL;       /* regexp specifying critical packages */
-static char *input_filename = NULL;    /* input filename for testing */
-/* number of packages available for upgrade to return WARNING status */
-static int packages_warning = 1;
+static int verbose = 0; /* -v */
 
 /* other global variables */
-static int stderr_warning = 0; /* if a cmd issued output on stderr */
-static int exec_warning = 0;   /* if a cmd exited non-zero */
+static bool stderr_warning = false; /* if a cmd issued output on stderr */
+static bool exec_warning = false;   /* if a cmd exited non-zero */
 
 int main(int argc, char **argv) {
         /* Parse extra opts if any */
         argv = np_extra_opts(&argc, argv, progname);
 
-        if (process_arguments(argc, argv) == ERROR) {
+        check_apt_config_wrapper tmp_config = process_arguments(argc, argv);
+
+        if (tmp_config.errorcode == ERROR) {
                 usage_va(_("Could not parse arguments"));
         }
 
+        const check_apt_config config = tmp_config.config;
+
         /* Set signal handling and alarm timeout */
         if (signal(SIGALRM, timeout_alarm_handler) == SIG_ERR) {
                 usage_va(_("Cannot catch SIGALRM"));
@@ -123,14 +115,15 @@ int main(int argc, char **argv) {
         /* handle timeouts gracefully... */
         alarm(timeout_interval);
 
-        int result = STATE_UNKNOWN;
+        mp_state_enum result = STATE_UNKNOWN;
         /* if they want to run apt-get update first... */
-        if (do_update) {
-                result = run_update();
+        if (config.do_update) {
+                result = run_update(config.update_opts);
         }
 
         /* apt-get upgrade */
-        run_upgrade_result upgrad_res = run_upgrade();
+        run_upgrade_result upgrad_res =
+                run_upgrade(config.upgrade, config.do_include, config.do_exclude, config.do_critical, config.upgrade_opts, config.input_filename);
 
         result = max_state(result, upgrad_res.errorcode);
         int packages_available = upgrad_res.package_count;
@@ -140,18 +133,18 @@ int main(int argc, char **argv) {
 
         if (sec_count > 0) {
                 result = max_state(result, STATE_CRITICAL);
-        } else if (packages_available >= packages_warning && only_critical == false) {
+        } else if (packages_available >= config.packages_warning && !config.only_critical) {
                 result = max_state(result, STATE_WARNING);
         } else if (result > STATE_UNKNOWN) {
                 result = STATE_UNKNOWN;
         }
 
         printf(_("APT %s: %d packages available for %s (%d critical updates). %s%s%s%s|available_upgrades=%d;;;0 critical_updates=%d;;;0\n"),
-                   state_text(result), packages_available, (upgrade == DIST_UPGRADE) ? "dist-upgrade" : "upgrade", sec_count,
+                   state_text(result), packages_available, (config.upgrade == DIST_UPGRADE) ? "dist-upgrade" : "upgrade", sec_count,
                    (stderr_warning) ? " warnings detected" : "", (stderr_warning && exec_warning) ? "," : "",
                    (exec_warning) ? " errors detected" : "", (stderr_warning || exec_warning) ? "." : "", packages_available, sec_count);
 
-        if (list) {
+        if (config.list) {
                 qsort(secpackages_list, sec_count, sizeof(char *), cmpstringp);
                 qsort(packages_list, packages_available - sec_count, sizeof(char *), cmpstringp);
 
@@ -159,7 +152,7 @@ int main(int argc, char **argv) {
                         printf("%s (security)\n", secpackages_list[i]);
                 }
 
-                if (only_critical == false) {
+                if (!config.only_critical) {
                         for (int i = 0; i < packages_available - sec_count; i++) {
                                 printf("%s\n", packages_list[i]);
                         }
@@ -170,7 +163,7 @@ int main(int argc, char **argv) {
 }
 
 /* process command-line arguments */
-int process_arguments(int argc, char **argv) {
+check_apt_config_wrapper process_arguments(int argc, char **argv) {
         static struct option longopts[] = {{"version", no_argument, 0, 'V'},
                                                                            {"help", no_argument, 0, 'h'},
                                                                            {"verbose", no_argument, 0, 'v'},
@@ -179,7 +172,7 @@ int process_arguments(int argc, char **argv) {
                                                                            {"upgrade", optional_argument, 0, 'U'},
                                                                            {"no-upgrade", no_argument, 0, 'n'},
                                                                            {"dist-upgrade", optional_argument, 0, 'd'},
-                                                                           {"list", no_argument, false, 'l'},
+                                                                           {"list", no_argument, 0, 'l'},
                                                                            {"include", required_argument, 0, 'i'},
                                                                            {"exclude", required_argument, 0, 'e'},
                                                                            {"critical", required_argument, 0, 'c'},
@@ -188,6 +181,11 @@ int process_arguments(int argc, char **argv) {
                                                                            {"packages-warning", required_argument, 0, 'w'},
                                                                            {0, 0, 0, 0}};
 
+        check_apt_config_wrapper result = {
+                .errorcode = OK,
+                .config = check_apt_config_init(),
+        };
+
         while (true) {
                 int option_char = getopt_long(argc, argv, "hVvt:u::U::d::nli:e:c:ow:", longopts, NULL);
 
@@ -209,55 +207,55 @@ int process_arguments(int argc, char **argv) {
                         timeout_interval = atoi(optarg);
                         break;
                 case 'd':
-                        upgrade = DIST_UPGRADE;
+                        result.config.upgrade = DIST_UPGRADE;
                         if (optarg != NULL) {
-                                upgrade_opts = strdup(optarg);
-                                if (upgrade_opts == NULL) {
+                                result.config.upgrade_opts = strdup(optarg);
+                                if (result.config.upgrade_opts == NULL) {
                                         die(STATE_UNKNOWN, "strdup failed");
                                 }
                         }
                         break;
                 case 'U':
-                        upgrade = UPGRADE;
+                        result.config.upgrade = UPGRADE;
                         if (optarg != NULL) {
-                                upgrade_opts = strdup(optarg);
-                                if (upgrade_opts == NULL) {
+                                result.config.upgrade_opts = strdup(optarg);
+                                if (result.config.upgrade_opts == NULL) {
                                         die(STATE_UNKNOWN, "strdup failed");
                                 }
                         }
                         break;
                 case 'n':
-                        upgrade = NO_UPGRADE;
+                        result.config.upgrade = NO_UPGRADE;
                         break;
                 case 'u':
-                        do_update = true;
+                        result.config.do_update = true;
                         if (optarg != NULL) {
-                                update_opts = strdup(optarg);
-                                if (update_opts == NULL) {
+                                result.config.update_opts = strdup(optarg);
+                                if (result.config.update_opts == NULL) {
                                         die(STATE_UNKNOWN, "strdup failed");
                                 }
                         }
                         break;
                 case 'l':
-                        list = true;
+                        result.config.list = true;
                         break;
                 case 'i':
-                        do_include = add_to_regexp(do_include, optarg);
+                        result.config.do_include = add_to_regexp(result.config.do_include, optarg);
                         break;
                 case 'e':
-                        do_exclude = add_to_regexp(do_exclude, optarg);
+                        result.config.do_exclude = add_to_regexp(result.config.do_exclude, optarg);
                         break;
                 case 'c':
-                        do_critical = add_to_regexp(do_critical, optarg);
+                        result.config.do_critical = add_to_regexp(result.config.do_critical, optarg);
                         break;
                 case 'o':
-                        only_critical = true;
+                        result.config.only_critical = true;
                         break;
                 case INPUT_FILE_OPT:
-                        input_filename = optarg;
+                        result.config.input_filename = optarg;
                         break;
                 case 'w':
-                        packages_warning = atoi(optarg);
+                        result.config.packages_warning = atoi(optarg);
                         break;
                 default:
                         /* print short usage statement if args not parsable */
@@ -265,11 +263,12 @@ int process_arguments(int argc, char **argv) {
                 }
         }
 
-        return OK;
+        return result;
 }
 
 /* run an apt-get upgrade */
-run_upgrade_result run_upgrade(void) {
+run_upgrade_result run_upgrade(const upgrade_type upgrade, const char *do_include, const char *do_exclude, const char *do_critical,
+                                                           const char *upgrade_opts, const char *input_filename) {
         regex_t ereg;
         /* initialize ereg as it is possible it is printed while uninitialized */
         memset(&ereg, '\0', sizeof(ereg.buffer));
@@ -332,7 +331,7 @@ run_upgrade_result run_upgrade(void) {
                 fprintf(stderr, _("'%s' exited with non-zero status.\n"), cmdline);
         }
 
-  char **pkglist = malloc(sizeof(char *) * chld_out.lines);
+        char **pkglist = malloc(sizeof(char *) * chld_out.lines);
         if (!pkglist) {
                 die(STATE_UNKNOWN, "malloc failed!\n");
         }
@@ -385,7 +384,7 @@ run_upgrade_result run_upgrade(void) {
 
         /* If we get anything on stderr, at least set warning */
         if (input_filename == NULL && chld_err.buflen) {
-                stderr_warning = 1;
+                stderr_warning = true;
                 result.errorcode = max_state(result.errorcode, STATE_WARNING);
                 if (verbose) {
                         for (size_t i = 0; i < chld_err.lines; i++) {
@@ -405,7 +404,7 @@ run_upgrade_result run_upgrade(void) {
 }
 
 /* run an apt-get update (needs root) */
-int run_update(void) {
+int run_update(char *update_opts) {
         int result = STATE_UNKNOWN;
         char *cmdline;
         /* run the update */
@@ -418,7 +417,7 @@ int run_update(void) {
          * since we were explicitly asked to do so, this is treated as
          * a critical error. */
         if (result != 0) {
-                exec_warning = 1;
+                exec_warning = true;
                 result = STATE_CRITICAL;
                 fprintf(stderr, _("'%s' exited with non-zero status.\n"), cmdline);
         }
@@ -446,7 +445,7 @@ int run_update(void) {
 char *pkg_name(char *line) {
         char *start = line + strlen(PKGINST_PREFIX);
 
-        int len = strlen(start);
+        size_t len = strlen(start);
 
         char *space = index(start, ' ');
         if (space != NULL) {
@@ -464,35 +463,37 @@ char *pkg_name(char *line) {
         return pkg;
 }
 
-int cmpstringp(const void *p1, const void *p2) { return strcmp(*(char *const *)p1, *(char *const *)p2); }
+int cmpstringp(const void *left_string, const void *right_string) {
+        return strcmp(*(char *const *)left_string, *(char *const *)right_string);
+}
 
 char *add_to_regexp(char *expr, const char *next) {
-        char *re = NULL;
+        char *regex_string = NULL;
 
         if (expr == NULL) {
-                re = malloc(sizeof(char) * (strlen("()") + strlen(next) + 1));
-                if (!re) {
+                regex_string = malloc(sizeof(char) * (strlen("()") + strlen(next) + 1));
+                if (!regex_string) {
                         die(STATE_UNKNOWN, "malloc failed!\n");
                 }
-                sprintf(re, "(%s)", next);
+                sprintf(regex_string, "(%s)", next);
         } else {
                 /* resize it, adding an extra char for the new '|' separator */
-                re = realloc(expr, sizeof(char) * (strlen(expr) + 1 + strlen(next) + 1));
-                if (!re) {
+                regex_string = realloc(expr, sizeof(char) * (strlen(expr) + 1 + strlen(next) + 1));
+                if (!regex_string) {
                         die(STATE_UNKNOWN, "realloc failed!\n");
                 }
                 /* append it starting at ')' in the old re */
-                sprintf((char *)(re + strlen(re) - 1), "|%s)", next);
+                sprintf((char *)(regex_string + strlen(regex_string) - 1), "|%s)", next);
         }
 
-        return re;
+        return regex_string;
 }
 
-char *construct_cmdline(upgrade_type u, const char *opts) {
+char *construct_cmdline(upgrade_type upgrade, const char *opts) {
         const char *opts_ptr = NULL;
         const char *aptcmd = NULL;
 
-        switch (u) {
+        switch (upgrade) {
         case UPGRADE:
                 if (opts == NULL) {
                         opts_ptr = UPGRADE_DEFAULT_OPTS;
diff --git a/plugins/check_apt.d/config.h b/plugins/check_apt.d/config.h
new file mode 100644
index 00000000..981f4f42
--- /dev/null
+++ b/plugins/check_apt.d/config.h
@@ -0,0 +1,41 @@
+#pragma once
+
+#include "../../config.h"
+#include <stddef.h>
+
+/* some constants */
+typedef enum {
+        UPGRADE,
+        DIST_UPGRADE,
+        NO_UPGRADE
+} upgrade_type;
+
+typedef struct {
+        bool do_update;       /* whether to call apt-get update */
+        upgrade_type upgrade; /* which type of upgrade to do */
+        bool only_critical;   /* whether to warn about non-critical updates */
+        bool list;            /* list packages available for upgrade */
+        /* number of packages available for upgrade to return WARNING status */
+        int packages_warning;
+
+        char *upgrade_opts;   /* options to override defaults for upgrade */
+        char *update_opts;    /* options to override defaults for update */
+        char *do_include;     /* regexp to only include certain packages */
+        char *do_exclude;     /* regexp to only exclude certain packages */
+        char *do_critical;    /* regexp specifying critical packages */
+        char *input_filename; /* input filename for testing */
+} check_apt_config;
+
+check_apt_config check_apt_config_init() {
+        check_apt_config tmp = {.do_update = false,
+                                                        .upgrade = UPGRADE,
+                                                        .only_critical = false,
+                                                        .list = false,
+                                                        .packages_warning = 1,
+                                                        .update_opts = NULL,
+                                                        .do_include = NULL,
+                                                        .do_exclude = NULL,
+                                                        .do_critical = NULL,
+                                                        .input_filename = NULL};
+        return tmp;
+}
diff --git a/plugins/check_by_ssh.c b/plugins/check_by_ssh.c
index 2ac7805d..2bc38d49 100644
--- a/plugins/check_by_ssh.c
+++ b/plugins/check_by_ssh.c
@@ -32,48 +32,28 @@ const char *email = "devel@monitoring-plugins.org";
 
 #include "common.h"
 #include "utils.h"
-#include "netutils.h"
 #include "utils_cmd.h"
+#include "check_by_ssh.d/config.h"
+#include "states.h"
 
 #ifndef NP_MAXARGS
 #       define NP_MAXARGS 1024
 #endif
 
-static int process_arguments(int /*argc*/, char ** /*argv*/);
-static int validate_arguments(void);
-static void comm_append(const char * /*str*/);
+typedef struct {
+        int errorcode;
+        check_by_ssh_config config;
+} check_by_ssh_config_wrapper;
+static check_by_ssh_config_wrapper process_arguments(int /*argc*/, char ** /*argv*/);
+static check_by_ssh_config_wrapper validate_arguments(check_by_ssh_config_wrapper /*config_wrapper*/);
+
+static command_construct comm_append(command_construct /*cmd*/, const char * /*str*/);
 static void print_help(void);
 void print_usage(void);
 
-static unsigned int commands = 0;
-static unsigned int services = 0;
-static int skip_stdout = 0;
-static int skip_stderr = 0;
-static int warn_on_stderr = 0;
-static bool unknown_timeout = false;
-static char *remotecmd = NULL;
-static char **commargv = NULL;
-static int commargc = 0;
-static char *hostname = NULL;
-static char *outputfile = NULL;
-static char *host_shortname = NULL;
-static char **service;
-static bool passive = false;
 static bool verbose = false;
 
 int main(int argc, char **argv) {
-
-        char *status_text;
-        int cresult;
-        int result = STATE_UNKNOWN;
-        time_t local_time;
-        FILE *file_pointer = NULL;
-        output chld_out;
-        output chld_err;
-
-        remotecmd = "";
-        comm_append(SSH_COMMAND);
-
         setlocale(LC_ALL, "");
         bindtextdomain(PACKAGE, LOCALEDIR);
         textdomain(PACKAGE);
@@ -81,11 +61,15 @@ int main(int argc, char **argv) {
         /* Parse extra opts if any */
         argv = np_extra_opts(&argc, argv, progname);
 
+        check_by_ssh_config_wrapper tmp_config = process_arguments(argc, argv);
+
         /* process arguments */
-        if (process_arguments(argc, argv) == ERROR) {
+        if (tmp_config.errorcode == ERROR) {
                 usage_va(_("Could not parse arguments"));
         }
 
+        const check_by_ssh_config config = tmp_config.config;
+
         /* Set signal handling and alarm timeout */
         if (signal(SIGALRM, timeout_alarm_handler) == SIG_ERR) {
                 usage_va(_("Cannot catch SIGALRM"));
@@ -94,16 +78,18 @@ int main(int argc, char **argv) {
 
         /* run the command */
         if (verbose) {
-                printf("Command: %s\n", commargv[0]);
-                for (int i = 1; i < commargc; i++) {
-                        printf("Argument %i: %s\n", i, commargv[i]);
+                printf("Command: %s\n", config.cmd.commargv[0]);
+                for (int i = 1; i < config.cmd.commargc; i++) {
+                        printf("Argument %i: %s\n", i, config.cmd.commargv[i]);
                 }
         }
 
-        result = cmd_run_array(commargv, &chld_out, &chld_err, 0);
+        output chld_out;
+        output chld_err;
+        mp_state_enum result = cmd_run_array(config.cmd.commargv, &chld_out, &chld_err, 0);
 
         /* SSH returns 255 if connection attempt fails; include the first line of error output */
-        if (result == 255 && unknown_timeout) {
+        if (result == 255 && config.unknown_timeout) {
                 printf(_("SSH connection failed: %s\n"), chld_err.lines > 0 ? chld_err.line[0] : "(no error output)");
                 return STATE_UNKNOWN;
         }
@@ -117,17 +103,24 @@ int main(int argc, char **argv) {
                 }
         }
 
-        if (skip_stdout == -1) { /* --skip-stdout specified without argument */
+        size_t skip_stdout = 0;
+        if (config.skip_stdout == -1) { /* --skip-stdout specified without argument */
                 skip_stdout = chld_out.lines;
+        } else {
+                skip_stdout = config.skip_stdout;
         }
-        if (skip_stderr == -1) { /* --skip-stderr specified without argument */
+
+        size_t skip_stderr = 0;
+        if (config.skip_stderr == -1) { /* --skip-stderr specified without argument */
                 skip_stderr = chld_err.lines;
+        } else {
+                skip_stderr = config.skip_stderr;
         }
 
         /* UNKNOWN or worse if (non-skipped) output found on stderr */
         if (chld_err.lines > (size_t)skip_stderr) {
                 printf(_("Remote command execution failed: %s\n"), chld_err.line[skip_stderr]);
-                if (warn_on_stderr) {
+                if (config.warn_on_stderr) {
                         return max_state_alt(result, STATE_WARNING);
                 }
                 return max_state_alt(result, STATE_UNKNOWN);
@@ -135,13 +128,13 @@ int main(int argc, char **argv) {
 
         /* this is simple if we're not supposed to be passive.
          * Wrap up quickly and keep the tricks below */
-        if (!passive) {
+        if (!config.passive) {
                 if (chld_out.lines > (size_t)skip_stdout) {
                         for (size_t i = skip_stdout; i < chld_out.lines; i++) {
                                 puts(chld_out.line[i]);
                         }
                 } else {
-                        printf(_("%s - check_by_ssh: Remote command '%s' returned status %d\n"), state_text(result), remotecmd, result);
+                        printf(_("%s - check_by_ssh: Remote command '%s' returned status %d\n"), state_text(result), config.remotecmd, result);
                 }
                 return result; /* return error status from remote command */
         }
@@ -151,36 +144,34 @@ int main(int argc, char **argv) {
          */
 
         /* process output */
-        if (!(file_pointer = fopen(outputfile, "a"))) {
-                printf(_("SSH WARNING: could not open %s\n"), outputfile);
+        FILE *file_pointer = NULL;
+        if (!(file_pointer = fopen(config.outputfile, "a"))) {
+                printf(_("SSH WARNING: could not open %s\n"), config.outputfile);
                 exit(STATE_UNKNOWN);
         }
 
-        local_time = time(NULL);
-        commands = 0;
+        time_t local_time = time(NULL);
+        unsigned int commands = 0;
+        char *status_text;
+        int cresult;
         for (size_t i = skip_stdout; i < chld_out.lines; i++) {
                 status_text = chld_out.line[i++];
                 if (i == chld_out.lines || strstr(chld_out.line[i], "STATUS CODE: ") == NULL) {
                         die(STATE_UNKNOWN, _("%s: Error parsing output\n"), progname);
                 }
 
-                if (service[commands] && status_text && sscanf(chld_out.line[i], "STATUS CODE: %d", &cresult) == 1) {
-                        fprintf(file_pointer, "[%d] PROCESS_SERVICE_CHECK_RESULT;%s;%s;%d;%s\n", (int)local_time, host_shortname, service[commands++],
-                                        cresult, status_text);
+                if (config.service[commands] && status_text && sscanf(chld_out.line[i], "STATUS CODE: %d", &cresult) == 1) {
+                        fprintf(file_pointer, "[%d] PROCESS_SERVICE_CHECK_RESULT;%s;%s;%d;%s\n", (int)local_time, config.host_shortname,
+                                        config.service[commands++], cresult, status_text);
                 }
         }
 
         /* Multiple commands and passive checking should always return OK */
-        return result;
+        exit(result);
 }
 
 /* process command-line arguments */
-int process_arguments(int argc, char **argv) {
-        int c;
-        char *p1;
-        char *p2;
-
-        int option = 0;
+check_by_ssh_config_wrapper process_arguments(int argc, char **argv) {
         static struct option longopts[] = {{"version", no_argument, 0, 'V'},
                                                                            {"help", no_argument, 0, 'h'},
                                                                            {"verbose", no_argument, 0, 'v'},
@@ -210,24 +201,33 @@ int process_arguments(int argc, char **argv) {
                                                                            {"configfile", optional_argument, 0, 'F'},
                                                                            {0, 0, 0, 0}};
 
+        check_by_ssh_config_wrapper result = {
+                .errorcode = OK,
+                .config = check_by_ssh_config_init(),
+        };
+
         if (argc < 2) {
-                return ERROR;
+                result.errorcode = ERROR;
+                return result;
         }
 
-        for (c = 1; c < argc; c++) {
-                if (strcmp("-to", argv[c]) == 0) {
-                        strcpy(argv[c], "-t");
+        for (int index = 1; index < argc; index++) {
+                if (strcmp("-to", argv[index]) == 0) {
+                        strcpy(argv[index], "-t");
                 }
         }
 
-        while (1) {
-                c = getopt_long(argc, argv, "Vvh1246fqt:UH:O:p:i:u:l:C:S::E::n:s:o:F:", longopts, &option);
+        result.config.cmd = comm_append(result.config.cmd, SSH_COMMAND);
 
-                if (c == -1 || c == EOF) {
+        int option = 0;
+        while (true) {
+                int opt_index = getopt_long(argc, argv, "Vvh1246fqt:UH:O:p:i:u:l:C:S::E::n:s:o:F:", longopts, &option);
+
+                if (opt_index == -1 || opt_index == EOF) {
                         break;
                 }
 
-                switch (c) {
+                switch (opt_index) {
                 case 'V': /* version */
                         print_revision(progname, NP_VERSION);
                         exit(STATE_UNKNOWN);
@@ -245,169 +245,182 @@ int process_arguments(int argc, char **argv) {
                         }
                         break;
                 case 'U':
-                        unknown_timeout = true;
+                        result.config.unknown_timeout = true;
                         break;
                 case 'H': /* host */
-                        hostname = optarg;
+                        result.config.hostname = optarg;
                         break;
                 case 'p': /* port number */
                         if (!is_integer(optarg)) {
                                 usage_va(_("Port must be a positive integer"));
                         }
-                        comm_append("-p");
-                        comm_append(optarg);
+                        result.config.cmd = comm_append(result.config.cmd, "-p");
+                        result.config.cmd = comm_append(result.config.cmd, optarg);
                         break;
                 case 'O': /* output file */
-                        outputfile = optarg;
-                        passive = true;
+                        result.config.outputfile = optarg;
+                        result.config.passive = true;
                         break;
-                case 's': /* description of service to check */
+                case 's': /* description of service to check */ {
+                        char *p1;
+                        char *p2;
+
                         p1 = optarg;
-                        service = realloc(service, (++services) * sizeof(char *));
+                        result.config.service = realloc(result.config.service, (++result.config.number_of_services) * sizeof(char *));
                         while ((p2 = index(p1, ':'))) {
                                 *p2 = '\0';
-                                service[services - 1] = p1;
-                                service = realloc(service, (++services) * sizeof(char *));
+                                result.config.service[result.config.number_of_services - 1] = p1;
+                                result.config.service = realloc(result.config.service, (++result.config.number_of_services) * sizeof(char *));
                                 p1 = p2 + 1;
                         }
-                        service[services - 1] = p1;
+                        result.config.service[result.config.number_of_services - 1] = p1;
                         break;
                 case 'n': /* short name of host in the monitoring configuration */
-                        host_shortname = optarg;
-                        break;
-
+                        result.config.host_shortname = optarg;
+                } break;
                 case 'u':
-                        comm_append("-l");
-                        comm_append(optarg);
+                        result.config.cmd = comm_append(result.config.cmd, "-l");
+                        result.config.cmd = comm_append(result.config.cmd, optarg);
                         break;
                 case 'l': /* login name */
-                        comm_append("-l");
-                        comm_append(optarg);
+                        result.config.cmd = comm_append(result.config.cmd, "-l");
+                        result.config.cmd = comm_append(result.config.cmd, optarg);
                         break;
                 case 'i': /* identity */
-                        comm_append("-i");
-                        comm_append(optarg);
+                        result.config.cmd = comm_append(result.config.cmd, "-i");
+                        result.config.cmd = comm_append(result.config.cmd, optarg);
                         break;
 
                 case '1': /* Pass these switches directly to ssh */
-                        comm_append("-1");
+                        result.config.cmd = comm_append(result.config.cmd, "-1");
                         break;
                 case '2': /* 1 to force version 1, 2 to force version 2 */
-                        comm_append("-2");
+                        result.config.cmd = comm_append(result.config.cmd, "-2");
                         break;
                 case '4': /* -4 for IPv4 */
-                        comm_append("-4");
+                        result.config.cmd = comm_append(result.config.cmd, "-4");
                         break;
                 case '6': /* -6 for IPv6 */
-                        comm_append("-6");
+                        result.config.cmd = comm_append(result.config.cmd, "-6");
                         break;
                 case 'f': /* fork to background */
-                        comm_append("-f");
+                        result.config.cmd = comm_append(result.config.cmd, "-f");
                         break;
                 case 'C': /* Command for remote machine */
-                        commands++;
-                        if (commands > 1) {
-                                xasprintf(&remotecmd, "%s;echo STATUS CODE: $?;", remotecmd);
+                        result.config.commands++;
+                        if (result.config.commands > 1) {
+                                xasprintf(&result.config.remotecmd, "%s;echo STATUS CODE: $?;", result.config.remotecmd);
                         }
-                        xasprintf(&remotecmd, "%s%s", remotecmd, optarg);
+                        xasprintf(&result.config.remotecmd, "%s%s", result.config.remotecmd, optarg);
                         break;
                 case 'S': /* skip n (or all) lines on stdout */
                         if (optarg == NULL) {
-                                skip_stdout = -1; /* skip all output on stdout */
+                                result.config.skip_stdout = -1; /* skip all output on stdout */
                         } else if (!is_integer(optarg)) {
                                 usage_va(_("skip-stdout argument must be an integer"));
                         } else {
-                                skip_stdout = atoi(optarg);
+                                result.config.skip_stdout = atoi(optarg);
                         }
                         break;
                 case 'E': /* skip n (or all) lines on stderr */
                         if (optarg == NULL) {
-                                skip_stderr = -1; /* skip all output on stderr */
+                                result.config.skip_stderr = -1; /* skip all output on stderr */
                         } else if (!is_integer(optarg)) {
                                 usage_va(_("skip-stderr argument must be an integer"));
                         } else {
-                                skip_stderr = atoi(optarg);
+                                result.config.skip_stderr = atoi(optarg);
                         }
                         break;
                 case 'W': /* exit with warning if there is an output on stderr */
-                        warn_on_stderr = 1;
+                        result.config.warn_on_stderr = true;
                         break;
                 case 'o': /* Extra options for the ssh command */
-                        comm_append("-o");
-                        comm_append(optarg);
+                        result.config.cmd = comm_append(result.config.cmd, "-o");
+                        result.config.cmd = comm_append(result.config.cmd, optarg);
                         break;
                 case 'q': /* Tell the ssh command to be quiet */
-                        comm_append("-q");
+                        result.config.cmd = comm_append(result.config.cmd, "-q");
                         break;
                 case 'F': /* ssh configfile */
-                        comm_append("-F");
-                        comm_append(optarg);
+                        result.config.cmd = comm_append(result.config.cmd, "-F");
+                        result.config.cmd = comm_append(result.config.cmd, optarg);
                         break;
                 default: /* help */
                         usage5();
                 }
         }
 
-        c = optind;
-        if (hostname == NULL) {
+        int c = optind;
+        if (result.config.hostname == NULL) {
                 if (c <= argc) {
                         die(STATE_UNKNOWN, _("%s: You must provide a host name\n"), progname);
                 }
-                hostname = argv[c++];
+                result.config.hostname = argv[c++];
         }
 
-        if (strlen(remotecmd) == 0) {
+        if (strlen(result.config.remotecmd) == 0) {
                 for (; c < argc; c++) {
-                        if (strlen(remotecmd) > 0) {
-                                xasprintf(&remotecmd, "%s %s", remotecmd, argv[c]);
+                        if (strlen(result.config.remotecmd) > 0) {
+                                xasprintf(&result.config.remotecmd, "%s %s", result.config.remotecmd, argv[c]);
                         } else {
-                                xasprintf(&remotecmd, "%s", argv[c]);
+                                xasprintf(&result.config.remotecmd, "%s", argv[c]);
                         }
                 }
         }
 
-        if (commands > 1 || passive) {
-                xasprintf(&remotecmd, "%s;echo STATUS CODE: $?;", remotecmd);
+        if (result.config.commands > 1 || result.config.passive) {
+                xasprintf(&result.config.remotecmd, "%s;echo STATUS CODE: $?;", result.config.remotecmd);
         }
 
-        if (remotecmd == NULL || strlen(remotecmd) <= 1) {
+        if (result.config.remotecmd == NULL || strlen(result.config.remotecmd) <= 1) {
                 usage_va(_("No remotecmd"));
         }
 
-        comm_append(hostname);
-        comm_append(remotecmd);
+        result.config.cmd = comm_append(result.config.cmd, result.config.hostname);
+        result.config.cmd = comm_append(result.config.cmd, result.config.remotecmd);
 
-        return validate_arguments();
+        return validate_arguments(result);
 }
 
-void comm_append(const char *str) {
+command_construct comm_append(command_construct cmd, const char *str) {
+
+        if (verbose) {
+                for (int i = 0; i < cmd.commargc; i++) {
+                        printf("Current command: [%i] %s\n", i, cmd.commargv[i]);
+                }
 
-        if (++commargc > NP_MAXARGS) {
+                printf("Appending: %s\n", str);
+        }
+
+        if (++cmd.commargc > NP_MAXARGS) {
                 die(STATE_UNKNOWN, _("%s: Argument limit of %d exceeded\n"), progname, NP_MAXARGS);
         }
 
-        if ((commargv = (char **)realloc(commargv, (commargc + 1) * sizeof(char *))) == NULL) {
+        if ((cmd.commargv = (char **)realloc(cmd.commargv, (cmd.commargc + 1) * sizeof(char *))) == NULL) {
                 die(STATE_UNKNOWN, _("Can not (re)allocate 'commargv' buffer\n"));
         }
 
-        commargv[commargc - 1] = strdup(str);
-        commargv[commargc] = NULL;
+        cmd.commargv[cmd.commargc - 1] = strdup(str);
+        cmd.commargv[cmd.commargc] = NULL;
+
+        return cmd;
 }
 
-int validate_arguments(void) {
-        if (remotecmd == NULL || hostname == NULL) {
-                return ERROR;
+check_by_ssh_config_wrapper validate_arguments(check_by_ssh_config_wrapper config_wrapper) {
+        if (config_wrapper.config.remotecmd == NULL || config_wrapper.config.hostname == NULL) {
+                config_wrapper.errorcode = ERROR;
+                return config_wrapper;
         }
 
-        if (passive && commands != services) {
+        if (config_wrapper.config.passive && config_wrapper.config.commands != config_wrapper.config.number_of_services) {
                 die(STATE_UNKNOWN, _("%s: In passive mode, you must provide a service name for each command.\n"), progname);
         }
 
-        if (passive && host_shortname == NULL) {
+        if (config_wrapper.config.passive && config_wrapper.config.host_shortname == NULL) {
                 die(STATE_UNKNOWN, _("%s: In passive mode, you must provide the host short name from the monitoring configs.\n"), progname);
         }
 
-        return OK;
+        return config_wrapper;
 }
 
 void print_help(void) {
diff --git a/plugins/check_by_ssh.d/config.h b/plugins/check_by_ssh.d/config.h
new file mode 100644
index 00000000..05435def
--- /dev/null
+++ b/plugins/check_by_ssh.d/config.h
@@ -0,0 +1,56 @@
+#pragma once
+
+#include "../../config.h"
+#include <stddef.h>
+
+typedef struct {
+        int commargc;
+        char **commargv;
+} command_construct;
+
+typedef struct {
+        char *hostname;
+        char *host_shortname;
+
+        char **service;
+        unsigned int number_of_services;
+
+        unsigned int commands; // Not needed during actual test run
+        char *remotecmd;
+
+        command_construct cmd;
+
+        bool unknown_timeout;
+        bool warn_on_stderr;
+        int skip_stdout;
+        int skip_stderr;
+        bool passive;
+        char *outputfile;
+} check_by_ssh_config;
+
+check_by_ssh_config check_by_ssh_config_init() {
+        check_by_ssh_config tmp = {
+                .hostname = NULL,
+                .host_shortname = NULL,
+
+                .service = NULL,
+                .number_of_services = 0,
+
+                .commands = 0,
+                .remotecmd = "",
+
+                .cmd =
+                        {
+                                .commargc = 0,
+                                .commargv = NULL,
+                        },
+
+                .unknown_timeout = false,
+                .warn_on_stderr = false,
+                .skip_stderr = 0,
+                .skip_stdout = 0,
+                .passive = false,
+                .outputfile = NULL,
+        };
+        return tmp;
+}