5 files changed, 101 insertions, 53 deletions

diff --git a/toxcore/DHT.c b/toxcore/DHT.c
index f5d93fc4..f49858bc 100644
--- a/toxcore/DHT.c
+++ b/toxcore/DHT.c
@@ -108,21 +108,6 @@ static int client_id_cmp(ClientPair p1, ClientPair p2)
     return c;
 }
 
-static int client_in_list(Client_data *list, uint32_t length, uint8_t *client_id)
-{
-    uint32_t i;
-
-    for (i = 0; i < length; i++)
-
-        /* Dead nodes are considered dead (not in the list)*/
-        if (!is_timeout(list[i].assoc4.timestamp, KILL_NODE_TIMEOUT) ||
-                !is_timeout(list[i].assoc6.timestamp, KILL_NODE_TIMEOUT))
-            if (id_equal(list[i].client_id, client_id))
-                return 1;
-
-    return 0;
-}
-
 /* Check if client with client_id is already in list of length length.
  * If it is then set its corresponding timestamp to current time.
  * If the id is already in the list with a different ip_port, update it.
@@ -380,21 +365,31 @@ static int replace_bad(    Client_data    *list,
     for (i = 0; i < length; ++i) {
         /* If node is bad */
         Client_data *client = &list[i];
-        IPPTsPng *ipptp = NULL;
 
-        if (ip_port.ip.family == AF_INET)
-            ipptp = &client->assoc4;
-        else
-            ipptp = &client->assoc6;
+        if (is_timeout(client->assoc4.timestamp, BAD_NODE_TIMEOUT) &&
+                is_timeout(client->assoc6.timestamp, BAD_NODE_TIMEOUT)) {
+
+            IPPTsPng *ipptp_write = NULL;
+            IPPTsPng *ipptp_clear = NULL;
+
+            if (ip_port.ip.family == AF_INET) {
+                ipptp_write = &client->assoc4;
+                ipptp_clear = &client->assoc6;
+            } else {
+                ipptp_write = &client->assoc6;
+                ipptp_clear = &client->assoc4;
+            }
 
-        if (is_timeout(ipptp->timestamp, BAD_NODE_TIMEOUT)) {
             memcpy(client->client_id, client_id, CLIENT_ID_SIZE);
-            ipptp->ip_port = ip_port;
-            ipptp->timestamp = unix_time();
+            ipptp_write->ip_port = ip_port;
+            ipptp_write->timestamp = unix_time();
+
+            ip_reset(&ipptp_write->ret_ip_port.ip);
+            ipptp_write->ret_ip_port.port = 0;
+            ipptp_write->ret_timestamp = 0;
 
-            ip_reset(&ipptp->ret_ip_port.ip);
-            ipptp->ret_ip_port.port = 0;
-            ipptp->ret_timestamp = 0;
+            /* zero out other address */
+            memset(ipptp_clear, 0, sizeof(*ipptp_clear));
 
             return 0;
         }
@@ -458,20 +453,28 @@ static int replace_good(   Client_data    *list,
         assert(replace >= 0 && replace < length);
 #endif
         Client_data *client = &list[replace];
-        IPPTsPng *ipptp = NULL;
+        IPPTsPng *ipptp_write = NULL;
+        IPPTsPng *ipptp_clear = NULL;
 
-        if (ip_port.ip.family == AF_INET)
-            ipptp = &client->assoc4;
-        else
-            ipptp = &client->assoc6;
+        if (ip_port.ip.family == AF_INET) {
+            ipptp_write = &client->assoc4;
+            ipptp_clear = &client->assoc6;
+        } else {
+            ipptp_write = &client->assoc6;
+            ipptp_clear = &client->assoc4;
+        }
 
         memcpy(client->client_id, client_id, CLIENT_ID_SIZE);
-        ipptp->ip_port = ip_port;
-        ipptp->timestamp = unix_time();
+        ipptp_write->ip_port = ip_port;
+        ipptp_write->timestamp = unix_time();
+
+        ip_reset(&ipptp_write->ret_ip_port.ip);
+        ipptp_write->ret_ip_port.port = 0;
+        ipptp_write->ret_timestamp = 0;
+
+        /* zero out other address */
+        memset(ipptp_clear, 0, sizeof(*ipptp_clear));
 
-        ip_reset(&ipptp->ret_ip_port.ip);
-        ipptp->ret_ip_port.port = 0;
-        ipptp->ret_timestamp = 0;
         return 0;
     }
 
@@ -1083,10 +1086,12 @@ int DHT_getfriendip(DHT *dht, uint8_t *client_id, IP_Port *ip_port)
     return -1;
 }
 
