5 files changed, 1 insertions, 4 deletions

diff --git a/core/DHT.c b/core/DHT.c
index 60e4704f..533425c4 100644
--- a/core/DHT.c
+++ b/core/DHT.c
@@ -1169,6 +1169,7 @@ DHT *new_DHT(Net_Crypto *c)
     networking_registerhandler(c->lossless_udp->net, NET_PACKET_PING_RESPONSE, &handle_ping_response, temp);
     networking_registerhandler(c->lossless_udp->net, NET_PACKET_GET_NODES, &handle_getnodes, temp);
     networking_registerhandler(c->lossless_udp->net, NET_PACKET_SEND_NODES, &handle_sendnodes, temp);
+    init_cryptopackets(temp);
     cryptopacket_registerhandler(c, CRYPTO_PACKET_NAT_PING, &handle_NATping, temp);
     return temp;
 }
diff --git a/core/Messenger.c b/core/Messenger.c
index dd24ab09..c5dd8a40 100644
--- a/core/Messenger.c
+++ b/core/Messenger.c
@@ -660,7 +660,6 @@ Messenger *initMessenger(void)
     friendreq_init(&(m->fr), m->net_crypto);
     LANdiscovery_init(m->dht);
     set_nospam(&(m->fr), random_int());
-    init_cryptopackets(m->dht);
 
     return m;
 }
diff --git a/other/DHT_bootstrap.c b/other/DHT_bootstrap.c
index 5d97b37a..c0d4fcc6 100644
--- a/other/DHT_bootstrap.c
+++ b/other/DHT_bootstrap.c
@@ -86,7 +86,6 @@ int main(int argc, char *argv[])
     IP ip;
     ip.i = 0;
     DHT *dht = new_DHT(new_net_crypto(new_networking(ip, PORT)));
-    init_cryptopackets(dht);
     manage_keys(dht);
     printf("Public key: ");
     uint32_t i;
diff --git a/other/bootstrap_serverdaemon/DHT_bootstrap_daemon.c b/other/bootstrap_serverdaemon/DHT_bootstrap_daemon.c
index 81ac538b..7604b1e0 100644
--- a/other/bootstrap_serverdaemon/DHT_bootstrap_daemon.c
+++ b/other/bootstrap_serverdaemon/DHT_bootstrap_daemon.c
@@ -321,7 +321,6 @@ int main(int argc, char *argv[])
     manage_keys(dht, server_conf.keys_file);
     errno = tmperr;
 
-    init_cryptopackets(dht);
     /* Public key */
     int i;
     printf("\nPublic Key: ");
diff --git a/testing/DHT_test.c b/testing/DHT_test.c
index 8ab9157e..53369794 100644
--- a/testing/DHT_test.c
+++ b/testing/DHT_test.c
@@ -136,7 +136,6 @@ int main(int argc, char *argv[])
     ip.i = 0;
 
     DHT *dht = new_DHT(new_net_crypto(new_networking(ip, PORT)));
-    init_cryptopackets(dht);
 
     if (argc < 4) {
         printf("usage %s ip port public_key\n", argv[0]);