add: version.h

fix: refactor

src/helpers/bind_server.c

@@ -0,0 +1,52 @@
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <netdb.h>
+#include <sys/socket.h>
+#include <sys/types.h>
+#include <errno.h>
+
+#include <logger.h>
+#include <helpers.h>
+
+int
+helper_bind_tcp_server(char* addr, uint16_t port, int max_client_backlog)
+{
+    char port_str[6];
+    sprintf(port_str, "%d", port);
+
+    struct addrinfo hints, *res;
+    int fd;
+    int status;
+
+    memset(&hints, 0, sizeof hints);
+    hints.ai_family = AF_UNSPEC;
+    hints.ai_socktype = SOCK_STREAM;
+    hints.ai_flags = AI_PASSIVE;
+
+    if ((status = getaddrinfo(addr, port_str, &hints, &res)) != 0)
+    {
+        LOG_ERROR("getaddrinfo: %s\n", gai_strerror(status));
+        return -1;
+    }
+
+    fd = socket(res->ai_family, res->ai_socktype, res->ai_protocol);
+
+    if ((status = bind(fd, res->ai_addr, res->ai_addrlen)) == -1)
+    {
+        LOG_ERROR("error binding socket: %s\n", strerror(errno));
+        freeaddrinfo(res);
+        return -1;
+    }
+
+    if ((status = listen(fd, max_client_backlog)) == -1)
+    {
+        LOG_ERROR("error setting up listener: %s\n", strerror(errno));
+        freeaddrinfo(res);
+        return -1;
+    }
+
+    freeaddrinfo(res);
+
+    return fd;
+}

src/helpers/connect_server.c

@@ -0,0 +1,39 @@
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <netdb.h>
+#include <sys/socket.h>
+
+#include <logger.h>
+#include <helpers.h>
+
+int
+helper_connect_tcp_server(char* host, uint16_t port)
+{
+    char port_str[6];
+    sprintf(port_str, "%d", port);
+
+    int s, status;
+    struct addrinfo hints, *res;
+    memset(&hints, 0, sizeof hints);
+    hints.ai_family = AF_INET; //set IP Protocol flag (IPv4 or IPv6 - we don't care)
+    hints.ai_socktype = SOCK_STREAM; //set socket flag
+
+    if ((status = getaddrinfo(host, port_str, &hints, &res)) != 0) { //getaddrinfo() will evaluate the given address, using the hints-flags and port, and return an IP address and other server infos
+        LOG_ERROR("getaddrinfo: %s\n", gai_strerror(status));
+        return -1;
+    }
+
+    //res got filled out by getaddrinfo() for us
+    s = socket(res->ai_family, res->ai_socktype, res->ai_protocol); //creating Socket
+
+    if ((status = connect(s, res->ai_addr, res->ai_addrlen)) != 0) {
+        LOG_ERROR("connect() failed\n");
+        freeaddrinfo(res);
+        return -1;
+    }
+
+    freeaddrinfo(res);
+
+    return s;
+}

src/helpers/get_port.c

@@ -0,0 +1,24 @@
+#include <sys/socket.h>
+#include <arpa/inet.h>
+#include <stdint.h>
+#include <errno.h>
+#include <string.h>
+
+#include <helpers.h>
+#include <logger.h>
+
+uint16_t
+helper_get_port(int sock)
+{
+    struct sockaddr_in sin;
+    socklen_t len = sizeof(sin);
+    if (getsockname(sock, (struct sockaddr *)&sin, &len) == -1)
+    {
+        LOG_ERROR("could not get socket name for port: %s\n", strerror(errno));
+        return 0;
+    }
+    else
+    {
+        return ntohs(sin.sin_port);
+    }
+}

src/helpers/get_weekday.c

@@ -0,0 +1,11 @@
+#include <time.h>
+
+#include <helpers.h>
+
+int
+helper_get_weekday(const struct tm *time_struct)
+{
+    int wday_sun_sat = time_struct->tm_wday;
+    int wday_mon_sun = (wday_sun_sat + 6) % 7;
+    return wday_mon_sun;
+}

