8 files changed, 75 insertions, 43 deletions

diff --git a/toxcore/DHT.c b/toxcore/DHT.c
index 47595d06..749eb78c 100644
--- a/toxcore/DHT.c
+++ b/toxcore/DHT.c
@@ -129,7 +129,7 @@ static int is_timeout(uint64_t time_now, uint64_t timestamp, uint64_t timeout)
 /* 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.
- *  TODO: Maybe optimize this. 
+ *  TODO: Maybe optimize this.
  *
  *  return True(1) or False(0)
  */
@@ -548,7 +548,10 @@ static int sendnodes(DHT *dht, IP_Port ip_port, uint8_t *public_key, uint8_t *cl
                             sizeof(ping_id) + num_nodes * sizeof(Node_format),
                             encrypt );
 
-    if (len != sizeof(ping_id) + num_nodes * sizeof(Node_format) + ENCRYPTION_PADDING)
+    if (len == -1)
+        return -1;
+
+    if ((unsigned int)len != sizeof(ping_id) + num_nodes * sizeof(Node_format) + ENCRYPTION_PADDING)
         return -1;
 
     data[0] = NET_PACKET_SEND_NODES;
@@ -614,7 +617,7 @@ static int handle_sendnodes(void *object, IP_Port source, uint8_t *packet, uint3
                   packet + 1 + CLIENT_ID_SIZE + crypto_box_NONCEBYTES,
                   sizeof(ping_id) + num_nodes * sizeof(Node_format) + ENCRYPTION_PADDING, plain );
 
-    if (len != sizeof(ping_id) + num_nodes * sizeof(Node_format))
+    if ((unsigned int)len != sizeof(ping_id) + num_nodes * sizeof(Node_format))
         return 1;
 
     memcpy(&ping_id, plain, sizeof(ping_id));
@@ -856,7 +859,7 @@ static int friend_iplist(DHT *dht, IP_Port *ip_portlist, uint16_t friend_num)
 
 
 /* Send the following packet to everyone who tells us they are connected to friend_id.
- * 
+ *
  *  return ip for friend.
  *  return number of nodes the packet was sent to. (Only works if more than (MAX_FRIEND_CLIENTS / 2).
  */
@@ -884,7 +887,9 @@ int route_tofriend(DHT *dht, uint8_t *friend_id, uint8_t *packet, uint32_t lengt
 
         /* If ip is not zero and node is good. */
         if (client->ret_ip_port.ip.uint32 != 0 && !is_timeout(temp_time, client->ret_timestamp, BAD_NODE_TIMEOUT)) {
-            if (sendpacket(dht->c->lossless_udp->net->sock, client->ip_port, packet, length) == length)
+            int retval = sendpacket(dht->c->lossless_udp->net->sock, client->ip_port, packet, length);
+
+            if ((unsigned int)retval == length)
                 ++sent;
         }
     }
