Make `ip_is_lan` return bool instead of 0/-1.

This inverts the truthiness of the return value. Previously, 0 meant
`true` and -1 meant `false`. Now, `true` (1) means `true` and `false` (0)
means `false`.

1 files changed, 10 insertions, 10 deletions

diff --git a/toxcore/DHT.c b/toxcore/DHT.c
index dc21575e..68143421 100644
--- a/toxcore/DHT.c
+++ b/toxcore/DHT.c
@@ -695,7 +695,7 @@ static void update_client(const Logger *log, const Mono_Time *mono_time, int ind
                      net_ntohs(ip_port.port));
     }
 
-    if (ip_is_lan(assoc->ip_port.ip) != 0 && ip_is_lan(ip_port.ip) == 0) {
+    if (!ip_is_lan(assoc->ip_port.ip) && ip_is_lan(ip_port.ip)) {
         return;
     }
 
@@ -798,7 +798,7 @@ static uint8_t hardening_correct(const Hardening *h)
  */
 static void get_close_nodes_inner(const Mono_Time *mono_time, const uint8_t *public_key, Node_format *nodes_list,
                                   Family sa_family, const Client_data *client_list, uint32_t client_list_length,
-                                  uint32_t *num_nodes_ptr, uint8_t is_LAN, uint8_t want_good)
+                                  uint32_t *num_nodes_ptr, bool is_LAN, uint8_t want_good)
 {
     if (!net_family_is_ipv4(sa_family) && !net_family_is_ipv6(sa_family) && !net_family_is_unspec(sa_family)) {
         return;
@@ -832,11 +832,11 @@ static void get_close_nodes_inner(const Mono_Time *mono_time, const uint8_t *pub
         }
 
         /* don't send LAN ips to non LAN peers */
-        if (ip_is_lan(ipptp->ip_port.ip) == 0 && !is_LAN) {
+        if (ip_is_lan(ipptp->ip_port.ip) && !is_LAN) {
             continue;
         }
 
-        if (ip_is_lan(ipptp->ip_port.ip) != 0 && want_good && hardening_correct(&ipptp->hardening) != HARDENING_ALL_OK
+        if (!ip_is_lan(ipptp->ip_port.ip) && want_good && hardening_correct(&ipptp->hardening) != HARDENING_ALL_OK
                 && !id_equal(public_key, client->public_key)) {
             continue;
         }
@@ -862,7 +862,7 @@ static void get_close_nodes_inner(const Mono_Time *mono_time, const uint8_t *pub
  * want_good : do we want only good nodes as checked with the hardening returned or not?
  */
 static int get_somewhat_close_nodes(const DHT *dht, const uint8_t *public_key, Node_format *nodes_list,
-                                    Family sa_family, uint8_t is_LAN, uint8_t want_good)
+                                    Family sa_family, bool is_LAN, uint8_t want_good)
 {
     uint32_t num_nodes = 0;
     get_close_nodes_inner(dht->mono_time, public_key, nodes_list, sa_family,
@@ -889,7 +889,7 @@ static int get_somewhat_close_nodes(const DHT *dht, const uint8_t *public_key, N
 }
 
 int get_close_nodes(const DHT *dht, const uint8_t *public_key, Node_format *nodes_list, Family sa_family,
-                    uint8_t is_LAN, uint8_t want_good)
+                    bool is_LAN, uint8_t want_good)
 {
     memset(nodes_list, 0, MAX_SENT_NODES * sizeof(Node_format));
     return get_somewhat_close_nodes(dht, public_key, nodes_list, sa_family, is_LAN, want_good);
@@ -1370,8 +1370,8 @@ static int sendnodes_ipv6(const DHT *dht, IP_Port ip_port, const uint8_t *public
     const size_t node_format_size = sizeof(Node_format);
 
     Node_format nodes_list[MAX_SENT_NODES];
-    const uint32_t num_nodes = get_close_nodes(dht, client_id, nodes_list, net_family_unspec, ip_is_lan(ip_port.ip) == 0,
-                               1);
+    const uint32_t num_nodes =
+        get_close_nodes(dht, client_id, nodes_list, net_family_unspec, ip_is_lan(ip_port.ip), 1);
 
     VLA(uint8_t, plain, 1 + node_format_size * MAX_SENT_NODES + length);
 
@@ -2996,12 +2996,12 @@ bool dht_non_lan_connected(const DHT *dht)
         const Client_data *const client = &dht->close_clientlist[i];
 
         if (!mono_time_is_timeout(dht->mono_time, client->assoc4.timestamp, BAD_NODE_TIMEOUT)
-                && ip_is_lan(client->assoc4.ip_port.ip) == -1) {
+                && !ip_is_lan(client->assoc4.ip_port.ip)) {
             return true;
         }
 
         if (!mono_time_is_timeout(dht->mono_time, client->assoc6.timestamp, BAD_NODE_TIMEOUT)
-                && ip_is_lan(client->assoc6.ip_port.ip) == -1) {
+                && !ip_is_lan(client->assoc6.ip_port.ip)) {
             return true;
         }
     }