StarMirror/toxcore
1
0
Fork 0
mirror of https://github.com/irungentoo/toxcore.git synced 2024-03-22 13:30:51 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #693 from nurupo/dht_bootstrap_daemon

Browse Source 
Fixed missing cleanup
This commit is contained in:
irungentoo 2014-01-20 11:34:53 -08:00
commit b9896e31dc
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
other/bootstrap_serverdaemon/tox_dht_bootstrap_server_daemon.c
View File

@ -92,6 +92,10 @@ int manage_keys(DHT *dht, char *keys_file_path)
fclose(keys_file); fclose(keys_file);
// We want our DHT public key to be the same as our internal one since this is a bootstrap server
memcpy(dht->self_public_key, dht->c->self_public_key, crypto_box_PUBLICKEYBYTES);
memcpy(dht->self_secret_key, dht->c->self_secret_key, crypto_box_SECRETKEYBYTES);
return 1; return 1;
} }
@ -224,6 +228,7 @@ int bootstrap_from_config(char *cfg_file_path, DHT *dht, int enable_ipv6)
server = config_setting_get_elem(server_list, 0); server = config_setting_get_elem(server_list, 0);
if (server == NULL) { if (server == NULL) {
config_destroy(&cfg);
return 0; return 0;
} }
@ -358,16 +363,17 @@ int main(int argc, char *argv[])
ip_init(&ip, enable_ipv6); ip_init(&ip, enable_ipv6);
DHT *dht = new_DHT(new_net_crypto(new_networking(ip, port))); DHT *dht = new_DHT(new_net_crypto(new_networking(ip, port)));
Onion *onion = new_onion(dht);
Onion_Announce *onion_a = new_onion_announce(dht);
if (dht == NULL) { if (dht == NULL) {
syslog(LOG_ERR, "Couldn't initialize Tox DHT instance. Exiting.\n"); syslog(LOG_ERR, "Couldn't initialize Tox DHT instance. Exiting.\n");
return 1; return 1;
} }
Onion *onion = new_onion(dht);
Onion_Announce *onion_a = new_onion_announce(dht);
if (!(onion && onion_a)) { if (!(onion && onion_a)) {
syslog(LOG_ERR, "Couldn't initialize Tox onion stuff. Exiting.\n"); syslog(LOG_ERR, "Couldn't initialize Tox Onion. Exiting.\n");
return 1; return 1;
} }
@ -382,10 +388,6 @@ int main(int argc, char *argv[])
return 1; return 1;
} }
/* We want our DHT public key to be the same as our internal one since this is a bootstrap server */
memcpy(dht->self_public_key, dht->c->self_public_key, crypto_box_PUBLICKEYBYTES);
memcpy(dht->self_secret_key, dht->c->self_secret_key, crypto_box_SECRETKEYBYTES);
if (bootstrap_from_config(cfg_file_path, dht, enable_ipv6)) { if (bootstrap_from_config(cfg_file_path, dht, enable_ipv6)) {
syslog(LOG_DEBUG, "List of bootstrap servers read successfully\n"); syslog(LOG_DEBUG, "List of bootstrap servers read successfully\n");
} else { } else {
@ -423,7 +425,6 @@ int main(int argc, char *argv[])
if (pid > 0) { if (pid > 0) {
syslog(LOG_DEBUG, "Forked successfully: PID: %d.\n", pid); syslog(LOG_DEBUG, "Forked successfully: PID: %d.\n", pid);
return 0; return 0;
} }