Cleanups.

4 files changed, 48 insertions, 35 deletions

diff --git a/other/bootstrap_daemon/src/command_line_arguments.c b/other/bootstrap_daemon/src/command_line_arguments.c
index 187fa786..ecfef1ad 100644
--- a/other/bootstrap_daemon/src/command_line_arguments.c
+++ b/other/bootstrap_daemon/src/command_line_arguments.c
@@ -41,26 +41,27 @@ void print_help()
     // make sure all lines fit into 80 columns
     // make sure options are listed in alphabetical order
     write_log(LOG_LEVEL_INFO,
-           "Usage: tox-bootstrapd [OPTION]... --config=FILE_PATH\n"
-           "\n"
-           "Options:\n"
-           "  --config=FILE_PATH     Specify path to the config file.\n"
-           "                         This is a required option.\n"
-           "                         Set FILE_PATH to a path to an empty file in order to\n"
-           "                         use default settings.\n"
-           "  --foreground           Run the daemon in foreground. The daemon won't fork\n"
-           "                         (detach from the terminal) and won't use the PID file.\n"
-           "  --help                 Print this help message.\n"
-           "  --log-backend=BACKEND  Specify which logging backend to use.\n"
-           "                         Valid BACKEND values (case sensetive):\n"
-           "                           syslog Writes log messages to syslog.\n"
-           "                                  Default option when no --log-backend is\n"
-           "                                  specified.\n"
-           "                           stdout Writes log messages to stdout/stderr.\n"
-           "  --version              Print version information.\n");
+              "Usage: tox-bootstrapd [OPTION]... --config=FILE_PATH\n"
+              "\n"
+              "Options:\n"
+              "  --config=FILE_PATH     Specify path to the config file.\n"
+              "                         This is a required option.\n"
+              "                         Set FILE_PATH to a path to an empty file in order to\n"
+              "                         use default settings.\n"
+              "  --foreground           Run the daemon in foreground. The daemon won't fork\n"
+              "                         (detach from the terminal) and won't use the PID file.\n"
+              "  --help                 Print this help message.\n"
+              "  --log-backend=BACKEND  Specify which logging backend to use.\n"
+              "                         Valid BACKEND values (case sensetive):\n"
+              "                           syslog Writes log messages to syslog.\n"
+              "                                  Default option when no --log-backend is\n"
+              "                                  specified.\n"
+              "                           stdout Writes log messages to stdout/stderr.\n"
+              "  --version              Print version information.\n");
 }
 
