1 files changed, 17 insertions, 8 deletions

diff --git a/src/dht.c b/src/dht.c
index c20b6ed..83fcb68 100644
--- a/src/dht.c
+++ b/src/dht.c
@@ -1354,16 +1354,24 @@ void remove_torrent (struct dht * d, struct torrent * t) {
 /**
  * what to do when there are too many torrents and their peers stored, used in add_peer and add_torrent
  *
- * removes last added torrent that wasn't manually added
+ * removes last added torrents that aren't ->type and aren't ->dl until there's space
  *
  * @param d	[in]	libhandle
  */
 
 void oom (struct dht * d) {
 	struct torrent * drop = d->last_torrent;
-	while (drop && (drop->type || drop->dl))
+	while (d->torrents_num >= d->torrents_max || d->peers_num >= d->peers_max) {
+		if (!drop)
+			break;
+		while (drop && (drop->type || drop->dl))
+			drop = drop->prev;
+		struct torrent * old = drop;
+		remove_torrent(d, old);
+		if (!drop)
+			break;
 		drop = drop->prev;
-	remove_torrent(d, drop);
+	}
 }
 
 /**
@@ -1383,8 +1391,7 @@ struct torrent * add_torrent (struct dht * d, struct torrent * t) {
 		torrent_free(t);
 		return found;
 	}
-	if (d->torrents_num >= d->torrents_max)
-		oom(d);
+	oom(d);
 	if (d->torrents)
 		d->torrents->prev = t;
 	else
@@ -1462,8 +1469,7 @@ struct peer * add_peer (struct dht * d, struct torrent * t, struct peer * p) {
 	p->next = t->peers;
 	t->peers = p;
 	d->peers_num++;
-	if (d->peers_num >= d->peers_max)
-		oom(d);
+	oom(d);
 	return p;
 }
 
@@ -2323,8 +2329,11 @@ void periodic (struct dht * d) {
 	torrent_ll_assert(d->torrents);
 	struct torrent * t = d->torrents;
 	while (t) {
-		if (t->ttl && seconds() > t->ttl)
+		if (t->ttl && seconds() > t->ttl) {
+			disconnect(t);
+			t->ttl = 0;
 			t->type = 0;
+		}
 		if (t->type & (peers | announce)) {
 			struct node * n = t->nodes;
 			int sent = 0;