src/helpers/load_config.c

@@ -0,0 +1,115 @@
+#include <stdlib.h>
+#include <string.h>
+
+#include <helpers.h>
+#include <config.h>
+#include <logger.h>
+#include <confini.h>
+
+#define CONFINI_IS_KEY(SECTION, KEY) \
+    (ini_array_match(SECTION, disp->append_to, '.', disp->format) && \
+     ini_string_match_ii(KEY, disp->data, disp->format))
+
+int
+helper_load_config(IniDispatch *disp, void *config_void)
+{
+    config_t *config = (config_t*)config_void;
+    char relay_section_name[10]; // "relay-255\0" is longest name 
+
+    if(disp->type == INI_KEY)
+    {
+        if(CONFINI_IS_KEY("controller", "name"))
+        {
+            strncpy(config->name, disp->value, MAX_NAME_LENGTH);
+            config->name[MAX_NAME_LENGTH] = '\0';
+            return 0;
+        }
+        if(CONFINI_IS_KEY("controller", "database"))
+        {
+            config->database = malloc(sizeof(char) * (strlen(disp->value) + 1));
+            strcpy(config->database, disp->value);
+            return 0;
+        }
+        if(CONFINI_IS_KEY("controller", "log-level"))
+        {
+            if(strcasecmp(disp->value, "trace") == 0)
+            {
+                config->log_level = LOG_LEVEL_TRACE;
+                return 0;
+            }
+            if(strcasecmp(disp->value, "debug") == 0)
+            {
+                config->log_level = LOG_LEVEL_DEBUG;
+                return 0;
+            }
+            if(strcasecmp(disp->value, "info") == 0)
+            {
+                config->log_level = LOG_LEVEL_INFO;
+                return 0;
+            }
+            if(strcasecmp(disp->value, "warn") == 0)
+            {
+                config->log_level = LOG_LEVEL_WARN;
+                return 0;
+            }
+            if(strcasecmp(disp->value, "error") == 0)
+            {
+                config->log_level = LOG_LEVEL_ERROR;
+                return 0;
+            }
+            if(strcasecmp(disp->value, "fatal") == 0)
+            {
+                config->log_level = LOG_LEVEL_FATAL;
+                return 0;
+            }
+            LOG_WARN("invalid log-level '%s'\n", disp->value);
+            return 0;
+        }
+        if(CONFINI_IS_KEY("controller", "discovery-port"))
+        {
+            config->discovery_port = atoi(disp->value);
+            return 0;
+        }
+        if(CONFINI_IS_KEY("controller", "relay-count"))
+        {
+            config->relay_count = atoi(disp->value);
+            config->relay_configs = malloc(sizeof(config_relay_t) * config->relay_count);
+            for(uint8_t i = 0; i < config->relay_count; ++i)
+            {
+                config->relay_configs[i].driver= RELAY_DRIVER_NONE;
+            }
+            LOG_TRACE("config relay-count set to %u\n", config->relay_count);
+            return 0;
+        }
+        for(uint8_t i = 0; i < config->relay_count; ++i)
+        {
+            sprintf(relay_section_name, "relay-%u", i);
+            if(CONFINI_IS_KEY(relay_section_name, "pin"))
+            {
+                config->relay_configs[i].pin = atoi(disp->value);
+                return 0;
+            }
+            if(CONFINI_IS_KEY(relay_section_name, "inverted"))
+            {
+                config->relay_configs[i].inverted = atoi(disp->value);
+                return 0;
+            }
+            if(CONFINI_IS_KEY(relay_section_name, "driver"))
+            {
+                if(strcasecmp(disp->value, "gpio") == 0)
+                {
+                    config->relay_configs[i].driver = RELAY_DRIVER_GPIO;
+                    return 0;
+                }
+                if(strcasecmp(disp->value, "piface") == 0)
+                {
+                    config->relay_configs[i].driver = RELAY_DRIVER_PIFACE;
+                    return 0;
+                }
+                LOG_WARN("invalid driver '%s' in section '%s'\n", disp->value, relay_section_name);
+                return 0;
+            }
+        }
+    }
+    return 0;
+}

