2 files changed, 19 insertions, 25 deletions

diff --git a/other/DHT_bootstrap.c b/other/DHT_bootstrap.c
index 50d473a9..462360c3 100644
--- a/other/DHT_bootstrap.c
+++ b/other/DHT_bootstrap.c
@@ -31,6 +31,8 @@
 #include "../toxcore/friend_requests.h"
 #include "../toxcore/util.h"
 
+#define TCP_RELAY_ENABLED
+
 #ifdef TCP_RELAY_ENABLED
 #include "../toxcore/TCP_server.h"
 #endif
@@ -73,11 +75,12 @@ void manage_keys(DHT *dht)
             exit(1);
         }
 
-        load_keys(dht->c, keys);
+        memcpy(dht->self_public_key, keys, crypto_box_PUBLICKEYBYTES);
+        memcpy(dht->self_secret_key, keys + crypto_box_PUBLICKEYBYTES, crypto_box_SECRETKEYBYTES);
         printf("Keys loaded successfully.\n");
     } else {
-        new_keys(dht->c);
-        save_keys(dht->c, keys);
+        memcpy(keys, dht->self_public_key, crypto_box_PUBLICKEYBYTES);
+        memcpy(keys + crypto_box_PUBLICKEYBYTES, dht->self_secret_key, crypto_box_SECRETKEYBYTES);
         keys_file = fopen("key", "w");
 
         if (fwrite(keys, sizeof(uint8_t), KEYS_SIZE, keys_file) != KEYS_SIZE) {
@@ -111,7 +114,7 @@ int main(int argc, char *argv[])
     IP ip;
     ip_init(&ip, ipv6enabled);
 
-    DHT *dht = new_DHT(new_net_crypto(new_networking(ip, PORT)));
+    DHT *dht = new_DHT(new_networking(ip, PORT));
     Onion *onion = new_onion(dht);
     Onion_Announce *onion_a = new_onion_announce(dht);
 
@@ -127,9 +130,6 @@ int main(int argc, char *argv[])
     perror("Initialization");
 
     manage_keys(dht);
-    /* We want our DHT public key to be the same as our internal one since this is a bootstrap node */
-    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);
     printf("Public key: ");
     uint32_t i;
 
@@ -149,17 +149,14 @@ int main(int argc, char *argv[])
     file = fopen("PUBLIC_ID.txt", "w");
 
     for (i = 0; i < 32; i++) {
-        if (dht->c->self_public_key[i] < 16)
-            printf("0");
-
-        printf("%hhX", dht->c->self_public_key[i]);
-        fprintf(file, "%hhX", dht->c->self_public_key[i]);
+        printf("%02hhX", dht->self_public_key[i]);
+        fprintf(file, "%02hhX", dht->self_public_key[i]);
     }
 
     fclose(file);
 
     printf("\n");
-    printf("Port: %u\n", ntohs(dht->c->lossless_udp->net->port));
+    printf("Port: %u\n", ntohs(dht->net->port));
 
     if (argc > argvoffset + 3) {
         printf("Trying to bootstrap into the network...\n");
@@ -196,7 +193,7 @@ int main(int argc, char *argv[])
 #ifdef TCP_RELAY_ENABLED
         do_TCP_server(tcp_s);
 #endif
-        networking_poll(dht->c->lossless_udp->net);
+        networking_poll(dht->net);
 
         c_sleep(1);
     }
diff --git a/other/bootstrap_daemon/tox_bootstrap_daemon.c b/other/bootstrap_daemon/tox_bootstrap_daemon.c
index 66f6436d..abad7760 100644
--- a/other/bootstrap_daemon/tox_bootstrap_daemon.c
+++ b/other/bootstrap_daemon/tox_bootstrap_daemon.c
@@ -36,9 +36,9 @@
 #include "config.h"
 #endif
 
-#include "../../toxcore/DHT.h"
-#include "../../toxcore/friend_requests.h"
+#include "../../toxcore/onion_announce.h"
 #include "../../toxcore/LAN_discovery.h"
+#include "../../toxcore/util.h"
 
 #include "../../testing/misc_tools.c"
 
@@ -75,11 +75,12 @@ int manage_keys(DHT *dht, char *keys_file_path)
             return 0;
         }
 
-        load_keys(dht->c, keys);
+        memcpy(dht->self_public_key, keys, crypto_box_PUBLICKEYBYTES);
+        memcpy(dht->self_secret_key, keys + crypto_box_PUBLICKEYBYTES, crypto_box_SECRETKEYBYTES);
     } else {
         // Otherwise save new keys
-        new_keys(dht->c);
-        save_keys(dht->c, keys);
+        memcpy(keys, dht->self_public_key, crypto_box_PUBLICKEYBYTES);
+        memcpy(keys + crypto_box_PUBLICKEYBYTES, dht->self_secret_key, crypto_box_SECRETKEYBYTES);
 
         keys_file = fopen(keys_file_path, "w");
 
@@ -92,10 +93,6 @@ int manage_keys(DHT *dht, char *keys_file_path)
 
     fclose(keys_file);
 
-    // We want our DHT public key to be the same as our internal one since this is a bootstrap node
-    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;
 }
 
@@ -351,7 +348,7 @@ int main(int argc, char *argv[])
     IP ip;
     ip_init(&ip, enable_ipv6);
 
-    DHT *dht = new_DHT(new_net_crypto(new_networking(ip, port)));
+    DHT *dht = new_DHT(new_networking(ip, port));
 
     if (dht == NULL) {
         syslog(LOG_ERR, "Couldn't initialize Tox DHT instance. Exiting.\n");
@@ -384,7 +381,7 @@ int main(int argc, char *argv[])
         return 1;
     }
 
-    print_public_key(dht->c->self_public_key);
+    print_public_key(dht->self_public_key);
 
     // Write the PID file
     FILE *pidf = fopen(pid_file_path, "w");