-static void do_ping_and_sendnode_requests(DHT *dht, uint64_t *lastgetnode, uint8_t *client_id,
+/* returns number of nodes not in kill-timeout */
+static uint8_t do_ping_and_sendnode_requests(DHT *dht, uint64_t *lastgetnode, uint8_t *client_id,
         Client_data *list, uint32_t list_count)
 {
     uint32_t i;
+    uint8_t not_kill = 0;
     uint64_t temp_time = unix_time();
 
     uint32_t num_nodes = 0;
@@ -1101,6 +1106,8 @@ static void do_ping_and_sendnode_requests(DHT *dht, uint64_t *lastgetnode, uint8
 
         for (a = 0, assoc = &client->assoc6; a < 2; a++, assoc = &client->assoc4)
             if (!is_timeout(assoc->timestamp, KILL_NODE_TIMEOUT)) {
+                not_kill++;
+
                 if (is_timeout(assoc->last_pinged, PING_INTERVAL)) {
                     send_ping_request(dht->ping, assoc->ip_port, client->client_id );
                     assoc->last_pinged = temp_time;
@@ -1121,6 +1128,8 @@ static void do_ping_and_sendnode_requests(DHT *dht, uint64_t *lastgetnode, uint8
                  client_id);
         *lastgetnode = temp_time;
     }
+
+    return not_kill;
 }
 
 /* Ping each client in the "friends" list every PING_INTERVAL seconds. Send a get nodes request
@@ -1140,8 +1149,28 @@ static void do_DHT_friends(DHT *dht)
  */
 static void do_Close(DHT *dht)
 {
-    do_ping_and_sendnode_requests(dht, &dht->close_lastgetnodes, dht->c->self_public_key,
-                                  dht->close_clientlist, LCLIENT_LIST);
+    uint8_t not_killed = do_ping_and_sendnode_requests(dht, &dht->close_lastgetnodes, dht->c->self_public_key,
+                                                       dht->close_clientlist, LCLIENT_LIST);
+
+    if (!not_killed) {
+        /* all existing nodes are at least KILL_NODE_TIMEOUT,
+         * which means we are mute, as we only send packets to
+         * nodes NOT in KILL_NODE_TIMEOUT
+         *
+         * so: reset all nodes to be BAD_NODE_TIMEOUT, but not
+         * KILL_NODE_TIMEOUT, so we at least keep trying pings */
+        uint64_t badonly = unix_time() - BAD_NODE_TIMEOUT;
+        size_t i, a;
+
+        for (i = 0; i < LCLIENT_LIST; i++) {
+            Client_data *client = &dht->close_clientlist[i];
+            IPPTsPng *assoc;
+
+            for (a = 0, assoc = &client->assoc4; a < 2; a++, assoc = &client->assoc6)
+                if (assoc->timestamp)
+                    assoc->timestamp = badonly;
+        }
+    }
 }
 
 void DHT_bootstrap(DHT *dht, IP_Port ip_port, uint8_t *public_key)
diff --git a/toxcore/Messenger.c b/toxcore/Messenger.c
index 904c3ecc..19bd7edf 100644
--- a/toxcore/Messenger.c
+++ b/toxcore/Messenger.c
@@ -734,7 +734,8 @@ static int group_num(Messenger *m, uint8_t *group_public_key)
     uint32_t i;
 
     for (i = 0; i < m->numchats; ++i) {
-        if (id_equal(m->chats[i]->self_public_key, group_public_key))
+        if (m->chats[i] != NULL)
+            if (id_equal(m->chats[i]->self_public_key, group_public_key))
             return i;
     }
 
diff --git a/toxcore/group_chats.c b/toxcore/group_chats.c
index 3fa90c42..b5e421a6 100644
--- a/toxcore/group_chats.c
+++ b/toxcore/group_chats.c
@@ -423,6 +423,7 @@ static int handle_sendnodes(Group_Chat *chat, IP_Port source, int peernum, uint8
 }
 
 #define GROUP_DATA_MIN_SIZE (crypto_box_PUBLICKEYBYTES + sizeof(uint32_t) + 1)
+static void send_names_new_peer(Group_Chat *chat);
 
 static int handle_data(Group_Chat *chat, uint8_t *data, uint32_t len)
 {
@@ -475,6 +476,7 @@ static int handle_data(Group_Chat *chat, uint8_t *data, uint32_t len)
                 return 1;
 
             addpeer(chat, contents);
+            send_names_new_peer(chat);
             break;
 
         case GROUP_CHAT_PEER_NICK:
@@ -673,7 +675,11 @@ static void del_dead_peers(Group_Chat *chat)
 }
 
 #define NICK_SEND_INTERVAL 180
-
+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;
+}
 static void send_names(Group_Chat *chat)
 {
     /* send own nick from time to time, to let newly added peers be informed
diff --git a/toxcore/network.c b/toxcore/network.c
index 0f96083c..e5a80254 100644
--- a/toxcore/network.c
+++ b/toxcore/network.c
@@ -278,7 +278,7 @@ void networking_registerhandler(Networking_Core *net, uint8_t byte, packet_handl
 void networking_poll(Networking_Core *net)
 {
     unix_time_update();
-    
+
     IP_Port ip_port;
     uint8_t data[MAX_UDP_PACKET_SIZE];
     uint32_t length;
@@ -373,13 +373,15 @@ int networking_wait_execute(uint8_t *data, uint16_t len, uint16_t milliseconds)
     /* returns -1 on error, 0 on timeout, the socket on activity */
     int res = select(nfds, &readfds, &writefds, &exceptfds, &timeout);
 #ifdef LOGGING
+
     /* only dump if not timeout */
     if (res) {
         sprintf(logbuffer, "select(%d): %d (%d, %s) - %d %d %d\n", milliseconds, res, errno,
-                           strerror(errno), FD_ISSET(s->sock, &readfds), FD_ISSET(s->sock, &writefds),
-                           FD_ISSET(s->sock, &exceptfds));
+                strerror(errno), FD_ISSET(s->sock, &readfds), FD_ISSET(s->sock, &writefds),
+                FD_ISSET(s->sock, &exceptfds));
         loglog(logbuffer);
     }
+
 #endif
 
     if (FD_ISSET(s->sock, &writefds))
@@ -527,14 +529,14 @@ Networking_Core *new_networking(IP ip, uint16_t port)
     } else
         return NULL;
 
-    if (ip.family == AF_INET6)
-    {
+    if (ip.family == AF_INET6) {
         char ipv6only = 0;
         socklen_t optsize = sizeof(ipv6only);
 #ifdef LOGGING
         errno = 0;
 #endif
         int res = getsockopt(temp->sock, IPPROTO_IPV6, IPV6_V6ONLY, &ipv6only, &optsize);
+
         if ((res == 0) && (ipv6only == 0)) {
 #ifdef LOGGING
             loglog("Dual-stack socket: enabled per default.\n");
@@ -542,6 +544,7 @@ Networking_Core *new_networking(IP ip, uint16_t port)
         } else {
             ipv6only = 0;
 #ifdef LOGGING
+
             if (res < 0) {
                 sprintf(logbuffer, "Dual-stack socket: Failed to query default. (%d, %s)\n",
                         errno, strerror(errno));
@@ -551,8 +554,9 @@ Networking_Core *new_networking(IP ip, uint16_t port)
             errno = 0;
             res =
 #endif
-                  setsockopt(temp->sock, IPPROTO_IPV6, IPV6_V6ONLY, (char *)&ipv6only, sizeof(ipv6only));
+                setsockopt(temp->sock, IPPROTO_IPV6, IPV6_V6ONLY, (char *)&ipv6only, sizeof(ipv6only));
 #ifdef LOGGING
+
             if (res < 0) {
                 sprintf(logbuffer,
                         "Dual-stack socket: Failed to enable, won't be able to receive from/send to IPv4 addresses. (%u, %s)\n",
@@ -560,6 +564,7 @@ Networking_Core *new_networking(IP ip, uint16_t port)
                 loglog(logbuffer);
             } else
                 loglog("Dual-stack socket: Enabled successfully.\n");
+
 #endif
         }
 
@@ -607,8 +612,7 @@ Networking_Core *new_networking(IP ip, uint16_t port)
     *portptr = htons(port_to_try);
     int tries, res;
 
-    for (tries = TOX_PORTRANGE_FROM; tries <= TOX_PORTRANGE_TO; tries++)
-    {
+    for (tries = TOX_PORTRANGE_FROM; tries <= TOX_PORTRANGE_TO; tries++) {
         res = bind(temp->sock, (struct sockaddr *)&addr, addrsize);
 
         if (!res) {
@@ -674,11 +678,7 @@ int ip_equal(IP *a, IP *b)
         if (a->family == AF_INET)
             return (a->ip4.in_addr.s_addr == b->ip4.in_addr.s_addr);
         else if (a->family == AF_INET6)
-#ifdef WIN32
-            return IN6_ADDR_EQUAL(&a->ip6.in6_addr, &b->ip6.in6_addr);
-#else
             return IN6_ARE_ADDR_EQUAL(&a->ip6.in6_addr, &b->ip6.in6_addr);
-#endif
         else
             return 0;
     }
diff --git a/toxcore/network.h b/toxcore/network.h
index 87cb4794..d9bc2bfe 100644
--- a/toxcore/network.h
+++ b/toxcore/network.h
@@ -43,6 +43,18 @@ typedef unsigned int sock_t;
 /* sa_family_t is the sockaddr_in / sockaddr_in6 family field */
 typedef short sa_family_t;
 
+#ifndef IN6_ARE_ADDR_EQUAL
+#ifdef IN6_ADDR_EQUAL
+#define IN6_ARE_ADDR_EQUAL(a,b) IN6_ADDR_EQUAL(a,b)
+#else
+#define IN6_ARE_ADDR_EQUAL(a,b) \
+   ((((__const uint32_t *) (a))[0] == ((__const uint32_t *) (b))[0]) \
+   && (((__const uint32_t *) (a))[1] == ((__const uint32_t *) (b))[1]) \
+   && (((__const uint32_t *) (a))[2] == ((__const uint32_t *) (b))[2]) \
+   && (((__const uint32_t *) (a))[3] == ((__const uint32_t *) (b))[3]))
+#endif
+#endif
+
 #ifndef EWOULDBLOCK
 #define EWOULDBLOCK WSAEWOULDBLOCK
 #endif