src/helpers/open_discovery_socket.c

@@ -0,0 +1,57 @@
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <netdb.h>
+#include <sys/socket.h>
+
+#include <logger.h>
+#include <helpers.h>
+
+int
+helper_open_discovery_socket(uint16_t discovery_port)
+{
+    struct addrinfo hints, *res;
+    int fd, status;
+
+    memset(&hints, 0, sizeof hints);
+    hints.ai_family = AF_INET; // use ipv4
+    hints.ai_socktype = SOCK_DGRAM; //set socket flag
+    hints.ai_flags = AI_PASSIVE; // get my IP
+
+    char discovery_port_str[6];
+    sprintf(discovery_port_str, "%u", discovery_port);
+
+    //get connection info for our computer
+    if ((status = getaddrinfo(NULL, discovery_port_str, &hints, &res)) != 0)
+    {
+        LOG_FATAL("getaddrinfo: %s\n", gai_strerror(status));
+        freeaddrinfo(res);
+        exit(EXIT_FAILURE);
+    }
+
+    //creating socket
+    fd = socket(res->ai_family, res->ai_socktype, res->ai_protocol);
+    int yes = 1;
+
+    // lose the pesky "Address already in use" error message
+    if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &yes, sizeof(yes)) == -1)
+    {
+        LOG_FATAL("setsockopt: %s\n", strerror(errno));
+        freeaddrinfo(res);
+        exit(EXIT_FAILURE);
+    }
+
+    if (bind(fd, res->ai_addr, res->ai_addrlen) == -1)
+    {
+        LOG_FATAL("bind: %s\n", strerror(errno));
+        freeaddrinfo(res);
+        exit(EXIT_FAILURE);
+    }
+
+    freeaddrinfo(res);
+
+    LOG_INFO("opened discovery socket on port %u\n", discovery_port);
+
+    return fd;
+}

src/helpers/parse_cli.c

@@ -0,0 +1,70 @@
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+
+#include <argparse.h>
+#include <config.h>
+#include <logger.h>
+#include <helpers.h>
+#include <version.h>
+
+static const char *const usage[] = {
+    "controller [options] [[--] args]",
+    "controller [options]",
+    NULL,
+};
+
+#define PERM_READ  (1<<0)
+#define PERM_WRITE (1<<1)
+#define PERM_EXEC  (1<<2)
+
+void
+helper_parse_cli(int argc, const char **argv, config_t *config)
+{
+    int version = 0;
+    struct argparse_option options[] =
+    {
+        OPT_HELP(),
+        OPT_GROUP("Basic options"),
+        OPT_STRING('c', "config", &config->file, "path to config file", NULL, 0, OPT_NONEG),
+        OPT_BOOLEAN('v', "version", &version, "print version", NULL, 0, OPT_NONEG),
+        OPT_END(),
+    };
+
+    struct argparse argparse;
+    argparse_init(&argparse, options, usage, 0);
+    argparse_describe(
+            &argparse,
+            "\nA brief description of what the program does and how it works.",
+            "\nAdditional description of the program after the description of the arguments."
+    );
+    argc = argparse_parse(&argparse, argc, argv);
+
+    if(version)
+    {
+        printf("%s\n", EMGAUWA_CONTROLLER_VERSION);
+        exit(0);
+    }
+
+    if(argc == 1)
+    {
+        if(strcmp(argv[0], "start") == 0)
+        {
+            config->run_type = RUN_TYPE_START;
+            return;
+        }
+        if(strcmp(argv[0], "test") == 0)
+        {
+            config->run_type = RUN_TYPE_TEST;
+            return;
+        }
+        LOG_FATAL("bad action '%s' given ('start', 'test')\n", argv[0]);
+        exit(1);
+    }
+    else
+    {
+        LOG_FATAL("no action given ('start', 'test')\n");
+        exit(1);
+    }
+    return;
+}