@@ -924,7 +929,9 @@ static int routeone_tofriend(DHT *dht, uint8_t *friend_id, uint8_t *packet, uint
     if (n < 1)
         return 0;
 
-    if (sendpacket(dht->c->lossless_udp->net->sock, ip_list[rand() % n], packet, length) == length)
+    int retval = sendpacket(dht->c->lossless_udp->net->sock, ip_list[rand() % n], packet, length);
+
+    if ((unsigned int)retval == length)
         return 1;
 
     return 0;
@@ -1074,7 +1081,7 @@ static void punch_holes(DHT *dht, IP ip, uint16_t *port_list, uint16_t numports,
     for (i = dht->friends_list[friend_num].punching_index; i != top; i++) {
         /* TODO: Improve port guessing algorithm. */
         uint16_t port = port_list[(i / 2) % numports] + (i / (2 * numports)) * ((i % 2) ? -1 : 1);
-        IP_Port pinging = {{ip, htons(port)}};
+        IP_Port pinging = {{ip, htons(port), 0}};
         send_ping_request(dht->ping, dht->c, pinging, dht->friends_list[friend_num].client_id);
     }
 
diff --git a/toxcore/LAN_discovery.c b/toxcore/LAN_discovery.c
index 4ccb893b..8998e0a9 100644
--- a/toxcore/LAN_discovery.c
+++ b/toxcore/LAN_discovery.c
@@ -145,7 +145,7 @@ int send_LANdiscovery(uint16_t port, Net_Crypto *c)
     uint8_t data[crypto_box_PUBLICKEYBYTES + 1];
     data[0] = NET_PACKET_LAN_DISCOVERY;
     memcpy(data + 1, c->self_public_key, crypto_box_PUBLICKEYBYTES);
-    IP_Port ip_port = {{broadcast_ip(), port}};
+    IP_Port ip_port = {{broadcast_ip(), port, 0}};
     return sendpacket(c->lossless_udp->net->sock, ip_port, data, 1 + crypto_box_PUBLICKEYBYTES);
 }
 
diff --git a/toxcore/Lossless_UDP.c b/toxcore/Lossless_UDP.c
index d501ea40..0d6d8694 100644
--- a/toxcore/Lossless_UDP.c
+++ b/toxcore/Lossless_UDP.c
@@ -228,7 +228,7 @@ static void free_connections(Lossless_UDP *ludp)
  */
 int kill_connection(Lossless_UDP *ludp, int connection_id)
 {
-    if (connection_id >= 0 && connection_id < ludp->connections.len) {
+    if ((unsigned int)connection_id < ludp->connections.len) {
         Connection *connection = &tox_array_get(&ludp->connections, connection_id, Connection);
 
         if (connection->status > 0) {
@@ -251,7 +251,7 @@ int kill_connection(Lossless_UDP *ludp, int connection_id)
  */
 int kill_connection_in(Lossless_UDP *ludp, int connection_id, uint32_t seconds)
 {
-    if (connection_id >= 0 && connection_id < ludp->connections.len) {
+    if ((unsigned int)connection_id < ludp->connections.len) {
         Connection *connection = &tox_array_get(&ludp->connections, connection_id, Connection);
 
         if (connection->status > 0) {
@@ -274,7 +274,7 @@ int kill_connection_in(Lossless_UDP *ludp, int connection_id, uint32_t seconds)
  */
 int is_connected(Lossless_UDP *ludp, int connection_id)
 {
-    if (connection_id >= 0 && connection_id < ludp->connections.len)
+    if ((unsigned int)connection_id < ludp->connections.len)
         return tox_array_get(&ludp->connections, connection_id, Connection).status;
 
     return 0;
@@ -283,7 +283,7 @@ int is_connected(Lossless_UDP *ludp, int connection_id)
 /*  return the ip_port of the corresponding connection. */
 IP_Port connection_ip(Lossless_UDP *ludp, int connection_id)
 {
-    if (connection_id >= 0 && connection_id < ludp->connections.len)
+    if ((unsigned int)connection_id < ludp->connections.len)
         return tox_array_get(&ludp->connections, connection_id, Connection).ip_port;
 
     IP_Port zero = {{{{0}}, 0, 0}};
@@ -293,7 +293,7 @@ IP_Port connection_ip(Lossless_UDP *ludp, int connection_id)
 /*  return the number of packets in the queue waiting to be successfully sent. */
 uint32_t sendqueue(Lossless_UDP *ludp, int connection_id)
 {
-    if (connection_id < 0 || connection_id >= ludp->connections.len)
+    if ((unsigned int)connection_id >= ludp->connections.len)
         return 0;
 
     Connection *connection = &tox_array_get(&ludp->connections, connection_id, Connection);
@@ -303,7 +303,7 @@ uint32_t sendqueue(Lossless_UDP *ludp, int connection_id)
 /*  return the number of packets in the queue waiting to be successfully read with read_packet(...). */
 uint32_t recvqueue(Lossless_UDP *ludp, int connection_id)
 {
-    if (connection_id < 0 || connection_id >= ludp->connections.len)
+    if ((unsigned int)connection_id >= ludp->connections.len)
         return 0;
 
     Connection *connection = &tox_array_get(&ludp->connections, connection_id, Connection);
@@ -315,7 +315,7 @@ uint32_t recvqueue(Lossless_UDP *ludp, int connection_id)
  */
 char id_packet(Lossless_UDP *ludp, int connection_id)
 {
-    if (connection_id < 0 || connection_id >= ludp->connections.len || recvqueue(ludp, connection_id) == 0)
+    if (recvqueue(ludp, connection_id) == 0)
         return -1;
 
     Connection *connection = &tox_array_get(&ludp->connections, connection_id, Connection);
diff --git a/toxcore/Messenger.c b/toxcore/Messenger.c
index e28ff9db..621f7130 100644
--- a/toxcore/Messenger.c
+++ b/toxcore/Messenger.c
@@ -28,11 +28,11 @@
 static void set_friend_status(Messenger *m, int friendnumber, uint8_t status);
 static int write_cryptpacket_id(Messenger *m, int friendnumber, uint8_t packet_id, uint8_t *data, uint32_t length);
 
-/* static uint8_t online;
- *
- *  return 1 if we are online.
- *  return 0 if we are offline. 
- */
+// friend_not_valid determines if the friendnumber passed is valid in the Messenger object
+static uint8_t friend_not_valid(Messenger *m, int friendnumber)
+{
+    return (unsigned int)friendnumber >= m->numfriends;
+}
 
 /* Set the size of the friend list to numfriends.
  *
@@ -79,7 +79,7 @@ int getfriend_id(Messenger *m, uint8_t *client_id)
  */
 int getclient_id(Messenger *m, int friend_id, uint8_t *client_id)
 {
-    if (friend_id >= m->numfriends || friend_id < 0)
+    if (friend_not_valid(m, friend_id))
         return -1;
 
     if (m->friendlist[friend_id].status > 0) {
@@ -249,7 +249,7 @@ int m_addfriend_norequest(Messenger *m, uint8_t *client_id)
  */
 int m_delfriend(Messenger *m, int friendnumber)
 {
-    if (friendnumber >= m->numfriends || friendnumber < 0)
+    if (friend_not_valid(m, friendnumber))
         return -1;
 
     DHT_delfriend(m->dht, m->friendlist[friendnumber].client_id);
@@ -279,7 +279,7 @@ int m_delfriend(Messenger *m, int friendnumber)
  */
 int m_friendstatus(Messenger *m, int friendnumber)
 {
-    if (friendnumber < 0 || friendnumber >= m->numfriends)
+    if (friend_not_valid(m, friendnumber))
         return NOFRIEND;
 
     return m->friendlist[friendnumber].status;
@@ -292,7 +292,7 @@ int m_friendstatus(Messenger *m, int friendnumber)
  */
 uint32_t m_sendmessage(Messenger *m, int friendnumber, uint8_t *message, uint32_t length)
 {
-    if (friendnumber < 0 || friendnumber >= m->numfriends)
+    if (friend_not_valid(m, friendnumber))
         return 0;
 
     uint32_t msgid = ++m->friendlist[friendnumber].message_id;
@@ -347,7 +347,7 @@ static int m_sendname(Messenger *m, int friendnumber, uint8_t *name, uint16_t le
  */
 static int setfriendname(Messenger *m, int friendnumber, uint8_t *name)
 {
-    if (friendnumber >= m->numfriends || friendnumber < 0)
+    if (friend_not_valid(m, friendnumber))
         return -1;
 
     memcpy(m->friendlist[friendnumber].name, name, MAX_NAME_LENGTH);
@@ -404,7 +404,7 @@ uint16_t getself_name(Messenger *m, uint8_t *name, uint16_t nlen)
  */
 int getname(Messenger *m, int friendnumber, uint8_t *name)
 {
-    if (friendnumber >= m->numfriends || friendnumber < 0)
+    if (friend_not_valid(m, friendnumber))
         return -1;
 
     memcpy(name, m->friendlist[friendnumber].name, MAX_NAME_LENGTH);
@@ -447,7 +447,7 @@ int m_set_userstatus(Messenger *m, USERSTATUS status)
  */
 int m_get_statusmessage_size(Messenger *m, int friendnumber)
 {
-    if (friendnumber >= m->numfriends || friendnumber < 0)
+    if (friend_not_valid(m, friendnumber))
         return -1;
 
     return m->friendlist[friendnumber].statusmessage_length;
@@ -458,7 +458,7 @@ int m_get_statusmessage_size(Messenger *m, int friendnumber)
  */
 int m_copy_statusmessage(Messenger *m, int friendnumber, uint8_t *buf, uint32_t maxlen)
 {
-    if (friendnumber >= m->numfriends || friendnumber < 0)
+    if (friend_not_valid(m, friendnumber))
         return -1;
 
     memset(buf, 0, maxlen);
@@ -475,7 +475,7 @@ int m_copy_self_statusmessage(Messenger *m, uint8_t *buf, uint32_t maxlen)
 
 USERSTATUS m_get_userstatus(Messenger *m, int friendnumber)
 {
-    if (friendnumber >= m->numfriends || friendnumber < 0)
+    if (friend_not_valid(m, friendnumber))
         return USERSTATUS_INVALID;
 
     USERSTATUS status = m->friendlist[friendnumber].userstatus;
@@ -511,7 +511,7 @@ static int send_ping(Messenger *m, int friendnumber)
 
 static int set_friend_statusmessage(Messenger *m, int friendnumber, uint8_t *status, uint16_t length)
 {
-    if (friendnumber >= m->numfriends || friendnumber < 0)
+    if (friend_not_valid(m, friendnumber))
         return -1;
 
     uint8_t *newstatus = calloc(length, 1);
@@ -533,7 +533,7 @@ void m_set_sends_receipts(Messenger *m, int friendnumber, int yesno)
     if (yesno != 0 || yesno != 1)
         return;
 
-    if (friendnumber >= m->numfriends || friendnumber < 0)
+    if (friend_not_valid(m, friendnumber))
         return;
 
     m->friendlist[friendnumber].receives_read_receipts = yesno;
@@ -615,7 +615,7 @@ void set_friend_status(Messenger *m, int friendnumber, uint8_t status)
 
 int write_cryptpacket_id(Messenger *m, int friendnumber, uint8_t packet_id, uint8_t *data, uint32_t length)
 {
-    if (friendnumber < 0 || friendnumber >= m->numfriends)
+    if (friend_not_valid(m, friendnumber))
         return 0;
 
     if (length >= MAX_DATA_SIZE || m->friendlist[friendnumber].status != FRIEND_ONLINE)
@@ -786,7 +786,7 @@ void doFriends(Messenger *m)
             len = read_cryptpacket(m->net_crypto, m->friendlist[i].crypt_connection_id, temp);
             uint8_t packet_id = temp[0];
             uint8_t *data = temp + 1;
-            int data_length = len - 1;
+            uint32_t data_length = len - 1;
 
             if (len > 0) {
                 switch (packet_id) {
@@ -968,7 +968,7 @@ void Messenger_save(Messenger *m, uint8_t *data)
 /* Load the messenger from data of size length. */
 int Messenger_load(Messenger *m, uint8_t *data, uint32_t length)
 {
-    if (length == ~0)
+    if (length == ~((uint32_t)0))
         return -1;
 
     if (length < crypto_box_PUBLICKEYBYTES + crypto_box_SECRETKEYBYTES + sizeof(uint32_t) * 3)
diff --git a/toxcore/misc_tools.h b/toxcore/misc_tools.h
index af31ff54..448c1cbd 100644
--- a/toxcore/misc_tools.h
+++ b/toxcore/misc_tools.h
@@ -196,10 +196,10 @@ static inline void tox_array_pop(tox_array *arr, uint32_t num)
  * Quick Sort: Complexity O(nlogn)
  * arr   - the array to sort
  * n     - the sort index (should be called with n = length(arr))
- * cmpfn - a function that compares two values of type type. 
+ * cmpfn - a function that compares two values of type type.
  *         Must return -1, 0, 1 for a < b, a == b, and a > b respectively.
  */
-/* Must be called in the header file. */ 
+/* Must be called in the header file. */
 #define declare_quick_sort(type) \
 void type##_quick_sort(type *arr, int n, int (*cmpfn)(type, type));
 
diff --git a/toxcore/net_crypto.c b/toxcore/net_crypto.c
index 739003a4..59a068c8 100644
--- a/toxcore/net_crypto.c
+++ b/toxcore/net_crypto.c
@@ -32,6 +32,11 @@
 #define CONN_ESTABLISHED 3
 #define CONN_TIMED_OUT 4
 
+static uint8_t crypt_connection_id_not_valid(Net_Crypto *c, int crypt_connection_id)
+{
+    return (uint32_t)crypt_connection_id >= c->crypto_connections_length;
+}
+
 /* Use this instead of memcmp; not vulnerable to timing attacks. */
 uint8_t crypto_iszero(uint8_t *mem, uint32_t length)
 {
@@ -150,7 +155,7 @@ void random_nonce(uint8_t *nonce)
  */
 int read_cryptpacket(Net_Crypto *c, int crypt_connection_id, uint8_t *data)
 {
-    if (crypt_connection_id < 0 || crypt_connection_id >= c->crypto_connections_length)
+    if (crypt_connection_id_not_valid(c, crypt_connection_id))
         return 0;
 
     if (c->crypto_connections[crypt_connection_id].status != CONN_ESTABLISHED)
@@ -182,7 +187,7 @@ int read_cryptpacket(Net_Crypto *c, int crypt_connection_id, uint8_t *data)
  */
 int write_cryptpacket(Net_Crypto *c, int crypt_connection_id, uint8_t *data, uint32_t length)
 {
-    if (crypt_connection_id < 0 || crypt_connection_id >= c->crypto_connections_length)
+    if (crypt_connection_id_not_valid(c, crypt_connection_id))
         return 0;
 
     if (length - crypto_box_BOXZEROBYTES + crypto_box_ZEROBYTES > MAX_DATA_SIZE - 1)
@@ -305,7 +310,9 @@ static int cryptopacket_handle(void *object, IP_Port source, uint8_t *packet, ui
                     len);
 
         } else { /* If request is not for us, try routing it. */
-            if (route_packet(dht, packet + 1, packet, length) == length)
+            int retval = route_packet(dht, packet + 1, packet, length);
+
+            if ((unsigned int)retval == length)
                 return 0;
         }
     }
@@ -512,7 +519,7 @@ int crypto_inbound(Net_Crypto *c, uint8_t *public_key, uint8_t *secret_nonce, ui
  */
 int crypto_kill(Net_Crypto *c, int crypt_connection_id)
 {
-    if (crypt_connection_id < 0 || crypt_connection_id >= c->crypto_connections_length)
+    if (crypt_connection_id_not_valid(c, crypt_connection_id))
         return 1;
 
     if (c->crypto_connections[crypt_connection_id].status != CONN_NO_CONNECTION) {
@@ -604,7 +611,7 @@ int accept_crypto_inbound(Net_Crypto *c, int connection_id, uint8_t *public_key,
  */
 int is_cryptoconnected(Net_Crypto *c, int crypt_connection_id)
 {
-    if (crypt_connection_id >= 0 && crypt_connection_id < c->crypto_connections_length)
+    if ((unsigned int)crypt_connection_id < c->crypto_connections_length)
         return c->crypto_connections[crypt_connection_id].status;
 
     return CONN_NO_CONNECTION;
diff --git a/toxcore/network.c b/toxcore/network.c
index 666846db..9e329949 100644
--- a/toxcore/network.c
+++ b/toxcore/network.c
@@ -60,9 +60,13 @@ uint32_t random_int(void)
 /* Basic network functions:
  * Function to send packet(data) of length length to ip_port.
  */
+#ifdef WIN32
+int sendpacket(unsigned int sock, IP_Port ip_port, uint8_t *data, uint32_t length)
+#else
 int sendpacket(int sock, IP_Port ip_port, uint8_t *data, uint32_t length)
+#endif
 {
-    ADDR addr = {AF_INET, ip_port.port, ip_port.ip};
+    ADDR addr = {AF_INET, ip_port.port, ip_port.ip, {0}};
     return sendto(sock, (char *) data, length, 0, (struct sockaddr *)&addr, sizeof(addr));
 }
 
@@ -72,7 +76,11 @@ int sendpacket(int sock, IP_Port ip_port, uint8_t *data, uint32_t length)
  *  Packet length is put into length.
  *  Dump all empty packets.
  */
+#ifdef WIN32
+static int receivepacket(unsigned int sock, IP_Port *ip_port, uint8_t *data, uint32_t *length)
+#else
 static int receivepacket(int sock, IP_Port *ip_port, uint8_t *data, uint32_t *length)
+#endif
 {
     ADDR addr;
 #ifdef WIN32
@@ -207,7 +215,7 @@ Networking_Core *new_networking(IP ip, uint16_t port)
 #endif
 
     /* Bind our socket to port PORT and address 0.0.0.0 */
-    ADDR addr = {AF_INET, htons(port), ip};
+    ADDR addr = {AF_INET, htons(port), ip, {0}};
     bind(temp->sock, (struct sockaddr *)&addr, sizeof(addr));
     return temp;
 }
diff --git a/toxcore/network.h b/toxcore/network.h
index eb725d25..ca79a81b 100644
--- a/toxcore/network.h
+++ b/toxcore/network.h
@@ -120,7 +120,12 @@ typedef struct {
 typedef struct {
     Packet_Handles packethandlers[256];
     /* Our UDP socket. */
+#ifdef WIN32
+    unsigned int sock;
+#else
     int sock;
+#endif
+
 } Networking_Core;
 
 /*  return current time in milleseconds since the epoch. */
@@ -134,7 +139,12 @@ uint32_t random_int(void);
 /* Basic network functions: */
 
 /* Function to send packet(data) of length length to ip_port. */
+#ifdef WIN32
+int sendpacket(unsigned int sock, IP_Port ip_port, uint8_t *data, uint32_t length);
+#else
 int sendpacket(int sock, IP_Port ip_port, uint8_t *data, uint32_t length);
+#endif
+
 
 /* Function to call when packet beginning with byte is received. */
 void networking_registerhandler(Networking_Core *net, uint8_t byte, packet_handler_callback cb, void *object);