4 files changed, 33 insertions, 14 deletions

diff --git a/toxcore/Messenger.c b/toxcore/Messenger.c
index 57cafc3f..c2971a70 100644
--- a/toxcore/Messenger.c
+++ b/toxcore/Messenger.c
@@ -732,7 +732,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 5376713c..5a68bc1a 100644
--- a/toxcore/group_chats.c
+++ b/toxcore/group_chats.c
@@ -393,6 +393,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)
 {
@@ -445,6 +446,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:
@@ -638,7 +640,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 8b9b8b2f..504a12af 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