From 9f6f3117bb1b3131038dd5a890063b7625858177 Mon Sep 17 00:00:00 2001 From: Tom Bartelt Date: Tue, 23 Jul 2013 06:28:47 -0400 Subject: [PATCH] Update daemon to use config files --- .../DHT_bootstrap_daemon.c | 395 +++++++++++++++--- 1 file changed, 331 insertions(+), 64 deletions(-) diff --git a/other/bootstrap_serverdaemon/DHT_bootstrap_daemon.c b/other/bootstrap_serverdaemon/DHT_bootstrap_daemon.c index 4d79c48b..667e5237 100644 --- a/other/bootstrap_serverdaemon/DHT_bootstrap_daemon.c +++ b/other/bootstrap_serverdaemon/DHT_bootstrap_daemon.c @@ -1,50 +1,306 @@ /* DHT boostrap -* -* A simple DHT boostrap server for tox (daemon edition) -*/ - + * + * A simple DHT boostrap server for tox - daemon edition. + */ + #include /* pid_t */ #include /* umask */ -#include -#include #include /* POSIX things */ #include - +#include + +#include +#include +#include +#include /* htons() */ +#include /* strcpy() */ + #include "../../core/DHT.h" #include "../../core/friend_requests.h" - -/* Sleep function (x = milliseconds) */ -#ifdef WIN32 -#define c_sleep(x) Sleep(1*x) -#else -#include -#define c_sleep(x) usleep(1000*x) -#endif - -#define PORT 33445 -#define USERNAME getenv("USER") -#define PIDFILE "/home/%s/.bootstrap_server.pid" /* %s represents the unser's name */ - +#define DEFAULT_PORT 33445 +#define DEFAULT_PID_FILE "bootstrap_server.pid" +#define DEFAULT_KEYS_FILE "bootstrap_server.keys" + +/* Server info struct */ +struct server_info_s { + int valid; + IP_Port conn; + uint8_t bs_pk[32]; +}; + +/* This is the struct configure_server() uses to return its data to */ +struct server_conf_s { + int err; + int port; + char pid_file[512]; + char keys_file[512]; + struct server_info_s info[32]; +}; + +int b16_to_key(char b16_string[], uint8_t *bs_pubkey) { + + int i; + unsigned int num1 = 0, num2 = 0; + + for(i = 0; i < 32; ++i) + { + sscanf(&b16_string[i*2], "%1X", &num1); + sscanf(&b16_string[i*2+1], "%1X", &num2); + num1 = num1 << 4; + bs_pubkey[i] = bs_pubkey[i] | num1; + bs_pubkey[i] = bs_pubkey[i] | num2; + } + return 0; +} + +/* This unction connects to all specified servers +and connect to them. +returns 1 if the connection to the DHT is up +returns -1 if all attempts failed +*/ +int connect_to_servers(struct server_info_s *info) +{ + int i; + int c; + + IP_Port ip_port; + uint8_t data[MAX_UDP_PACKET_SIZE]; + uint32_t length; + + for(i = 0; i < 32; ++i) { + if(info[i].valid) { + /* Actual bootstrapping code goes here */ + //puts("Calling DHT_bootstrap"); + DHT_bootstrap(info[i].conn, info[i].bs_pk); + } + } + + /* Check if we're connected to the DHT */ + for(c = 0; c != 100; ++c) { + usleep(10000); + if(DHT_isconnected()) { + //puts("Connected"); + return 1; + break; + } + if(DHT_isconnected() == 0 && c == 99) { + //puts("Not connected"); + return -1; + break; + } + + doDHT(); + + while(receivepacket(&ip_port, data, &length) != -1) + { + DHT_handlepacket(data, length, ip_port); + } + } + + /* This probably never happens */ + return 0; +} + +void manage_keys(char *keys_file) +{ + const uint32_t KEYS_SIZE = crypto_box_PUBLICKEYBYTES + crypto_box_SECRETKEYBYTES; + uint8_t keys[KEYS_SIZE]; + + /* TODO: stat the file before trying to open it. We aren't cave people! */ + FILE *keysf = fopen(keys_file, "r"); + if (keysf != NULL) { + /* if file was opened successfully -- load keys */ + size_t read_size = fread(keys, sizeof(uint8_t), KEYS_SIZE, keysf); + if (read_size != KEYS_SIZE) { + printf("Error while reading the key file\nExiting.\n"); + exit(1); + } else { + printf("Keys loaded successfully\n"); + } + load_keys(keys); + + } else { + /* otherwise save new keys */ + /* Silly work-around to ignore any errors coming from new_keys() */ + new_keys(); + save_keys(keys); + keysf = fopen(keys_file, "w"); + if (fwrite(keys, sizeof(uint8_t), KEYS_SIZE, keysf) != KEYS_SIZE) { + printf("Error while writing the key file.\nExiting.\n"); + exit(1); + } else { + printf("Keys saved successfully\n"); + } + } + + fclose(keysf); +} + +/* This reads the configuration file, and returns a struct server_conf_s with: + *an error number: + *-1 = file wasn't read, for whatever reason + *-2 = no bootstrap servers found + *the port + *the location of the keys file + *the location of the PID file + *the list of bootstrap servers +*/ +struct server_conf_s configure_server(char *cfg_file) +{ + config_t cfg; + config_setting_t *server_list; + + /* This one will be strcpy'd into the pid_file array in server_conf */ + const char *pid_file_tmp; + const char *keys_file_tmp; + + /* Remote bootstrap server variables */ + int bs_port; + const char *bs_ip; + const char *bs_pk; + + /* The big struct */ + static struct server_conf_s server_conf; + + /* Set both to their default values. If there's an error + with opening/reading the config file, we return right away */ + server_conf.port = DEFAULT_PORT; + strcpy(server_conf.pid_file, DEFAULT_PID_FILE); + strcpy(server_conf.keys_file, DEFAULT_KEYS_FILE); + + config_init(&cfg); + + /* Read the file. If there is an error, report it and exit. */ + if(! config_read_file(&cfg, cfg_file)) + { + fprintf(stderr, "%s:%d - %s\n", config_error_file(&cfg), + config_error_line(&cfg), config_error_text(&cfg)); + config_destroy(&cfg); + server_conf.err = -1; + return server_conf; + } + + /* Get the port to listen on */ + if(config_lookup_int(&cfg, "port", &server_conf.port)) { + //printf("Port: %d\n", port); + } else { + fprintf(stderr, "No 'port' setting in configuration file.\n"); + } + + /* Get PID file location */ + if(config_lookup_string(&cfg, "pid_file", &pid_file_tmp)) { + //printf("PID file: %s\n", pid_file_tmp); + strcpy(server_conf.pid_file, pid_file_tmp); + } else { + fprintf(stderr, "No 'pid_file' setting in configuration file.\n"); + } + + /* Get keys file location */ + if(config_lookup_string(&cfg, "keys_file", &keys_file_tmp)) { + //printf("Keys file: %s\n", keys_file_tmp); + strcpy(server_conf.keys_file, keys_file_tmp); + } else { + fprintf(stderr, "No 'keys_file' setting in configuration file.\n"); + } + + /* Get all the servers in the list */ + server_list = config_lookup(&cfg, "bootstrap_servers"); + if(server_list != NULL) { + int count = config_setting_length(server_list); + int i; + + char tmp_ip[30]; /* IP */ + char tmp_pk[64]; /* bs_pk */ + for(i = 0; i < count; ++i) { + config_setting_t *server = config_setting_get_elem(server_list, i); + /* Get a pointer on the key aray */ + uint8_t *bs_pk_p = server_conf.info[i].bs_pk; + + /* Only output the record if all of the expected fields are present. */ + if(!(config_setting_lookup_string(server, "ip", &bs_ip) + && config_setting_lookup_int(server, "port", &bs_port) + && config_setting_lookup_string(server, "bs_pk", &bs_pk))) + continue; + + /* Converting all that stuff into usable formats and storing + it away in the server_info struct */ + server_conf.info[i].valid = 1; + + if(resolve_addr(strcpy(tmp_ip, bs_ip)) == -1) { + server_conf.info[i].valid = 0; + printf("bootstrap_server %d: Invalid IP\n", i); + } + + if(strlen(bs_pk) != 64) { + server_conf.info[i].valid = 0; + printf("bootstrap_server %d: Invalid public key\n", i); + } + + if(!bs_port) { + server_conf.info[i].valid = 0; + printf("bootstrap_server %d: Invalid port\n", i); + } + + server_conf.info[i].conn.ip.i = inet_addr(strcpy(tmp_ip, bs_ip)); + server_conf.info[i].conn.port = htons(bs_port); + b16_to_key(strcpy(tmp_pk, bs_pk), bs_pk_p); + } + + /* Check if at least one server entry is valid */ + for(i = 0; i < 32; ++i) { + if(server_conf.info[i].valid) + break; + else + server_conf.err = -2; + } + + } else { + server_conf.err = -2; + } + + config_destroy(&cfg); + return server_conf; +} + int main(int argc, char *argv[]) { - - char pidfloc[512]; /* Location of the soon-to-be PID file */ + pid_t pid, sid; /* Process- and Session-ID */ - + struct server_conf_s server_conf; + FILE *pidf; /* The PID file */ - - /* Assemble PID file location an try to open the file */ - sprintf(pidfloc, PIDFILE, USERNAME); - pidf = fopen(pidfloc, "w"); - - /* Generate new keypair */ - new_keys(); - + + if(argc < 2) { + printf("Please specify a configuration file.\n"); + exit(EXIT_FAILURE); + } + + /* Read the config file */ + server_conf = configure_server(argv[1]); + + printf("PID file: %s\n", server_conf.pid_file); + printf("Key file: %s\n", server_conf.keys_file); + + if(server_conf.err == -1) + printf("Config file not read.\n"); + + if(server_conf.err == -2) + printf("No valid servers in list.\n"); + + /* Open PID file for writing - if an error happens, + it will be caught down the line */ + pidf = fopen(server_conf.pid_file, "w"); + + /* Manage the keys */ + /* for now, just ignore any errors after this call. */ + int tmperr = errno; + manage_keys(server_conf.keys_file); + errno = tmperr; + /* Public key */ - uint32_t i; - + int i; printf("\nPublic Key: "); - for(i = 0; i < 32; i++) + for(i = 0; i < 32; ++i) { uint8_t ln, hn; ln = 0x0F & self_public_key[i]; @@ -53,84 +309,95 @@ int main(int argc, char *argv[]) { printf("%X%X", hn, ln); } printf("\n"); - + /* initialize networking bind to ip 0.0.0.0:PORT */ IP ip; ip.i = 0; - init_networking(ip, PORT); - + init_networking(ip, server_conf.port); + + /* Bootstrap the DHT + This one throws odd errors, too. Ignore. I assume they come + from somewhere in the core. */ + tmperr = errno; + connect_to_servers(server_conf.info); + errno = tmperr; + + if(!DHT_isconnected()) { + puts("Could not establish DHT connection. Check server settings.\n"); + exit(EXIT_FAILURE); + } else { + printf("Connected to DHT successfully.\n"); + } + /* If there's been an error, exit before forking off */ if (errno != 0) { perror("Error"); printf("Error(s) occured during start-up. Exiting.\n"); exit(EXIT_FAILURE); } - -// /* Assemble the location of the PID file */ -// sprintf(pidfloc, PIDFILE, USERNAME); -// pidf = fopen(pidfloc, "w"); -// /* Check if we can actually open the file */ -// if(pidf == NULL) { -// printf("Couldn't open PID-File %s for writing.\n", pidfloc); -// exit(EXIT_FAILURE); -// } - - /* Fork off the parent process */ + + /* Things that make the daemon work come past here. + There should be nothing here but the daemon code and + the main loop. */ + + /* Fork off from the parent process */ pid = fork(); if (pid < 0) { printf("Forking failed.\n"); exit(EXIT_FAILURE); } - + /* If we got a good PID, then we can exit the parent process. */ if (pid > 0) { printf("Forked successfully: %d\n", pid); - + /* Write the PID file */ fprintf(pidf, "%d\n", pid); fclose(pidf); - + /* Exit parent */ exit(EXIT_SUCCESS); } - + /* Change the file mode mask */ umask(0); - + /* Create a new SID for the child process */ sid = setsid(); if (sid < 0) { printf("SID creation failure.\n"); exit(EXIT_FAILURE); } - + /* Change the current working directory */ if ((chdir("/")) < 0) { exit(EXIT_FAILURE); } - + /* Go quiet */ - close(STDIN_FILENO); close(STDOUT_FILENO); + close(STDIN_FILENO); close(STDERR_FILENO); - + + /* Main loop */ IP_Port ip_port; uint8_t data[MAX_UDP_PACKET_SIZE]; uint32_t length; - - /* Main loop */ - while(1) { + + while(1) + { doDHT(); - while(receivepacket(&ip_port, data, &length) != -1) { + + while(receivepacket(&ip_port, data, &length) != -1) + { DHT_handlepacket(data, length, ip_port); friendreq_handlepacket(data, length, ip_port); } - c_sleep(1); + usleep(10000); } - + shutdown_networking(); exit(EXIT_SUCCESS); } -