jiigen666/libtorrent
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

proper seed mode fix

Browse Source
This commit is contained in:
Arvid Norberg
2011-04-28 07:32:42 +00:00
parent bbde8f772a
commit c4761e3922
1 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/policy.cpp
View File

@@ -357,20 +357,32 @@ namespace libtorrent
continue; continue;
} }
if (ses.m_alerts.should_post<peer_blocked_alert>())
ses.m_alerts.post_alert(peer_blocked_alert(m_torrent->get_handle(), (*i)->address()));
int current = i - m_peers.begin();
TORRENT_ASSERT(current >= 0);
TORRENT_ASSERT(m_peers.size() > 0);
TORRENT_ASSERT(i != m_peers.end());
if ((*i)->connection) if ((*i)->connection)
{ {
(*i)->connection->disconnect(errors::banned_by_ip_filter); // disconnecting the peer here may also delete the
if (ses.m_alerts.should_post<peer_blocked_alert>()) // peer_info_struct. If that is the case, just continue
ses.m_alerts.post_alert(peer_blocked_alert(m_torrent->get_handle(), (*i)->address())); int count = m_peers.size();
peer_connection* p = (*i)->connection;
p->disconnect(errors::banned_by_ip_filter);
// what *i refers to has changed, i.e. cur was deleted
if (m_peers.size() < count)
{
i = m_peers.begin() + current;
continue;
}
TORRENT_ASSERT((*i)->connection == 0 TORRENT_ASSERT((*i)->connection == 0
|| (*i)->connection->peer_info_struct() == 0); || (*i)->connection->peer_info_struct() == 0);
} }
else
{
if (ses.m_alerts.should_post<peer_blocked_alert>())
ses.m_alerts.post_alert(peer_blocked_alert(m_torrent->get_handle(), (*i)->address()));
}
int current = i - m_peers.begin();
erase_peer(i); erase_peer(i);
i = m_peers.begin() + current; i = m_peers.begin() + current;
} }