3 files changed, 22 insertions, 17 deletions

diff --git a/other/bootstrap_daemon/src/config.c b/other/bootstrap_daemon/src/config.c
index 27d1364a..3e102af9 100644
--- a/other/bootstrap_daemon/src/config.c
+++ b/other/bootstrap_daemon/src/config.c
@@ -62,7 +62,7 @@ static void parse_tcp_relay_ports_config(config_t *cfg, uint16_t **tcp_relay_por
         }
 
         // similar procedure to the one of reading config file below
-        *tcp_relay_ports = malloc(DEFAULT_TCP_RELAY_PORTS_COUNT * sizeof(uint16_t));
+        *tcp_relay_ports = (uint16_t *)malloc(DEFAULT_TCP_RELAY_PORTS_COUNT * sizeof(uint16_t));
 
         for (i = 0; i < DEFAULT_TCP_RELAY_PORTS_COUNT; i ++) {
 
@@ -80,7 +80,7 @@ static void parse_tcp_relay_ports_config(config_t *cfg, uint16_t **tcp_relay_por
 
         // the loop above skips invalid ports, so we adjust the allocated memory size
         if ((*tcp_relay_port_count) > 0) {
-            *tcp_relay_ports = realloc(*tcp_relay_ports, (*tcp_relay_port_count) * sizeof(uint16_t));
+            *tcp_relay_ports = (uint16_t *)realloc(*tcp_relay_ports, (*tcp_relay_port_count) * sizeof(uint16_t));
         } else {
             free(*tcp_relay_ports);
             *tcp_relay_ports = NULL;
@@ -102,7 +102,7 @@ static void parse_tcp_relay_ports_config(config_t *cfg, uint16_t **tcp_relay_por
         return;
     }
 
-    *tcp_relay_ports = malloc(config_port_count * sizeof(uint16_t));
+    *tcp_relay_ports = (uint16_t *)malloc(config_port_count * sizeof(uint16_t));
 
     int i;
 
@@ -134,7 +134,7 @@ static void parse_tcp_relay_ports_config(config_t *cfg, uint16_t **tcp_relay_por
 
     // the loop above skips invalid ports, so we adjust the allocated memory size
     if ((*tcp_relay_port_count) > 0) {
-        *tcp_relay_ports = realloc(*tcp_relay_ports, (*tcp_relay_port_count) * sizeof(uint16_t));
+        *tcp_relay_ports = (uint16_t *)realloc(*tcp_relay_ports, (*tcp_relay_port_count) * sizeof(uint16_t));
     } else {
         free(*tcp_relay_ports);
         *tcp_relay_ports = NULL;
@@ -182,7 +182,7 @@ int get_general_config(const char *cfg_file_path, char **pid_file_path, char **k
         tmp_pid_file = DEFAULT_PID_FILE_PATH;
     }
 
-    *pid_file_path = malloc(strlen(tmp_pid_file) + 1);
+    *pid_file_path = (char *)malloc(strlen(tmp_pid_file) + 1);
     strcpy(*pid_file_path, tmp_pid_file);
 
     // Get keys file location
@@ -194,7 +194,7 @@ int get_general_config(const char *cfg_file_path, char **pid_file_path, char **k
         tmp_keys_file = DEFAULT_KEYS_FILE_PATH;
     }
 
-    *keys_file_path = malloc(strlen(tmp_keys_file) + 1);
+    *keys_file_path = (char *)malloc(strlen(tmp_keys_file) + 1);
     strcpy(*keys_file_path, tmp_keys_file);
 
     // Get IPv6 option
@@ -254,7 +254,7 @@ int get_general_config(const char *cfg_file_path, char **pid_file_path, char **k
 
         size_t tmp_motd_length = strlen(tmp_motd) + 1;
         size_t motd_length = tmp_motd_length > MAX_MOTD_LENGTH ? MAX_MOTD_LENGTH : tmp_motd_length;
-        *motd = malloc(motd_length);
+        *motd = (char *)malloc(motd_length);
         strncpy(*motd, tmp_motd, motd_length);
         (*motd)[motd_length - 1] = '\0';
     }
@@ -310,7 +310,7 @@ static uint8_t *hex_string_to_bin(const char *hex_string)
     }
 
     size_t len = strlen(hex_string) / 2;
-    uint8_t *ret = malloc(len);
+    uint8_t *ret = (uint8_t *)malloc(len);
 
     const char *pos = hex_string;
     size_t i;
@@ -364,6 +364,8 @@ int bootstrap_from_config(const char *cfg_file_path, DHT *dht, int enable_ipv6)
     int i = 0;
 
     while (config_setting_length(node_list)) {
+        int address_resolved;
+        uint8_t *bs_public_key_bin;
 
         node = config_setting_get_elem(node_list, 0);
 
@@ -403,9 +405,9 @@ int bootstrap_from_config(const char *cfg_file_path, DHT *dht, int enable_ipv6)
             goto next;
         }
 
-        uint8_t *bs_public_key_bin = hex_string_to_bin(bs_public_key);
-        const int address_resolved = DHT_bootstrap_from_address(dht, bs_address, enable_ipv6, htons(bs_port),
-                                     bs_public_key_bin);
+        bs_public_key_bin = hex_string_to_bin(bs_public_key);
+        address_resolved = DHT_bootstrap_from_address(dht, bs_address, enable_ipv6, htons(bs_port),
+                           bs_public_key_bin);
         free(bs_public_key_bin);
 
         if (!address_resolved) {
diff --git a/other/bootstrap_daemon/src/log.c b/other/bootstrap_daemon/src/log.c
index 2eae3286..7632d739 100644
--- a/other/bootstrap_daemon/src/log.c
+++ b/other/bootstrap_daemon/src/log.c
@@ -31,11 +31,12 @@
 #include <stdarg.h>
 #include <stdio.h>
 
-static LOG_BACKEND current_backend = -1;
+#define INVALID_BACKEND (LOG_BACKEND)-1u
+static LOG_BACKEND current_backend = INVALID_BACKEND;
 
 bool open_log(LOG_BACKEND backend)
 {
-    if (current_backend != -1) {
+    if (current_backend != INVALID_BACKEND) {
         return false;
     }
 
@@ -50,7 +51,7 @@ bool open_log(LOG_BACKEND backend)
 
 bool close_log(void)
 {
-    if (current_backend == -1) {
+    if (current_backend == INVALID_BACKEND) {
         return false;
     }
 
@@ -58,7 +59,7 @@ bool close_log(void)
         closelog();
     }
 
-    current_backend = -1;
+    current_backend = INVALID_BACKEND;
 
     return true;
 }
@@ -121,5 +122,5 @@ bool write_log(LOG_LEVEL level, const char *format, ...)
 
     va_end(args);
 
-    return current_backend != -1;
+    return current_backend != INVALID_BACKEND;
 }
diff --git a/other/bootstrap_node_packets.c b/other/bootstrap_node_packets.c
index 8ee26786..8abbb7f2 100644
--- a/other/bootstrap_node_packets.c
+++ b/other/bootstrap_node_packets.c
@@ -40,13 +40,15 @@ static int handle_info_request(void *object, IP_Port source, const uint8_t *pack
         return 1;
     }
 
+    Networking_Core *nc = (Networking_Core *)object;
+
     uint8_t data[1 + sizeof(bootstrap_version) + MAX_MOTD_LENGTH];
     data[0] = BOOTSTRAP_INFO_PACKET_ID;
     memcpy(data + 1, &bootstrap_version, sizeof(bootstrap_version));
     uint16_t len = 1 + sizeof(bootstrap_version) + bootstrap_motd_length;
     memcpy(data + 1 + sizeof(bootstrap_version), bootstrap_motd, bootstrap_motd_length);
 
-    if (sendpacket(object, source, data, len) == len) {
+    if (sendpacket(nc, source, data, len) == len) {
         return 0;
     }