1 files changed, 21 insertions, 15 deletions

diff --git a/core/net_crypto.h b/core/net_crypto.h
index 745f1f14..887b432b 100644
--- a/core/net_crypto.h
+++ b/core/net_crypto.h
@@ -25,7 +25,6 @@
 #define NET_CRYPTO_H
 
 #include "Lossless_UDP.h"
-#include "DHT.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -33,9 +32,6 @@ extern "C" {
 
 #define MAX_INCOMING 64
 
-extern uint8_t self_public_key[crypto_box_PUBLICKEYBYTES];//TODO: Remove this
-extern uint8_t self_secret_key[crypto_box_SECRETKEYBYTES];
-
 typedef struct {
     uint8_t public_key[crypto_box_PUBLICKEYBYTES]; /* the real public key of the peer. */
     uint8_t recv_nonce[crypto_box_NONCEBYTES]; /* nonce of received packets */
@@ -51,25 +47,32 @@ typedef struct {
 
 } Crypto_Connection;
 
-typedef int (*cryptopacket_handler_callback)(IP_Port ip_port, uint8_t *source_pubkey, uint8_t *data, uint32_t len);
+typedef int (*cryptopacket_handler_callback)(void * object, IP_Port ip_port, uint8_t *source_pubkey, uint8_t *data, uint32_t len);
+
+typedef struct {
+    cryptopacket_handler_callback function;
+    void * object;
+}Cryptopacket_Handles;
 
 typedef struct {
-Lossless_UDP * lossless_udp;
+    Lossless_UDP * lossless_udp;
 
-Crypto_Connection *crypto_connections;
+    Crypto_Connection *crypto_connections;
 
-uint32_t crypto_connections_length; /* Length of connections array */
+    uint32_t crypto_connections_length; /* Length of connections array */
 
-/* Our public and secret keys. */
-uint8_t self_public_key[crypto_box_PUBLICKEYBYTES];
-uint8_t self_secret_key[crypto_box_SECRETKEYBYTES];
+    /* Our public and secret keys. */
+    uint8_t self_public_key[crypto_box_PUBLICKEYBYTES];
+    uint8_t self_secret_key[crypto_box_SECRETKEYBYTES];
 
-/* keeps track of the connection numbers for friends request so we can check later if they were sent */
-int incoming_connections[MAX_INCOMING];
+    /* keeps track of the connection numbers for friends request so we can check later if they were sent */
+    int incoming_connections[MAX_INCOMING];
 
-cryptopacket_handler_callback cryptopackethandlers[256];
+    Cryptopacket_Handles cryptopackethandlers[256];
 } Net_Crypto;
 
+#include "DHT.h"
+
 Net_Crypto * temp_net_crypto; //TODO: remove this
 
 #define ENCRYPTION_PADDING (crypto_box_ZEROBYTES - crypto_box_BOXZEROBYTES)
@@ -130,7 +133,7 @@ int create_request(uint8_t *send_public_key, uint8_t *send_secret_key, uint8_t *
 
 
 /* Function to call when request beginning with byte is received */
-void cryptopacket_registerhandler(Net_Crypto *c, uint8_t byte, cryptopacket_handler_callback cb);
+void cryptopacket_registerhandler(Net_Crypto *c, uint8_t byte, cryptopacket_handler_callback cb, void * object);
 
 /* Start a secure connection with other peer who has public_key and ip_port
     returns -1 if failure
@@ -183,6 +186,9 @@ void do_net_crypto(Net_Crypto *c);
 
 void kill_net_crypto(Net_Crypto *c);
 
+/* Init the cryptopacket handling */
+void init_cryptopackets(void *dht);
+
 #ifdef __cplusplus
 }
 #endif