summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorirungentoo_trip <irungentoo@gmail.com>2014-10-27 20:57:13 -0700
committerirungentoo_trip <irungentoo@gmail.com>2014-10-27 20:57:13 -0700
commit70869b601ebd546aee2a909d9baa322cd4973227 (patch)
tree9bc985bcdbc5aabe6f4aaf28e0d466d41b124042
parent18c66eed50f6cb4cbc488eb111684571cf3a77d1 (diff)
parent7bb0c495ac871a621d838e0db216e17ec9d38aed (diff)
Merge branch 'master' of https://github.com/tux3/toxcore
# # Please enter a commit message to explain why this merge is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored, and an empty message aborts # the commit.
-rw-r--r--toxcore/DHT.c2
-rw-r--r--toxcore/onion_client.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/toxcore/DHT.c b/toxcore/DHT.c
index db03def1..52664218 100644
--- a/toxcore/DHT.c
+++ b/toxcore/DHT.c
@@ -2331,6 +2331,8 @@ void kill_DHT(DHT *dht)
2331 ping_array_free_all(&dht->dht_harden_ping_array); 2331 ping_array_free_all(&dht->dht_harden_ping_array);
2332 kill_ping(dht->ping); 2332 kill_ping(dht->ping);
2333 free(dht->friends_list); 2333 free(dht->friends_list);
2334 free(dht->loaded_friends_list);
2335 free(dht->loaded_clients_list);
2334 free(dht); 2336 free(dht);
2335} 2337}
2336 2338
diff --git a/toxcore/onion_client.c b/toxcore/onion_client.c
index 1395fc07..24949aff 100644
--- a/toxcore/onion_client.c
+++ b/toxcore/onion_client.c
@@ -149,7 +149,7 @@ static int is_path_used(const Onion_Client_Paths *onion_paths, const Node_format
149} 149}
150 150
151/* Create a new path or use an old suitable one (if pathnum is valid) 151/* Create a new path or use an old suitable one (if pathnum is valid)
152 * or a rondom one from onion_paths. 152 * or a random one from onion_paths.
153 * 153 *
154 * return -1 on failure 154 * return -1 on failure
155 * return 0 on success 155 * return 0 on success