11 files changed, 41 insertions, 38 deletions

diff --git a/.travis/cmake-linux b/.travis/cmake-linux
index 9b2a1fae..c0d175f8 100755
--- a/.travis/cmake-linux
+++ b/.travis/cmake-linux
@@ -7,6 +7,7 @@ set -eu
 CACHEDIR="$HOME/cache"
 NPROC=`nproc`
 ASTYLE="$CACHEDIR/astyle/build/gcc/bin/astyle"
+ASTYLE_VERSION=3.1
 
 install_tool() {
   SLUG="$1"
@@ -35,9 +36,10 @@ travis_install() {
   }
 
   # Install astyle (version in ubuntu-precise too old).
-  [ -f "$ASTYLE" ] || {
-    wget -O ../astyle.tar.gz https://deb.debian.org/debian/pool/main/a/astyle/astyle_3.1.orig.tar.gz
+  ([ -f "$ASTYLE" ] && "$ASTYLE" --version | grep "$ASTYLE_VERSION" >/dev/null) || {
+    wget -O ../astyle.tar.gz "https://deb.debian.org/debian/pool/main/a/astyle/astyle_$ASTYLE_VERSION.orig.tar.gz"
     tar -xf ../astyle.tar.gz -C "$CACHEDIR"
+    make -C "$CACHEDIR/astyle/build/gcc" clean
     make -C "$CACHEDIR/astyle/build/gcc" "-j$NPROC"
   }
 
@@ -77,6 +79,7 @@ travis_script() {
   # Coverage flags.
   add_flag -fprofile-arcs -ftest-coverage
 
+  "$ASTYLE" --version
   other/astyle/format-source . "$ASTYLE"
 
   echo "Running TokTok style checker"
diff --git a/auto_tests/toxav_basic_test.c b/auto_tests/toxav_basic_test.c
index 5c6daefa..89c2918a 100644
--- a/auto_tests/toxav_basic_test.c
+++ b/auto_tests/toxav_basic_test.c
@@ -88,7 +88,7 @@ static void t_accept_friend_request_cb(Tox *m, const uint8_t *public_key, const
                                        void *userdata)
 {
     if (length == 7 && memcmp("gentoo", data, 7) == 0) {
-        ck_assert(tox_friend_add_norequest(m, public_key, nullptr) != (uint32_t) ~0);
+        ck_assert(tox_friend_add_norequest(m, public_key, nullptr) != (uint32_t) -1);
     }
 }
 
@@ -191,7 +191,7 @@ static void test_av_flows(void)
     tox_bootstrap(Alice, "localhost", dht_port, dht_key, nullptr);
     tox_bootstrap(Bob, "localhost", dht_port, dht_key, nullptr);
 
-    ck_assert(tox_friend_add(Bob, address, (const uint8_t *)"gentoo", 7, nullptr) != (uint32_t) ~0);
+    ck_assert(tox_friend_add(Bob, address, (const uint8_t *)"gentoo", 7, nullptr) != (uint32_t) -1);
 
     uint8_t off = 1;
 
diff --git a/auto_tests/toxav_many_test.c b/auto_tests/toxav_many_test.c
index c8b14022..76417366 100644
--- a/auto_tests/toxav_many_test.c
+++ b/auto_tests/toxav_many_test.c
@@ -72,7 +72,7 @@ static void t_accept_friend_request_cb(Tox *m, const uint8_t *public_key, const
                                        void *userdata)
 {
     if (length == 7 && memcmp("gentoo", data, 7) == 0) {
-        ck_assert(tox_friend_add_norequest(m, public_key, nullptr) != (uint32_t) ~0);
+        ck_assert(tox_friend_add_norequest(m, public_key, nullptr) != (uint32_t) -1);
     }
 }
 
@@ -180,9 +180,9 @@ static void test_av_three_calls(void)
     tox_bootstrap(Bobs[1], "localhost", dht_port, dht_key, nullptr);
     tox_bootstrap(Bobs[2], "localhost", dht_port, dht_key, nullptr);
 
-    ck_assert(tox_friend_add(Bobs[0], address, (const uint8_t *)"gentoo", 7, nullptr) != (uint32_t) ~0);
-    ck_assert(tox_friend_add(Bobs[1], address, (const uint8_t *)"gentoo", 7, nullptr) != (uint32_t) ~0);
-    ck_assert(tox_friend_add(Bobs[2], address, (const uint8_t *)"gentoo", 7, nullptr) != (uint32_t) ~0);
+    ck_assert(tox_friend_add(Bobs[0], address, (const uint8_t *)"gentoo", 7, nullptr) != (uint32_t) -1);
+    ck_assert(tox_friend_add(Bobs[1], address, (const uint8_t *)"gentoo", 7, nullptr) != (uint32_t) -1);
+    ck_assert(tox_friend_add(Bobs[2], address, (const uint8_t *)"gentoo", 7, nullptr) != (uint32_t) -1);
 
     uint8_t off = 1;
 
diff --git a/toxcore/DHT.c b/toxcore/DHT.c
index 79925552..8603b9c0 100644
--- a/toxcore/DHT.c
+++ b/toxcore/DHT.c
@@ -247,7 +247,7 @@ static unsigned int bit_by_bit_cmp(const uint8_t *pk1, const uint8_t *pk2)
 void get_shared_key(const Mono_Time *mono_time, Shared_Keys *shared_keys, uint8_t *shared_key,
                     const uint8_t *secret_key, const uint8_t *public_key)
 {
-    uint32_t num = ~0;
+    uint32_t num = -1;
     uint32_t curr = 0;
 
     for (uint32_t i = 0; i < MAX_KEYS_PER_SLOT; ++i) {
diff --git a/toxcore/TCP_client.c b/toxcore/TCP_client.c
index 6eae8408..1fae897f 100644
--- a/toxcore/TCP_client.c
+++ b/toxcore/TCP_client.c
@@ -555,7 +555,7 @@ int send_oob_packet(TCP_Client_Connection *con, const uint8_t *public_key, const
 
 /* Set the number that will be used as an argument in the callbacks related to con_id.
  *
- * When not set by this function, the number is ~0.
+ * When not set by this function, the number is -1.
  *
  * return 0 on success.
  * return -1 on failure.
@@ -785,7 +785,7 @@ static int handle_TCP_client_packet(TCP_Client_Connection *conn, const uint8_t *
             }
 
             conn->connections[con_id].status = 1;
-            conn->connections[con_id].number = ~0;
+            conn->connections[con_id].number = -1;
             memcpy(conn->connections[con_id].public_key, data + 2, CRYPTO_PUBLIC_KEY_SIZE);
 
             if (conn->response_callback) {
@@ -1038,7 +1038,7 @@ void do_TCP_connection(Mono_Time *mono_time, TCP_Client_Connection *tcp_connecti
 
         if (sizeof(data) == len) {
             if (handle_handshake(tcp_connection, data) == 0) {
-                tcp_connection->kill_at = ~0;
+                tcp_connection->kill_at = -1;
                 tcp_connection->status = TCP_CLIENT_CONFIRMED;
             } else {
                 tcp_connection->kill_at = 0;
diff --git a/toxcore/TCP_client.h b/toxcore/TCP_client.h
index 9d43d642..6a9bf8e2 100644
--- a/toxcore/TCP_client.h
+++ b/toxcore/TCP_client.h
@@ -103,7 +103,7 @@ int send_disconnect_request(TCP_Client_Connection *con, uint8_t con_id);
 
 /* Set the number that will be used as an argument in the callbacks related to con_id.
  *
- * When not set by this function, the number is ~0.
+ * When not set by this function, the number is -1.
  *
  * return 0 on success.
  * return -1 on failure.
diff --git a/toxcore/TCP_server.c b/toxcore/TCP_server.c
index 23b95940..086fe3d3 100644
--- a/toxcore/TCP_server.c
+++ b/toxcore/TCP_server.c
@@ -288,7 +288,7 @@ static int del_accepted(TCP_Server *tcp_server, int index)
  *
  * return length on success
  * return 0 if nothing has been read from socket.
- * return ~0 on failure.
+ * return -1 on failure.
  */
 uint16_t read_TCP_length(Socket sock)
 {
@@ -306,7 +306,7 @@ uint16_t read_TCP_length(Socket sock)
         length = net_ntohs(length);
 
         if (length > MAX_PACKET_SIZE) {
-            return ~0;
+            return -1;
         }
 
         return length;
@@ -348,7 +348,7 @@ int read_packet_TCP_secure_connection(Socket sock, uint16_t *next_packet_length,
     if (*next_packet_length == 0) {
         uint16_t len = read_TCP_length(sock);
 
-        if (len == (uint16_t)~0) {
+        if (len == (uint16_t) -1) {
             return -1;
         }
 
@@ -684,7 +684,7 @@ static int send_disconnect_notification(TCP_Secure_Connection *con, uint8_t id)
 static int handle_TCP_routing_req(TCP_Server *tcp_server, uint32_t con_id, const uint8_t *public_key)
 {
     uint32_t i;
-    uint32_t index = ~0;
+    uint32_t index = -1;
     TCP_Secure_Connection *con = &tcp_server->accepted_connection_array[con_id];
 
     /* If person tries to cennect to himself we deny the request*/
@@ -705,12 +705,12 @@ static int handle_TCP_routing_req(TCP_Server *tcp_server, uint32_t con_id, const
 
                 return 0;
             }
-        } else if (index == (uint32_t)~0) {
+        } else if (index == (uint32_t) -1) {
             index = i;
         }
     }
 
-    if (index == (uint32_t)~0) {
+    if (index == (uint32_t) -1) {
         if (send_routing_response(con, 0, public_key) == -1) {
             return -1;
         }
@@ -733,7 +733,7 @@ static int handle_TCP_routing_req(TCP_Server *tcp_server, uint32_t con_id, const
     int other_index = get_TCP_connection_index(tcp_server, public_key);
 
     if (other_index != -1) {
-        uint32_t other_id = ~0;
+        uint32_t other_id = -1;
         TCP_Secure_Connection *other_conn = &tcp_server->accepted_connection_array[other_index];
 
         for (i = 0; i < NUM_CLIENT_CONNECTIONS; ++i) {
@@ -744,7 +744,7 @@ static int handle_TCP_routing_req(TCP_Server *tcp_server, uint32_t con_id, const
             }
         }
 
-        if (other_id != (uint32_t)~0) {
+        if (other_id != (uint32_t) -1) {
             con->connections[index].status = 2;
             con->connections[index].index = other_index;
             con->connections[index].other_id = other_id;
diff --git a/toxcore/TCP_server.h b/toxcore/TCP_server.h
index 252df9fa..bc159f73 100644
--- a/toxcore/TCP_server.h
+++ b/toxcore/TCP_server.h
@@ -100,7 +100,7 @@ void kill_TCP_server(TCP_Server *tcp_server);
  *
  * return length on success
  * return 0 if nothing has been read from socket.
- * return ~0 on failure.
+ * return -1 on failure.
  */
 uint16_t read_TCP_length(Socket sock);
 
diff --git a/toxcore/group.c b/toxcore/group.c
index 1761d02d..9ba0c3df 100644
--- a/toxcore/group.c
+++ b/toxcore/group.c
@@ -2457,7 +2457,7 @@ static unsigned int send_lossy_all_close(const Group_Chats *g_c, uint32_t groupn
     }
 
     unsigned int to_send = 0;
-    uint64_t comp_val_old = ~0;
+    uint64_t comp_val_old = -1;
 
     for (i = 0; i < num_connected_closest; ++i) {
         uint8_t real_pk[CRYPTO_PUBLIC_KEY_SIZE] = {0};
@@ -2477,7 +2477,7 @@ static unsigned int send_lossy_all_close(const Group_Chats *g_c, uint32_t groupn
     }
 
     unsigned int to_send_other = 0;
-    comp_val_old = ~0;
+    comp_val_old = -1;
 
     for (i = 0; i < num_connected_closest; ++i) {
         uint8_t real_pk[CRYPTO_PUBLIC_KEY_SIZE] = {0};
diff --git a/toxcore/net_crypto.c b/toxcore/net_crypto.c
index 01dd680e..09ce91ba 100644
--- a/toxcore/net_crypto.c
+++ b/toxcore/net_crypto.c
@@ -1004,7 +1004,7 @@ static int handle_request_packet(Mono_Time *mono_time, const Logger *log, Packet
     uint32_t requested = 0;
 
     const uint64_t temp_time = current_time_monotonic(mono_time);
-    uint64_t l_sent_time = ~0;
+    uint64_t l_sent_time = -1;
 
     for (uint32_t i = send_array->buffer_start; i != send_array->buffer_end; ++i) {
         if (length == 0) {
@@ -2513,7 +2513,7 @@ static void send_crypto_packets(Net_Crypto *c)
 {
     const uint64_t temp_time = current_time_monotonic(c->mono_time);
     double total_send_rate = 0;
-    uint32_t peak_request_packet_interval = ~0;
+    uint32_t peak_request_packet_interval = -1;
 
     for (uint32_t i = 0; i < c->crypto_connections_length; ++i) {
         Crypto_Connection *conn = get_crypto_connection(c, i);
@@ -2722,7 +2722,7 @@ static void send_crypto_packets(Net_Crypto *c)
         }
     }
 
-    c->current_sleep_time = ~0;
+    c->current_sleep_time = -1;
     uint32_t sleep_time = peak_request_packet_interval;
 
     if (c->current_sleep_time > sleep_time) {
diff --git a/toxcore/onion_client.c b/toxcore/onion_client.c
index 6dd945b0..b3a54879 100644
--- a/toxcore/onion_client.c
+++ b/toxcore/onion_client.c
@@ -465,7 +465,7 @@ static uint32_t set_path_timeouts(Onion_Client *onion_c, uint32_t num, uint32_t
         return path_num;
     }
 
-    return ~0;
+    return -1;
 }
 
 /* Function to send onion packet via TCP and UDP.
@@ -544,7 +544,7 @@ static int new_sendback(Onion_Client *onion_c, uint32_t num, const uint8_t *publ
  * ret_pubkey must be at least CRYPTO_PUBLIC_KEY_SIZE big
  * ret_ip_port must be at least 1 big
  *
- * return ~0 on failure
+ * return -1 on failure
  * return num (see new_sendback(...)) on success
  */
 static uint32_t check_sendback(Onion_Client *onion_c, const uint8_t *sendback, uint8_t *ret_pubkey,
@@ -555,7 +555,7 @@ static uint32_t check_sendback(Onion_Client *onion_c, const uint8_t *sendback, u
     uint8_t data[sizeof(uint32_t) + CRYPTO_PUBLIC_KEY_SIZE + sizeof(IP_Port) + sizeof(uint32_t)];
 
     if (ping_array_check(onion_c->announce_ping_array, onion_c->mono_time, data, sizeof(data), sback) != sizeof(data)) {
-        return ~0;
+        return -1;
     }
 
     memcpy(ret_pubkey, data + sizeof(uint32_t), CRYPTO_PUBLIC_KEY_SIZE);
@@ -834,7 +834,7 @@ static int client_ping_nodes(Onion_Client *onion_c, uint32_t num, const Node_for
             }
 
             if (j == list_length && good_to_ping(onion_c->mono_time, last_pinged, last_pinged_index, nodes[i].public_key)) {
-                client_send_announce_request(onion_c, num, nodes[i].ip_port, nodes[i].public_key, nullptr, ~0);
+                client_send_announce_request(onion_c, num, nodes[i].ip_port, nodes[i].public_key, nullptr, -1);
             }
         }
     }
@@ -1098,7 +1098,7 @@ int send_onion_data(Onion_Client *onion_c, int friend_num, const uint8_t *data,
     for (i = 0; i < num_good; ++i) {
         Onion_Path path;
 
-        if (random_path(onion_c, &onion_c->onion_paths_friends, ~0, &path) == -1) {
+        if (random_path(onion_c, &onion_c->onion_paths_friends, -1, &path) == -1) {
             continue;
         }
 
@@ -1303,7 +1303,7 @@ int onion_addfriend(Onion_Client *onion_c, const uint8_t *public_key)
         return num;
     }
 
-    unsigned int i, index = ~0;
+    unsigned int i, index = -1;
 
     for (i = 0; i < onion_c->num_friends; ++i) {
         if (onion_c->friends_list[i].status == 0) {
@@ -1312,7 +1312,7 @@ int onion_addfriend(Onion_Client *onion_c, const uint8_t *public_key)
         }
     }
 
-    if (index == (uint32_t)~0) {
+    if (index == (uint32_t) -1) {
         if (realloc_onion_friends(onion_c, onion_c->num_friends + 1) == -1) {
             return -1;
         }
@@ -1607,7 +1607,7 @@ static void do_friend(Onion_Client *onion_c, uint16_t friendnum)
             if (mono_time_is_timeout(onion_c->mono_time, list_nodes[i].last_pinged, interval)
                     || (ping_random && random_u32() % (MAX_ONION_CLIENTS - i) == 0)) {
                 if (client_send_announce_request(onion_c, friendnum + 1, list_nodes[i].ip_port,
-                                                 list_nodes[i].public_key, nullptr, ~0) == 0) {
+                                                 list_nodes[i].public_key, nullptr, -1) == 0) {
                     list_nodes[i].last_pinged = mono_time_get(onion_c->mono_time);
                     ++list_nodes[i].unsuccessful_pings;
                     ping_random = false;
@@ -1630,7 +1630,7 @@ static void do_friend(Onion_Client *onion_c, uint16_t friendnum)
                     for (j = 0; j < n; ++j) {
                         const uint32_t num = random_u32() % num_nodes;
                         client_send_announce_request(onion_c, friendnum + 1, onion_c->path_nodes[num].ip_port,
-                                                     onion_c->path_nodes[num].public_key, nullptr, ~0);
+                                                     onion_c->path_nodes[num].public_key, nullptr, -1);
                     }
 
                     ++onion_c->friends_list[friendnum].run_count;
@@ -1723,7 +1723,7 @@ static void do_announce(Onion_Client *onion_c)
             if (list_nodes[i].unsuccessful_pings == ONION_NODE_MAX_PINGS - 1
                     && mono_time_is_timeout(onion_c->mono_time, list_nodes[i].added_time, TIME_TO_STABLE)) {
                 /* Last chance for a long-lived node - try a random path */
-                path_to_use = ~0;
+                path_to_use = -1;
             }
 
             if (client_send_announce_request(onion_c, 0, list_nodes[i].ip_port, list_nodes[i].public_key,
@@ -1751,7 +1751,7 @@ static void do_announce(Onion_Client *onion_c)
             if (num_nodes != 0) {
                 for (i = 0; i < (MAX_ONION_CLIENTS_ANNOUNCE / 2); ++i) {
                     const uint32_t num = random_u32() % num_nodes;
-                    client_send_announce_request(onion_c, 0, path_nodes[num].ip_port, path_nodes[num].public_key, nullptr, ~0);
+                    client_send_announce_request(onion_c, 0, path_nodes[num].ip_port, path_nodes[num].public_key, nullptr, -1);
                 }
             }
         }