wornvirtue
/
premiere-libtorrent
forked from premiere/premiere-libtorrent
1
0
Fork 0
Code Pull Requests Activity

fix post_torrent_update patch in client_test

This commit is contained in:
Arvid Norberg 2011-12-24 04:30:27 +00:00
parent 9412506df7
commit 67d6f5aeb4
1 changed files with 12 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
examples/client_test.cpp
View File

@ -716,25 +716,8 @@ void add_torrent(libtorrent::session& ses
p.flags |= add_torrent_params::flag_paused; p.flags |= add_torrent_params::flag_paused;
p.flags &= ~add_torrent_params::flag_duplicate_is_error; p.flags &= ~add_torrent_params::flag_duplicate_is_error;
p.flags |= add_torrent_params::flag_auto_managed; p.flags |= add_torrent_params::flag_auto_managed;
if (monitored_dir) p.userdata = (void*)strdup(torrent.c_str());
{ ses.async_add_torrent(p);
p.userdata = (void*)strdup(torrent.c_str());
ses.async_add_torrent(p);
return;
}
torrent_handle h = ses.add_torrent(p, ec);
non_files.insert(h);
h.set_max_connections(max_connections_per_torrent);
h.set_max_uploads(-1);
h.set_upload_limit(torrent_upload_limit);
h.set_download_limit(torrent_download_limit);
h.use_interface(outgoing_interface.c_str());
#ifndef TORRENT_DISABLE_RESOLVE_COUNTRIES
h.resolve_countries(true);
#endif
} }
void scan_dir(std::string const& dir_path void scan_dir(std::string const& dir_path
@ -895,8 +878,12 @@ bool handle_alert(libtorrent::session& ses, libtorrent::alert* a
if (add_torrent_alert* p = alert_cast<add_torrent_alert>(a)) if (add_torrent_alert* p = alert_cast<add_torrent_alert>(a))
{ {
std::string filename = (char*)p->params.userdata; std::string filename;
free(p->params.userdata); if (p->params.userdata)
{
filename = (char*)p->params.userdata;
free(p->params.userdata);
}
if (p->error) if (p->error)
{ {
@ -906,7 +893,8 @@ bool handle_alert(libtorrent::session& ses, libtorrent::alert* a
{ {
torrent_handle h = p->handle; torrent_handle h = p->handle;
files.insert(std::pair<const std::string, torrent_handle>(filename, h)); if (!filename.empty())
files.insert(std::pair<const std::string, torrent_handle>(filename, h));
h.set_max_connections(max_connections_per_torrent); h.set_max_connections(max_connections_per_torrent);
h.set_max_uploads(-1); h.set_max_uploads(-1);
@ -1407,20 +1395,7 @@ int main(int argc, char* argv[])
for (std::vector<add_torrent_params>::iterator i = magnet_links.begin() for (std::vector<add_torrent_params>::iterator i = magnet_links.begin()
, end(magnet_links.end()); i != end; ++i) , end(magnet_links.end()); i != end; ++i)
{ {
error_code ec; ses.async_add_torrent(*i);
torrent_handle h = ses.add_torrent(*i, ec);
if (ec)
{
fprintf(stderr, "failed to add torrent: %s\n", ec.message().c_str());
continue;
}
non_files.insert(h);
h.set_max_connections(max_connections_per_torrent);
h.set_max_uploads(-1);
h.set_upload_limit(torrent_upload_limit);
h.set_download_limit(torrent_download_limit);
h.use_interface(outgoing_interface.c_str());
} }
for (std::vector<std::string>::iterator i = torrents.begin() for (std::vector<std::string>::iterator i = torrents.begin()
@ -1459,20 +1434,7 @@ int main(int argc, char* argv[])
} }
printf("adding URL: %s\n", i->c_str()); printf("adding URL: %s\n", i->c_str());
error_code ec; ses.async_add_torrent(p);
torrent_handle h = ses.add_torrent(p, ec);
if (ec)
{
fprintf(stderr, "%s\n", ec.message().c_str());
continue;
}
non_files.insert(h);
h.set_max_connections(max_connections_per_torrent);
h.set_max_uploads(-1);
h.set_upload_limit(torrent_upload_limit);
h.set_download_limit(torrent_download_limit);
h.use_interface(outgoing_interface.c_str());
continue; continue;
} }