21 files changed, 296 insertions, 276 deletions

diff --git a/README.md b/README.md
index d526a4c5..4e6ebf0e 100644
--- a/README.md
+++ b/README.md
@@ -7,8 +7,8 @@ With the rise of governmental monitoring programs, Tox aims to be an easy to use
 
 **IRC**: #tox on freenode, alternatively, you can use the [webchat](https://webchat.freenode.net/?channels=#tox).<br />
 **Website**: [https://tox.im](https://tox.im)<br>
-**Developer Blog**: [http://dev.tox.im](http://dev.tox.im)<br>
-**Jenkins**: [http://jenkins.tox.im](http://jenkins.tox.im)
+**Jenkins**: [http://jenkins.tox.im](http://jenkins.tox.im)<br>
+**Nightly Binary Downloads***: [http://download.tox.im](http://download.tox.im)
 
 **Website translations**: [here](https://github.com/Tox/tox.im)<br/>
 **Qt GUI**: [see nurupo's repository](https://github.com/nurupo/ProjectTox-Qt-GUI)
diff --git a/auto_tests/messenger_test.c b/auto_tests/messenger_test.c
index 5c8e242e..0393e6d9 100644
--- a/auto_tests/messenger_test.c
+++ b/auto_tests/messenger_test.c
@@ -14,6 +14,7 @@
 #include "config.h"
 #endif
 
+#include "../testing/misc_tools.c" // hex_string_to_bin
 #include "../toxcore/Messenger.h"
 #include "../toxcore/Lossless_UDP.h"
 #include <sys/types.h>
@@ -41,18 +42,6 @@ int friend_id_num = 0;
 
 Messenger *m;
 
-unsigned char *hex_string_to_bin(char hex_string[])
-{
-    size_t i, len = strlen(hex_string);
-    unsigned char *val = calloc(1, len);
-    char *pos = hex_string;
-
-    for (i = 0; i < len; ++i, pos += 2)
-        sscanf(pos, "%2hhx", &val[i]);
-
-    return val;
-}
-
 START_TEST(test_m_sendmesage)
 {
     char *message = "h-hi :3";
diff --git a/auto_tests/onion_test.c b/auto_tests/onion_test.c
index 73f69744..1a458f65 100644
--- a/auto_tests/onion_test.c
+++ b/auto_tests/onion_test.c
@@ -262,9 +262,13 @@ START_TEST(test_announce)
     ip_init(&ip, 1);
     ip.ip6.uint8[15] = 1;
 
-    for (i = 1; i < NUM_ONIONS; ++i) {
+    for (i = 3; i < NUM_ONIONS; ++i) {
         IP_Port ip_port = {ip, onions[i - 1]->onion->net->port};
         DHT_bootstrap(onions[i]->onion->dht, ip_port, onions[i - 1]->onion->dht->self_public_key);
+        IP_Port ip_port1 = {ip, onions[i - 2]->onion->net->port};
+        DHT_bootstrap(onions[i]->onion->dht, ip_port1, onions[i - 2]->onion->dht->self_public_key);
+        IP_Port ip_port2 = {ip, onions[i - 3]->onion->net->port};
+        DHT_bootstrap(onions[i]->onion->dht, ip_port2, onions[i - 3]->onion->dht->self_public_key);
     }
 
     uint32_t connected = 0;
@@ -276,23 +280,41 @@ START_TEST(test_announce)
             do_onions(onions[i]);
             connected += DHT_isconnected(onions[i]->onion->dht);
         }
+
+        c_sleep(50);
     }
 
-    onion_addfriend(onions[7]->onion_c, onions[23]->onion->dht->c->self_public_key);
-    int frnum = onion_addfriend(onions[23]->onion_c, onions[7]->onion->dht->c->self_public_key);
+    onion_addfriend(onions[7]->onion_c, onions[27]->onion->dht->c->self_public_key);
+    int frnum = onion_addfriend(onions[27]->onion_c, onions[7]->onion->dht->c->self_public_key);
+
+    int ok = -1;
+
+    IP_Port ip_port;
+
+    while (ok == -1) {
+        for (i = 0; i < NUM_ONIONS; ++i) {
+            networking_poll(onions[i]->onion->net);
+            do_onion_client(onions[i]->onion_c);
+        }
+
+        ok = onion_getfriendip(onions[27]->onion_c, frnum, &ip_port);
+
+        c_sleep(50);
+    }
 
-    uint32_t ok = 0;
+    printf("id discovered\n");
 
     while (ok != 1) {
         for (i = 0; i < NUM_ONIONS; ++i) {
             do_onions(onions[i]);
         }
 
-        IP_Port ip_port;
-        ok = onion_getfriendip(onions[23]->onion_c, frnum, &ip_port);
+        ok = onion_getfriendip(onions[27]->onion_c, frnum, &ip_port);
 
         c_sleep(50);
     }
+
+    ck_assert_msg(ip_port.port == onions[7]->onion->net->port, "Port in returned ip not correct.");
 }
 END_TEST
 
@@ -309,7 +331,7 @@ Suite *onion_suite(void)
     Suite *s = suite_create("Onion");
 
     DEFTESTCASE_SLOW(basic, 5);
-    DEFTESTCASE_SLOW(announce, 80);
+    DEFTESTCASE_SLOW(announce, 200);
     return s;
 }
 
diff --git a/docs/TCP_Network.txt b/docs/TCP_Network.txt
new file mode 100644
index 00000000..f44cca71
--- /dev/null
+++ b/docs/TCP_Network.txt
@@ -0,0 +1,35 @@
+It has come to our attention that to achieve decent market penetration Tox 
+must work behind ALL internet connections, may they be behind enterprise NATs 
+or any other bad network conditions. 
+
+The people who have issues with the UDP direct connection approach seem to be a 
+small minority though it is hard to estimate how many.
+
+This means that routing their packets using good nodes on the network will 
+probably not take a huge toll on the network and will assure that people
+can use Tox regardless of the quality of their internet connection.
+
+
+How it's probably going to work:
+1. Alice, a Tox client on a TCP only network generates a temporary public key 
+and connects to a bootstrap server.
+
+2. Using the bootstrap server she find and connects to a couple (exact number 
+to be determined later) number of random nodes that have TCP relay support.
+
+3. She uses the onion through the TCP relay connections to send friend requests 
+or tell online friends which TCP nodes she is connected to and her temporary 
+public key.
+
+4. Bob receives an onion packet from Alice telling him which nodes she is 
+connected to. Bob connects to these nodes and establishes a routed connection 
+with alice using that temporary public key.
+
+5. That connection is used by both to transmit encrypted Messenger and A/V 
+packets.
+
+6. If one of the nodes shuts down while it is currently routing traffic, Alice 
+and bob just switch to one of the other nodes they are both connected to.
+
+
+Actual detailed implementation details coming soon.
diff --git a/docs/TODO b/docs/TODO
index fbbd0614..0b5aa4ab 100644
--- a/docs/TODO
+++ b/docs/TODO
@@ -7,7 +7,7 @@ Networking:
     [NOT STARTED] NAT-PMP port forwarding.
 
 DHT:
-    [IN PROGRESS] Metadata collection prevention. (docs/Prevent_Tracking.txt)
+    [ALMOST DONE] Metadata collection prevention. (docs/Prevent_Tracking.txt)
     [IN PROGRESS] Hardening against attacks.
     [IN PROGRESS] Optimizing the code.
 
@@ -20,14 +20,15 @@ Lossless UDP:
     [NOT STARTED] Make clients sign their messages so that peers can't modify them.
 
 [IN PROGRESS] Audio/Video
-    [DONE] Capture/encoding/streaming/decoding/displaying
+    [DONE] encoding/streaming/decoding
     [IN PROGRESS] Call initiation
-    [NOT STARTED] Encryption
+    [IN PROGRESS] Encryption
+    [IN PROGRESS] Auditing.
     [NOT STARTED] Small group chats
-    [NOT STARTED] Push to talk for audio
 
 Friend_requests.c:
-    [NOT STARTED] What happens when a friend request is recieved needs to be changed.
+    [NOT STARTED] What happens when a friend request is received needs to be changed.
+    [NOT STARTED] Add multiple nospam functionality.
 
 [DONE] File transfers
 [NOT STARTED] Offline messaging
@@ -37,6 +38,10 @@ Friend_requests.c:
     [DONE] DHT + Messenger
     [NOT STARTED] Group chats (They work with IPv6 but some things need to be tested.)
 
+
+[NOT STARTED] A way for people to connect to people on Tox if they are behind a bad NAT that 
+blocks UDP (or is just unpunchable) (docs/TCP_Network.txt)
+
 [NEEDS TESTING] Make the save made with tox_save_encrypted(...) harder to brute force.
 See: (https://github.com/jencka/ProjectTox-libtoxdata)
 
diff --git a/other/DHT_bootstrap.c b/other/DHT_bootstrap.c
index ebb0ab78..307f80f6 100644
--- a/other/DHT_bootstrap.c
+++ b/other/DHT_bootstrap.c
@@ -33,6 +33,13 @@
 
 #include "../testing/misc_tools.c"
 
+#ifdef DHT_SERVER_EXTRA_PACKETS
+#include "./bootstrap_server_packets.c"
+
+#define DHT_VERSION_NUMBER 1
+#define DHT_MOTD "This is a test motd"
+#endif
+
 /* Sleep function (x = milliseconds) */
 #if defined(_WIN32) || defined(__WIN32__) || defined (WIN32)
 #define c_sleep(x) Sleep(1*x)
@@ -45,7 +52,6 @@
 #define PORT 33445
 
 
-
 void manage_keys(DHT *dht)
 {
     const uint32_t KEYS_SIZE = crypto_box_PUBLICKEYBYTES + crypto_box_SECRETKEYBYTES;
@@ -105,6 +111,10 @@ int main(int argc, char *argv[])
     Onion *onion = new_onion(dht);
     Onion_Announce *onion_a = new_onion_announce(dht);
 
+#ifdef DHT_SERVER_EXTRA_PACKETS
+    bootstrap_set_callbacks(dht->net, DHT_VERSION_NUMBER, DHT_MOTD, sizeof(DHT_MOTD));
+#endif
+
     if (!(onion && onion_a)) {
         printf("Something failed to initialize.\n");
         exit(1);
diff --git a/other/bootstrap_server_packets.c b/other/bootstrap_server_packets.c
new file mode 100644
index 00000000..c9297535
--- /dev/null
+++ b/other/bootstrap_server_packets.c
@@ -0,0 +1,65 @@
+/* bootstrap_server_packets.c
+ *
+ * Special bootstrap server only packets.
+ *
+ * Include it in your bootstrap server and use: bootstrap_set_callbacks() to enable.
+ *
+ *  Copyright (C) 2013 Tox project All Rights Reserved.
+ *
+ *  This file is part of Tox.
+ *
+ *  Tox is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  Tox is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with Tox.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#define MAX_MOTD_LENGTH 256 /* I recommend you use a maximum of 96 bytes. The hard maximum is this though. */
+
+#define INFO_REQUEST_PACKET_LENGTH 78
+
+static uint32_t bootstrap_version;
+static uint8_t bootstrap_motd[MAX_MOTD_LENGTH];
+static uint16_t bootstrap_motd_length;
+
+/* To request this packet just send a packet of length INFO_REQUEST_PACKET_LENGTH
+ * with the first byte being BOOTSTRAP_INFO_PACKET_ID
+ */
+static int handle_info_request(void *object, IP_Port source, uint8_t *packet, uint32_t length)
+{
+    if (length != INFO_REQUEST_PACKET_LENGTH)
+        return 1;
+
+    uint8_t data[1 + sizeof(bootstrap_version) + MAX_MOTD_LENGTH];
+    data[0] = BOOTSTRAP_INFO_PACKET_ID;
+    memcpy(data + 1, &bootstrap_version, sizeof(bootstrap_version));
+    uint16_t len = 1 + sizeof(bootstrap_version) + bootstrap_motd_length;
+    memcpy(data + 1 + sizeof(bootstrap_version), bootstrap_motd, bootstrap_motd_length);
+
+    if (sendpacket(object, source, data, len) == len)
+        return 0;
+
+    return 1;
+}
+
+int bootstrap_set_callbacks(Networking_Core *net, uint32_t version, uint8_t *motd, uint16_t motd_length)
+{
+    if (motd_length > MAX_MOTD_LENGTH)
+        return -1;
+
+    bootstrap_version = htonl(version);
+    memcpy(bootstrap_motd, motd, motd_length);
+    bootstrap_motd_length = motd_length;
+
+    networking_registerhandler(net, BOOTSTRAP_INFO_PACKET_ID, &handle_info_request, net);
+    return 0;
+}
diff --git a/other/bootstrap_serverdaemon/tox_bootstrap_daemon.c b/other/bootstrap_serverdaemon/tox_bootstrap_daemon.c
index f2c54bb1..b7684115 100644
--- a/other/bootstrap_serverdaemon/tox_bootstrap_daemon.c
+++ b/other/bootstrap_serverdaemon/tox_bootstrap_daemon.c
@@ -256,7 +256,8 @@ int bootstrap_from_config(char *cfg_file_path, DHT *dht, int enable_ipv6)
 
         // Process settings
         if (strlen(bs_public_key) != 64) {
-            syslog(LOG_WARNING, "Bootstrap server #%d: Invalid '%s': %s. Skipping the server.\n", i, NAME_PUBLIC_KEY, bs_public_key);
+            syslog(LOG_WARNING, "Bootstrap server #%d: Invalid '%s': %s. Skipping the server.\n", i, NAME_PUBLIC_KEY,
+                   bs_public_key);
             goto next;
         }
 
@@ -266,8 +267,10 @@ int bootstrap_from_config(char *cfg_file_path, DHT *dht, int enable_ipv6)
             goto next;
         }
 
+        uint8_t *bs_public_key_bin = hex_string_to_bin((char *)bs_public_key);
         const int address_resolved = DHT_bootstrap_from_address(dht, bs_address, enable_ipv6, htons(bs_port),
-                                     hex_string_to_bin((char *)bs_public_key));
+                                     bs_public_key_bin);
+        free(bs_public_key_bin);
 
         if (!address_resolved) {
             syslog(LOG_WARNING, "Bootstrap server #%d: Invalid '%s': %s. Skipping the server.\n", i, NAME_ADDRESS, bs_address);
diff --git a/other/fun/cracker.c b/other/fun/cracker.c
new file mode 100644
index 00000000..9921df31
--- /dev/null
+++ b/other/fun/cracker.c
@@ -0,0 +1,75 @@
+/* Public key cracker.
+ *
+ * Can be used to find public keys starting with specific hex (ABCD) for example.
+ *
+ * NOTE: There's probably a way to make this faster.
+ *
+ * Usage: ./cracker ABCDEF
+ *
+ * Will try to find a public key starting with: ABCDEF
+ */
+
+#include "../../testing/misc_tools.c"
+#include <time.h>
+
+/* NaCl includes*/
+#include <crypto_scalarmult_curve25519.h>
+#include <randombytes.h>
+
+/* Sodium include*/
+//#include <libsodium.h>
+
+void print_key(uint8_t *client_id)
+{
+    uint32_t j;
+
+    for (j = 0; j < 32; j++) {
+        printf("%02hhX", client_id[j]);
+    }
+}
+
+
+int main(int argc, char *argv[])
+{
+    if (argc < 2) {
+        printf("usage: ./cracker public_key(or beggining of one in hex format)\n");
+        return 0;
+    }
+
+    long long unsigned int num_tries = 0;
+
+    uint32_t len = strlen(argv[1]) / 2;
+    unsigned char *key = hex_string_to_bin(argv[1]);
+    uint8_t pub_key[32], priv_key[32], c_key[32];
+
+    if (len > 32)
+        len = 32;
+
+    memcpy(c_key, key, len);
+    free(key);
+    randombytes(priv_key, 32);
+
+    while (1) {
+        crypto_scalarmult_curve25519_base(pub_key, priv_key);
+        uint32_t i;
+
+        if (memcmp(c_key, pub_key, len) == 0)
+            break;
+
+        for (i = 32; i != 0; --i) {
+            priv_key[i - 1] += 1;
+
+            if (priv_key[i - 1] != 0)
+                break;
+        }
+
+        ++num_tries;
+    }
+
+    printf("Public key:\n");
+    print_key(pub_key);
+    printf("\nPrivate key:\n");
+    print_key(priv_key);
+    printf("\n %llu keys tried\n", num_tries);
+    return 0;
+}
diff --git a/other/fun/sign.c b/other/fun/sign.c
index 423d974a..eaea9d6a 100644
--- a/other/fun/sign.c
+++ b/other/fun/sign.c
@@ -17,19 +17,7 @@
  */
 #include <sodium.h>
 #include <string.h>
-
-unsigned char *hex_string_to_bin(char hex_string[])
-{
-    size_t len = strlen(hex_string);
-    unsigned char *val = malloc(len);
-    char *pos = hex_string;
-    int i;
-
-    for (i = 0; i < len; ++i, pos += 2)
-        sscanf(pos, "%2hhx", &val[i]);
-
-    return val;
-}
+#include "../../testing/misc_tools.c" // hex_string_to_bin
 
 int load_file(char *filename, char **result)
 {
@@ -90,6 +78,7 @@ int main(int argc, char *argv[])
         unsigned long long smlen;
         char *sm = malloc(size + crypto_sign_ed25519_BYTES * 2);
         crypto_sign_ed25519(sm, &smlen, data, size, secret_key);
+        free(secret_key);
 
         if (smlen - size != crypto_sign_ed25519_BYTES)
             goto fail;
diff --git a/testing/DHT_test.c b/testing/DHT_test.c
index a8ad8426..cae88ce4 100644
--- a/testing/DHT_test.c
+++ b/testing/DHT_test.c
@@ -206,7 +206,9 @@ int main(int argc, char *argv[])
     if (scanf("%s", temp_id) != 1)
         exit(0);
 
-    DHT_addfriend(dht, hex_string_to_bin(temp_id));
+    uint8_t *bin_id = hex_string_to_bin(temp_id);
+    DHT_addfriend(dht, bin_id);
+    free(bin_id);
 
     perror("Initialization");
 
diff --git a/testing/Messenger_test.c b/testing/Messenger_test.c
index 969d6b1f..895a23d9 100644
--- a/testing/Messenger_test.c
+++ b/testing/Messenger_test.c
@@ -161,14 +161,16 @@ int main(int argc, char *argv[])
 
     setname(m, (uint8_t *)"Anon", 5);
 
-    char temp_id[128];
+    char temp_hex_id[128];
     printf("\nEnter the address of the friend you wish to add (38 bytes HEX format):\n");
 
-    if (scanf("%s", temp_id) != 1) {
+    if (scanf("%s", temp_hex_id) != 1) {
         return 1;
     }
 
-    int num = m_addfriend(m, hex_string_to_bin(temp_id), (uint8_t *)"Install Gentoo", sizeof("Install Gentoo"));
+    uint8_t *bin_id = hex_string_to_bin(temp_hex_id);
+    int num = m_addfriend(m, bin_id, (uint8_t *)"Install Gentoo", sizeof("Install Gentoo"));
+    free(bin_id);
 
     perror("Initialization");
 
diff --git a/testing/experiment/group_chats_test.c b/testing/experiment/group_chats_test.c
deleted file mode 100644
index 04fee327..00000000
--- a/testing/experiment/group_chats_test.c
+++ /dev/null
@@ -1,105 +0,0 @@
-#include "../../toxcore/group_chats.h"
-#define NUM_CHATS 8
-
-#if defined(_WIN32) || defined(__WIN32__) || defined (WIN32)
-#define c_sleep(x) Sleep(1*x)
-#else
-#define c_sleep(x) usleep(1000*x)
-#endif
-Group_Chat *chats[NUM_CHATS];
-
-void print_close(Group_Close *close)
-{
-    uint32_t i, j;
-    IP_Port p_ip;
-    printf("___________________CLOSE________________________________\n");
-
-    for (i = 0; i < GROUP_CLOSE_CONNECTIONS; i++) {
-        printf("ClientID: ");
-
-        for (j = 0; j < CLIENT_ID_SIZE; j++) {
-            printf("%02hhX", close[i].client_id[j]);
-        }
-
-        p_ip = close[i].ip_port;
-        printf("\nIP: %u.%u.%u.%u Port: %u", p_ip.ip.uint8[0], p_ip.ip.uint8[1], p_ip.ip.uint8[2], p_ip.ip.uint8[3],
-               ntohs(p_ip.port));
-        printf("\nTimestamp: %llu", (long long unsigned int) close[i].last_recv);
-        printf("\n");
-    }
-}
-
-void print_group(Group_Chat *chat)
-{
-    uint32_t i, j;
-    printf("-----------------\nClientID: ");
-
-    for (j = 0; j < CLIENT_ID_SIZE; j++) {
-        printf("%02hhX", chat->self_public_key[j]);
-    }
-
-    printf("\n___________________GROUP________________________________\n");
-
-    for (i = 0; i < chat->numpeers; i++) {
-        printf("ClientID: ");
-
-        for (j = 0; j < CLIENT_ID_SIZE; j++) {
-            printf("%02hhX", chat->group[i].client_id[j]);
-        }
-
-        printf("\nTimestamp: %llu", (long long unsigned int) chat->group[i].last_recv);
-        printf("\nlast_pinged: %llu", (long long unsigned int) chat->group[i].last_pinged);
-        printf("\npingid: %llu", (long long unsigned int) chat->group[i].pingid);
-        printf("\n");
-    }
-}
-
-void print_message(Group_Chat *chat, int peer_number, uint8_t *message, uint16_t length, void *userdata)
-{
-    printf("%u: %s | %u\n", peer_number, message, length);
-}
-
-int main()
-{
-    IP ip;
-    ip.uint32 = 0;
-    uint32_t i;
-
-
-    for (i = 0; i < NUM_CHATS; ++i) {
-        chats[i] = new_groupchat(new_networking(ip, 12745));
-
-        if (chats[i] == 0)
-            exit(1);
-
-        networking_registerhandler(chats[i]->net, 48, &handle_groupchatpacket, chats[i]);
-        callback_groupmessage(chats[i], &print_message, 0);
-    }
-
-    printf("ok\n");
-    IP_Port ip_port;
-    ip_port.ip.uint32 = 0;
-    ip_port.ip.uint8[0] = 127;
-    ip_port.ip.uint8[3] = 1;
-    ip_port.port = htons(12745);
-
-    for (i = 0; i < NUM_CHATS; ++i) {
-        group_newpeer(chats[0], chats[i]->self_public_key);
-        chat_bootstrap(chats[i], ip_port, chats[0]->self_public_key);
-        printf("%u\n", i);
-    }
-
-    while (1) {
-        for (i = 0; i < NUM_CHATS; ++i) {
-            networking_poll(chats[i]->net);
-            do_groupchat(chats[i]);
-            printf("%u\n", chats[i]->numpeers);
-            print_close(chats[i]->close);
-            print_group(chats[i]);
-        }
-
-        c_sleep(100);
-    }
-
-    return 0;
-}
diff --git a/testing/experiment/group_chats_test1.c b/testing/experiment/group_chats_test1.c
deleted file mode 100644
index a74f808a..00000000
--- a/testing/experiment/group_chats_test1.c
+++ /dev/null
@@ -1,114 +0,0 @@
-#include "../../toxcore/group_chats.h"
-#define NUM_CHATS 8
-
-#if defined(_WIN32) || defined(__WIN32__) || defined (WIN32)
-#define c_sleep(x) Sleep(1*x)
-#else
-#define c_sleep(x) usleep(1000*x)
-#endif
-Group_Chat *chat;
-
-void print_close(Group_Close *close)
-{
-    uint32_t i, j;
-    IP_Port p_ip;
-    printf("___________________CLOSE________________________________\n");
-
-    for (i = 0; i < GROUP_CLOSE_CONNECTIONS; i++) {
-        printf("ClientID: ");
-
-        for (j = 0; j < CLIENT_ID_SIZE; j++) {
-            printf("%02hhX", close[i].client_id[j]);
-        }
-
-        p_ip = close[i].ip_port;
-        printf("\nIP: %u.%u.%u.%u Port: %u", p_ip.ip.uint8[0], p_ip.ip.uint8[1], p_ip.ip.uint8[2], p_ip.ip.uint8[3],
-               ntohs(p_ip.port));
-        printf("\nTimestamp: %llu", (long long unsigned int) close[i].last_recv);
-        printf("\n");
-    }
-}
-
-void print_group(Group_Chat *chat)
-{
-    uint32_t i, j;
-    printf("-----------------\nClientID: ");
-
-    for (j = 0; j < CLIENT_ID_SIZE; j++) {
-        printf("%02hhX", chat->self_public_key[j]);
-    }
-
-    printf("\n___________________GROUP________________________________\n");
-
-    for (i = 0; i < chat->numpeers; i++) {
-        printf("ClientID: ");
-
-        for (j = 0; j < CLIENT_ID_SIZE; j++) {
-            printf("%02hhX", chat->group[i].client_id[j]);
-        }
-
-        printf("\nTimestamp: %llu", (long long unsigned int) chat->group[i].last_recv);
-        printf("\nlast_pinged: %llu", (long long unsigned int) chat->group[i].last_pinged);
-        printf("\npingid: %llu", (long long unsigned int) chat->group[i].pingid);
-        printf("\n");
-    }
-}
-
-unsigned char *hex_string_to_bin(char hex_string[])
-{
-    size_t len = strlen(hex_string);
-    unsigned char *val = malloc(len);
-    char *pos = hex_string;
-    int i;
-
-    for (i = 0; i < len; ++i, pos += 2)
-        sscanf(pos, "%2hhx", &val[i]);
-
-    return val;
-}
-
-void print_message(Group_Chat *chat, int peer_number, uint8_t *message, uint16_t length, void *userdata)
-{
-    printf("%u: %s | %u\n", peer_number, message, length);
-}
-
-int main(int argc, char *argv[])
-{
-    IP ip;
-    ip.uint32 = 0;
-    uint32_t i;
-
-    chat = new_groupchat(new_networking(ip, 12745));
-
-    if (chat == 0)
-        exit(1);
-
-    networking_registerhandler(chat->net, 48, &handle_groupchatpacket, chat);
-
-    callback_groupmessage(chat, &print_message, 0);
-
-    printf("ok\n");
-    IP_Port bootstrap_ip_port;
-    bootstrap_ip_port.port = htons(atoi(argv[2]));
-    /* bootstrap_ip_port.ip.c[0] = 127;
-     * bootstrap_ip_port.ip.c[1] = 0;
-     * bootstrap_ip_port.ip.c[2] = 0;
-     * bootstrap_ip_port.ip.c[3] = 1; */
-    bootstrap_ip_port.ip.uint32 = inet_addr(argv[1]);
-
-    chat_bootstrap(chat, bootstrap_ip_port, hex_string_to_bin(argv[3]));
-
-    while (1) {
-
-        networking_poll(chat->net);
-        do_groupchat(chat);
-        printf("%u ", chat->numpeers);
-        printf("%u\n", group_sendmessage(chat, "Install Gentoo", sizeof("Install Gentoo")));
-        //print_close(chat->close);
-        // print_group(chat);
-
-        c_sleep(100);
-    }
-
-    return 0;
-}
diff --git a/testing/misc_tools.c b/testing/misc_tools.c
index efe1a555..ad6b2bff 100644
--- a/testing/misc_tools.c
+++ b/testing/misc_tools.c
@@ -28,22 +28,28 @@
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
+#include <stdint.h>
 
 #ifdef DEBUG
 #include <assert.h>
 #endif // DEBUG
 
-/* TODO: rewrite */
-unsigned char *hex_string_to_bin(char hex_string[])
+// You are responsible for freeing the return value!
+uint8_t *hex_string_to_bin(char *hex_string)
 {
-    size_t i, len = strlen(hex_string);
-    unsigned char *val = malloc(len);
+    // byte is represented by exactly 2 hex digits, so lenth of binary string
+    // is half of that of the hex one. only hex string with even length
+    // valid. the more proper implementation would be to check if strlen(hex_string)
+    // is odd and return error code if it is. we assume strlen is even. if it's not
+    // then the last byte just won't be written in 'ret'.
+    size_t i, len = strlen(hex_string) / 2;
+    uint8_t *ret = malloc(len);
     char *pos = hex_string;
 
     for (i = 0; i < len; ++i, pos += 2)
-        sscanf(pos, "%2hhx", &val[i]);
+        sscanf(pos, "%2hhx", &ret[i]);
 
-    return val;
+    return ret;
 }
 
 int cmdline_parsefor_ipv46(int argc, char **argv, uint8_t *ipv6enabled)
diff --git a/testing/tox_sync.c b/testing/tox_sync.c
index ccb5d20d..2799e7fe 100644
--- a/testing/tox_sync.c
+++ b/testing/tox_sync.c
@@ -221,6 +221,7 @@ int main(int argc, char *argv[])
     uint16_t port = htons(atoi(argv[argvoffset + 2]));
     unsigned char *binary_string = hex_string_to_bin(argv[argvoffset + 3]);
     int res = tox_bootstrap_from_address(tox, argv[argvoffset + 1], ipv6enabled, port, binary_string);
+    free(binary_string);
 
     if (!res) {
         printf("Failed to convert \"%s\" into an IP address. Exiting...\n", argv[argvoffset + 1]);
@@ -242,7 +243,9 @@ int main(int argc, char *argv[])
         return 1;
     }
 
-    int num = tox_add_friend(tox, hex_string_to_bin(temp_id), (uint8_t *)"Install Gentoo", sizeof("Install Gentoo"));
+    uint8_t *bin_id = hex_string_to_bin(temp_id);
+    int num = tox_add_friend(tox, bin_id, (uint8_t *)"Install Gentoo", sizeof("Install Gentoo"));
+    free(bin_id);
 
     if (num < 0) {
         printf("\nSomething went wrong when adding friend.\n");
diff --git a/toxcore/LAN_discovery.h b/toxcore/LAN_discovery.h
index 58bd2bee..fcb094e4 100644
--- a/toxcore/LAN_discovery.h
+++ b/toxcore/LAN_discovery.h
@@ -36,7 +36,7 @@
 #endif
 
 /* Interval in seconds between LAN discovery packet sending. */
-#define LAN_DISCOVERY_INTERVAL 60
+#define LAN_DISCOVERY_INTERVAL 10
 
 /* Send a LAN discovery pcaket to the broadcast address with port port. */
 int send_LANdiscovery(uint16_t port, DHT *dht);
diff --git a/toxcore/group_chats.c b/toxcore/group_chats.c
index 6dff52ef..17914038 100644
--- a/toxcore/group_chats.c
+++ b/toxcore/group_chats.c
@@ -251,6 +251,22 @@ static int addpeer(Group_Chat *chat, uint8_t *client_id)
 }
 
 /*
+ * Set a peer from the group chat to deleted.
+ *
+ * return 0 if success
+ * return -1 if error.
+ */
+static int del_peer_set(Group_Chat *chat, int peernum)
+{
+    if ((uint32_t)peernum >= chat->numpeers)
+        return -1;
+
+    chat->group[peernum].deleted = 1;
+    chat->group[peernum].deleted_time = unix_time();
+    return 0;
+}
+
+/*
  * Delete a peer from the group chat.
  *
  * return 0 if success
@@ -488,6 +504,9 @@ static int handle_data(Group_Chat *chat, uint8_t *data, uint32_t len)
     if (peernum == -1)
         return 1;
 
+    if (chat->group[peernum].deleted)
+        return 1;
+
     /* Spam prevention (1 message per peer per second limit.)
 
         if (chat->group[peernum].last_recv == temp_time)
@@ -531,7 +550,7 @@ static int handle_data(Group_Chat *chat, uint8_t *data, uint32_t len)
             if (contents_len != 0)
                 return 1;
 
-            delpeer(chat, peernum);
+            del_peer_set(chat, peernum);
             break;
 
         case GROUP_CHAT_PEER_NICK:
@@ -758,6 +777,7 @@ static void ping_group(Group_Chat *chat)
     }
 }
 
+#define DEL_PEER_DELAY 3
 static void del_dead_peers(Group_Chat *chat)
 {
     uint32_t i;
@@ -766,6 +786,11 @@ static void del_dead_peers(Group_Chat *chat)
         if (is_timeout(chat->group[i].last_recv_msgping, GROUP_PING_INTERVAL * 4)) {
             delpeer(chat, i);
         }
+
+        if (chat->group[i].deleted) {
+            if (is_timeout(chat->group[i].deleted_time, DEL_PEER_DELAY))
+                delpeer(chat, i);
+        }
     }
 }
 
@@ -773,7 +798,7 @@ static void del_dead_peers(Group_Chat *chat)
 static void send_names_new_peer(Group_Chat *chat)
 {
     group_send_nick(chat, chat->nick, chat->nick_len);
-    chat->last_sent_nick = (unix_time() - NICK_SEND_INTERVAL) + 10;
+    chat->last_sent_nick = (unix_time() - NICK_SEND_INTERVAL) + 15;
 }
 static void send_names(Group_Chat *chat)
 {
diff --git a/toxcore/group_chats.h b/toxcore/group_chats.h
index 8d5f5e50..e31aa229 100644
--- a/toxcore/group_chats.h
+++ b/toxcore/group_chats.h
@@ -41,6 +41,9 @@ typedef struct {
 
     uint8_t     nick[MAX_NICK_BYTES];
     uint16_t    nick_len;
+
+    uint8_t     deleted;
+    uint64_t    deleted_time;
 } Group_Peer;
 
 typedef struct {
diff --git a/toxcore/onion_announce.c b/toxcore/onion_announce.c
index da40584d..28e27d91 100644
--- a/toxcore/onion_announce.c
+++ b/toxcore/onion_announce.c
@@ -207,7 +207,7 @@ static int add_to_entries(Onion_Announce *onion_a, IP_Port ret_ip_port, uint8_t
 
     memcpy(cmp_public_key, onion_a->dht->self_public_key, crypto_box_PUBLICKEYBYTES);
     qsort(onion_a->entries, ONION_ANNOUNCE_MAX_ENTRIES, sizeof(Onion_Announce_Entry), cmp_entry);
-    return pos;
+    return in_entries(onion_a, public_key);
 }
 
 static int handle_announce_request(void *object, IP_Port source, uint8_t *packet, uint32_t length)
diff --git a/toxcore/onion_client.c b/toxcore/onion_client.c
index c03dfcea..b3c665b7 100644
--- a/toxcore/onion_client.c
+++ b/toxcore/onion_client.c
@@ -174,6 +174,11 @@ static int client_add_to_list(Onion_Client *onion_c, uint32_t num, uint8_t *publ
     if (num == 0) {
         list_nodes = onion_c->clients_announce_list;
         reference_id = onion_c->dht->c->self_public_key;
+
+        if (is_stored && memcmp(pingid_or_key, onion_c->temp_public_key, crypto_box_PUBLICKEYBYTES) != 0) {
+            is_stored = 0;
+        }
+
     } else {
         list_nodes = onion_c->friends_list[num - 1].clients_list;
         reference_id = onion_c->friends_list[num - 1].real_client_id;