Combine last_reported_announced with last_seen in Onion_Friend

This resets friend search rate in two circumstances where it should be
reset:
* When the friend gets a dhtpk packet to us;
* When a friend connection to the friend goes down.

1 files changed, 5 insertions, 9 deletions

diff --git a/toxcore/onion_client.c b/toxcore/onion_client.c
index 87b0c79c..1c3b34da 100644
--- a/toxcore/onion_client.c
+++ b/toxcore/onion_client.c
@@ -84,8 +84,6 @@ typedef struct Onion_Friend {
     uint8_t temp_public_key[CRYPTO_PUBLIC_KEY_SIZE];
     uint8_t temp_secret_key[CRYPTO_SECRET_KEY_SIZE];
 
-    uint64_t last_reported_announced;
-
     uint64_t last_dht_pk_onion_sent;
     uint64_t last_dht_pk_dht_sent;
 
@@ -700,7 +698,7 @@ static int client_add_to_list(Onion_Client *onion_c, uint32_t num, const uint8_t
         }
 
         if (is_stored == 1) {
-            onion_c->friends_list[num - 1].last_reported_announced = mono_time_get(onion_c->mono_time);
+            onion_c->friends_list[num - 1].last_seen = mono_time_get(onion_c->mono_time);
         }
 
         list_nodes = onion_c->friends_list[num - 1].clients_list;
@@ -1403,7 +1401,7 @@ int onion_dht_pk_callback(Onion_Client *onion_c, int friend_num,
     return 0;
 }
 
-/* Set a friends DHT public key.
+/* Set a friend's DHT public key.
  *
  * return -1 on failure.
  * return 0 on success.
@@ -1422,8 +1420,6 @@ int onion_set_friend_DHT_pubkey(Onion_Client *onion_c, int friend_num, const uin
         if (public_key_cmp(dht_key, onion_c->friends_list[friend_num].dht_public_key) == 0) {
             return -1;
         }
-
-        onion_c->friends_list[friend_num].know_dht_public_key = 0;
     }
 
     onion_c->friends_list[friend_num].last_seen = mono_time_get(onion_c->mono_time);
@@ -1553,12 +1549,12 @@ static void do_friend(Onion_Client *onion_c, uint16_t friendnum)
     if (onion_c->friends_list[friendnum].run_count < RUN_COUNT_FRIEND_ANNOUNCE_BEGINNING) {
         interval = ANNOUNCE_FRIEND_BEGINNING;
     } else {
-        if (onion_c->friends_list[friendnum].last_reported_announced == 0) {
-            onion_c->friends_list[friendnum].last_reported_announced = mono_time_get(onion_c->mono_time);
+        if (onion_c->friends_list[friendnum].last_seen == 0) {
+            onion_c->friends_list[friendnum].last_seen = mono_time_get(onion_c->mono_time);
         }
 
         uint64_t backoff_interval = (mono_time_get(onion_c->mono_time) -
-                                     onion_c->friends_list[friendnum].last_reported_announced)
+                                     onion_c->friends_list[friendnum].last_seen)
                                     / ONION_FRIEND_BACKOFF_FACTOR;
 
         if (backoff_interval > ONION_FRIEND_MAX_PING_INTERVAL) {