29 files changed, 644 insertions, 180 deletions

diff --git a/auto_tests/CMakeLists.txt b/auto_tests/CMakeLists.txt
index fbbcb7d7..c0b6aee4 100644
--- a/auto_tests/CMakeLists.txt
+++ b/auto_tests/CMakeLists.txt
@@ -5,16 +5,18 @@ include_directories(${CHECK_INCLUDE_DIRS})
 
 find_package(Check REQUIRED)
 include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/messenger_test.cmake)
+include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/crypto_test.cmake)
 include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/friends_test.cmake)
 
 include( CTest )
 enable_testing()
 
 add_test(messenger messenger_test)
+add_test(crypto crypto_test)
 # TODO enable once test is fixed
 #add_test(friends friends_test)
 
 add_custom_target(
     test COMMAND ${CMAKE_CTEST_COMMAND} -V 
-    DEPENDS messenger_test
+    DEPENDS messenger_test crypto_test
 )
diff --git a/auto_tests/cmake/crypto_test.cmake b/auto_tests/cmake/crypto_test.cmake
new file mode 100644
index 00000000..9ca9a331
--- /dev/null
+++ b/auto_tests/cmake/crypto_test.cmake
@@ -0,0 +1,10 @@
+cmake_minimum_required(VERSION 2.6.0)
+project(crypto_test C)
+set(exe_name crypto_test)
+
+add_executable(${exe_name}
+    crypto_test.c)
+
+linkCoreLibraries(${exe_name})
+add_dependencies(${exe_name} Check)
+target_link_libraries(${exe_name} check)
diff --git a/auto_tests/crypto_test.c b/auto_tests/crypto_test.c
new file mode 100644
index 00000000..9ac81349
--- /dev/null
+++ b/auto_tests/crypto_test.c
@@ -0,0 +1,230 @@
+#include "../core/net_crypto.h"
+#include <sys/types.h>
+#include <stdint.h>
+#include <string.h>
+#include <check.h>
+#include <stdlib.h>
+#include <time.h>
+#include <sodium.h>
+
+void rand_bytes(uint8_t *b, size_t blen)
+{
+    size_t i;
+    for (i = 0; i < blen; i++)
+    {
+        b[i] = rand();
+    }
+}
+
+// These test vectors are from libsodium's test suite
+
+unsigned char alicesk[32] = {
+    0x77,0x07,0x6d,0x0a,0x73,0x18,0xa5,0x7d,
+    0x3c,0x16,0xc1,0x72,0x51,0xb2,0x66,0x45,
+    0xdf,0x4c,0x2f,0x87,0xeb,0xc0,0x99,0x2a,
+    0xb1,0x77,0xfb,0xa5,0x1d,0xb9,0x2c,0x2a
+};
+
+unsigned char bobpk[32] = {
+    0xde,0x9e,0xdb,0x7d,0x7b,0x7d,0xc1,0xb4,
+    0xd3,0x5b,0x61,0xc2,0xec,0xe4,0x35,0x37,
+    0x3f,0x83,0x43,0xc8,0x5b,0x78,0x67,0x4d,
+    0xad,0xfc,0x7e,0x14,0x6f,0x88,0x2b,0x4f
+};
+
+unsigned char nonce[24] = {
+    0x69,0x69,0x6e,0xe9,0x55,0xb6,0x2b,0x73,
+    0xcd,0x62,0xbd,0xa8,0x75,0xfc,0x73,0xd6,
+    0x82,0x19,0xe0,0x03,0x6b,0x7a,0x0b,0x37
+};
+
+unsigned char test_m[131] = {
+    0xbe,0x07,0x5f,0xc5,0x3c,0x81,0xf2,0xd5,
+    0xcf,0x14,0x13,0x16,0xeb,0xeb,0x0c,0x7b,
+    0x52,0x28,0xc5,0x2a,0x4c,0x62,0xcb,0xd4,
+    0x4b,0x66,0x84,0x9b,0x64,0x24,0x4f,0xfc,
+    0xe5,0xec,0xba,0xaf,0x33,0xbd,0x75,0x1a,
+    0x1a,0xc7,0x28,0xd4,0x5e,0x6c,0x61,0x29,
+    0x6c,0xdc,0x3c,0x01,0x23,0x35,0x61,0xf4,
+    0x1d,0xb6,0x6c,0xce,0x31,0x4a,0xdb,0x31,
+    0x0e,0x3b,0xe8,0x25,0x0c,0x46,0xf0,0x6d,
+    0xce,0xea,0x3a,0x7f,0xa1,0x34,0x80,0x57,
+    0xe2,0xf6,0x55,0x6a,0xd6,0xb1,0x31,0x8a,
+    0x02,0x4a,0x83,0x8f,0x21,0xaf,0x1f,0xde,
+    0x04,0x89,0x77,0xeb,0x48,0xf5,0x9f,0xfd,
+    0x49,0x24,0xca,0x1c,0x60,0x90,0x2e,0x52,
+    0xf0,0xa0,0x89,0xbc,0x76,0x89,0x70,0x40,
+    0xe0,0x82,0xf9,0x37,0x76,0x38,0x48,0x64,
+    0x5e,0x07,0x05
+};
+
+unsigned char test_c[147] = {
+    0xf3,0xff,0xc7,0x70,0x3f,0x94,0x00,0xe5,
+    0x2a,0x7d,0xfb,0x4b,0x3d,0x33,0x05,0xd9,
+    0x8e,0x99,0x3b,0x9f,0x48,0x68,0x12,0x73,
+    0xc2,0x96,0x50,0xba,0x32,0xfc,0x76,0xce,
+    0x48,0x33,0x2e,0xa7,0x16,0x4d,0x96,0xa4,
+    0x47,0x6f,0xb8,0xc5,0x31,0xa1,0x18,0x6a,
+    0xc0,0xdf,0xc1,0x7c,0x98,0xdc,0xe8,0x7b,
+    0x4d,0xa7,0xf0,0x11,0xec,0x48,0xc9,0x72,
+    0x71,0xd2,0xc2,0x0f,0x9b,0x92,0x8f,0xe2,
+    0x27,0x0d,0x6f,0xb8,0x63,0xd5,0x17,0x38,
+    0xb4,0x8e,0xee,0xe3,0x14,0xa7,0xcc,0x8a,
+    0xb9,0x32,0x16,0x45,0x48,0xe5,0x26,0xae,
+    0x90,0x22,0x43,0x68,0x51,0x7a,0xcf,0xea,
+    0xbd,0x6b,0xb3,0x73,0x2b,0xc0,0xe9,0xda,
+    0x99,0x83,0x2b,0x61,0xca,0x01,0xb6,0xde,
+    0x56,0x24,0x4a,0x9e,0x88,0xd5,0xf9,0xb3,
+    0x79,0x73,0xf6,0x22,0xa4,0x3d,0x14,0xa6,
+    0x59,0x9b,0x1f,0x65,0x4c,0xb4,0x5a,0x74,
+    0xe3,0x55,0xa5
+};
+
+START_TEST(test_known)
+{
+    unsigned char c[147];
+    unsigned char m[131];
+    int clen, mlen;
+
+    ck_assert_msg(sizeof(c) == sizeof(m) + ENCRYPTION_PADDING * sizeof(unsigned char), "cyphertext should be ENCRYPTION_PADDING bytes longer than plaintext");
+    ck_assert_msg(sizeof(test_c) == sizeof(c), "sanity check failed");
+    ck_assert_msg(sizeof(test_m) == sizeof(m), "sanity check failed");
+
+    clen = encrypt_data(bobpk, alicesk, nonce, test_m, sizeof(test_m)/sizeof(unsigned char), c);
+
+    ck_assert_msg(memcmp(test_c, c, sizeof(c)) == 0, "cyphertext doesn't match test vector");
+    ck_assert_msg(clen == sizeof(c)/sizeof(unsigned char), "wrong ciphertext length");
+
+    mlen = decrypt_data(bobpk, alicesk, nonce, test_c, sizeof(test_c)/sizeof(unsigned char), m);
+
+    ck_assert_msg(memcmp(test_m, m, sizeof(m)) == 0, "decrypted text doesn't match test vector");
+    ck_assert_msg(mlen == sizeof(m)/sizeof(unsigned char), "wrong plaintext length");
+}
+END_TEST
+
+START_TEST(test_fast_known)
+{
+    unsigned char k[crypto_box_BEFORENMBYTES];
+    unsigned char c[147];
+    unsigned char m[131];
+    int clen, mlen;
+
+    encrypt_precompute(bobpk, alicesk, k);
+
+    ck_assert_msg(sizeof(c) == sizeof(m) + ENCRYPTION_PADDING * sizeof(unsigned char), "cyphertext should be ENCRYPTION_PADDING bytes longer than plaintext");
+    ck_assert_msg(sizeof(test_c) == sizeof(c), "sanity check failed");
+    ck_assert_msg(sizeof(test_m) == sizeof(m), "sanity check failed");
+
+    clen = encrypt_data_fast(k, nonce, test_m, sizeof(test_m)/sizeof(unsigned char), c);
+
+    ck_assert_msg(memcmp(test_c, c, sizeof(c)) == 0, "cyphertext doesn't match test vector");
+    ck_assert_msg(clen == sizeof(c)/sizeof(unsigned char), "wrong ciphertext length");
+
+    mlen = decrypt_data_fast(k, nonce, test_c, sizeof(test_c)/sizeof(unsigned char), m);
+
+    ck_assert_msg(memcmp(test_m, m, sizeof(m)) == 0, "decrypted text doesn't match test vector");
+    ck_assert_msg(mlen == sizeof(m)/sizeof(unsigned char), "wrong plaintext length");
+   
+}
+END_TEST
+
+START_TEST(test_endtoend)
+{
+    unsigned char pk1[crypto_box_PUBLICKEYBYTES];
+    unsigned char sk1[crypto_box_SECRETKEYBYTES];
+    unsigned char pk2[crypto_box_PUBLICKEYBYTES];
+    unsigned char sk2[crypto_box_SECRETKEYBYTES];
+    unsigned char k1[crypto_box_BEFORENMBYTES];
+    unsigned char k2[crypto_box_BEFORENMBYTES];
+
+    unsigned char n[crypto_box_NONCEBYTES];
+
+    unsigned char m[500];
+    unsigned char c1[sizeof(m) + ENCRYPTION_PADDING];
+    unsigned char c2[sizeof(m) + ENCRYPTION_PADDING];
+    unsigned char c3[sizeof(m) + ENCRYPTION_PADDING];
+    unsigned char c4[sizeof(m) + ENCRYPTION_PADDING];
+    unsigned char m1[sizeof(m)];
+    unsigned char m2[sizeof(m)];
+    unsigned char m3[sizeof(m)];
+    unsigned char m4[sizeof(m)];
+
+    int mlen;
+    int c1len, c2len, c3len, c4len;
+    int m1len, m2len, m3len, m4len;
+
+    int testno;
+
+    // Test 100 random messages and keypairs
+    for (testno = 0; testno < 100; testno++)
+    {
+        //Generate random message (random length from 100 to 500)
+        mlen = (rand() % 400) + 100;
+        rand_bytes(m, mlen);
+        rand_bytes(n, crypto_box_NONCEBYTES);
+        
+        //Generate keypairs
+        crypto_box_keypair(pk1,sk1);
+        crypto_box_keypair(pk2,sk2);
+        
+        //Precompute shared keys
+        encrypt_precompute(pk2, sk1, k1);
+        encrypt_precompute(pk1, sk2, k2);
+        
+        ck_assert_msg(memcmp(k1, k2, crypto_box_BEFORENMBYTES) == 0, "encrypt_precompute: bad");
+        
+        //Encrypt all four ways
+        c1len = encrypt_data(pk2, sk1, n, m, mlen, c1);
+        c2len = encrypt_data(pk1, sk2, n, m, mlen, c2);
+        c3len = encrypt_data_fast(k1, n, m, mlen, c3);
+        c4len = encrypt_data_fast(k2, n, m, mlen, c4);
+
+        ck_assert_msg(c1len == c2len && c1len == c3len && c1len == c4len, "cyphertext lengths differ");
+        ck_assert_msg(c1len == mlen + ENCRYPTION_PADDING, "wrong cyphertext length");
+        ck_assert_msg(memcmp(c1, c2, c1len) == 0 && memcmp(c1, c3, c1len) == 0 && memcmp(c1, c4, c1len) == 0, "crypertexts differ");
+
+        //Decrypt all four ways
+        m1len = decrypt_data(pk2, sk1, n, c1, c1len, m1);
+        m2len = decrypt_data(pk1, sk2, n, c1, c1len, m2);
+        m3len = decrypt_data_fast(k1, n, c1, c1len, m3);
+        m4len = decrypt_data_fast(k2, n, c1, c1len, m4);
+
+        ck_assert_msg(m1len == m2len && m1len == m3len && m1len == m4len, "decrypted text lengths differ");
+        ck_assert_msg(m1len == mlen, "wrong decrypted text length");
+        ck_assert_msg(memcmp(m1, m2, mlen) == 0 && memcmp(m1, m3, mlen) == 0 && memcmp(m1, m4, mlen) == 0, "decrypted texts differ");
+        ck_assert_msg(memcmp(m1, m, mlen) == 0, "wrong decrypted text");
+    }
+}
+END_TEST
+
+#define DEFTESTCASE(NAME) \
+    TCase *NAME = tcase_create(#NAME); \
+    tcase_add_test(NAME, test_##NAME); \
+    suite_add_tcase(s, NAME);
+
+Suite* crypto_suite(void)
+{
+    Suite *s = suite_create("Crypto");
+
+    DEFTESTCASE(known);
+    DEFTESTCASE(fast_known);
+    DEFTESTCASE(endtoend);
+
+    return s;
+}
+
+int main(int argc, char* argv[])
+{
+    srand((unsigned int) time(NULL));
+
+    Suite *crypto = crypto_suite();
+    SRunner *test_runner = srunner_create(crypto);
+    int number_failed = 0;
+
+    srunner_run_all(test_runner, CK_NORMAL);
+    number_failed = srunner_ntests_failed(test_runner);
+
+    srunner_free(test_runner);
+
+    return number_failed;
+}
diff --git a/auto_tests/run_tests b/auto_tests/run_tests
index 4448b2e2..1899f354 100755
--- a/auto_tests/run_tests
+++ b/auto_tests/run_tests
@@ -2,4 +2,4 @@
 # run_tests - run the current tests for tox core
 set -e
 
-./messenger_test && ./friends_test 
+./messenger_test && ./friends_test && ./crypto_test
diff --git a/core/DHT.c b/core/DHT.c
index 7e3af9d2..d359076d 100644
--- a/core/DHT.c
+++ b/core/DHT.c
@@ -554,7 +554,7 @@ static int sendnodes(IP_Port ip_port, uint8_t * public_key, uint8_t * client_id,
     return sendpacket(ip_port, data, 1 + CLIENT_ID_SIZE + crypto_box_NONCEBYTES + len);
 }
 
-static int handle_getnodes(uint8_t * packet, uint32_t length, IP_Port source)
+static int handle_getnodes(IP_Port source, uint8_t * packet, uint32_t length)
 {
     uint64_t ping_id;
 
@@ -586,7 +586,7 @@ static int handle_getnodes(uint8_t * packet, uint32_t length, IP_Port source)
     return 0;
 }
 
-static int handle_sendnodes(uint8_t * packet, uint32_t length, IP_Port source)
+static int handle_sendnodes(IP_Port source, uint8_t * packet, uint32_t length)
 {
     uint64_t ping_id;
     uint32_t cid_size = 1 + CLIENT_ID_SIZE;
@@ -930,7 +930,7 @@ static int send_NATping(uint8_t * public_key, uint64_t ping_id, uint8_t type)
 }
 
 /* Handle a received ping request for */
-static int handle_NATping(uint8_t * packet, uint32_t length, IP_Port source)
+static int handle_NATping(IP_Port source, uint8_t * packet, uint32_t length) 
 {
     if (length < crypto_box_PUBLICKEYBYTES * 2 + crypto_box_NONCEBYTES + ENCRYPTION_PADDING 
             || length > MAX_DATA_SIZE + ENCRYPTION_PADDING)
@@ -1074,30 +1074,13 @@ static void doNAT(void)
 /*----------------------------------------------------------------------------------*/
 /*-----------------------END OF NAT PUNCHING FUNCTIONS------------------------------*/
 
-int DHT_handlepacket(uint8_t * packet, uint32_t length, IP_Port source)
+void DHT_init(void)
 {
-    switch (packet[0]) {
-    case 0:
-        return handle_ping_request(packet, length, source);
-
-    case 1:
-        return handle_ping_response(packet, length, source);
-
-    case 2:
-        return handle_getnodes(packet, length, source);
-
-    case 3:
-        return handle_sendnodes(packet, length, source);
-
-    case 254:
-        return handle_NATping(packet, length, source);
-
-    default:
-        return 1;
-
-    }
-
-    return 0;
+    networking_registerhandler(0, &handle_ping_request);
+    networking_registerhandler(1, &handle_ping_response);
+    networking_registerhandler(2, &handle_getnodes);
+    networking_registerhandler(3, &handle_sendnodes);
+    networking_registerhandler(254, &handle_NATping);
 }
 
 void doDHT(void)
diff --git a/core/DHT.h b/core/DHT.h
index cb5697ea..0e05f132 100644
--- a/core/DHT.h
+++ b/core/DHT.h
@@ -58,11 +58,6 @@ IP_Port DHT_getfriendip(uint8_t *client_id);
 /* Run this function at least a couple times per second (It's the main loop) */
 void doDHT(void);
 
-/* if we receive a DHT packet we call this function so it can be handled.
-    return 0 if packet is handled correctly.
-    return 1 if it didn't handle the packet or if the packet was shit. */
-int DHT_handlepacket(uint8_t *packet, uint32_t length, IP_Port source);
-
 /* Use this function to bootstrap the client
     Sends a get nodes request to the given node with ip port and public_key */
 void DHT_bootstrap(IP_Port ip_port, uint8_t *public_key);
@@ -93,6 +88,9 @@ uint32_t DHT_size(void);
 /* save the DHT in data where data is an array of size DHT_size() */
 void DHT_save(uint8_t *data);
 
+/* init DHT */
+void DHT_init(void);
+
 /* load the DHT from data of size size;
     return -1 if failure
     return 0 if success */
diff --git a/core/LAN_discovery.c b/core/LAN_discovery.c
index 26b3930c..67dc656b 100644
--- a/core/LAN_discovery.c
+++ b/core/LAN_discovery.c
@@ -111,7 +111,7 @@ static int LAN_ip(IP ip)
     return -1;
 }
 
-static int handle_LANdiscovery(uint8_t *packet, uint32_t length, IP_Port source)
+static int handle_LANdiscovery(IP_Port source, uint8_t *packet, uint32_t length)
 {
     if (LAN_ip(source.ip) == -1)
         return 1;
@@ -125,16 +125,14 @@ static int handle_LANdiscovery(uint8_t *packet, uint32_t length, IP_Port source)
 int send_LANdiscovery(uint16_t port)
 {
     uint8_t data[crypto_box_PUBLICKEYBYTES + 1];
-    data[0] = 32;
+    data[0] = 33;
     memcpy(data + 1, self_public_key, crypto_box_PUBLICKEYBYTES);
     IP_Port ip_port = {broadcast_ip(), port};
     return sendpacket(ip_port, data, 1 + crypto_box_PUBLICKEYBYTES);
 }
 
 
-int LANdiscovery_handlepacket(uint8_t *packet, uint32_t length, IP_Port source)
+void LANdiscovery_init(void)
 {
-    if (packet[0] == 32)
-        return handle_LANdiscovery(packet, length, source);
-    return 1;
+    networking_registerhandler(33, &handle_LANdiscovery);
 }
diff --git a/core/LAN_discovery.h b/core/LAN_discovery.h
index 96a6e6ad..6b5b8c75 100644
--- a/core/LAN_discovery.h
+++ b/core/LAN_discovery.h
@@ -43,10 +43,8 @@ extern "C" {
 int send_LANdiscovery(uint16_t port);
 
 
-/* if we receive a packet we call this function so it can be handled.
-    return 0 if packet is handled correctly.
-    return 1 if it didn't handle the packet or if the packet was shit. */
-int LANdiscovery_handlepacket(uint8_t *packet, uint32_t length, IP_Port source);
+/* sets up packet handlers */
+void LANdiscovery_init(void);
 
 
 
diff --git a/core/Lossless_UDP.c b/core/Lossless_UDP.c
index 3a289735..002e2cf8 100644
--- a/core/Lossless_UDP.c
+++ b/core/Lossless_UDP.c
@@ -555,7 +555,7 @@ static int send_DATA(uint32_t connection_id)
 
 
 /* Return 0 if handled correctly, 1 if packet is bad. */
-static int handle_handshake(uint8_t * packet, uint32_t length, IP_Port source)
+static int handle_handshake(IP_Port source, uint8_t * packet, uint32_t length)
 {
     if (length != (1 + 4 + 4))
         return 1;
@@ -669,7 +669,7 @@ static int handle_SYNC3(int connection_id, uint8_t counter, uint32_t recv_packet
     return 1;
 }
 
-static int handle_SYNC(uint8_t *packet, uint32_t length, IP_Port source)
+static int handle_SYNC(IP_Port source, uint8_t *packet, uint32_t length)
 {
 
     if (!SYNC_valid(length))
@@ -742,7 +742,7 @@ static int add_recv(int connection_id, uint32_t data_num, uint8_t *data, uint16_
     return 0;
 }
 
-static int handle_data(uint8_t *packet, uint32_t length, IP_Port source)
+static int handle_data(IP_Port source, uint8_t *packet, uint32_t length)
 {
     int connection = getconnection_id(source);
 
@@ -770,23 +770,11 @@ static int handle_data(uint8_t *packet, uint32_t length, IP_Port source)
  * END of packet handling functions 
  */
 
-int LosslessUDP_handlepacket(uint8_t *packet, uint32_t length, IP_Port source)
+void LosslessUDP_init(void)
 {
-    switch (packet[0]) {
-    case 16:
-        return handle_handshake(packet, length, source);
-
-    case 17:
-        return handle_SYNC(packet, length, source);
-
-    case 18:
-        return handle_data(packet, length, source);
-
-    default:
-        return 1;
-    }
-
-    return 0;
+    networking_registerhandler(16, &handle_handshake);
+    networking_registerhandler(17, &handle_SYNC);
+    networking_registerhandler(18, &handle_data);
 }
 
 /*
diff --git a/core/Lossless_UDP.h b/core/Lossless_UDP.h
index b4cb186a..53afe606 100644
--- a/core/Lossless_UDP.h
+++ b/core/Lossless_UDP.h
@@ -113,11 +113,9 @@ int is_connected(int connection_id);
 void doLossless_UDP(void);
 
 /* 
- * If we receive a Lossless_UDP packet, call this function so it can be handled.
- * Return 0 if packet is handled correctly.
- * Return 1 if it didn't handle the packet or if the packet was shit.
+ * This function sets up LosslessUDP packet handling.
  */
-int LosslessUDP_handlepacket(uint8_t *packet, uint32_t length, IP_Port source);
+void LosslessUDP_init(void);
 
 #ifdef __cplusplus
 }
diff --git a/core/Messenger.c b/core/Messenger.c
index dd651107..d26bba56 100644
--- a/core/Messenger.c
+++ b/core/Messenger.c
@@ -138,7 +138,7 @@ int m_addfriend(uint8_t *client_id, uint8_t *data, uint16_t length)
     for (i = 0; i <= numfriends; ++i)  {
         if (friendlist[i].status == NOFRIEND) {
             DHT_addfriend(client_id);
-            set_friend_status(i, FRIEND_ADDED);
+            friendlist[i].status = FRIEND_ADDED;
             friendlist[i].crypt_connection_id = -1;
             friendlist[i].friend_request_id = -1;
             memcpy(friendlist[i].client_id, client_id, CLIENT_ID_SIZE);
@@ -231,7 +231,11 @@ uint32_t m_sendmessage(int friendnumber, uint8_t *message, uint32_t length)
     uint32_t msgid = ++friendlist[friendnumber].message_id;
     if (msgid == 0)
         msgid = 1; /* otherwise, false error */
-    return m_sendmessage_withid(friendnumber, msgid, message, length);
+    if(m_sendmessage_withid(friendnumber, msgid, message, length)) {
+        return msgid;
+    }
+    
+    return 0;
 }
 
 uint32_t m_sendmessage_withid(int friendnumber, uint32_t theid, uint8_t *message, uint32_t length)
@@ -518,6 +522,11 @@ int initMessenger(void)
     if(init_networking(ip,PORT) == -1)
         return -1;
 
+    DHT_init();
+    LosslessUDP_init();
+    friendreq_init();
+    LANdiscovery_init();
+
     return 0;
 }
 
@@ -684,29 +693,8 @@ static void LANdiscovery(void)
 /* the main loop that needs to be run at least 200 times per second. */
 void doMessenger(void)
 {
-    IP_Port ip_port;
-    uint8_t data[MAX_UDP_PACKET_SIZE];
-    uint32_t length;
-    while (receivepacket(&ip_port, data, &length) != -1) {
-#ifdef DEBUG
-        /* if(rand() % 3 != 1) //simulate packet loss */
-        /* { */
-        if (DHT_handlepacket(data, length, ip_port) && LosslessUDP_handlepacket(data, length, ip_port) &&
-            friendreq_handlepacket(data, length, ip_port) && LANdiscovery_handlepacket(data, length, ip_port))
-            /* if packet is discarded */
-            printf("Received unhandled packet with length: %u\n", length);
-        else
-            printf("Received handled packet with length: %u\n", length);
-        /* } */
-        printf("Status: %u %u %u\n",friendlist[0].status ,is_cryptoconnected(friendlist[0].crypt_connection_id),  friendlist[0].crypt_connection_id);
-#else
-        DHT_handlepacket(data, length, ip_port);
-        LosslessUDP_handlepacket(data, length, ip_port);
-        friendreq_handlepacket(data, length, ip_port);
-        LANdiscovery_handlepacket(data, length, ip_port);
-#endif
-
-    }
+    networking_poll();
+        
     doDHT();
     doLossless_UDP();
     doNetCrypto();
diff --git a/core/friend_requests.c b/core/friend_requests.c
index b8dab87e..422cc028 100644
--- a/core/friend_requests.c
+++ b/core/friend_requests.c
@@ -101,7 +101,7 @@ static int request_received(uint8_t * client_id)
 }
 
 
-int friendreq_handlepacket(uint8_t * packet, uint32_t length, IP_Port source)
+static int friendreq_handlepacket(IP_Port source, uint8_t * packet, uint32_t length)
 {
     if (packet[0] == 32) {
         if (length <= crypto_box_PUBLICKEYBYTES * 2 + crypto_box_NONCEBYTES + 1 + ENCRYPTION_PADDING ||
@@ -129,3 +129,8 @@ int friendreq_handlepacket(uint8_t * packet, uint32_t length, IP_Port source)
     }
     return 1;
 }
+
+void friendreq_init(void)
+{
+    networking_registerhandler(32, &friendreq_handlepacket);
+}
diff --git a/core/friend_requests.h b/core/friend_requests.h
index 4dfc5130..708d8f66 100644
--- a/core/friend_requests.h
+++ b/core/friend_requests.h
@@ -39,10 +39,8 @@ int send_friendrequest(uint8_t *public_key, uint8_t *data, uint32_t length);
     function format is function(uint8_t * public_key, uint8_t * data, uint16_t length) */
 void callback_friendrequest(void (*function)(uint8_t *, uint8_t *, uint16_t));
 
-/* if we receive a packet we call this function so it can be handled.
-    return 0 if packet is handled correctly.
-    return 1 if it didn't handle the packet or if the packet was shit. */
-int friendreq_handlepacket(uint8_t *packet, uint32_t length, IP_Port source);
+/* sets up friendreq packet handlers */
+void friendreq_init(void);
 
 #ifdef __cplusplus
 }
diff --git a/core/net_crypto.c b/core/net_crypto.c
index 1c56b95a..07c43c40 100644
--- a/core/net_crypto.c
+++ b/core/net_crypto.c
@@ -37,6 +37,7 @@ typedef struct {
     uint8_t sessionpublic_key[crypto_box_PUBLICKEYBYTES]; /* our public key for this session. */
     uint8_t sessionsecret_key[crypto_box_SECRETKEYBYTES]; /* our private key for this session. */
     uint8_t peersessionpublic_key[crypto_box_PUBLICKEYBYTES]; /* The public key of the peer. */
+    uint8_t shared_key[crypto_box_BEFORENMBYTES]; /* the precomputed shared key from encrypt_precompute */
     uint8_t status; /* 0 if no connection, 1 we have sent a handshake, 2 if connexion is not confirmed yet
                        (we have received a handshake but no empty data packet), 3 if the connection is established.
                        4 if the connection is timed out. */
@@ -59,6 +60,17 @@ static Crypto_Connection crypto_connections[MAX_CRYPTO_CONNECTIONS];
 /* keeps track of the connection numbers for friends request so we can check later if they were sent */
 static int incoming_connections[MAX_INCOMING];
 
+/* Use this instead of memcmp; not vulnerable to timing attacks. */
+uint8_t crypto_iszero(uint8_t *mem, uint32_t length)
+{
+    uint8_t check = 0;
+    uint32_t i;
+    for (i = 0; i < length; ++i) {
+        check |= mem[i];
+    }
+    return check; // We return zero if mem is made out of zeroes.
+}
+
 /* encrypts plain of length length to encrypted of length + 16 using the
    public key(32 bytes) of the receiver and the secret key of the sender and a 24 byte nonce
    return -1 if there was a problem.
@@ -78,12 +90,38 @@ int encrypt_data(uint8_t *public_key, uint8_t *secret_key, uint8_t *nonce,
 
     /* if encryption is successful the first crypto_box_BOXZEROBYTES of the message will be zero
        apparently memcmp should not be used so we do this instead:*/
-    uint32_t i;
-    uint32_t check = 0;
-    for(i = 0; i < crypto_box_BOXZEROBYTES; ++i) {
-            check |= temp_encrypted[i] ^ 0;
-    }
-    if(check != 0)
+    if(crypto_iszero(temp_encrypted, crypto_box_BOXZEROBYTES) != 0)
+        return -1;
+
+    /* unpad the encrypted message */
+    memcpy(encrypted, temp_encrypted + crypto_box_BOXZEROBYTES, length + crypto_box_MACBYTES);
+    return length - crypto_box_BOXZEROBYTES + crypto_box_ZEROBYTES;
+}
+
+/* Precomputes the shared key from their public_key and our secret_key.
+   This way we can avoid an expensive elliptic curve scalar multiply for each 
+   encrypt/decrypt operation.
+   enc_key has to be crypto_box_BEFORENMBYTES bytes long. */
+void encrypt_precompute(uint8_t *public_key, uint8_t *secret_key, uint8_t *enc_key)
+{
+    crypto_box_beforenm(enc_key, public_key, secret_key);
+}
+
+/* Fast encrypt. Depends on enc_key from encrypt_precompute. */
+int encrypt_data_fast(uint8_t *enc_key, uint8_t *nonce, 
+                      uint8_t *plain, uint32_t length, uint8_t *encrypted)
+{
+    if (length + crypto_box_MACBYTES > MAX_DATA_SIZE || length == 0)
+        return -1;
+
+    uint8_t temp_plain[MAX_DATA_SIZE + crypto_box_BOXZEROBYTES] = {0};
+    uint8_t temp_encrypted[MAX_DATA_SIZE + crypto_box_BOXZEROBYTES];
+
+    memcpy(temp_plain + crypto_box_ZEROBYTES, plain, length); /* pad the message with 32 0 bytes. */
+
+    crypto_box_afternm(temp_encrypted, temp_plain, length + crypto_box_ZEROBYTES, nonce, enc_key);
+
+    if(crypto_iszero(temp_encrypted, crypto_box_BOXZEROBYTES) != 0)
         return -1;
 
     /* unpad the encrypted message */
@@ -112,12 +150,33 @@ int decrypt_data(uint8_t *public_key, uint8_t *secret_key, uint8_t *nonce,
 
     /* if decryption is successful the first crypto_box_ZEROBYTES of the message will be zero 
        apparently memcmp should not be used so we do this instead:*/
-    uint32_t i;
-    uint32_t check = 0;
-    for(i = 0; i < crypto_box_ZEROBYTES; ++i) {
-            check |= temp_plain[i] ^ 0;
-    }
-    if(check != 0)
+    if(crypto_iszero(temp_plain, crypto_box_ZEROBYTES) != 0)
+        return -1;
+
+    /* unpad the plain message */
+    memcpy(plain, temp_plain + crypto_box_ZEROBYTES, length - crypto_box_MACBYTES);
+    return length - crypto_box_ZEROBYTES + crypto_box_BOXZEROBYTES;
+}
+
+/* Fast decrypt. Depends on enc_ley from encrypt_precompute. */
+int decrypt_data_fast(uint8_t *enc_key, uint8_t *nonce,
+                      uint8_t *encrypted, uint32_t length, uint8_t *plain)
+{
+    if (length > MAX_DATA_SIZE || length <= crypto_box_BOXZEROBYTES)
+        return -1;
+
+    uint8_t temp_plain[MAX_DATA_SIZE + crypto_box_BOXZEROBYTES];
+    uint8_t temp_encrypted[MAX_DATA_SIZE + crypto_box_BOXZEROBYTES] = {0};
+
+    memcpy(temp_encrypted + crypto_box_BOXZEROBYTES, encrypted, length); /* pad the message with 16 0 bytes. */
+
+    if (crypto_box_open_afternm(temp_plain, temp_encrypted, length + crypto_box_BOXZEROBYTES,
+                                nonce, enc_key) == -1)
+        return -1;
+
+    /* if decryption is successful the first crypto_box_ZEROBYTES of the message will be zero 
+       apparently memcmp should not be used so we do this instead:*/
+    if(crypto_iszero(temp_plain, crypto_box_ZEROBYTES) != 0)
         return -1;
 
     /* unpad the plain message */
@@ -161,9 +220,9 @@ int read_cryptpacket(int crypt_connection_id, uint8_t *data)
         return 0;
     if (temp_data[0] != 3)
         return -1;
-    int len = decrypt_data(crypto_connections[crypt_connection_id].peersessionpublic_key,
-                           crypto_connections[crypt_connection_id].sessionsecret_key,
-                           crypto_connections[crypt_connection_id].recv_nonce, temp_data + 1, length - 1, data);
+    int len = decrypt_data_fast(crypto_connections[crypt_connection_id].shared_key,
+                                crypto_connections[crypt_connection_id].recv_nonce, 
+                                temp_data + 1, length - 1, data);
     if (len != -1) {
         increment_nonce(crypto_connections[crypt_connection_id].recv_nonce);
         return len;
@@ -182,9 +241,9 @@ int write_cryptpacket(int crypt_connection_id, uint8_t *data, uint32_t length)
     if (crypto_connections[crypt_connection_id].status != CONN_ESTABLISHED)
         return 0;
     uint8_t temp_data[MAX_DATA_SIZE];
-    int len = encrypt_data(crypto_connections[crypt_connection_id].peersessionpublic_key,
-                           crypto_connections[crypt_connection_id].sessionsecret_key,
-                           crypto_connections[crypt_connection_id].sent_nonce, data, length, temp_data + 1);
+    int len = encrypt_data_fast(crypto_connections[crypt_connection_id].shared_key,
+                                crypto_connections[crypt_connection_id].sent_nonce, 
+                                data, length, temp_data + 1);
     if (len == -1)
         return 0;
     temp_data[0] = 3;
@@ -417,6 +476,9 @@ int accept_crypto_inbound(int connection_id, uint8_t *public_key, uint8_t *secre
                                      crypto_connections[i].sessionpublic_key) == 1) {
                 increment_nonce(crypto_connections[i].recv_nonce);
                 uint32_t zero = 0;
+                encrypt_precompute(crypto_connections[i].peersessionpublic_key, 
+                                   crypto_connections[i].sessionsecret_key, 
+                                   crypto_connections[i].shared_key);
                 crypto_connections[i].status = CONN_ESTABLISHED; /* connection status needs to be 3 for write_cryptpacket() to work */
                 write_cryptpacket(i, ((uint8_t *)&zero), sizeof(zero));
                 crypto_connections[i].status = CONN_NOT_CONFIRMED; /* set it to its proper value right after. */
@@ -511,6 +573,9 @@ static void receive_crypto(void)
                         memcpy(crypto_connections[i].peersessionpublic_key, session_key, crypto_box_PUBLICKEYBYTES);
                         increment_nonce(crypto_connections[i].sent_nonce);
                         uint32_t zero = 0;
+                        encrypt_precompute(crypto_connections[i].peersessionpublic_key, 
+                                           crypto_connections[i].sessionsecret_key, 
+                                           crypto_connections[i].shared_key);
                         crypto_connections[i].status = CONN_ESTABLISHED; /* connection status needs to be 3 for write_cryptpacket() to work */
                         write_cryptpacket(i, ((uint8_t *)&zero), sizeof(zero));
                         crypto_connections[i].status = CONN_NOT_CONFIRMED; /* set it to its proper value right after. */
@@ -521,7 +586,7 @@ static void receive_crypto(void)
 
         }
         if (crypto_connections[i].status == CONN_NOT_CONFIRMED) {
-            if (id_packet(crypto_connections[i].number) == CONN_ESTABLISHED) {
+            if (id_packet(crypto_connections[i].number) == 3) {
                 uint8_t temp_data[MAX_DATA_SIZE];
                 uint8_t data[MAX_DATA_SIZE];
                 int length = read_packet(crypto_connections[i].number, temp_data);
@@ -531,6 +596,9 @@ static void receive_crypto(void)
                 uint32_t zero = 0;
                 if (len == sizeof(uint32_t) && memcmp(((uint8_t *)&zero), data, sizeof(uint32_t)) == 0) {
                     increment_nonce(crypto_connections[i].recv_nonce);
+                    encrypt_precompute(crypto_connections[i].peersessionpublic_key, 
+                                       crypto_connections[i].sessionsecret_key, 
+                                       crypto_connections[i].shared_key);
                     crypto_connections[i].status = CONN_ESTABLISHED;
 
                     /* connection is accepted so we disable the auto kill by setting it to about 1 month from now. */
diff --git a/core/net_crypto.h b/core/net_crypto.h
index 66634d45..135e099d 100644
--- a/core/net_crypto.h
+++ b/core/net_crypto.h
@@ -36,6 +36,9 @@ extern uint8_t self_secret_key[crypto_box_SECRETKEYBYTES];
 
 #define ENCRYPTION_PADDING (crypto_box_ZEROBYTES - crypto_box_BOXZEROBYTES)
 
+/* returns zero if the buffer contains only zeros */
+uint8_t crypto_iszero(uint8_t* buffer, uint32_t blen);
+
 /* encrypts plain of length length to encrypted of length + 16 using the
     public key(32 bytes) of the receiver and the secret key of the sender and a 24 byte nonce
     return -1 if there was a problem.
@@ -51,6 +54,19 @@ int encrypt_data(uint8_t *public_key, uint8_t *secret_key, uint8_t *nonce,
 int decrypt_data(uint8_t *public_key, uint8_t *secret_key, uint8_t *nonce,
                     uint8_t *encrypted, uint32_t length, uint8_t *plain);
 
+/* Fast encrypt/decrypt operations. Use if this is not a one-time communication. 
+   encrypt_precompute does the shared-key generation once so it does not have
+   to be preformed on every encrypt/decrypt. */
+void encrypt_precompute(uint8_t *public_key, uint8_t *secret_key, uint8_t *enc_key);
+
+/* Fast encrypt. Depends on enc_key from encrypt_precompute. */
+int encrypt_data_fast(uint8_t *enc_key, uint8_t *nonce, 
+                      uint8_t *plain, uint32_t length, uint8_t *encrypted);
+
+/* Fast decrypt. Depends on enc_ley from encrypt_precompute. */
+int decrypt_data_fast(uint8_t *enc_key, uint8_t *nonce,
+                      uint8_t *encrypted, uint32_t length, uint8_t *plain);
+
 
 /* fill the given nonce with random bytes. */
 void random_nonce(uint8_t *nonce);
diff --git a/core/network.c b/core/network.c
index 8c6fa7b6..7e3b344a 100644
--- a/core/network.c
+++ b/core/network.c
@@ -71,7 +71,7 @@ int sendpacket(IP_Port ip_port, uint8_t * data, uint32_t length)
    the packet data into data
    the packet length into length.
    dump all empty packets. */
-int receivepacket(IP_Port * ip_port, uint8_t * data, uint32_t * length)
+static int receivepacket(IP_Port * ip_port, uint8_t * data, uint32_t * length)
 {
     ADDR addr;
 #ifdef WIN32
@@ -88,6 +88,27 @@ int receivepacket(IP_Port * ip_port, uint8_t * data, uint32_t * length)
     return 0;
 }
 
+static packet_handler_callback packethandlers[256] = {0};
+
+void networking_registerhandler(uint8_t byte, packet_handler_callback cb)
+{
+    packethandlers[byte] = cb;
+}
+
+void networking_poll()
+{
+    IP_Port ip_port;
+    uint8_t data[MAX_UDP_PACKET_SIZE];
+    uint32_t length;
+    
+    while (receivepacket(&ip_port, data, &length) != -1)
+    {
+        if (length < 1) continue;
+        if (!packethandlers[data[0]]) continue;
+        packethandlers[data[0]](ip_port, data, length);
+    }
+}
+
 /* initialize networking
    bind to ip and port
    ip must be in network order EX: 127.0.0.1 = (7F000001)
@@ -149,7 +170,6 @@ int init_networking(IP ip, uint16_t port)
     bind(sock, (struct sockaddr*)&addr, sizeof(addr));
 
     return 0;
-
 }
 
 /* function to cleanup networking stuff */
diff --git a/core/network.h b/core/network.h
index d3c39333..7c95d84d 100644
--- a/core/network.h
+++ b/core/network.h
@@ -94,6 +94,11 @@ typedef struct {
 #endif
 } ADDR;
 
+/* Function to receive data, ip and port of sender is put into ip_port
+    the packet data into data
+    the packet length into length. */
+typedef int (*packet_handler_callback)(IP_Port ip_port, uint8_t *data, uint32_t len);
+
 /* returns current time in milleseconds since the epoch. */
 uint64_t current_time(void);
 
@@ -106,10 +111,11 @@ uint32_t random_int(void);
 /* Function to send packet(data) of length length to ip_port */
 int sendpacket(IP_Port ip_port, uint8_t *data, uint32_t length);
 
-/* Function to receive data, ip and port of sender is put into ip_port
-    the packet data into data
-    the packet length into length. */
-int receivepacket(IP_Port *ip_port, uint8_t *data, uint32_t *length);
+/* Function to call when packet beginning with byte is received */
+void networking_registerhandler(uint8_t byte, packet_handler_callback cb);
+
+/* call this several times a second */
+void networking_poll();
 
 /* initialize networking
     bind to ip and port
diff --git a/core/ping.c b/core/ping.c
index 6a1fbb7e..24ece06a 100644
--- a/core/ping.c
+++ b/core/ping.c
@@ -163,7 +163,7 @@ int send_ping_response(IP_Port ipp, clientid_t* client_id, uint64_t ping_id)
     return sendpacket(ipp, (uint8_t*) &pk, sizeof(pk));
 }
 
-int handle_ping_request(uint8_t* packet, uint32_t length, IP_Port source)
+int handle_ping_request(IP_Port source, uint8_t* packet, uint32_t length)
 {
     pingreq_t* p = (pingreq_t*) packet;
     int        rc;
@@ -190,7 +190,7 @@ int handle_ping_request(uint8_t* packet, uint32_t length, IP_Port source)
     return 0;
 }
 
-int handle_ping_response(uint8_t* packet, uint32_t length, IP_Port source)
+int handle_ping_response(IP_Port source, uint8_t* packet, uint32_t length)
 {
     pingres_t* p = (pingres_t*) packet;
     int       rc;
diff --git a/core/ping.h b/core/ping.h
index 2cab7d59..1ccfabac 100644
--- a/core/ping.h
+++ b/core/ping.h
@@ -12,5 +12,5 @@ uint64_t add_ping(IP_Port ipp);
 bool is_pinging(IP_Port ipp, uint64_t ping_id);
 int send_ping_request(IP_Port ipp, clientid_t* client_id);
 int send_ping_response(IP_Port ipp, clientid_t* client_id, uint64_t ping_id);
-int handle_ping_request(uint8_t* packet, uint32_t length, IP_Port source);
-int handle_ping_response(uint8_t* packet, uint32_t length, IP_Port source);
+int handle_ping_request(IP_Port source, uint8_t* packet, uint32_t length);
+int handle_ping_response(IP_Port source, uint8_t* packet, uint32_t length);
diff --git a/other/CMakeLists.txt b/other/CMakeLists.txt
index 05b24f06..db742e3e 100644
--- a/other/CMakeLists.txt
+++ b/other/CMakeLists.txt
@@ -4,6 +4,6 @@ cmake_policy(SET CMP0011 NEW)
 
 include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/DHT_bootstrap.cmake)
 
-if(NOT WIN32)
+if(LINUX)
         add_subdirectory(bootstrap_serverdaemon)
 endif()
diff --git a/other/DHT_bootstrap.c b/other/DHT_bootstrap.c
index befe2225..4b0adeff 100644
--- a/other/DHT_bootstrap.c
+++ b/other/DHT_bootstrap.c
@@ -113,9 +113,8 @@ int main(int argc, char *argv[])
         free(bootstrap_key);
     }
 
-    IP_Port ip_port;
-    uint8_t data[MAX_UDP_PACKET_SIZE];
-    uint32_t length;
+    DHT_init();
+    friendreq_init();
 
     int is_waiting_for_dht_connection = 1;
     while(1)
@@ -127,11 +126,8 @@ int main(int argc, char *argv[])
         }
         doDHT();
 
-        while(receivepacket(&ip_port, data, &length) != -1)
-        {
-            DHT_handlepacket(data, length, ip_port);
-            friendreq_handlepacket(data, length, ip_port);
-        }
+        networking_poll();
+
         c_sleep(1);
     }
     shutdown_networking();
diff --git a/other/bootstrap_serverdaemon/DHT_bootstrap_daemon.c b/other/bootstrap_serverdaemon/DHT_bootstrap_daemon.c
index 48152744..6ce542c1 100644
--- a/other/bootstrap_serverdaemon/DHT_bootstrap_daemon.c
+++ b/other/bootstrap_serverdaemon/DHT_bootstrap_daemon.c
@@ -81,10 +81,6 @@ 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 */
@@ -109,10 +105,7 @@ int connect_to_servers(struct server_info_s *info)
 
         doDHT();
 
-        while(receivepacket(&ip_port, data, &length) != -1)
-        {
-            DHT_handlepacket(data, length, ip_port);
-        }
+        networking_poll();
     }
 
     /* This probably never happens */
@@ -337,6 +330,7 @@ int main(int argc, char *argv[]) {
     /* Bootstrap the DHT
     This one throws odd errors, too. Ignore. I assume they come
     from somewhere in the core. */
+    DHT_init();
     tmperr = errno;
     connect_to_servers(server_conf.info);
     errno = tmperr;
@@ -400,19 +394,13 @@ int main(int argc, char *argv[]) {
     close(STDERR_FILENO);
 
     /* Main loop */
-    IP_Port ip_port;
-    uint8_t data[MAX_UDP_PACKET_SIZE];
-    uint32_t length;
+    friendreq_init();
 
     while(1)
     {
         doDHT();
 
-        while(receivepacket(&ip_port, data, &length) != -1)
-        {
-            DHT_handlepacket(data, length, ip_port);
-            friendreq_handlepacket(data, length, ip_port);
-        }
+        networking_poll();
         usleep(10000);
     }
 
diff --git a/testing/CMakeLists.txt b/testing/CMakeLists.txt
index f2a2e95e..7322509a 100644
--- a/testing/CMakeLists.txt
+++ b/testing/CMakeLists.txt
@@ -8,6 +8,7 @@ include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/DHT_test.cmake)
 include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/Lossless_UDP_testclient.cmake)
 include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/Lossless_UDP_testserver.cmake)
 include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/Messenger_test.cmake)
+include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/crypto_speed_test.cmake)
 
 if(WIN32)
         include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/nTox_win32.cmake)
diff --git a/testing/DHT_test.c b/testing/DHT_test.c
index c8feaf4b..350093fd 100644
--- a/testing/DHT_test.c
+++ b/testing/DHT_test.c
@@ -156,14 +156,20 @@ int main(int argc, char *argv[])
     bootstrap_ip_port.ip.i = inet_addr(argv[1]);
     DHT_bootstrap(bootstrap_ip_port, hex_string_to_bin(argv[3]));
     
+/*
     IP_Port ip_port;
     uint8_t data[MAX_UDP_PACKET_SIZE];
     uint32_t length;
+*/
+
+    DHT_init();
+    friendreq_init();
     
     while(1) {
             
         doDHT();
         
+/* slvrTODO:
         while(receivepacket(&ip_port, data, &length) != -1) {
             if(DHT_handlepacket(data, length, ip_port) && friendreq_handlepacket(data, length, ip_port)) {
                 //unhandled packet
@@ -172,11 +178,14 @@ int main(int argc, char *argv[])
                 printf("Received handled packet with length: %u\n", length);
             }
         }
+*/
+        networking_poll();
+
         print_clientlist();
         print_friendlist();
         c_sleep(300);
     }
     
     shutdown_networking();
-    return 0;   
+    return 0;
 }
diff --git a/testing/Lossless_UDP_testclient.c b/testing/Lossless_UDP_testclient.c
index 78aff1a3..7efafa4f 100644
--- a/testing/Lossless_UDP_testclient.c
+++ b/testing/Lossless_UDP_testclient.c
@@ -120,20 +120,23 @@ void printconnection(int connection_id)
 /*run doLossless_UDP(); */
 void Lossless_UDP()
 {
-    IP_Port ip_port;
+/*    IP_Port ip_port;
     uint8_t data[MAX_UDP_PACKET_SIZE];
     uint32_t length;
     while (receivepacket(&ip_port, data, &length) != -1) {
-        printf("packet with length: %u\n", length);
+    printf("packet with length: %u\n", length); */
         /* if(rand() % 3 != 1)//add packet loss
          { */
+/*
             if (LosslessUDP_handlepacket(data, length, ip_port))
                 printpacket(data, length, ip_port);
             else 
-                printf("Received handled packet with length: %u\n", length); //printconnection(0);
+            printf("Received handled packet with length: %u\n", length); //printconnection(0); */
             
        /* } */
-    }
+        /* }*/
+
+    networking_poll();
     
     doLossless_UDP();   
     
@@ -181,6 +184,7 @@ int main(int argc, char *argv[])
     }
     timer = current_time();
     
+    LosslessUDP_init();
     
     /*read first part of file */
     read = fread(buffer, 1, 512, file);
diff --git a/testing/Lossless_UDP_testserver.c b/testing/Lossless_UDP_testserver.c
index f4b144b4..bc4fed7a 100644
--- a/testing/Lossless_UDP_testserver.c
+++ b/testing/Lossless_UDP_testserver.c
@@ -117,20 +117,22 @@ void printconnection(int connection_id)
  * run doLossless_UDP(); */
 void Lossless_UDP()
 {
-    IP_Port ip_port;
-    uint8_t data[MAX_UDP_PACKET_SIZE];
-    uint32_t length;
-    while (receivepacket(&ip_port, data, &length) != -1) {
+//    IP_Port ip_port;
+//    uint8_t data[MAX_UDP_PACKET_SIZE];
+//    uint32_t length;
+//    while (receivepacket(&ip_port, data, &length) != -1) {
         //if(rand() % 3 != 1)//add packet loss
         //{
-            if (LosslessUDP_handlepacket(data, length, ip_port)) {
-                    printpacket(data, length, ip_port);
-            } else {
+//            if (LosslessUDP_handlepacket(data, length, ip_port)) {
+//                    printpacket(data, length, ip_port);
+//            } else {
                 //printconnection(0);
-                 printf("Received handled packet with length: %u\n", length);
-            }
+//                 printf("Received handled packet with length: %u\n", length);
+//            }
         //}
-    }
+//    }
+
+    networking_poll();
     
     doLossless_UDP();   
 }
@@ -161,6 +163,7 @@ int main(int argc, char *argv[])
     int connection;
     uint64_t timer = current_time();
     
+    LosslessUDP_init();
     
     while (1) {
         Lossless_UDP();
diff --git a/testing/cmake/crypto_speed_test.cmake b/testing/cmake/crypto_speed_test.cmake
new file mode 100644
index 00000000..c269af5b
--- /dev/null
+++ b/testing/cmake/crypto_speed_test.cmake
@@ -0,0 +1,9 @@
+cmake_minimum_required(VERSION 2.6.0)
+project(crypto_speed_test C)
+
+set(exe_name crypto_speed_test)
+
+add_executable(${exe_name}
+        crypto_speed_test.c)
+
+linkCoreLibraries(${exe_name})
diff --git a/testing/crypto_speed_test.c b/testing/crypto_speed_test.c
new file mode 100644
index 00000000..81be92c6
--- /dev/null
+++ b/testing/crypto_speed_test.c
@@ -0,0 +1,130 @@
+// Hi-resolution timer
+#ifdef WIN32
+
+#include <windows.h>
+double get_time()
+{
+    LARGE_INTEGER t, f;
+    QueryPerformanceCounter(&t);
+    QueryPerformanceFrequency(&f);
+    return (double)t.QuadPart/(double)f.QuadPart;
+}
+
+#else
+
+#include <sys/time.h>
+#include <sys/resource.h>
+
+double get_time()
+{
+    struct timeval t;
+    struct timezone tzp;
+    gettimeofday(&t, &tzp);
+    return t.tv_sec + t.tv_usec*1e-6;
+}
+
+#endif
+
+#include "../core/net_crypto.h"
+#include <stdlib.h>
+#include <time.h>
+
+void rand_bytes(uint8_t *b, size_t blen)
+{
+    size_t i;
+    for (i = 0; i < blen; i++)
+    {
+        b[i] = rand();
+    }
+}
+
+int main(int argc, char* argv[])
+{
+    const int numtrials = 10000;
+ 
+    unsigned char pk1[crypto_box_PUBLICKEYBYTES];
+    unsigned char sk1[crypto_box_SECRETKEYBYTES];
+    unsigned char pk2[crypto_box_PUBLICKEYBYTES];
+    unsigned char sk2[crypto_box_SECRETKEYBYTES];
+    unsigned char k1[crypto_box_BEFORENMBYTES];
+    unsigned char k2[crypto_box_BEFORENMBYTES];
+
+    unsigned char n[crypto_box_NONCEBYTES];    
+
+    unsigned char m[500];
+    unsigned char c[sizeof(m) + ENCRYPTION_PADDING];
+
+    unsigned char k[crypto_box_BEFORENMBYTES];
+
+    int trialno;
+
+    double starttime;
+    double endtime;
+    double slow_time;
+    double fast_time;
+    double keygen_time;
+    double precompute_time;
+
+    // Pregenerate
+    crypto_box_keypair(pk1, sk1);
+    crypto_box_keypair(pk2, sk2);
+    encrypt_precompute(pk1, sk2, k1);
+    encrypt_precompute(pk2, sk1, k2);
+    rand_bytes(m, sizeof(m));
+    rand_bytes(n, sizeof(n));
+
+    printf("starting slow...\n");
+    starttime = get_time();
+    for (trialno = 0; trialno < numtrials; trialno++)
+    {
+        encrypt_data(pk1, sk2, n, m, sizeof(m), c);
+        decrypt_data(pk2, sk1, n, c, sizeof(c), m);
+    }
+    endtime = get_time();
+    slow_time = endtime-starttime;
+
+    printf("starting fast...\n");
+    starttime = get_time();
+    for (trialno = 0; trialno < numtrials; trialno++)
+    {
+        encrypt_data_fast(k1, n, m, sizeof(m), c);
+        decrypt_data_fast(k2, n, c, sizeof(c), m);
+    }
+    endtime = get_time();
+    fast_time = endtime-starttime;
+
+    printf("starting keygen...\n");
+    starttime = get_time();
+    for (trialno = 0; trialno < numtrials; trialno++)
+    {
+        crypto_box_keypair(pk1, sk1);
+        crypto_box_keypair(pk2, sk2);
+    }
+    endtime = get_time();
+    keygen_time = endtime-starttime;
+
+    printf("starting precompute...\n");
+    starttime = get_time();
+    for (trialno = 0; trialno < numtrials; trialno++)
+    {
+        encrypt_precompute(pk1, sk2, k);
+        encrypt_precompute(pk2, sk1, k);
+    }
+    endtime = get_time();
+    precompute_time = endtime-starttime;
+
+    printf("\n");
+    printf("trials: %i\n", 2*numtrials);
+    printf("\n");
+    printf("slow time: %f sec\n", slow_time);
+    printf("fast time: %f sec\n", fast_time);
+    printf("keygen time: %f sec\n", keygen_time);
+    printf("precompute time: %f sec\n", precompute_time);
+    printf("\n");
+    printf("Speed boost: %.1f%%\n", slow_time * 100 / fast_time);
+    printf("\n");
+    printf("slow: %.1f per second\n", 2*numtrials/slow_time);
+    printf("fast: %.1f per second\n", 2*numtrials/fast_time);
+
+    return 0;
+}
diff --git a/testing/toxic/prompt.c b/testing/toxic/prompt.c
index e4eb259b..ab44e960 100644
--- a/testing/toxic/prompt.c
+++ b/testing/toxic/prompt.c
@@ -40,7 +40,7 @@ static struct {
   void (*func)(ToxWindow *, char **);
 } commands[] = {
   { "accept",    1, cmd_accept    },
-  { "add",       2, cmd_add       },
+  { "add",       1, cmd_add       },
   { "clear",     0, cmd_clear     },
   { "connect",   3, cmd_connect   },
   { "exit",      0, cmd_quit      },
@@ -300,36 +300,54 @@ static void execute(ToxWindow *self, char *u_cmd)
       break;
   cmd[cmd_end + 1] = '\0';
 
-  char *args[4];
-  args[0] = strtok(cmd, " ");
+  /* insert \0 at argument boundaries */
+  int numargs = 0;
+  for (i = 0; i < MAX_STR_SIZE; i++) {
+    if (cmd[i] == '\"')
+      while (cmd[++i] != '\"'); /* skip over strings */
+    if (cmd[i] == ' ') {
+      cmd[i] = '\0';
+      numargs++;
+    }
+  }
+
+  /* excessive arguments */
+  if (numargs > 3) {
+    wprintw(self->window, "Invalid command: too many arguments.\n");
+    return;
+  }
+
+  /* read arguments into array */
+  char *cmdargs[5];
+  int pos = 0;
+  for (i = 0; i < 5; i++) {
+    cmdargs[i] = cmd + pos;
+    pos += strlen(cmdargs[i]) + 1;
+  }
 
   /* no input */
-  if (!args[0])
+  if (strlen(cmdargs[0]) == 0)
     return;
 
   /* match input to command list */
   for (i = 0; i < NUM_COMMANDS; i++) {
-    if (!strcmp(args[0], commands[i].name)) {
-      /* read in arguments */
+    if (!strcmp(cmdargs[0], commands[i].name)) {
+      /* check for missing arguments */
       int j;
-      for (j = 1; j <= commands[i].numargs; j++) {
-        args[j] = strtok(NULL, " ");
-        /* check for missing arguments */
-        /* add is special because it can take either 1 or 2 arguments */
-        if (strcmp(args[0], "add") != 0 && args[j] == NULL) {
+      for (j = 0; j <= commands[i].numargs; j++) {
+        if (strlen(cmdargs[j]) == 0) {
           wprintw(self->window, "Invalid command: %s expected %d arguments, got %d.\n",
                   commands[i].name, commands[i].numargs, j - 1);
           return;
         }
       }
-      /* check for excess arguments */
-      /* add is special because the add message may contain spaces */
-      if (strcmp(args[0], "add") != 0 && strtok(NULL, " ") != NULL) {
+      /* check for excess arguments */ 
+      if (strcmp(cmdargs[0], "add") && strlen(cmdargs[j]) != 0) {
         wprintw(self->window, "Invalid command: too many arguments to %s.\n", commands[i].name);
         return;
       }
       /* pass arguments to command function */
-      (commands[i].func)(self, args);
+      (commands[i].func)(self, cmdargs);
       return;
     }
   }