-void handle_command_line_arguments(int argc, char *argv[], char **cfg_file_path, LOG_BACKEND *log_backend, bool *run_in_foreground)
+void handle_command_line_arguments(int argc, char *argv[], char **cfg_file_path, LOG_BACKEND *log_backend,
+                                   bool *run_in_foreground)
 {
     if (argc < 2) {
         write_log(LOG_LEVEL_ERROR, "Error: No arguments provided.\n\n");
@@ -115,6 +116,7 @@ void handle_command_line_arguments(int argc, char *argv[], char **cfg_file_path,
                     print_help();
                     exit(1);
                 }
+
                 break;
 
             case 'v':
@@ -122,12 +124,12 @@ void handle_command_line_arguments(int argc, char *argv[], char **cfg_file_path,
                 exit(0);
 
             case '?':
-                write_log(LOG_LEVEL_ERROR, "Error: Unrecognized option %s\n\n", argv[optind-1]);
+                write_log(LOG_LEVEL_ERROR, "Error: Unrecognized option %s\n\n", argv[optind - 1]);
                 print_help();
                 exit(1);
 
             case ':':
-                write_log(LOG_LEVEL_ERROR, "Error: No argument provided for option %s\n\n", argv[optind-1]);
+                write_log(LOG_LEVEL_ERROR, "Error: No argument provided for option %s\n\n", argv[optind - 1]);
                 print_help();
                 exit(1);
         }
diff --git a/other/bootstrap_daemon/src/config.c b/other/bootstrap_daemon/src/config.c
index 861a3803..12ae693d 100644
--- a/other/bootstrap_daemon/src/config.c
+++ b/other/bootstrap_daemon/src/config.c
@@ -72,7 +72,7 @@ void parse_tcp_relay_ports_config(config_t *cfg, uint16_t **tcp_relay_ports, int
             if ((*tcp_relay_ports)[*tcp_relay_port_count] < MIN_ALLOWED_PORT
                     || (*tcp_relay_ports)[*tcp_relay_port_count] > MAX_ALLOWED_PORT) {
                 write_log(LOG_LEVEL_WARNING, "Port #%d: Invalid port: %u, should be in [%d, %d]. Skipping.\n", i,
-                       (*tcp_relay_ports)[*tcp_relay_port_count], MIN_ALLOWED_PORT, MAX_ALLOWED_PORT);
+                          (*tcp_relay_ports)[*tcp_relay_port_count], MIN_ALLOWED_PORT, MAX_ALLOWED_PORT);
                 continue;
             }
 
@@ -92,7 +92,7 @@ void parse_tcp_relay_ports_config(config_t *cfg, uint16_t **tcp_relay_ports, int
 
     if (config_setting_is_array(ports_array) == CONFIG_FALSE) {
         write_log(LOG_LEVEL_ERROR, "'%s' setting should be an array. Array syntax: 'setting = [value1, value2, ...]'.\n",
-               NAME_TCP_RELAY_PORTS);
+                  NAME_TCP_RELAY_PORTS);
         return;
     }
 
@@ -126,7 +126,7 @@ void parse_tcp_relay_ports_config(config_t *cfg, uint16_t **tcp_relay_ports, int
         if ((*tcp_relay_ports)[*tcp_relay_port_count] < MIN_ALLOWED_PORT
                 || (*tcp_relay_ports)[*tcp_relay_port_count] > MAX_ALLOWED_PORT) {
             write_log(LOG_LEVEL_WARNING, "Port #%d: Invalid port: %u, should be in [%d, %d]. Skipping.\n", i,
-                   (*tcp_relay_ports)[*tcp_relay_port_count], MIN_ALLOWED_PORT, MAX_ALLOWED_PORT);
+                      (*tcp_relay_ports)[*tcp_relay_port_count], MIN_ALLOWED_PORT, MAX_ALLOWED_PORT);
             continue;
         }
 
@@ -142,7 +142,8 @@ void parse_tcp_relay_ports_config(config_t *cfg, uint16_t **tcp_relay_ports, int
     }
 }
 
-int get_general_config(const char *cfg_file_path, char **pid_file_path, char **keys_file_path, int *port, int *enable_ipv6,
+int get_general_config(const char *cfg_file_path, char **pid_file_path, char **keys_file_path, int *port,
+                       int *enable_ipv6,
                        int *enable_ipv4_fallback, int *enable_lan_discovery, int *enable_tcp_relay, uint16_t **tcp_relay_ports,
                        int *tcp_relay_port_count, int *enable_motd, char **motd)
 {
@@ -209,7 +210,7 @@ int get_general_config(const char *cfg_file_path, char **pid_file_path, char **k
     if (config_lookup_bool(&cfg, NAME_ENABLE_IPV4_FALLBACK, enable_ipv4_fallback) == CONFIG_FALSE) {
         write_log(LOG_LEVEL_WARNING, "No '%s' setting in configuration file.\n", NAME_ENABLE_IPV4_FALLBACK);
         write_log(LOG_LEVEL_WARNING, "Using default '%s': %s\n", NAME_ENABLE_IPV4_FALLBACK,
-               DEFAULT_ENABLE_IPV4_FALLBACK ? "true" : "false");
+                  DEFAULT_ENABLE_IPV4_FALLBACK ? "true" : "false");
         *enable_ipv4_fallback = DEFAULT_ENABLE_IPV4_FALLBACK;
     }
 
@@ -217,7 +218,7 @@ int get_general_config(const char *cfg_file_path, char **pid_file_path, char **k
     if (config_lookup_bool(&cfg, NAME_ENABLE_LAN_DISCOVERY, enable_lan_discovery) == CONFIG_FALSE) {
         write_log(LOG_LEVEL_WARNING, "No '%s' setting in configuration file.\n", NAME_ENABLE_LAN_DISCOVERY);
         write_log(LOG_LEVEL_WARNING, "Using default '%s': %s\n", NAME_ENABLE_LAN_DISCOVERY,
-               DEFAULT_ENABLE_LAN_DISCOVERY ? "true" : "false");
+                  DEFAULT_ENABLE_LAN_DISCOVERY ? "true" : "false");
         *enable_lan_discovery = DEFAULT_ENABLE_LAN_DISCOVERY;
     }
 
@@ -225,7 +226,7 @@ int get_general_config(const char *cfg_file_path, char **pid_file_path, char **k
     if (config_lookup_bool(&cfg, NAME_ENABLE_TCP_RELAY, enable_tcp_relay) == CONFIG_FALSE) {
         write_log(LOG_LEVEL_WARNING, "No '%s' setting in configuration file.\n", NAME_ENABLE_TCP_RELAY);
         write_log(LOG_LEVEL_WARNING, "Using default '%s': %s\n", NAME_ENABLE_TCP_RELAY,
-               DEFAULT_ENABLE_TCP_RELAY ? "true" : "false");
+                  DEFAULT_ENABLE_TCP_RELAY ? "true" : "false");
         *enable_tcp_relay = DEFAULT_ENABLE_TCP_RELAY;
     }
 
@@ -239,7 +240,7 @@ int get_general_config(const char *cfg_file_path, char **pid_file_path, char **k
     if (config_lookup_bool(&cfg, NAME_ENABLE_MOTD, enable_motd) == CONFIG_FALSE) {
         write_log(LOG_LEVEL_WARNING, "No '%s' setting in configuration file.\n", NAME_ENABLE_MOTD);
         write_log(LOG_LEVEL_WARNING, "Using default '%s': %s\n", NAME_ENABLE_MOTD,
-               DEFAULT_ENABLE_MOTD ? "true" : "false");
+                  DEFAULT_ENABLE_MOTD ? "true" : "false");
         *enable_motd = DEFAULT_ENABLE_MOTD;
     }
 
@@ -315,6 +316,7 @@ uint8_t *hex_string_to_bin(char *hex_string)
 
     char *pos = hex_string;
     size_t i;
+
     for (i = 0; i < len; ++i, pos += 2) {
         sscanf(pos, "%2hhx", &ret[i]);
     }
@@ -343,7 +345,8 @@ int bootstrap_from_config(const char *cfg_file_path, DHT *dht, int enable_ipv6)
     config_setting_t *node_list = config_lookup(&cfg, NAME_BOOTSTRAP_NODES);
 
     if (node_list == NULL) {
-        write_log(LOG_LEVEL_WARNING, "No '%s' setting in the configuration file. Skipping bootstrapping.\n", NAME_BOOTSTRAP_NODES);
+        write_log(LOG_LEVEL_WARNING, "No '%s' setting in the configuration file. Skipping bootstrapping.\n",
+                  NAME_BOOTSTRAP_NODES);
         config_destroy(&cfg);
         return 1;
     }
@@ -373,7 +376,8 @@ int bootstrap_from_config(const char *cfg_file_path, DHT *dht, int enable_ipv6)
 
         // Check that all settings are present
         if (config_setting_lookup_string(node, NAME_PUBLIC_KEY, &bs_public_key) == CONFIG_FALSE) {
-            write_log(LOG_LEVEL_WARNING, "Bootstrap node #%d: Couldn't find '%s' setting. Skipping the node.\n", i, NAME_PUBLIC_KEY);
+            write_log(LOG_LEVEL_WARNING, "Bootstrap node #%d: Couldn't find '%s' setting. Skipping the node.\n", i,
+                      NAME_PUBLIC_KEY);
             goto next;
         }
 
@@ -390,13 +394,14 @@ int bootstrap_from_config(const char *cfg_file_path, DHT *dht, int enable_ipv6)
         // Process settings
         if (strlen(bs_public_key) != crypto_box_PUBLICKEYBYTES * 2) {
             write_log(LOG_LEVEL_WARNING, "Bootstrap node #%d: Invalid '%s': %s. Skipping the node.\n", i, NAME_PUBLIC_KEY,
-                   bs_public_key);
+                      bs_public_key);
             goto next;
         }
 
         if (bs_port < MIN_ALLOWED_PORT || bs_port > MAX_ALLOWED_PORT) {
-            write_log(LOG_LEVEL_WARNING, "Bootstrap node #%d: Invalid '%s': %d, should be in [%d, %d]. Skipping the node.\n", i, NAME_PORT,
-                   bs_port, MIN_ALLOWED_PORT, MAX_ALLOWED_PORT);
+            write_log(LOG_LEVEL_WARNING, "Bootstrap node #%d: Invalid '%s': %d, should be in [%d, %d]. Skipping the node.\n", i,
+                      NAME_PORT,
+                      bs_port, MIN_ALLOWED_PORT, MAX_ALLOWED_PORT);
             goto next;
         }
 
diff --git a/other/bootstrap_daemon/src/log.c b/other/bootstrap_daemon/src/log.c
index d441b98e..a0ac20d9 100644
--- a/other/bootstrap_daemon/src/log.c
+++ b/other/bootstrap_daemon/src/log.c
@@ -68,8 +68,10 @@ int level_syslog(LOG_LEVEL level)
     switch (level) {
         case LOG_LEVEL_INFO:
             return LOG_INFO;
+
         case LOG_LEVEL_WARNING:
             return LOG_WARNING;
+
         case LOG_LEVEL_ERROR:
             return LOG_ERR;
     }
@@ -80,11 +82,12 @@ void log_syslog(LOG_LEVEL level, const char *format, va_list args)
     vsyslog(level_syslog(level), format, args);
 }
 
-FILE* level_stdout(LOG_LEVEL level)
+FILE *level_stdout(LOG_LEVEL level)
 {
     switch (level) {
         case LOG_LEVEL_INFO:
             return stdout;
+
         case LOG_LEVEL_WARNING: // intentional fallthrough
         case LOG_LEVEL_ERROR:
             return stderr;
@@ -106,6 +109,7 @@ bool write_log(LOG_LEVEL level, const char *format, ...)
         case LOG_BACKEND_SYSLOG:
             log_syslog(level, format, args);
             break;
+
         case LOG_BACKEND_STDOUT:
             log_stdout(level, format, args);
             break;
diff --git a/other/bootstrap_daemon/src/tox-bootstrapd.c b/other/bootstrap_daemon/src/tox-bootstrapd.c
index e252a37d..27a910f3 100644
--- a/other/bootstrap_daemon/src/tox-bootstrapd.c
+++ b/other/bootstrap_daemon/src/tox-bootstrapd.c
@@ -127,6 +127,7 @@ void daemonize(LOG_BACKEND log_backend, char *pid_file_path)
 
     // Open the PID file for writing
     pid_file = fopen(pid_file_path, "a+");
+
     if (pid_file == NULL) {
         write_log(LOG_LEVEL_ERROR, "Couldn't open the PID file for writing: %s. Exiting.\n", pid_file_path);
         exit(1);
@@ -209,7 +210,8 @@ int main(int argc, char *argv[])
     }
 
     if (port < MIN_ALLOWED_PORT || port > MAX_ALLOWED_PORT) {
-        write_log(LOG_LEVEL_ERROR, "Invalid port: %d, should be in [%d, %d]. Exiting.\n", port, MIN_ALLOWED_PORT, MAX_ALLOWED_PORT);
+        write_log(LOG_LEVEL_ERROR, "Invalid port: %d, should be in [%d, %d]. Exiting.\n", port, MIN_ALLOWED_PORT,
+                  MAX_ALLOWED_PORT);
         return 1;
     }